Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-sql / functions / utils.sql

diff --git a/lib-sql/functions/utils.sql b/lib-sql/functions/utils.sql
index 50116566b99c738c37f391cf476da6481ceec491..df00f9167fae980554a52f071dc6d3cd4c6bfbbd 100644 (file)
--- a/lib-sql/functions/utils.sql
+++ b/lib-sql/functions/utils.sql
@@ -7,20 +7,37 @@
 
 -- Assorted helper functions for the triggers.
 
-CREATE OR REPLACE FUNCTION geometry_sector(partition INTEGER, place geometry)
-  RETURNS INTEGER
+CREATE OR REPLACE FUNCTION get_center_point(place GEOMETRY)
+  RETURNS GEOMETRY
   AS $$
 DECLARE
-  NEWgeometry geometry;
+  geom_type TEXT;
 BEGIN
---  RAISE WARNING '%',place;
-  NEWgeometry := ST_PointOnSurface(place);
-  RETURN (partition*1000000) + (500-ST_X(NEWgeometry)::integer)*1000 + (500-ST_Y(NEWgeometry)::integer);
+  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 $$
+BEGIN
+  RETURN (partition*1000000) + (500-ST_X(place)::INTEGER)*1000 + (500-ST_Y(place)::INTEGER);
+END;
+$$
+LANGUAGE plpgsql IMMUTABLE;
+
+
+
 CREATE OR REPLACE FUNCTION array_merge(a INTEGER[], b INTEGER[])
   RETURNS INTEGER[]
   AS $$
@@ -162,17 +179,14 @@ CREATE OR REPLACE FUNCTION get_country_code(place 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);
+-- RAISE WARNING 'get_country_code, start: %', ST_AsText(place);
 
   -- Try for a OSM polygon
   SELECT array_agg(country_code) FROM location_area_country
-    WHERE country_code is not null and st_covers(geometry, place_centre)
+    WHERE country_code is not null and st_covers(geometry, place)
     INTO countries;
 
   IF array_length(countries, 1) = 1 THEN
@@ -183,7 +197,7 @@ BEGIN
     -- more than one country found, confirm against the fallback data what to choose
     FOR nearcountry IN
         SELECT country_code FROM country_osm_grid
-          WHERE ST_Covers(geometry, place_centre) AND country_code = ANY(countries)
+          WHERE ST_Covers(geometry, place) AND country_code = ANY(countries)
           ORDER BY area ASC
     LOOP
         RETURN nearcountry.country_code;
@@ -203,18 +217,18 @@ BEGIN
     RETURN countries[1];
   END IF;
 
--- RAISE WARNING 'osm fallback: %', ST_AsText(place_centre);
+-- RAISE WARNING 'osm fallback: %', ST_AsText(place);
 
   -- Try for OSM fallback data
   -- The order is to deal with places like HongKong that are 'states' within another polygon
   FOR nearcountry IN
     SELECT country_code from country_osm_grid
-    WHERE st_covers(geometry, place_centre) order by area asc limit 1
+    WHERE st_covers(geometry, place) order by area asc limit 1
   LOOP
     RETURN nearcountry.country_code;
   END LOOP;
 
--- RAISE WARNING 'near osm fallback: %', ST_AsText(place_centre);
+-- RAISE WARNING 'near osm fallback: %', ST_AsText(place);
 
   RETURN NULL;
 END;