hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

linked centroids must always be within geometry

Browse Source 
When using a linked place as centroid for a boundary, check
first that it is really within the area. If it is outside,
just keep the computed centroid because a centroid outside the
area just causes havok.

Fixes #1352.
This commit is contained in:
Sarah Hoffmann
2020-03-04 09:59:57 +01:00
parent a00ea23847
commit 6d431aebb7
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/functions/placex_triggers.sql
View File

@@ -609,6 +609,8 @@ DECLARE
location RECORD;
relation_members TEXT[];
centroid GEOMETRY;
addr_street TEXT;
addr_place TEXT;
@@ -683,10 +685,10 @@ BEGIN
-- Speed up searches - just use the centroid of the feature
-- cheaper but less acurate
NEW.centroid := ST_PointOnSurface(NEW.geometry);
-- For searching near features rather use the centroid
NEW.postcode := null;
--DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid);
NEW.postcode := null;
-- recalculate country and partition
IF NEW.rank_search = 4 AND NEW.address is not NULL AND NEW.address ? 'country' THEN
-- for countries, believe the mapped country code,
@@ -837,9 +839,12 @@ BEGIN
IF location.place_id is not null THEN
--DEBUG: RAISE WARNING 'Linked %', location;
-- Use this as the centre point of the geometry
NEW.centroid := coalesce(location.centroid,
ST_Centroid(location.geometry));
-- Use the linked point as the centre point of the geometry,
-- but only if it is within the area of the boundary.
centroid := coalesce(location.centroid, ST_Centroid(location.geometry));
IF centroid is not NULL AND ST_Within(centroid, NEW.geometry) THEN
NEW.centroid := centroid;
END IF;
-- Use the address rank of the linked place, if it has one
IF location.rank_address between 5 and 25 THEN