X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a8d6db0b2a3b641e2435aa2ccae63d5caa4bcb7f..c68a8c9f2d4898bbc0fa5a13200b888093c0e808:/lib/Geocode.php?ds=inline

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 582b5cae..7de9c8e2 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -544,35 +544,9 @@
 			}
 
 			// Do we have anything that looks like a lat/lon pair?
-			if (preg_match('/\\b([NS])[ ]+([0-9]+[0-9.]*)[ ]+([0-9.]+)?[, ]+([EW])[ ]+([0-9]+)[ ]+([0-9]+[0-9.]*)?\\b/', $sQuery, $aData))
-			{
-				$fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60);
-				$fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60);
-				if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
-				{
-					$this->setNearPoint(array($fQueryLat, $fQueryLon));
-					$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
-				}
-			}
-			elseif (preg_match('/\\b([0-9]+)[ ]+([0-9]+[0-9.]*)?[ ]+([NS])[, ]+([0-9]+)[ ]+([0-9]+[0-9.]*)?[ ]+([EW])\\b/', $sQuery, $aData))
-			{
-				$fQueryLat = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60);
-				$fQueryLon = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60);
-				if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
-				{
-					$this->setNearPoint(array($fQueryLat, $fQueryLon));
-					$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
-				}
-			}
-			elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData))
-			{
-				$fQueryLat = $aData[2];
-				$fQueryLon = $aData[3];
-				if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
-				{
-					$this->setNearPoint(array($fQueryLat, $fQueryLon));
-					$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
-				}
+			if ( $aLooksLike = looksLikeLatLonPair($sQuery) ){
+				$this->setNearPoint(array($aLooksLike['lat'], $aLooksLike['lon']));
+				$sQuery = $aLooksLike['query'];			
 			}
 
 			$aSearchResults = array();
@@ -1184,6 +1158,8 @@
 								{
 									$sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
 									if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
+                                    if ($bBoundingBoxSearch)
+                                        $sSQL .= " and st_overlaps($this->sViewboxSmallSQL, geometry)";
 									$sSQL .= " order by st_area(geometry) desc limit 1";
 									if (CONST_Debug) var_dump($sSQL);
 									$aPlaceIDs = $this->oDB->getCol($sSQL);