X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/237e31b3ce8b1dd7012a5d89e7de5b322dfefdd4..5f2410119de1125f228e69627a362ea7fa1d9557:/lib/ReverseGeocode.php?ds=sidebyside

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index ae7c8527..7e23d1c2 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -70,15 +70,20 @@ class ReverseGeocode
     }
     
     protected function lookupPolygon($sPointSQL, $iMaxRank)
-    {
-        $sSQL = 'select place_id,parent_place_id,rank_search,country_code, geometry';
+    {   
+        $sSQL = 'SELECT * FROM';
+        $sSQL .= '(select place_id,parent_place_id,rank_address,country_code, geometry';
         $sSQL .= ' FROM placex';
         $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\',\'ST_MultiPolygon\')';
-        $sSQL .= ' AND rank_search <= LEAST(25, '.$iMaxRank.')';
-        $sSQL .= ' AND ST_CONTAINS(geometry, '.$sPointSQL.' )';
+        $sSQL .= ' AND rank_address <= '.Min(25,$iMaxRank);
+        $sSQL .= ' AND geometry && '.$sPointSQL;
         $sSQL .= ' AND type != \'postcode\' ';
-        $sSQL .= ' AND name IS NOT NULL ';
-        $sSQL .= ' ORDER BY rank_search DESC LIMIT 1';
+        $sSQL .= ' AND name is not null';
+        $sSQL .= ' AND class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
+        $sSQL .= ' AND indexed_status = 0 and linked_place_id is null';
+        $sSQL .= ' ORDER BY rank_address DESC LIMIT 50 ) as a';
+        $sSQL .= ' WHERE ST_CONTAINS(geometry, '.$sPointSQL.' )';
+        $sSQL .= ' ORDER BY rank_address DESC LIMIT 1';
 
         $aPoly = chksql(
             $this->oDB->getRow($sSQL),
@@ -86,28 +91,39 @@ class ReverseGeocode
         );
         if ($aPoly) {
             $iParentPlaceID = $aPoly['parent_place_id'];
-            $iRankSearch = $aPoly['rank_search'];
-            $iGeometry = $aPoly['geometry'];
+            $iRankAddress = $aPoly['rank_address'];
+            $iPlaceID = $aPoly['place_id'];
             
-            $sSQL = 'select place_id,parent_place_id,rank_search,country_code, linked_place_id,';
-            $sSQL .='  ST_distance('.$sPointSQL.', geometry) as distance';
-            $sSQL .= ' FROM placex';
-            $sSQL .= ' WHERE osm_type = \'N\'';
-            $sSQL .= ' AND rank_search >= '.$iRankSearch;
-            $sSQL .= ' AND rank_search <= LEAST(25, '.$iMaxRank.')';
-            $sSQL .= ' AND ST_CONTAINS(\''.$iGeometry.'\'::geometry, geometry )';
-            $sSQL .= ' AND type != \'postcode\'';
-            $sSQL .= ' AND name IS NOT NULL ';
-            $sSQL .= ' ORDER BY distance ASC,';
-            $sSQL .= ' rank_search DESC';
-            $sSQL .= ' limit 1';
-            if (CONST_Debug) var_dump($sSQL);
-            $aPlacNode = chksql(
-                $this->oDB->getRow($sSQL),
-                'Could not determine place node.'
-            );
-            if ($aPlacNode) {
-                return $aPlacNode;
+            if ($iRankAddress != $iMaxRank) {
+                $sSQL = 'SELECT *';
+                $sSQL .= ' FROM (';
+                $sSQL .= ' SELECT place_id, rank_address,country_code, geometry,';
+                $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
+                $sSQL .= ' FROM placex';
+                $sSQL .= ' WHERE osm_type = \'N\'';
+                $sSQL .= ' AND rank_address > '.$iRankAddress;
+                $sSQL .= ' AND rank_address <= '.Min(25,$iMaxRank);
+                $sSQL .= ' AND type != \'postcode\'';
+                $sSQL .= ' AND name IS NOT NULL ';
+                $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
+                $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
+                // preselection through bbox
+                $sSQL .= ' AND (SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.') && geometry';
+                $sSQL .= ' ORDER BY distance ASC,';
+                $sSQL .= ' rank_address DESC';
+                $sSQL .= ' limit 500) as a';
+                $sSQL .= ' WHERE ST_CONTAINS((SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.'), geometry )';
+                $sSQL .= ' ORDER BY distance ASC, rank_address DESC';
+                $sSQL .= ' LIMIT 1';
+                
+                if (CONST_Debug) var_dump($sSQL);
+                $aPlacNode = chksql(
+                    $this->oDB->getRow($sSQL),
+                    'Could not determine place node.'
+                );
+                if ($aPlacNode) {
+                    return $aPlacNode;
+                }
             }
         }
         return $aPoly;
@@ -136,7 +152,7 @@ class ReverseGeocode
         // for POI or street level
         if ( $iMaxRank >= 26 ) {
             
-            $sSQL = 'select place_id,parent_place_id,rank_search,country_code,';
+            $sSQL = 'select place_id,parent_place_id,rank_address,country_code,';
             $sSQL .= 'CASE WHEN ST_GeometryType(geometry) in (\'ST_Polygon\',\'ST_MultiPolygon\') THEN ST_distance('.$sPointSQL.', centroid)';
             $sSQL .= ' ELSE ST_distance('.$sPointSQL.', geometry) ';
             $sSQL .= ' END as distance';
@@ -146,13 +162,13 @@ class ReverseGeocode
             $sSQL .= '   AND';
             // only streets
             if ($iMaxRank == 26) {
-                $sSQL .= ' rank_search != 28 and rank_search = 26';
+                $sSQL .= ' rank_address != 28 and rank_address = 26';
             } else {
-                $sSQL .= ' rank_search != 28 and rank_search >= 26';
+                $sSQL .= ' rank_address != 28 and rank_address >= 26';
             }
             $sSQL .= ' and (name is not null or housenumber is not null';
-            $sSQL .= '      or rank_search between 26 and 27)';
-            $sSQL .= ' and type not in (\'proposed\')';
+            $sSQL .= ' or rank_address between 26 and 27)';
+            //$sSQL .= ' and type not in (\'proposed\')';
             $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
             $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
             $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
@@ -169,16 +185,20 @@ class ReverseGeocode
                     $oResult = new Result($iPlaceID);
                     $iParentPlaceID = $aPlace['parent_place_id'];
                     // if street and maxrank > streetlevel
-                    if (($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27)&& $iMaxRank > 27 ) {
+                    if (($aPlace['rank_address'] == 26 || $aPlace['rank_address'] == 27)&& $iMaxRank > 27 ) {
                         // find the closest object (up to a certain radius) of which the street is a parent of
-                        $sSQL = ' select place_id,parent_place_id,rank_search,country_code,';
+                        $sSQL = ' select place_id,parent_place_id,rank_address,country_code,';
                         $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
                         $sSQL .= ' FROM ';
                         $sSQL .= ' placex';
                         // radius ?
-                        $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, 0.003)';
+                        $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, 0.001)';
                         $sSQL .= ' AND parent_place_id = '.$iPlaceID;
-                        $sSQL .= ' and (name is not null or housenumber is not null)';
+                        $sSQL .= ' and rank_address != 28';
+                        $sSQL .= ' and (name is not null or housenumber is not null';
+                        $sSQL .= ' or rank_address between 26 and 27)';
+                        $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
+                        $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
                         $sSQL .= ' ORDER BY distance ASC limit 1';
                         if (CONST_Debug) var_dump($sSQL);
                         $aStreet = chksql(
@@ -194,24 +214,14 @@ class ReverseGeocode
                 }else{
                     $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
                     if ($aPlace) {
-                        // if place node is found adress goes over linked_place_id
-                        if (!empty($aPlace['linked_place_id'])) {
-                            $oResult = new Result($aPlace['linked_place_id']);
-                        }else{
-                            $oResult = new Result($aPlace['place_id']);
-                        }
+                        $oResult = new Result($aPlace['place_id']);
                     }
                 }
             // lower than street level ($iMaxRank < 26 )
             }else{
                 $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
                 if ($aPlace) {
-                // if place node is found adress goes over linked_place_id
-                    if (!empty($aPlace['linked_place_id'])) {
-                        $oResult = new Result($aPlace['linked_place_id']);
-                    }else{
                         $oResult = new Result($aPlace['place_id']);
-                    }
                 }
             }
         return $oResult;