From: Sarah Hoffmann Date: Sun, 3 Nov 2024 16:46:06 +0000 (+0100) Subject: use line interpolation to create centroid for lines X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ad50016c498098d0f0850c3a9de60623a3bd7e1f use line interpolation to create centroid for lines ST_PointOnSurface always returns one of the vertices of a line. This means that a two-point line will have the centroid at one of the ends, which is less then ideal. --- diff --git a/lib-sql/functions/interpolation.sql b/lib-sql/functions/interpolation.sql index b0797df2..b8738d33 100644 --- a/lib-sql/functions/interpolation.sql +++ b/lib-sql/functions/interpolation.sql @@ -176,8 +176,8 @@ BEGIN END IF; NEW.parent_place_id := get_interpolation_parent(NEW.token_info, NEW.partition, - ST_PointOnSurface(NEW.linegeo), - NEW.linegeo); + get_center_point(NEW.linegeo), + NEW.linegeo); -- Cannot find a parent street. We will not be able to display a reliable -- address, so drop entire interpolation. diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql index 01f99715..9d0d73b5 100644 --- a/lib-sql/functions/placex_triggers.sql +++ b/lib-sql/functions/placex_triggers.sql @@ -668,7 +668,7 @@ BEGIN NEW.place_id := nextval('seq_place'); NEW.indexed_status := 1; --STATUS_NEW - NEW.centroid := ST_PointOnSurface(NEW.geometry); + NEW.centroid := get_center_point(NEW.geometry); NEW.country_code := lower(get_country_code(NEW.centroid)); NEW.partition := get_partition(NEW.country_code); @@ -870,7 +870,7 @@ BEGIN END IF; -- Compute a preliminary centroid. - NEW.centroid := ST_PointOnSurface(NEW.geometry); + NEW.centroid := get_center_point(NEW.geometry); -- recalculate country and partition IF NEW.rank_search = 4 AND NEW.address is not NULL AND NEW.address ? 'country' THEN diff --git a/lib-sql/functions/utils.sql b/lib-sql/functions/utils.sql index 50116566..d15ebe43 100644 --- a/lib-sql/functions/utils.sql +++ b/lib-sql/functions/utils.sql @@ -7,6 +7,26 @@ -- Assorted helper functions for the triggers. +CREATE OR REPLACE FUNCTION get_center_point(place GEOMETRY) + RETURNS GEOMETRY + AS $$ +DECLARE + geom_type TEXT; +BEGIN + geom_type := ST_GeometryType(place); + IF geom_type = ' ST_Point' THEN + RETURN place; + END IF; + IF geom_type = 'ST_LineString' THEN + RETURN ST_LineInterpolatePoint(place, 0.5); + END IF; + + RETURN ST_PointOnSurface(place); +END; +$$ +LANGUAGE plpgsql IMMUTABLE; + + CREATE OR REPLACE FUNCTION geometry_sector(partition INTEGER, place geometry) RETURNS INTEGER AS $$ @@ -21,6 +41,7 @@ $$ LANGUAGE plpgsql IMMUTABLE; + CREATE OR REPLACE FUNCTION array_merge(a INTEGER[], b INTEGER[]) RETURNS INTEGER[] AS $$