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

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index b69e6446..91a043da 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -47,12 +47,13 @@ class ReverseGeocode
     /**
      * Find the closest interpolation with the given search diameter.
      *
-     * @param string $sPointSQL   Reverse geocoding point as SQL
-     * @param float  $fSearchDiam Search diameter
+     * @param string  $sPointSQL      Reverse geocoding point as SQL
+     * @param float   $fSearchDiam    Search diameter
+     * @param integer $iParentPlaceID Id of parent object
      *
      * @return Record of the interpolation or null.
      */
-    protected function lookupInterpolation($sPointSQL, $fSearchDiam)
+    protected function lookupInterpolation($sPointSQL, $fSearchDiam, $iParentPlaceID = null)
     {
         $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,';
         $sSQL .= '  ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,';
@@ -61,6 +62,9 @@ class ReverseGeocode
         $sSQL .= ' FROM location_property_osmline';
         $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
         $sSQL .= ' and indexed_status = 0 and startnumber is not NULL ';
+        if (isset($iParentPlaceID)) {
+            $sSQL .= ' and parent_place_id = '.$iParentPlaceID;
+        }
         $sSQL .= ' ORDER BY distance ASC limit 1';
 
         return chksql(
@@ -69,8 +73,24 @@ class ReverseGeocode
         );
     }
     
+    protected function polygonFunctions($sPointSQL, $iMaxRank)
+    {
+        $oResult = null;
+        
+        $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;
+    }
+    
     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.' )';
@@ -107,10 +127,6 @@ class ReverseGeocode
     
     protected function lookupPolygon($sPointSQL, $iMaxRank)
     {
-    
-        $oResult = null;
-        $aPlace = null;
-        
         $sSQL = 'SELECT * FROM';
         $sSQL .= '(select place_id,parent_place_id,rank_address, rank_search, country_code, geometry';
         $sSQL .= ' FROM placex';
@@ -141,12 +157,12 @@ class ReverseGeocode
                 $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
                 $sSQL .= ' FROM placex';
                 $sSQL .= ' WHERE osm_type = \'N\'';
-                if ($iRankAddress = 16){
-                //  using rank_search because of a better differentiation for place nodes at rank_address 16
+                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{
+                } else {
                     $sSQL .= ' AND rank_address > '.$iRankAddress;
                     $sSQL .= ' AND rank_address <= ' .Min(25, $iMaxRank);
                 }
@@ -174,6 +190,7 @@ class ReverseGeocode
         }
         return $aPoly;
     }
+    
 
     public function lookup($fLat, $fLon, $bDoInterpolation = true)
     {
@@ -194,23 +211,7 @@ class ReverseGeocode
         $aPlace = null;
         $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,';
@@ -225,11 +226,11 @@ class ReverseGeocode
             if ($iMaxRank == 26) {
                 $sSQL .= ' rank_address = 26';
             } else {
-                $sSQL .= ' rank_address >= 26';
+                $sSQL .= ' rank_address between 26 and '.$iMaxRank;
             }
             $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 class not in (\'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\') ';
             $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
@@ -241,11 +242,26 @@ class ReverseGeocode
             );
             
             if ($aPlace) {
-                    $iPlaceID = $aPlace['place_id'];
-                    $oResult = new Result($iPlaceID);
-                    $iParentPlaceID = $aPlace['parent_place_id'];
-                    // if street and maxrank > streetlevel
-                if (($aPlace['rank_address'] == 26 || $aPlace['rank_address'] == 27)&& $iMaxRank > 27) {
+                    
+                $iDistance = $aPlace['distance'];
+                $iPlaceID = $aPlace['place_id'];
+                $oResult = new Result($iPlaceID);
+                $iParentPlaceID = $aPlace['parent_place_id'];
+                
+                if ($bDoInterpolation && $iMaxRank >= 30) {
+                    if ($aPlace['rank_address'] <=27) {
+                        $iDistance = 0.001;
+                    }
+                    $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance);
+
+                    if ($aHouse) {
+                        $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
+                        $oResult->iHouseNumber = closestHouseNumber($aHouse);
+                    }
+                }
+                
+                // if street and maxrank > streetlevel
+                if (($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_address,country_code,';
                     $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
@@ -255,9 +271,8 @@ class ReverseGeocode
                     $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, 0.001)';
                     $sSQL .= ' AND parent_place_id = '.$iPlaceID;
                     $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 (name is not null or housenumber is not null)';
+                    $sSQL .= ' and class not in (\'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);
@@ -266,33 +281,51 @@ class ReverseGeocode
                         'Could not determine closest place.'
                     );
                     if ($aStreet) {
+                        $iDistance = $aStreet['distance'];
                         $iPlaceID = $aStreet['place_id'];
                         $oResult = new Result($iPlaceID);
                         $iParentPlaceID = $aStreet['parent_place_id'];
+                            
+                        if ($bDoInterpolation && $iMaxRank >= 30) {
+                            $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance, $iParentPlaceID);
+
+                            if ($aHouse) {
+                                $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
+                                $oResult->iHouseNumber = closestHouseNumber($aHouse);
+                            }
+                        }
                     }
                 }
-            } 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']);
+                
+                  // 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;
+                    $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,';
+                    $sSQL .= 'startnumber,endnumber,interpolationtype';
+                    $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$oResult->iId;
+                    $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
+                    $sSQL .= ' ORDER BY distance ASC limit 1';
+                    if (CONST_Debug) var_dump($sSQL);
+                    $aPlaceTiger = chksql(
+                        $this->oDB->getRow($sSQL),
+                        'Could not determine closest Tiger place.'
+                    );
+                    if ($aPlaceTiger) {
+                        if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
+                        $aPlace = $aPlaceTiger;
+                        $oResult = new Result($aPlace['place_id'], Result::TABLE_TIGER);
+                        $oResult->iHouseNumber = closestHouseNumber($aPlaceTiger);
                     }
                 }
+            // if no POI or street is found ...
+            } else {
+                $oResult = $this->PolygonFunctions($sPointSQL, $iMaxRank);
             }
             // 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']);
-                }
-            }
+            $oResult = $this->PolygonFunctions($sPointSQL, $iMaxRank);
         }
         return $oResult;
     }