Merge pull request #1126 from lonvia/improve-country-reverse

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 41da26676f771cbd1750b66a3a790400be469e0d..5648fedf26d83b2c053c924a0ad9ac24e45b35f9 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -72,12 +72,12 @@ class ReverseGeocode
             'Could not determine closest housenumber on an osm interpolation line.'
         );
     }
             'Could not determine closest housenumber on an osm interpolation line.'
         );
     }

-    
+

     protected function polygonFunctions($sPointSQL, $iMaxRank)
     {
         // starts the nopolygonFound function if no polygon is found with the lookupPolygon function
         $oResult = null;
     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']);
         $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
         if ($aPlace) {
             $oResult = new Result($aPlace['place_id']);


@@ -91,33 +91,55 @@ class ReverseGeocode
         }
         return $oResult;
     }
         }
         return $oResult;
     }

-    
+

     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
     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.' )';
-        
+        $sSQL = 'SELECT country_code FROM country_osm_grid';
+        $sSQL .= ' WHERE ST_CONTAINS (geometry, '.$sPointSQL.') limit 1';
+

         $aPoly = chksql(
             $this->oDB->getRow($sSQL),
             'Could not determine polygon containing the point.'
         );
         if ($aPoly) {
             $sCountryCode = $aPoly['country_code'];
         $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';
+
+            // look for place nodes with the given country code
+            $sSQL = 'SELECT place_id FROM';
+            $sSQL .= ' (SELECT place_id, rank_search,';
+            $sSQL .= '         ST_distance('.$sPointSQL.', geometry) as distance';

             $sSQL .= ' FROM placex';
             $sSQL .= ' WHERE osm_type = \'N\'';
             $sSQL .= ' AND country_code = \''.$sCountryCode.'\'';
             $sSQL .= ' FROM placex';
             $sSQL .= ' WHERE osm_type = \'N\'';
             $sSQL .= ' AND country_code = \''.$sCountryCode.'\'';

-            $sSQL .= ' AND rank_address > 0';
-            $sSQL .= ' AND rank_address <= ' .$iMaxRank;
+            $sSQL .= ' AND rank_search > 4';
+            $sSQL .= ' AND rank_search <= ' .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 .= ' 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 .= ' AND ST_DWithin('.$sPointSQL.', geometry, 5.0)) p ';
+            $sSQL .= 'WHERE distance <= reverse_place_diameter(rank_search)';
+            $sSQL .= ' ORDER BY rank_search DESC, distance ASC';

             $sSQL .= ' LIMIT 1';
             $sSQL .= ' LIMIT 1';

-            
+
+            if (CONST_Debug) var_dump($sSQL);
+            $aPlacNode = chksql(
+                $this->oDB->getRow($sSQL),
+                'Could not determine place node.'
+            );
+            if ($aPlacNode) {
+                return $aPlacNode;
+            }
+
+            // still nothing, then return the country object
+            $sSQL = 'SELECT place_id, ST_distance('.$sPointSQL.', centroid) as distance';
+            $sSQL .= ' FROM placex';
+            $sSQL .= ' WHERE country_code = \''.$sCountryCode.'\'';
+            $sSQL .= ' AND rank_search = 4 AND rank_address = 4';
+            $sSQL .= ' AND class in (\'boundary\',  \'place\')';
+            $sSQL .= ' ORDER BY distance ASC';
+

             if (CONST_Debug) var_dump($sSQL);
             $aPlacNode = chksql(
                 $this->oDB->getRow($sSQL),
             if (CONST_Debug) var_dump($sSQL);
             $aPlacNode = chksql(
                 $this->oDB->getRow($sSQL),


@@ -128,22 +150,22 @@ 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
     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

-    
+

         // polygon search begins at suburb-level
         if ($iMaxRank > 25) $iMaxRank = 25;
         // no polygon search over country-level
         // polygon search begins at suburb-level
         if ($iMaxRank > 25) $iMaxRank = 25;
         // no polygon search over country-level

-        if ($iMaxRank < 4) $iMaxRank = 4;
+        if ($iMaxRank < 5) $iMaxRank = 5;

         // search for polygon
         // search for polygon

-        $sSQL = 'SELECT * FROM';
-        $sSQL .= '(select place_id,parent_place_id,rank_address, rank_search, country_code, geometry';
+        $sSQL = 'SELECT place_id, parent_place_id, rank_address, rank_search 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 .= ' FROM placex';
         $sSQL .= ' WHERE ST_GeometryType(geometry) in (\'ST_Polygon\', \'ST_MultiPolygon\')';

-        $sSQL .= ' AND rank_address Between 4 AND ' .$iMaxRank;
+        $sSQL .= ' AND rank_address Between 5 AND ' .$iMaxRank;

         $sSQL .= ' AND geometry && '.$sPointSQL;
         $sSQL .= ' AND type != \'postcode\' ';
         $sSQL .= ' AND name is not null';
         $sSQL .= ' AND geometry && '.$sPointSQL;
         $sSQL .= ' AND type != \'postcode\' ';
         $sSQL .= ' AND name is not null';


@@ -162,53 +184,31 @@ class ReverseGeocode
             $iRankAddress = $aPoly['rank_address'];
             $iRankSearch = $aPoly['rank_search'];
             $iPlaceID = $aPoly['place_id'];
             $iRankAddress = $aPoly['rank_address'];
             $iRankSearch = $aPoly['rank_search'];
             $iPlaceID = $aPoly['place_id'];

-            
+

             if ($iRankAddress != $iMaxRank) {
             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,';
+                $sSQL = 'SELECT place_id FROM ';
+                $sSQL .= '(SELECT place_id, rank_search, country_code, geometry,';

                 $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance';
                 $sSQL .= ' FROM placex';
                 $sSQL .= ' WHERE osm_type = \'N\'';
                 $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
-                    $sSQL .= ' AND rank_search > '.$iRankSearch;
-                    $sSQL .= ' AND rank_search <= ' .$iMaxRank;
-                    $sSQL .= ' AND class = \'place\'';
-                } else {
-                    $sSQL .= ' AND rank_address > '.$iRankAddress;
-                    $sSQL .= ' AND rank_address <= ' .$iMaxRank;
-                }
-                $sSQL .= ' AND ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
+                // using rank_search because of a better differentiation
+                // for place nodes at rank_address 16
+                $sSQL .= ' AND rank_search > '.$iRankSearch;
+                $sSQL .= ' AND rank_search <= ' .$iMaxRank;
+                $sSQL .= ' AND class = \'place\'';

                 $sSQL .= ' AND type != \'postcode\'';
                 $sSQL .= ' AND name IS NOT NULL ';
                 $sSQL .= ' AND type != \'postcode\'';
                 $sSQL .= ' AND name IS NOT NULL ';

-                $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
+                $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 )';
                 // 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 .= ' AND distance <= reverse_place_diameter(rank_search)';
+                $sSQL .= ' ORDER BY distance ASC, rank_search DESC';

                 $sSQL .= ' LIMIT 1';
                 $sSQL .= ' LIMIT 1';

-                
+

                 if (CONST_Debug) var_dump($sSQL);
                 $aPlacNode = chksql(
                     $this->oDB->getRow($sSQL),
                 if (CONST_Debug) var_dump($sSQL);
                 $aPlacNode = chksql(
                     $this->oDB->getRow($sSQL),


@@ -221,7 +221,7 @@ class ReverseGeocode
         }
         return $aPoly;
     }
         }
         return $aPoly;
     }

-    
+

 
     public function lookup($fLat, $fLon, $bDoInterpolation = true)
     {
 
     public function lookup($fLat, $fLon, $bDoInterpolation = true)
     {


@@ -245,7 +245,7 @@ class ReverseGeocode
         $aPlace = null;
         $fMaxAreaDistance = 1;
         $bIsTigerStreet = false;
         $aPlace = null;
         $fMaxAreaDistance = 1;
         $bIsTigerStreet = false;

-       
+

         // for POI or street level
         if ($iMaxRank >= 26) {
             $sSQL = 'select place_id,parent_place_id,rank_address,country_code,';
         // for POI or street level
         if ($iMaxRank >= 26) {
             $sSQL = 'select place_id,parent_place_id,rank_address,country_code,';


@@ -274,14 +274,13 @@ class ReverseGeocode
                 $this->oDB->getRow($sSQL),
                 'Could not determine closest place.'
             );
                 $this->oDB->getRow($sSQL),
                 'Could not determine closest place.'
             );

-            
+

             if ($aPlace) {
             if ($aPlace) {

-                    

                 $iDistance = $aPlace['distance'];
                 $iPlaceID = $aPlace['place_id'];
                 $oResult = new Result($iPlaceID);
                 $iParentPlaceID = $aPlace['parent_place_id'];
                 $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;
                 if ($bDoInterpolation && $iMaxRank >= 30) {
                     if ($aPlace['rank_address'] <=27) {
                         $iDistance = 0.001;


@@ -293,7 +292,7 @@ class ReverseGeocode
                         $oResult->iHouseNumber = closestHouseNumber($aHouse);
                     }
                 }
                         $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
                 // 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


@@ -319,7 +318,7 @@ class ReverseGeocode
                         $iPlaceID = $aStreet['place_id'];
                         $oResult = new Result($iPlaceID);
                         $iParentPlaceID = $aStreet['parent_place_id'];
                         $iPlaceID = $aStreet['place_id'];
                         $oResult = new Result($iPlaceID);
                         $iParentPlaceID = $aStreet['parent_place_id'];

-                            
+

                         if ($bDoInterpolation && $iMaxRank >= 30) {
                             $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance, $iParentPlaceID);
 
                         if ($bDoInterpolation && $iMaxRank >= 30) {
                             $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance, $iParentPlaceID);
 


@@ -330,7 +329,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_address'] > 28 ? $aPlace['distance'] : 0.001;
                   // 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_address'] > 28 ? $aPlace['distance'] : 0.001;