rename nominatim.admin to nominatim.tools

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

diff --git a/sql/functions/utils.sql b/sql/functions/utils.sql
index 08e82c5be671d4e8b37b89424d30b77fdc491d98..0a49eef52fc16ee1068642e73ac337880e2d1ed1 100644 (file)
--- a/sql/functions/utils.sql
+++ b/sql/functions/utils.sql
@@ -301,12 +301,12 @@ LANGUAGE plpgsql IMMUTABLE;
 CREATE OR REPLACE FUNCTION add_location(place_id BIGINT, country_code varchar(2),
                                         partition INTEGER, keywords INTEGER[],
                                         rank_search INTEGER, rank_address INTEGER,
 CREATE OR REPLACE FUNCTION add_location(place_id BIGINT, country_code varchar(2),
                                         partition INTEGER, keywords INTEGER[],
                                         rank_search INTEGER, rank_address INTEGER,

-                                        in_postcode TEXT, geometry GEOMETRY)
+                                        in_postcode TEXT, geometry GEOMETRY,
+                                        centroid GEOMETRY)

   RETURNS BOOLEAN
   AS $$
 DECLARE
   locationid INTEGER;
   RETURNS BOOLEAN
   AS $$
 DECLARE
   locationid INTEGER;

-  centroid GEOMETRY;

   secgeo GEOMETRY;
   postcode TEXT;
 BEGIN
   secgeo GEOMETRY;
   postcode TEXT;
 BEGIN


@@ -319,15 +319,13 @@ BEGIN
   END IF;
 
   IF ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') THEN
   END IF;
 
   IF ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') THEN

-    centroid := ST_Centroid(geometry);
-

     FOR secgeo IN select split_geometry(geometry) AS geom LOOP
       PERFORM insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, postcode, centroid, secgeo);
     END LOOP;
 
   ELSEIF ST_GeometryType(geometry) = 'ST_Point' THEN
     secgeo := place_node_fuzzy_area(geometry, rank_search);
     FOR secgeo IN select split_geometry(geometry) AS geom LOOP
       PERFORM insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, false, postcode, centroid, secgeo);
     END LOOP;
 
   ELSEIF ST_GeometryType(geometry) = 'ST_Point' THEN
     secgeo := place_node_fuzzy_area(geometry, rank_search);

-    PERFORM insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, true, postcode, geometry, secgeo);
+    PERFORM insertLocationAreaLarge(partition, place_id, country_code, keywords, rank_search, rank_address, true, postcode, centroid, secgeo);

 
   END IF;
 
 
   END IF;