X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3d68828201467d99b007065f5db68bbdef6c0d5c..7a11e17008efa632eac9fd65b8599814681cb03d:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 8616be13..6908ac98 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -520,7 +520,7 @@
 				foreach($this->aRoutePoints as $aPoint)
 				{
 					if (!$bFirst) $sViewboxCentreSQL .= ",";
-					$sViewboxCentreSQL .= $aPoint[1].' '.$aPoint[0];
+					$sViewboxCentreSQL .= $aPoint[0].' '.$aPoint[1];
 					$bFirst = false;
 				}
 				$sViewboxCentreSQL .= ")'::geometry,4326)";
@@ -1270,7 +1270,21 @@
 								}
 							}
 							if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
-							if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank between 16 and 27";
+							if ($aSearch['sHouseNumber'])
+							{
+								$aTerms[] = "address_rank between 16 and 27";
+							}
+							else
+							{
+								if ($this->iMinAddressRank > 0)
+								{
+									$aTerms[] = "address_rank >= ".$this->iMinAddressRank;
+								}
+								if ($this->iMaxAddressRank < 30)
+								{
+									$aTerms[] = "address_rank <= ".$this->iMaxAddressRank;
+								}
+							}
 							if ($aSearch['fLon'] && $aSearch['fLat'])
 							{
 								$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
@@ -1351,8 +1365,8 @@
 								$sPlaceIDs = join(',',$aPlaceIDs);
 
 								// Now they are indexed look for a house attached to a street we found
-								$sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M';
-								$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'";
+								$sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
+								$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and transliteration(housenumber) ~* E'".$sHouseNumberRegex."'";
 								if (sizeof($this->aExcludePlaceIDs))
 								{
 									$sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")";