From: Markus Gail <markus.gail.94@gmail.com>
Date: Mon, 25 Apr 2016 15:44:34 +0000 (+0200)
Subject: Correct merge error in Geocode.php.
X-Git-Tag: v3.0.0~170^2~11^2~5
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a10f5371312d7d98797847381fb0846f6872afcd

Correct merge error in Geocode.php.
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a37455fa..0fb333aa 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -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)
-								$searchedHousenumber = intval($aSearch['sHouseNumber']);
 								if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))
 								{
 									//new query for lines, not housenumbers anymore
@@ -1682,7 +1681,8 @@
 							$sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
 							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);
 						$aFilteredPlaceIDs = $this->oDB->getCol($sSQL);
 						$tempIDs = array();
diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 0921711e..30e74234 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -163,7 +163,7 @@
 				$fSearchDiam = 0.001;
 				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
 					$iRoadID = null;
 					while(!$iRoadID && $fSearchDiam < $fMaxAreaDistance)