Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index ce2ee5e5db1a3d5bfba35b894349d0c9a07ab3f6..8e5e8bd1de59dd1d13c502d169faf5fcb4153481 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -47,12 +47,13 @@ class ReverseGeocode
     /**
      * Find the closest interpolation with the given search diameter.
      *
     /**
      * 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.
      */
      *
      * @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,';
     {
         $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,';
         $sSQL .= '  ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,';


@@ -61,14 +62,168 @@ class ReverseGeocode
         $sSQL .= ' FROM location_property_osmline';
         $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
         $sSQL .= ' and indexed_status = 0 and startnumber is not NULL ';
         $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(
             $this->oDB->getRow($sSQL),
         $sSQL .= ' ORDER BY distance ASC limit 1';
 
         return chksql(
             $this->oDB->getRow($sSQL),

-            "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;
+
+        $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
+        if ($aPlace) {
+            $oResult = new Result($aPlace['place_id']);
+        // if no polygon which contains the searchpoint is found,
+        // the noPolygonFound function searches in the country_osm_grid table for a polygon
+        } 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
+        // and searches for the nearest place node to the searchpoint in this polygon
+        $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'];
+
+            $sSQL = 'SELECT place_id, 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 .= ' AND ST_DWithin('.$sPointSQL.', geometry, 1.0)';
+            $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)
+    {
+        // 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
+        if ($iMaxRank < 4) $iMaxRank = 4;
+        // search for polygon
+        $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 .= ' AND rank_address Between 4 AND ' .$iMaxRank;
+        $sSQL .= ' AND geometry && '.$sPointSQL;
+        $sSQL .= ' AND type != \'postcode\' ';
+        $sSQL .= ' AND name is not null';
+        $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.' )';
+        $sSQL .= ' ORDER BY rank_address DESC LIMIT 1';
+
+        $aPoly = chksql(
+            $this->oDB->getRow($sSQL),
+            'Could not determine polygon containing the point.'
+        );
+        if ($aPoly) {
+        // if a polygon is found, search for placenodes begins ...
+            $iParentPlaceID = $aPoly['parent_place_id'];
+            $iRankAddress = $aPoly['rank_address'];
+            $iRankSearch = $aPoly['rank_search'];
+            $iPlaceID = $aPoly['place_id'];
+
+            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 place_id';
+                $sSQL .= ' FROM (';
+                $sSQL .= ' SELECT place_id, rank_address,country_code, geometry,';
+                $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.')';
+                $sSQL .= ' AND type != \'postcode\'';
+                $sSQL .= ' AND name IS NOT 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 )';
+                $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;
+                }
+            }
+        }
+        return $aPoly;

     }
 
     }
 

+

     public function lookup($fLat, $fLon, $bDoInterpolation = true)
     {
         return $this->lookupPoint(
     public function lookup($fLat, $fLon, $bDoInterpolation = true)
     {
         return $this->lookupPoint(


@@ -79,143 +234,133 @@ class ReverseGeocode
 
     public function lookupPoint($sPointSQL, $bDoInterpolation = true)
     {
 
     public function lookupPoint($sPointSQL, $bDoInterpolation = true)
     {

+        // starts if the search is on POI or street level,
+        // searches for the nearest POI or street,
+        // if a street is found and a POI is searched for,
+        // the nearest POI which the found street is a parent of is choosen.

         $iMaxRank = $this->iMaxRank;
 
         // Find the nearest point
         $iMaxRank = $this->iMaxRank;
 
         // Find the nearest point

-        $fSearchDiam = 0.0004;
+        $fSearchDiam = 0.006;

         $oResult = null;
         $aPlace = null;
         $fMaxAreaDistance = 1;
         $bIsTigerStreet = false;
         $oResult = null;
         $aPlace = null;
         $fMaxAreaDistance = 1;
         $bIsTigerStreet = false;

-        while ($oResult === null && $fSearchDiam < $fMaxAreaDistance) {
-            $fSearchDiam = $fSearchDiam * 2;
-
-            // If we have to expand the search area by a large amount then we need a larger feature
-            // then there is a limit to how small the feature should be
-            if ($fSearchDiam > 2 && $iMaxRank > 4) $iMaxRank = 4;
-            if ($fSearchDiam > 1 && $iMaxRank > 9) $iMaxRank = 8;
-            if ($fSearchDiam > 0.8 && $iMaxRank > 10) $iMaxRank = 10;
-            if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12;
-            if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17;
-            if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18;
-            if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
-            if ($fSearchDiam > 0.001 && $iMaxRank > 26) {
-                // try with interpolations before continuing
-                if ($bDoInterpolation) {
-                    $aHouse = $this->lookupInterpolation($sPointSQL, $fSearchDiam/2);
-
-                    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;
-
-                        break;
-                    }
-                }
-                // no interpolation found, continue search
-                $iMaxRank = 26;
-            }

 
 

-            $sSQL = 'select place_id,parent_place_id,rank_search,country_code,';
-            $sSQL .= '  ST_distance('.$sPointSQL.', geometry) as distance';
+        // for POI or street level
+        if ($iMaxRank >= 26) {
+            $sSQL = 'select place_id,parent_place_id,rank_address,country_code,';
+            $sSQL .= 'CASE WHEN ST_GeometryType(geometry) in (\'ST_Polygon\',\'ST_MultiPolygon\') THEN ST_distance('.$sPointSQL.', centroid)';
+            $sSQL .= ' ELSE ST_distance('.$sPointSQL.', geometry) ';
+            $sSQL .= ' END as distance';

             $sSQL .= ' FROM ';
             $sSQL .= ' FROM ';

-            if ($fSearchDiam < 0.01) {
-                $sSQL .= ' placex';
-                $sSQL .= '   WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
-                $sSQL .= '   AND';
+            $sSQL .= ' placex';
+            $sSQL .= '   WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
+            $sSQL .= '   AND';
+            // only streets
+            if ($iMaxRank == 26) {
+                $sSQL .= ' rank_address = 26';

             } else {
             } else {

-                $sSQL .= ' (SELECT * FROM placex ';
-                $sSQL .= '   WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
-                $sSQL .= '   LIMIT 1000) as p WHERE';
+                $sSQL .= ' rank_address between 26 and '.$iMaxRank;

             }
             }

-            $sSQL .= ' rank_search != 28 and rank_search >= '.$iMaxRank;
-            $sSQL .= ' and (name is not null or housenumber is not null)';
-            $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
-            $sSQL .= ' and indexed_status = 0 ';
+            $sSQL .= ' and (name is not null or housenumber is not null';
+            $sSQL .= ' or rank_address between 26 and 27)';
+            $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.'))';
             $sSQL .= ' ORDER BY distance ASC limit 1';
             if (CONST_Debug) var_dump($sSQL);
             $aPlace = chksql(
                 $this->oDB->getRow($sSQL),
             $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
             $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
             $sSQL .= ' ORDER BY distance ASC limit 1';
             if (CONST_Debug) var_dump($sSQL);
             $aPlace = chksql(
                 $this->oDB->getRow($sSQL),

-                "Could not determine closest place."
+                'Could not determine closest place.'

             );
             );

+

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

-                $oResult = new Result($aPlace['place_id']);
+                $iDistance = $aPlace['distance'];
+                $iPlaceID = $aPlace['place_id'];
+                $oResult = new Result($iPlaceID);

                 $iParentPlaceID = $aPlace['parent_place_id'];
                 $iParentPlaceID = $aPlace['parent_place_id'];

-                if ($bDoInterpolation) {
-                    if ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27) {
-                        $bIsTigerStreet = ($aPlace['country_code'] == 'us');
-                    } elseif ($aPlace['rank_search'] == 30) {
-                        // If a house was found, make sure there isn't an
-                        // interpolation line that is closer.
-                        $aHouse = $this->lookupInterpolation(
-                            $sPointSQL,
-                            $aPlace['distance']
-                        );
-                        if ($aHouse && $aPlace['distance'] < $aHouse['distance']) {
-                            $oResult = new Result(
-                                $aHouse['place_id'],
-                                Result::TABLE_OSMLINE
-                            );
-                            $oResult->iHouseNumber = closestHouseNumber($aHouse);
-
-                            $aPlace = $aHouse;
-                            $iParentPlaceID = $aHouse['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);

                     }
                 }
                     }
                 }

-            }
-        }

 
 

-        // Only street found? In the US we can check TIGER data for nearest housenumber
-        if (CONST_Use_US_Tiger_Data && $bIsTigerStreet && $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 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';
+                    $sSQL .= ' FROM ';
+                    $sSQL .= ' placex';
+                    // radius ?
+                    $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 .= ' 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);
+                    $aStreet = chksql(
+                        $this->oDB->getRow($sSQL),
+                        'Could not determine closest place.'
+                    );
+                    if ($aStreet) {
+                        $iDistance = $aStreet['distance'];
+                        $iPlaceID = $aStreet['place_id'];
+                        $oResult = new Result($iPlaceID);
+                        $iParentPlaceID = $aStreet['parent_place_id'];

 
 

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

 
 

-            $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);
-                $iParentPlaceID = $aPlace['parent_place_id'];
-                $iMaxRank = 30;
-            }
-        }
+                            if ($aHouse) {
+                                $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
+                                $oResult->iHouseNumber = closestHouseNumber($aHouse);
+                            }
+                        }
+                    }
+                }

 
 

-        // The point we found might be too small - use the address to find what it is a child of
-        if ($oResult !== null && $iMaxRank < 28) {
-            if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
-                $iPlaceID = $iParentPlaceID;
+                  // 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;
+                    $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 {
             } else {

-                $iPlaceID = $oResult->iId;
-            }
-            $sSQL  = 'select address_place_id';
-            $sSQL .= ' FROM place_addressline';
-            $sSQL .= " WHERE place_id = $iPlaceID";
-            $sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
-            $sSQL .= ' LIMIT 1';
-            $iPlaceID = chksql($this->oDB->getOne($sSQL), "Could not get parent for place.");
-            if ($iPlaceID) {
-                $oResult = new Result($iPlaceID);
+                $oResult = $this->PolygonFunctions($sPointSQL, $iMaxRank);

             }
             }

+            // lower than street level ($iMaxRank < 26 )
+        } else {
+            $oResult = $this->PolygonFunctions($sPointSQL, $iMaxRank);

         }
         }

-

         return $oResult;
     }
 }
         return $oResult;
     }
 }