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

Merge pull request #3808 from lonvia/avoid-st-relate

Browse Source 
Replace ST_Relate by shortcut functions
This commit is contained in:
Sarah Hoffmann
2025-08-06 16:28:51 +02:00
committed by GitHub
parent a7709c768d 6270c90052
commit b325413486
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib-sql/functions/placex_triggers.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This file is part of Nominatim. (https://nominatim.org) -- This file is part of Nominatim. (https://nominatim.org)
-- --
-- Copyright (C) 2024 by the Nominatim developer community. -- Copyright (C) 2025 by the Nominatim developer community.
-- For a full list of authors see the git log. -- For a full list of authors see the git log.
-- Trigger functions for the placex table. -- Trigger functions for the placex table.
@@ -962,9 +962,8 @@ BEGIN
WHERE class = 'place' and rank_address between 1 and 23 WHERE class = 'place' and rank_address between 1 and 23
and prank.address_rank >= NEW.rank_address and prank.address_rank >= NEW.rank_address
and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index
and geometry && NEW.geometry and ST_Contains(geometry, NEW.geometry)
and geometry ~ NEW.geometry -- needed because ST_Relate does not do bbox cover test and not ST_Equals(geometry, NEW.geometry)
and ST_Relate(geometry, NEW.geometry, 'T*T***FF*') -- contains but not equal
ORDER BY prank.address_rank desc LIMIT 1 ORDER BY prank.address_rank desc LIMIT 1
LOOP LOOP
NEW.rank_address := location.rank_address + 2; NEW.rank_address := location.rank_address + 2;
@@ -985,9 +984,8 @@ BEGIN
and rank_address between 1 and 25 -- select right index and rank_address between 1 and 25 -- select right index
and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index
and prank.address_rank >= NEW.rank_address and prank.address_rank >= NEW.rank_address
and geometry && NEW.geometry and ST_Contains(geometry, NEW.geometry)
and geometry ~ NEW.geometry -- needed because ST_Relate does not do bbox cover test and not ST_Equals(geometry, NEW.geometry)
and ST_Relate(geometry, NEW.geometry, 'T*T***FF*') -- contains but not equal
ORDER BY prank.address_rank desc LIMIT 1 ORDER BY prank.address_rank desc LIMIT 1
LOOP LOOP
NEW.rank_address := location.rank_address + 2; NEW.rank_address := location.rank_address + 2;