hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 21:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid multiple centroid computations

Browse Source
This commit is contained in:
Sarah Hoffmann
2024-11-03 22:00:03 +01:00
parent ad50016c49
commit 7b21354a8a
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib-sql/functions/interpolation.sql
View File

@@ -121,6 +121,8 @@ LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION osmline_insert() CREATE OR REPLACE FUNCTION osmline_insert()
RETURNS TRIGGER RETURNS TRIGGER
AS $$ AS $$
DECLARE
centroid GEOMETRY;
BEGIN BEGIN
NEW.place_id := nextval('seq_place'); NEW.place_id := nextval('seq_place');
NEW.indexed_date := now(); NEW.indexed_date := now();
@@ -135,10 +137,11 @@ BEGIN
END IF; END IF;
NEW.indexed_status := 1; --STATUS_NEW NEW.indexed_status := 1; --STATUS_NEW
NEW.country_code := lower(get_country_code(NEW.linegeo)); centroid := get_center_point(NEW.linegeo);
NEW.country_code := lower(get_country_code(centroid));
NEW.partition := get_partition(NEW.country_code); NEW.partition := get_partition(NEW.country_code);
NEW.geometry_sector := geometry_sector(NEW.partition, NEW.linegeo); NEW.geometry_sector := geometry_sector(NEW.partition, centroid);
END IF; END IF;
RETURN NEW; RETURN NEW;

13
lib-sql/functions/utils.sql
View File

@@ -27,15 +27,11 @@ $$
LANGUAGE plpgsql IMMUTABLE; LANGUAGE plpgsql IMMUTABLE;
CREATE OR REPLACE FUNCTION geometry_sector(partition INTEGER, place geometry) CREATE OR REPLACE FUNCTION geometry_sector(partition INTEGER, place GEOMETRY)
RETURNS INTEGER RETURNS INTEGER
AS $$ AS $$
DECLARE
NEWgeometry geometry;
BEGIN BEGIN
-- RAISE WARNING '%',place; RETURN (partition*1000000) + (500-ST_X(place)::INTEGER)*1000 + (500-ST_Y(place)::INTEGER);
NEWgeometry := ST_PointOnSurface(place);
RETURN (partition*1000000) + (500-ST_X(NEWgeometry)::integer)*1000 + (500-ST_Y(NEWgeometry)::integer);
END; END;
$$ $$
LANGUAGE plpgsql IMMUTABLE; LANGUAGE plpgsql IMMUTABLE;
@@ -179,16 +175,13 @@ $$
LANGUAGE plpgsql STABLE; LANGUAGE plpgsql STABLE;
CREATE OR REPLACE FUNCTION get_country_code(place geometry) CREATE OR REPLACE FUNCTION get_country_code(place_centre geometry)
RETURNS TEXT RETURNS TEXT
AS $$ AS $$
DECLARE DECLARE
place_centre GEOMETRY;
nearcountry RECORD; nearcountry RECORD;
countries TEXT[]; countries TEXT[];
BEGIN BEGIN
place_centre := ST_PointOnSurface(place);
-- RAISE WARNING 'get_country_code, start: %', ST_AsText(place_centre); -- RAISE WARNING 'get_country_code, start: %', ST_AsText(place_centre);
-- Try for a OSM polygon -- Try for a OSM polygon