Merge pull request #3509 from lonvia/deprecations

[nominatim.git] / lib-php / ReverseGeocode.php

diff --git a/lib-php/ReverseGeocode.php b/lib-php/ReverseGeocode.php
index 712f14809bb07f0edffc3b0e371cf791119380db..f6ea590fb7c6cfa451f75952fde894a39f34dceb 100644 (file)
--- a/lib-php/ReverseGeocode.php
+++ b/lib-php/ReverseGeocode.php
@@ -40,10 +40,10 @@ class ReverseGeocode
                       9 => 12,
                       10 => 17, // City
                       11 => 17,
                       9 => 12,
                       10 => 17, // City
                       11 => 17,

-                      12 => 18, // Town / Village
-                      13 => 18,
-                      14 => 22, // Suburb
-                      15 => 22,
+                      12 => 18, // Town
+                      13 => 19, // Village
+                      14 => 22, // Neighbourhood
+                      15 => 25, // Locality

                       16 => 26, // major street
                       17 => 27, // minor street
                       18 => 30, // or >, Building
                       16 => 26, // major street
                       17 => 27, // minor street
                       18 => 30, // or >, Building


@@ -85,6 +85,11 @@ class ReverseGeocode
 
     protected function lookupLargeArea($sPointSQL, $iMaxRank)
     {
 
     protected function lookupLargeArea($sPointSQL, $iMaxRank)
     {

+        $sCountryCode = $this->getCountryCode($sPointSQL);
+        if (CONST_Search_WithinCountries and $sCountryCode == null) {
+            return  null;
+        }
+

         if ($iMaxRank > 4) {
             $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
             if ($aPlace) {
         if ($iMaxRank > 4) {
             $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
             if ($aPlace) {


@@ -94,12 +99,12 @@ class ReverseGeocode
 
         // If no polygon which contains the searchpoint is found,
         // searches in the country_osm_grid table for a polygon.
 
         // If no polygon which contains the searchpoint is found,
         // searches in the country_osm_grid table for a polygon.

-        return  $this->lookupInCountry($sPointSQL, $iMaxRank);
+        return  $this->lookupInCountry($sPointSQL, $iMaxRank, $sCountryCode);

     }
 
     }
 

-    protected function lookupInCountry($sPointSQL, $iMaxRank)
+    protected function getCountryCode($sPointSQL)

     {
     {

-        Debug::newFunction('lookupInCountry');
+        Debug::newFunction('getCountryCode');

         // 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 country_code FROM country_osm_grid';
         // 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 country_code FROM country_osm_grid';


@@ -111,8 +116,12 @@ class ReverseGeocode
             null,
             'Could not determine country polygon containing the point.'
         );
             null,
             'Could not determine country polygon containing the point.'
         );

-        Debug::printVar('Country code', $sCountryCode);
+        return $sCountryCode;
+    }

 
 

+    protected function lookupInCountry($sPointSQL, $iMaxRank, $sCountryCode)
+    {
+        Debug::newFunction('lookupInCountry');

         if ($sCountryCode) {
             if ($iMaxRank > 4) {
                 // look for place nodes with the given country code
         if ($sCountryCode) {
             if ($iMaxRank > 4) {
                 // look for place nodes with the given country code