Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 5451c3820dee27bafbccba637151aa8e8598689d..7de9c8e2771a47b49c62b63d2bf8ca4d7ff6e283 100644 (file)
--- 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)";
@@ -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();
@@ -735,7 +709,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);
@@ -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);
@@ -1270,7 +1246,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'].")";