Skip to content

Commit

Permalink
avoid multiple centroid computations
Browse files Browse the repository at this point in the history
  • Loading branch information
lonvia committed Nov 3, 2024
1 parent ad50016 commit 7b21354
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
7 changes: 5 additions & 2 deletions lib-sql/functions/interpolation.sql
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION osmline_insert()
RETURNS TRIGGER
AS $$
DECLARE
centroid GEOMETRY;
BEGIN
NEW.place_id := nextval('seq_place');
NEW.indexed_date := now();
Expand All @@ -135,10 +137,11 @@ BEGIN
END IF;

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.geometry_sector := geometry_sector(NEW.partition, NEW.linegeo);
NEW.geometry_sector := geometry_sector(NEW.partition, centroid);
END IF;

RETURN NEW;
Expand Down
13 changes: 3 additions & 10 deletions lib-sql/functions/utils.sql
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,11 @@ $$
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
AS $$
DECLARE
NEWgeometry geometry;
BEGIN
-- RAISE WARNING '%',place;
NEWgeometry := ST_PointOnSurface(place);
RETURN (partition*1000000) + (500-ST_X(NEWgeometry)::integer)*1000 + (500-ST_Y(NEWgeometry)::integer);
RETURN (partition*1000000) + (500-ST_X(place)::INTEGER)*1000 + (500-ST_Y(place)::INTEGER);
END;
$$
LANGUAGE plpgsql IMMUTABLE;
Expand Down Expand Up @@ -179,16 +175,13 @@ $$
LANGUAGE plpgsql STABLE;


CREATE OR REPLACE FUNCTION get_country_code(place geometry)
CREATE OR REPLACE FUNCTION get_country_code(place_centre geometry)
RETURNS TEXT
AS $$
DECLARE
place_centre GEOMETRY;
nearcountry RECORD;
countries TEXT[];
BEGIN
place_centre := ST_PointOnSurface(place);

-- RAISE WARNING 'get_country_code, start: %', ST_AsText(place_centre);

-- Try for a OSM polygon
Expand Down

0 comments on commit 7b21354

Please sign in to comment.