From ebe489c22702a9b5d8116b725c1fcb7fbe839c2d Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 20 Nov 2022 19:28:56 +0100 Subject: [PATCH] use rank_search for reverse polygon match --- lib-php/ReverseGeocode.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib-php/ReverseGeocode.php b/lib-php/ReverseGeocode.php index 2aea9038..7732ffbc 100644 --- a/lib-php/ReverseGeocode.php +++ b/lib-php/ReverseGeocode.php @@ -189,14 +189,15 @@ class ReverseGeocode $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 5 AND ' .$iMaxRank; + $sSQL .= ' AND rank_search between 5 and ' .$iMaxRank; + $sSQL .= ' AND rank_address between 4 and 25'; // needed for index selection $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'; + $sSQL .= ' ORDER BY rank_search DESC LIMIT 50 ) as a'; + $sSQL .= ' WHERE ST_Contains(geometry, '.$sPointSQL.' )'; + $sSQL .= ' ORDER BY rank_search DESC LIMIT 1'; Debug::printSQL($sSQL); $aPoly = $this->oDB->getRow($sSQL, null, 'Could not determine polygon containing the point.'); @@ -208,7 +209,7 @@ class ReverseGeocode $iRankSearch = $aPoly['rank_search']; $iPlaceID = $aPoly['place_id']; - if ($iRankAddress != $iMaxRank) { + if ($iRankSearch != $iMaxRank) { $sSQL = 'SELECT place_id FROM '; $sSQL .= '(SELECT place_id, rank_search, country_code, geometry,'; $sSQL .= ' ST_distance('.$sPointSQL.', geometry) as distance'; -- 2.39.5