deleted query for place nodes search if no polygon is found and added search for...

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index c3356392dba10422fa9719dbbfc6d7d6216b5399..93da7caf168066f41c80329046b0eb4b4c34c6a6 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -68,9 +68,13 @@ class ReverseGeocode
             'Could not determine closest housenumber on an osm interpolation line.'
         );
     }
-    
+
     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 .= ' FROM placex';
@@ -79,7 +83,6 @@ class ReverseGeocode
         $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.' )';
@@ -105,7 +108,6 @@ class ReverseGeocode
                 $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 +151,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 +179,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\') ';
@@ -220,7 +237,7 @@ class ReverseGeocode
         } else {
             $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
             if ($aPlace) {
-                    $oResult = new Result($aPlace['place_id']);
+                $oResult = new Result($aPlace['place_id']);
             }
         }
         return $oResult;