X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f404b81388537f33a4a9355991f8eeecd914a5b9..70f0d6ba8bc0e8c4115155b27a36e8a9a037d727:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index c345bf36..32b50580 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -485,8 +485,6 @@
 				$sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
 			}
 
-			// Hack to make it handle "new york, ny" (and variants) correctly
-			//$sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $this->sQuery);
 			$sQuery = $this->sQuery;
 
 			// Conflicts between US state abreviations and various words for 'the' in different languages
@@ -498,7 +496,7 @@
 			}
 
 			// View Box SQL
-			$sViewboxCentreSQL;
+			$sViewboxCentreSQL = false;
 			$bBoundingBoxSearch = false;
 			if ($this->aViewBox)
 			{
@@ -894,6 +892,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']++;
 													if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
 													/*
 													// Fall back to not searching for this item (better than nothing)
@@ -1277,9 +1278,17 @@
 							if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";
 							if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
 
-							$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+							if ($aSearch['sHouseNumber'])
+							{
+								$sImportanceSQL = '- abs(26 - address_rank) + 3';
+							}
+							else
+							{
+								$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+							}
 							if ($this->sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
 							if ($this->sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
+
 							$aOrder[] = "$sImportanceSQL DESC";
 							if (sizeof($aSearch['aFullNameAddress']))
 							{