Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index a7bfad63cd730180d5763d5b63449480d9388744..27f8c89cb5b3d90e555d1b3f76984cb32773da39 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -132,7 +132,8 @@ class ReverseGeocode
                 $sSQL .= '   LIMIT 1000) as p WHERE';
             }
             $sSQL .= ' rank_search != 28 and rank_search >= '.$iMaxRank;
                 $sSQL .= '   LIMIT 1000) as p WHERE';
             }
             $sSQL .= ' rank_search != 28 and rank_search >= '.$iMaxRank;

-            $sSQL .= ' and (name is not null or housenumber is not null)';
+            $sSQL .= ' and (name is not null or housenumber is not null';
+            $sSQL .= '      or rank_search between 26 and 27)';

             $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\') ';
             $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\') ';


@@ -205,9 +206,10 @@ class ReverseGeocode
             } else {
                 $iPlaceID = $oResult->iId;
             }
             } else {
                 $iPlaceID = $oResult->iId;
             }

-            $sSQL  = 'select coalesce(p.linked_place_id, a.address_place_id)';
+            $sSQL  = 'select a.address_place_id';

             $sSQL .= ' FROM place_addressline a, placex p';
             $sSQL .= ' FROM place_addressline a, placex p';

-            $sSQL .= " WHERE a.place_id = $iPlaceID and a.place_id = p.place_id";
+            $sSQL .= " WHERE a.place_id = $iPlaceID and a.address_place_id = p.place_id";
+            $sSQL .= '   AND p.linked_place_id is null';

             $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.');
             $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.');