X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/88eaa8430b8ceb1696af50c603561a451353ed2a..8081896bc0e3933c7c8a497a012c674c125de66e:/lib/Geocode.php diff --git a/lib/Geocode.php b/lib/Geocode.php index 12410acc..0e5d4a53 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -808,9 +808,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).')'; } @@ -907,12 +905,6 @@ class Geocode $aResult = array_merge($aResult, $aOutlineResult); } - if ($aResult['extra_place'] == 'city') { - $aResult['class'] = 'place'; - $aResult['type'] = 'city'; - $aResult['rank_search'] = 16; - } - // Is there an icon set for this type of result? $aClassInfo = ClassTypes\getInfo($aResult);