X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/625018b65420af0af436e999770275788b19f674..796f069d74af5a038afb47047aaa92e8004dda20:/lib/ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index c3356392..b69e6446 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -69,17 +69,56 @@ class ReverseGeocode
         );
     }
     
+    protected function noPolygonFound($sPointSQL, $iMaxRank)
+    {   
+        // searches for polygon in table country_osm_grid which contains the searchpoint
+        $sSQL = 'SELECT * FROM country_osm_grid';
+        $sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.' )';
+        
+        $aPoly = chksql(
+            $this->oDB->getRow($sSQL),
+            'Could not determine polygon containing the point.'
+        );
+        if ($aPoly) {
+            $sCountryCode = $aPoly['country_code'];
+            
+            $sSQL = 'SELECT *, ST_distance('.$sPointSQL.', geometry) as distance';
+            $sSQL .= ' FROM placex';
+            $sSQL .= ' WHERE osm_type = \'N\'';
+            $sSQL .= ' AND country_code = \''.$sCountryCode.'\'';
+            $sSQL .= ' AND rank_address > 0';
+            $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank);
+            $sSQL .= ' AND type != \'postcode\'';
+            $sSQL .= ' AND name IS NOT NULL ';
+            $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
+            $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;
+            }
+        }
+    }
+    
     protected function lookupPolygon($sPointSQL, $iMaxRank)
     {
+    
+        $oResult = null;
+        $aPlace = null;
+        
         $sSQL = 'SELECT * FROM';
-        $sSQL .= '(select place_id,parent_place_id,rank_address,country_code, geometry';
+        $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 geometry && '.$sPointSQL;
         $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';
         $sSQL .= ' ORDER BY rank_address DESC LIMIT 50 ) as a';
         $sSQL .= ' WHERE ST_CONTAINS(geometry, '.$sPointSQL.' )';
@@ -92,6 +131,7 @@ class ReverseGeocode
         if ($aPoly) {
             $iParentPlaceID = $aPoly['parent_place_id'];
             $iRankAddress = $aPoly['rank_address'];
+            $iRankSearch = $aPoly['rank_search'];
             $iPlaceID = $aPoly['place_id'];
             
             if ($iRankAddress != $iMaxRank) {
@@ -101,11 +141,17 @@ class ReverseGeocode
                 $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);
+                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 class = \'place\'';
+                }else{
+                    $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';
@@ -149,6 +195,22 @@ class ReverseGeocode
         $fMaxAreaDistance = 1;
         $bIsTigerStreet = false;
         
+        // try with interpolations before continuing
+        if ($bDoInterpolation && $iMaxRank >= 30) {
+            $aHouse = $this->lookupInterpolation($sPointSQL, $fSearchDiam/3);
+
+            if ($aHouse) {
+                $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
+                $oResult->iHouseNumber = closestHouseNumber($aHouse);
+
+                $aPlace = $aHouse;
+                $iParentPlaceID = $aHouse['parent_place_id']; // the street
+                $iMaxRank = 30;
+                
+                return $oResult;
+            }
+        }// no interpolation found, continue search
+        
         // for POI or street level
         if ($iMaxRank >= 26) {
             $sSQL = 'select place_id,parent_place_id,rank_address,country_code,';
@@ -161,13 +223,12 @@ class ReverseGeocode
             $sSQL .= '   AND';
             // only streets
             if ($iMaxRank == 26) {
-                $sSQL .= ' rank_address != 28 and rank_address = 26';
+                $sSQL .= ' rank_address = 26';
             } else {
-                $sSQL .= ' rank_address != 28 and rank_address >= 26';
+                $sSQL .= ' rank_address >= 26';
             }
             $sSQL .= ' and (name is not null or housenumber is not null';
             $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\') ';
@@ -214,13 +275,23 @@ class ReverseGeocode
                 $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
                 if ($aPlace) {
                     $oResult = new Result($aPlace['place_id']);
+                } elseif(!$aPlace && $iMaxRank > 4)  {
+                    $aPlace = $this->noPolygonFound($sPointSQL, $iMaxRank);
+                    if ($aPlace) {
+                        $oResult = new Result($aPlace['place_id']);
+                    }
                 }
             }
             // lower than street level ($iMaxRank < 26 )
         } else {
             $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
             if ($aPlace) {
+                $oResult = new Result($aPlace['place_id']);
+            } elseif(!$aPlace && $iMaxRank > 4) {
+                $aPlace = $this->noPolygonFound($sPointSQL, $iMaxRank);
+                if ($aPlace) {
                     $oResult = new Result($aPlace['place_id']);
+                }
             }
         }
         return $oResult;