hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-10 12:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct merge error in Geocode.php.

Browse Source
This commit is contained in:
Markus Gail
2016-04-25 17:44:34 +02:00
parent 89c556d163
commit a10f537131
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Geocode.php
View File

@@ -1502,7 +1502,6 @@
} }
//if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger) //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
$searchedHousenumber = intval($aSearch['sHouseNumber']);
if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs)) if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))
{ {
//new query for lines, not housenumbers anymore //new query for lines, not housenumbers anymore
@@ -1682,7 +1681,8 @@
$sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank "; $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")"; if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
} }
$sSQL .= ")"; $sSQL .= ") UNION select place_id from location_property_osmline where place_id in (".join(',',array_keys($aResultPlaceIDs)).")";
$sSQL .= " and (30 between $this->iMinAddressRank and $this->iMaxAddressRank)";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aFilteredPlaceIDs = $this->oDB->getCol($sSQL); $aFilteredPlaceIDs = $this->oDB->getCol($sSQL);
$tempIDs = array(); $tempIDs = array();

2
lib/ReverseGeocode.php
View File

@@ -163,7 +163,7 @@
$fSearchDiam = 0.001; $fSearchDiam = 0.001;
if ($aPlace['rank_search'] == 30) if ($aPlace['rank_search'] == 30)
{ {
// if a house was found, the closest road needs to be searched, to use its place id as parent_place_id of the interpolation line // if a house was found, the closest road needs to be searched, to use its place id as parent_place_id for the interpolation line search
// because a road can be closer to the point than the house from above // because a road can be closer to the point than the house from above
$iRoadID = null; $iRoadID = null;
while(!$iRoadID && $fSearchDiam < $fMaxAreaDistance) while(!$iRoadID && $fSearchDiam < $fMaxAreaDistance)