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 b0797df2bddcd574ea05df20f1e83c57d68a7e87..b8738d33660c3651dd989c0cab57327c0440f2c1 100644 (file)
--- 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,
   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.
 
   -- 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 01f99715e6cbf63770a8cab2f813383196166b7d..9d0d73b5197e23ad0452c05c877db2f7fb3bfb54 100644 (file)
--- 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.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);
   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.
   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
 
     -- 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 50116566b99c738c37f391cf476da6481ceec491..d15ebe43f660464b87ec916155b3c3725c09abce 100644 (file)
--- a/lib-sql/functions/utils.sql
+++ b/lib-sql/functions/utils.sql
@@ -7,6 +7,26 @@
 
 -- Assorted helper functions for the triggers.
 
 
 -- 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 $$
 CREATE OR REPLACE FUNCTION geometry_sector(partition INTEGER, place geometry)
   RETURNS INTEGER
   AS $$


@@ -21,6 +41,7 @@ $$
 LANGUAGE plpgsql IMMUTABLE;
 
 
 LANGUAGE plpgsql IMMUTABLE;
 
 

+

 CREATE OR REPLACE FUNCTION array_merge(a INTEGER[], b INTEGER[])
   RETURNS INTEGER[]
   AS $$
 CREATE OR REPLACE FUNCTION array_merge(a INTEGER[], b INTEGER[])
   RETURNS INTEGER[]
   AS $$