From: gemo1011 <moritzgeiger91@web.de>
Date: Mon, 23 Apr 2018 12:32:54 +0000 (+0200)
Subject: better performance for  place node search
X-Git-Tag: v3.2.0~60^2~30
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/cb76635da768d0ba63f12eb8e8d53b6d0d29c373

better performance for  place node search
---

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index ae7c8527..83f6c7e3 100644
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -87,7 +87,7 @@ class ReverseGeocode
         if ($aPoly) {
             $iParentPlaceID = $aPoly['parent_place_id'];
             $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 .='  ST_distance('.$sPointSQL.', geometry) as distance';
@@ -95,9 +95,10 @@ class ReverseGeocode
             $sSQL .= ' WHERE osm_type = \'N\'';
             $sSQL .= ' AND rank_search >= '.$iRankSearch;
             $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 name IS NOT NULL ';
+            $sSQL .= ' AND class not in ( \'waterway\')';
             $sSQL .= ' ORDER BY distance ASC,';
             $sSQL .= ' rank_search DESC';
             $sSQL .= ' limit 1';