X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0996fdfb55ec0152a61a2534d04fe7372ed39fae..13291274e73e1d2fc3582e49fd635f92a9b061e1:/lib/ReverseGeocode.php?ds=sidebyside

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 44ab2bdf..41da2667 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -75,11 +75,14 @@ class ReverseGeocode
     
     protected function polygonFunctions($sPointSQL, $iMaxRank)
     {
+        // starts the nopolygonFound function if no polygon is found with the lookupPolygon function
         $oResult = null;
         
         $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
         if ($aPlace) {
             $oResult = new Result($aPlace['place_id']);
+        // if no polygon which contains the searchpoint is found,
+        // the noPolygonFound function searches in the country_osm_grid table for a polygon
         } elseif (!$aPlace && $iMaxRank > 4) {
             $aPlace = $this->noPolygonFound($sPointSQL, $iMaxRank);
             if ($aPlace) {
@@ -92,6 +95,7 @@ class ReverseGeocode
     protected function noPolygonFound($sPointSQL, $iMaxRank)
     {
         // searches for polygon in table country_osm_grid which contains the searchpoint
+        // and searches for the nearest place node to the searchpoint in this polygon
         $sSQL = 'SELECT * FROM country_osm_grid';
         $sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.' )';
         
@@ -107,7 +111,7 @@ class ReverseGeocode
             $sSQL .= ' WHERE osm_type = \'N\'';
             $sSQL .= ' AND country_code = \''.$sCountryCode.'\'';
             $sSQL .= ' AND rank_address > 0';
-            $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank);
+            $sSQL .= ' AND rank_address <= ' .$iMaxRank;
             $sSQL .= ' AND type != \'postcode\'';
             $sSQL .= ' AND name IS NOT NULL ';
             $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
@@ -127,15 +131,19 @@ class ReverseGeocode
     
     protected function lookupPolygon($sPointSQL, $iMaxRank)
     {
+        // searches for polygon where the searchpoint is within
+        // if a polygon is found, placenodes with a higher rank are searched inside the polygon
     
-        $oResult = null;
-        $aPlace = null;
-        
+        // polygon search begins at suburb-level
+        if ($iMaxRank > 25) $iMaxRank = 25;
+        // no polygon search over country-level
+        if ($iMaxRank < 4) $iMaxRank = 4;
+        // search for polygon
         $sSQL = 'SELECT * FROM';
         $sSQL .= '(select place_id,parent_place_id,rank_address, rank_search, country_code, geometry';
         $sSQL .= ' FROM placex';
         $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')';
-        $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank);
+        $sSQL .= ' AND rank_address Between 4 AND ' .$iMaxRank;
         $sSQL .= ' AND geometry && '.$sPointSQL;
         $sSQL .= ' AND type != \'postcode\' ';
         $sSQL .= ' AND name is not null';
@@ -149,12 +157,30 @@ class ReverseGeocode
             'Could not determine polygon containing the point.'
         );
         if ($aPoly) {
+        // if a polygon is found, search for placenodes begins ...
             $iParentPlaceID = $aPoly['parent_place_id'];
             $iRankAddress = $aPoly['rank_address'];
             $iRankSearch = $aPoly['rank_search'];
             $iPlaceID = $aPoly['place_id'];
             
             if ($iRankAddress != $iMaxRank) {
+            //search diameter for the place node search
+                if ($iMaxRank <= 4) {
+                    $fSearchDiam = 4;
+                } elseif ($iMaxRank <= 8) {
+                    $fSearchDiam = 2;
+                } elseif ($iMaxRank <= 10) {
+                    $fSearchDiam = 1;
+                } elseif ($iMaxRank <= 12) {
+                    $fSearchDiam = 0.8;
+                } elseif ($iMaxRank <= 17) {
+                    $fSearchDiam = 0.6;
+                } elseif ($iMaxRank <= 18) {
+                    $fSearchDiam = 0.2;
+                } elseif ($iMaxRank <= 25) {
+                    $fSearchDiam = 0.1;
+                }
+                
                 $sSQL = 'SELECT *';
                 $sSQL .= ' FROM (';
                 $sSQL .= ' SELECT place_id, rank_address,country_code, geometry,';
@@ -164,12 +190,13 @@ class ReverseGeocode
                 if ($iRankAddress = 16) {
                 // using rank_search because of a better differentiation for place nodes at rank_address 16
                     $sSQL .= ' AND rank_search > '.$iRankSearch;
-                    $sSQL .= ' AND rank_search <= ' .Min(25, $iMaxRank);
+                    $sSQL .= ' AND rank_search <= ' .$iMaxRank;
                     $sSQL .= ' AND class = \'place\'';
                 } else {
                     $sSQL .= ' AND rank_address > '.$iRankAddress;
-                    $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank);
+                    $sSQL .= ' AND rank_address <= ' .$iMaxRank;
                 }
+                $sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
                 $sSQL .= ' AND type != \'postcode\'';
                 $sSQL .= ' AND name IS NOT NULL ';
                 $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
@@ -206,7 +233,10 @@ class ReverseGeocode
 
     public function lookupPoint($sPointSQL, $bDoInterpolation = true)
     {
-        
+        // starts if the search is on POI or street level,
+        // searches for the nearest POI or street,
+        // if a street is found and a POI is searched for,
+        // the nearest POI which the found street is a parent of is choosen.
         $iMaxRank = $this->iMaxRank;
 
         // Find the nearest point
@@ -253,6 +283,9 @@ class ReverseGeocode
                 $iParentPlaceID = $aPlace['parent_place_id'];
                 
                 if ($bDoInterpolation && $iMaxRank >= 30) {
+                    if ($aPlace['rank_address'] <=27) {
+                        $iDistance = 0.001;
+                    }
                     $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance);
 
                     if ($aHouse) {
@@ -282,7 +315,7 @@ class ReverseGeocode
                         'Could not determine closest place.'
                     );
                     if ($aStreet) {
-                        $iDistance = $aPlace['distance'];
+                        $iDistance = $aStreet['distance'];
                         $iPlaceID = $aStreet['place_id'];
                         $oResult = new Result($iPlaceID);
                         $iParentPlaceID = $aStreet['parent_place_id'];
@@ -300,7 +333,7 @@ class ReverseGeocode
                 
                   // In the US we can check TIGER data for nearest housenumber
                 if (CONST_Use_US_Tiger_Data && $aPlace['country_code'] == 'us' && $this->iMaxRank >= 28) {
-                    $fSearchDiam = $aPlace['rank_search'] > 28 ? $aPlace['distance'] : 0.001;
+                    $fSearchDiam = $aPlace['rank_address'] > 28 ? $aPlace['distance'] : 0.001;
                     $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search,';
                     $sSQL .= 'ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,';
                     $sSQL .= 'ST_distance('.$sPointSQL.', linegeo) as distance,';