X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ac70726591928de57cf5d9cb6a1d9623de7d1838..11153633ffdf9631d411bd6ea1999cd90a5bd98b:/lib/Geocode.php?ds=sidebyside

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 847439c7..cc846f54 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -890,9 +890,9 @@
 												if ($aSearch['sHouseNumber'] === '')
 												{
 													$aSearch['sHouseNumber'] = $sToken;
-                                                    // sanity check: if the housenumber is not mainly made
-                                                    // up of numbers, add a penalty
-                                                    if (preg_match_all("/[^0-9]/", $sToken, $aMatches) > 2) $aSearch['iSearchRank']++;
+													// sanity check: if the housenumber is not mainly made
+													// up of numbers, add a penalty
+													if (preg_match_all("/[^0-9]/", $sToken, $aMatches) > 2) $aSearch['iSearchRank']++;
 													if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
 													/*
 													// Fall back to not searching for this item (better than nothing)
@@ -911,7 +911,7 @@
 													$aSearch['sType'] = $aSearchTerm['type'];
 													if (sizeof($aSearch['aName'])) $aSearch['sOperator'] = 'name';
 													else $aSearch['sOperator'] = 'near'; // near = in for the moment
-                                                    if (strlen($aSearchTerm['operator']) == 0) $aSearch['iSearchRank'] += 1;
+													if (strlen($aSearchTerm['operator']) == 0) $aSearch['iSearchRank'] += 1;
 
 													// Do we have a shortcut id?
 													if ($aSearch['sOperator'] == 'name')
@@ -1205,7 +1205,8 @@
 									// If excluded place IDs are given, it is fair to assume that
 									// there have been results in the small box, so no further
 									// expansion in that case.
-									if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs))
+									// Also don't expand if bounded results were requested.
+									if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch)
 									{
 										$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
 										if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
@@ -1790,17 +1791,3 @@
 
 	} // end class
 
-
-/*
-		if (isset($_GET['route']) && $_GET['route'] && isset($_GET['routewidth']) && $_GET['routewidth'])
-		{
-			$aPoints = explode(',',$_GET['route']);
-			if (sizeof($aPoints) % 2 != 0)
-			{
-				userError("Uneven number of points");
-				exit;
-			}
-			$sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
-			$fPrevCoord = false;
-		}
-*/