X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6e4b7eb96642078f573fc4c05601fb0b44706fab..67c995aef63d25ed343d7c85efbcfa0f62d10725:/sql/functions/place_triggers.sql diff --git a/sql/functions/place_triggers.sql b/sql/functions/place_triggers.sql index b7b51150..eaba12be 100644 --- a/sql/functions/place_triggers.sql +++ b/sql/functions/place_triggers.sql @@ -162,14 +162,14 @@ BEGIN IF st_area(NEW.geometry) < 0.000000001 AND st_area(existinggeometry) < 1 THEN -- re-index points that have moved in / out of the polygon, could be done as a single query but postgres gets the index usage wrong - update placex set indexed_status = 2 where indexed_status = 0 and - (st_covers(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry)) - AND NOT (st_covers(existinggeometry, placex.geometry) OR ST_Intersects(existinggeometry, placex.geometry)) + update placex set indexed_status = 2 where indexed_status = 0 + AND ST_Intersects(NEW.geometry, placex.geometry) + AND NOT ST_Intersects(existinggeometry, placex.geometry) AND rank_search > existingplacex.rank_search AND (rank_search < 28 or name is not null); - update placex set indexed_status = 2 where indexed_status = 0 and - (st_covers(existinggeometry, placex.geometry) OR ST_Intersects(existinggeometry, placex.geometry)) - AND NOT (st_covers(NEW.geometry, placex.geometry) OR ST_Intersects(NEW.geometry, placex.geometry)) + update placex set indexed_status = 2 where indexed_status = 0 + AND ST_Intersects(existinggeometry, placex.geometry) + AND NOT ST_Intersects(NEW.geometry, placex.geometry) AND rank_search > existingplacex.rank_search AND (rank_search < 28 or name is not null); END IF;