Merge pull request #2789 from lonvia/update-osm2pgsql

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

diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql
index 6143a1edae6b78c2052cd23447880115fe97ad79..70071b2f592f0c6a38f1a19a02bb0f7ddd95b8f1 100644 (file)
--- a/lib-sql/functions/placex_triggers.sql
+++ b/lib-sql/functions/placex_triggers.sql
@@ -16,7 +16,9 @@ CREATE TYPE prepare_update_info AS (
   country_code TEXT,
   class TEXT,
   type TEXT,
   country_code TEXT,
   class TEXT,
   type TEXT,

-  linked_place_id BIGINT
+  linked_place_id BIGINT,
+  centroid_x float,
+  centroid_y float

 );
 
 -- Retrieve the data needed by the indexer for updating the place.
 );
 
 -- Retrieve the data needed by the indexer for updating the place.


@@ -47,7 +49,7 @@ BEGIN
                and rank_search = 30 AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')
          LIMIT 1;
     ELSE
                and rank_search = 30 AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')
          LIMIT 1;
     ELSE

-      -- See if we can inherit addtional address tags from an interpolation.
+      -- See if we can inherit additional address tags from an interpolation.

       -- These will become permanent.
       FOR location IN
         SELECT (address - 'interpolation'::text - 'housenumber'::text) as address
       -- These will become permanent.
       FOR location IN
         SELECT (address - 'interpolation'::text - 'housenumber'::text) as address


@@ -71,6 +73,8 @@ BEGIN
   result.type := p.type;
   result.country_code := p.country_code;
   result.rank_address := p.rank_address;
   result.type := p.type;
   result.country_code := p.country_code;
   result.rank_address := p.rank_address;

+  result.centroid_x := ST_X(p.centroid);
+  result.centroid_y := ST_Y(p.centroid);

 
   -- Names of linked places need to be merged in, so search for a linkable
   -- place already here.
 
   -- Names of linked places need to be merged in, so search for a linkable
   -- place already here.


@@ -992,7 +996,7 @@ BEGIN
       {% if debug %}RAISE WARNING 'Got parent details from search name';{% endif %}
 
       -- determine postcode
       {% if debug %}RAISE WARNING 'Got parent details from search name';{% endif %}
 
       -- determine postcode

-      NEW.postcode := coalesce(token_normalized_postcode(NEW.address->'postcode'),
+      NEW.postcode := coalesce(token_get_postcode(NEW.token_info),

                                location.postcode,
                                get_nearest_postcode(NEW.country_code, NEW.centroid));
 
                                location.postcode,
                                get_nearest_postcode(NEW.country_code, NEW.centroid));
 


@@ -1032,7 +1036,7 @@ BEGIN
   {% if debug %}RAISE WARNING 'Using full index mode for % %', NEW.osm_type, NEW.osm_id;{% endif %}
   IF linked_place is not null THEN
     -- Recompute the ranks here as the ones from the linked place might
   {% if debug %}RAISE WARNING 'Using full index mode for % %', NEW.osm_type, NEW.osm_id;{% endif %}
   IF linked_place is not null THEN
     -- Recompute the ranks here as the ones from the linked place might

-    -- have been shifted to accomodate surrounding boundaries.
+    -- have been shifted to accommodate surrounding boundaries.

     SELECT place_id, osm_id, class, type, extratags,
            centroid, geometry,
            (compute_place_rank(country_code, osm_type, class, type, admin_level,
     SELECT place_id, osm_id, class, type, extratags,
            centroid, geometry,
            (compute_place_rank(country_code, osm_type, class, type, admin_level,


@@ -1103,7 +1107,7 @@ BEGIN
   THEN
     -- Update the list of country names.
     -- Only take the name from the largest area for the given country code
   THEN
     -- Update the list of country names.
     -- Only take the name from the largest area for the given country code

-    -- in the hope that this is the authoritive one.
+    -- in the hope that this is the authoritative one.

     -- Also replace any old names so that all mapping mistakes can
     -- be fixed through regular OSM updates.
     FOR location IN
     -- Also replace any old names so that all mapping mistakes can
     -- be fixed through regular OSM updates.
     FOR location IN


@@ -1150,8 +1154,7 @@ BEGIN
 
   {% if debug %}RAISE WARNING 'RETURN insert_addresslines: %, %, %', NEW.parent_place_id, NEW.postcode, nameaddress_vector;{% endif %}
 
 
   {% if debug %}RAISE WARNING 'RETURN insert_addresslines: %, %, %', NEW.parent_place_id, NEW.postcode, nameaddress_vector;{% endif %}
 

-  NEW.postcode := coalesce(token_normalized_postcode(NEW.address->'postcode'),
-                           NEW.postcode);
+  NEW.postcode := coalesce(token_get_postcode(NEW.token_info), NEW.postcode);

 
   -- if we have a name add this to the name search table
   IF NEW.name IS NOT NULL THEN
 
   -- if we have a name add this to the name search table
   IF NEW.name IS NOT NULL THEN


@@ -1192,7 +1195,7 @@ BEGIN
     NEW.postcode := get_nearest_postcode(NEW.country_code, NEW.geometry);
   END IF;
 
     NEW.postcode := get_nearest_postcode(NEW.country_code, NEW.geometry);
   END IF;
 

-  {% if debug %}RAISE WARNING 'place update % % finsihed.', NEW.osm_type, NEW.osm_id;{% endif %}
+  {% if debug %}RAISE WARNING 'place update % % finished.', NEW.osm_type, NEW.osm_id;{% endif %}

 
   NEW.token_info := token_strip_info(NEW.token_info);
   RETURN NEW;
 
   NEW.token_info := token_strip_info(NEW.token_info);
   RETURN NEW;