X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ffcce6036fa166736e45625ff239e6407c269b4d..13fb92a9832fa8eef342638ae5d9347811834c79:/lib/Geocode.php?ds=inline diff --git a/lib/Geocode.php b/lib/Geocode.php index c1d0c46f..3336790f 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -245,7 +245,6 @@ class Geocode } $this->oPlaceLookup->loadParamArray($oParams, $sForceGeometryType); - $this->oPlaceLookup->setIncludePolygonAsPoints($oParams->getBool('polygon')); $this->oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', false)); } @@ -808,9 +807,7 @@ class Geocode $sSQL .= 'WHERE place_id in ('.$sPlaceIds.') '; $sSQL .= ' AND ('; $sSQL .= " placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank "; - if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) { - $sSQL .= " OR (extratags->'place') = 'city'"; - } + $sSQL .= " OR placex.rank_search between $this->iMinAddressRank and $this->iMaxAddressRank "; if ($this->aAddressRankList) { $sSQL .= ' OR placex.rank_address in ('.join(',', $this->aAddressRankList).')'; }