From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 3 Nov 2024 21:00:03 +0000 (+0100)
Subject: avoid multiple centroid computations
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/7b21354a8ae6f07ec3774e7114e546c38568f693

avoid multiple centroid computations
---

diff --git a/lib-sql/functions/interpolation.sql b/lib-sql/functions/interpolation.sql
index b8738d33..2fd21e8a 100644
--- a/lib-sql/functions/interpolation.sql
+++ b/lib-sql/functions/interpolation.sql
@@ -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();
@@ -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;
diff --git a/lib-sql/functions/utils.sql b/lib-sql/functions/utils.sql
index d15ebe43..1445be54 100644
--- a/lib-sql/functions/utils.sql
+++ b/lib-sql/functions/utils.sql
@@ -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;
@@ -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