X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6b1f2cb2bc9771f2c65ff3f44855e6bfdf778d90..a8d6db0b2a3b641e2435aa2ccae63d5caa4bcb7f:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 5451c382..582b5cae 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)";
@@ -735,7 +735,7 @@
 						{
 							if (substr($aData[1],-2,1) != ' ')
 							{
-								$aData[0] = substr($aData[0],0,strlen($aData[1]-1)).' '.substr($aData[0],strlen($aData[1]-1));
+								$aData[0] = substr($aData[0],0,strlen($aData[1])-1).' '.substr($aData[0],strlen($aData[1])-1);
 								$aData[1] = substr($aData[1],0,-1).' '.substr($aData[1],-1,1);
 							}
 							$aGBPostcodeLocation = gbPostcodeCalculate($aData[0], $aData[1], $aData[2], $this->oDB);
@@ -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'].")";