safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

revert to && comparison for geometries

Browse Source 
Postgis 3 picks the wrong index when using ~ or @.
This commit is contained in:
Sarah Hoffmann
2020-10-16 09:49:48 +02:00
parent acfa7bec9c
commit 1064a9264e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/functions/placex_triggers.sql
View File

@@ -624,7 +624,7 @@ BEGIN
SELECT rank_address FROM placex
WHERE class = 'place' and rank_address < 24
and rank_address > NEW.rank_address
and geometry ~ NEW.geometry
and geometry && NEW.geometry
and ST_Relate(geometry, NEW.geometry, 'T*T***FF*') -- contains but not equal
ORDER BY rank_address desc LIMIT 1
LOOP
@@ -640,7 +640,7 @@ BEGIN
SELECT rank_address FROM placex
WHERE osm_type = 'R' and class = 'boundary' and type = 'administrative'
and rank_address = NEW.rank_address
and geometry ~ NEW.centroid and _ST_Covers(geometry, NEW.centroid)
and geometry && NEW.centroid and _ST_Covers(geometry, NEW.centroid)
LIMIT 1
LOOP
NEW.rank_address = NEW.rank_address + 2;
@@ -743,10 +743,10 @@ BEGIN
IF NEW.osm_type = 'N' AND addr_street IS NULL AND addr_place IS NULL
AND NEW.housenumber IS NULL THEN
FOR location IN
-- The additional ~ condition works around the misguided query
-- The additional && condition works around the misguided query
-- planner of postgis 3.0.
SELECT address from placex where ST_Covers(geometry, NEW.centroid)
and geometry ~ NEW.centroid
and geometry && NEW.centroid
and (address ? 'housenumber' or address ? 'street' or address ? 'place')
and rank_search > 28 AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')
limit 1