Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-sql/functions/interpolation.sql b/lib-sql/functions/interpolation.sql
index 8bfc307b7d9f1dd2147f190cb3a168695118fecd..4ef36f4f635e50b821eb0105b803f67302f9570e 100644 (file)
--- a/lib-sql/functions/interpolation.sql
+++ b/lib-sql/functions/interpolation.sql
@@ -43,8 +43,8 @@ LANGUAGE plpgsql STABLE;
 
 
 -- find the parent road of the cut road parts
 
 
 -- find the parent road of the cut road parts

-CREATE OR REPLACE FUNCTION get_interpolation_parent(street TEXT,
-                                                    place TEXT, partition SMALLINT,
+CREATE OR REPLACE FUNCTION get_interpolation_parent(token_info JSONB,
+                                                    partition SMALLINT,

                                                     centroid GEOMETRY, geom GEOMETRY)
   RETURNS BIGINT
   AS $$
                                                     centroid GEOMETRY, geom GEOMETRY)
   RETURNS BIGINT
   AS $$


@@ -52,7 +52,7 @@ DECLARE
   parent_place_id BIGINT;
   location RECORD;
 BEGIN
   parent_place_id BIGINT;
   location RECORD;
 BEGIN

-  parent_place_id := find_parent_for_address(street, place, partition, centroid);
+  parent_place_id := find_parent_for_address(token_info, partition, centroid);

 
   IF parent_place_id is null THEN
     FOR location IN SELECT place_id FROM placex
 
   IF parent_place_id is null THEN
     FOR location IN SELECT place_id FROM placex


@@ -155,16 +155,12 @@ BEGIN
   NEW.interpolationtype = NEW.address->'interpolation';
 
   place_centroid := ST_PointOnSurface(NEW.linegeo);
   NEW.interpolationtype = NEW.address->'interpolation';
 
   place_centroid := ST_PointOnSurface(NEW.linegeo);

-  NEW.parent_place_id = get_interpolation_parent(NEW.address->'street',
-                                                 NEW.address->'place',
-                                                 NEW.partition, place_centroid, NEW.linegeo);
-
-  IF NEW.address is not NULL AND NEW.address ? 'postcode' AND NEW.address->'postcode' not similar to '%(,|;)%' THEN
-    interpol_postcode := NEW.address->'postcode';
-  ELSE
-    interpol_postcode := NULL;
-  END IF;
+  NEW.parent_place_id = get_interpolation_parent(NEW.token_info, NEW.partition,
+                                                 place_centroid, NEW.linegeo);
+
+  interpol_postcode := token_normalized_postcode(NEW.address->'postcode');

 
 

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

   IF NEW.address ? '_inherited' THEN
     NEW.address := hstore('interpolation', NEW.interpolationtype);
   END IF;
   IF NEW.address ? '_inherited' THEN
     NEW.address := hstore('interpolation', NEW.interpolationtype);
   END IF;


@@ -213,12 +209,13 @@ BEGIN
 
             -- determine postcode
             postcode := coalesce(interpol_postcode,
 
             -- determine postcode
             postcode := coalesce(interpol_postcode,

-                                 prevnode.address->'postcode',
-                                 nextnode.address->'postcode',
+                                 token_normalized_postcode(prevnode.address->'postcode'),
+                                 token_normalized_postcode(nextnode.address->'postcode'),

                                  postcode);
 
             IF postcode is NULL THEN
                                  postcode);
 
             IF postcode is NULL THEN

-                SELECT placex.postcode FROM placex WHERE place_id = NEW.parent_place_id INTO postcode;
+                SELECT token_normalized_postcode(placex.postcode)
+                  FROM placex WHERE place_id = NEW.parent_place_id INTO postcode;

             END IF;
             IF postcode is NULL THEN
                 postcode := get_nearest_postcode(NEW.country_code, nextnode.geometry);
             END IF;
             IF postcode is NULL THEN
                 postcode := get_nearest_postcode(NEW.country_code, nextnode.geometry);


@@ -228,7 +225,7 @@ BEGIN
                 NEW.startnumber := startnumber;
                 NEW.endnumber := endnumber;
                 NEW.linegeo := sectiongeo;
                 NEW.startnumber := startnumber;
                 NEW.endnumber := endnumber;
                 NEW.linegeo := sectiongeo;

-                NEW.postcode := upper(trim(postcode));
+                NEW.postcode := postcode;

              ELSE
               insert into location_property_osmline
                      (linegeo, partition, osm_id, parent_place_id,
              ELSE
               insert into location_property_osmline
                      (linegeo, partition, osm_id, parent_place_id,