hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

better performance for place node search

Browse Source
This commit is contained in:
gemo1011
2018-04-23 14:32:54 +02:00
parent 237e31b3ce
commit cb76635da7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ReverseGeocode.php
View File

@@ -87,7 +87,7 @@ class ReverseGeocode
if ($aPoly) { if ($aPoly) {
$iParentPlaceID = $aPoly['parent_place_id']; $iParentPlaceID = $aPoly['parent_place_id'];
$iRankSearch = $aPoly['rank_search']; $iRankSearch = $aPoly['rank_search'];
$iGeometry = $aPoly['geometry']; $iPlaceID = $aPoly['place_id'];
$sSQL = 'select place_id,parent_place_id,rank_search,country_code, linked_place_id,'; $sSQL = 'select place_id,parent_place_id,rank_search,country_code, linked_place_id,';
$sSQL .=' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .=' ST_distance('.$sPointSQL.', geometry) as distance';
@@ -95,9 +95,10 @@ class ReverseGeocode
$sSQL .= ' WHERE osm_type = \'N\''; $sSQL .= ' WHERE osm_type = \'N\'';
$sSQL .= ' AND rank_search >= '.$iRankSearch; $sSQL .= ' AND rank_search >= '.$iRankSearch;
$sSQL .= ' AND rank_search <= LEAST(25, '.$iMaxRank.')'; $sSQL .= ' AND rank_search <= LEAST(25, '.$iMaxRank.')';
$sSQL .= ' AND ST_CONTAINS(\''.$iGeometry.'\'::geometry, geometry )'; $sSQL .= ' AND ST_CONTAINS((SELECT geometry FROM placex WHERE place_id = '.$iPlaceID.'), geometry )';
$sSQL .= ' AND type != \'postcode\''; $sSQL .= ' AND type != \'postcode\'';
$sSQL .= ' AND name IS NOT NULL '; $sSQL .= ' AND name IS NOT NULL ';
$sSQL .= ' AND class not in ( \'waterway\')';
$sSQL .= ' ORDER BY distance ASC,'; $sSQL .= ' ORDER BY distance ASC,';
$sSQL .= ' rank_search DESC'; $sSQL .= ' rank_search DESC';
$sSQL .= ' limit 1'; $sSQL .= ' limit 1';