adapt tests to new ICU address token handling

[nominatim.git] / lib-sql / tiger_import_start.sql

diff --git a/lib-sql/tiger_import_start.sql b/lib-sql/tiger_import_start.sql
index 4b9c33fcbcb5e7650729e1ea34102e056ddf0af4..f344e1745ac8da95a86fd3d8013a8916671f2f91 100644 (file)
--- a/lib-sql/tiger_import_start.sql
+++ b/lib-sql/tiger_import_start.sql
@@ -1,9 +1,9 @@
 DROP TABLE IF EXISTS location_property_tiger_import;
 CREATE TABLE location_property_tiger_import (linegeo GEOMETRY, place_id BIGINT, partition INTEGER, parent_place_id BIGINT, startnumber INTEGER, endnumber INTEGER, interpolationtype TEXT, postcode TEXT);
 
 DROP TABLE IF EXISTS location_property_tiger_import;
 CREATE TABLE location_property_tiger_import (linegeo GEOMETRY, place_id BIGINT, partition INTEGER, parent_place_id BIGINT, startnumber INTEGER, endnumber INTEGER, interpolationtype TEXT, postcode TEXT);
 

-CREATE OR REPLACE FUNCTION tiger_line_import(linegeo GEOMETRY, in_startnumber INTEGER, 
-  in_endnumber INTEGER, interpolationtype TEXT,
-  in_street TEXT, in_isin TEXT, in_postcode TEXT) RETURNS INTEGER
+CREATE OR REPLACE FUNCTION tiger_line_import(linegeo GEOMETRY, in_startnumber INTEGER,
+                                             in_endnumber INTEGER, interpolationtype TEXT,
+                                             token_info JSONB, in_postcode TEXT) RETURNS INTEGER

   AS $$
 DECLARE
   startnumber INTEGER;
   AS $$
 DECLARE
   startnumber INTEGER;


@@ -14,7 +14,6 @@ DECLARE
   out_partition INTEGER;
   out_parent_place_id BIGINT;
   location RECORD;
   out_partition INTEGER;
   out_parent_place_id BIGINT;
   location RECORD;

-  address_street_word_ids INTEGER[];

 
 BEGIN
 
 
 BEGIN
 


@@ -27,13 +26,13 @@ BEGIN
   END IF;
 
   IF startnumber < 0 THEN
   END IF;
 
   IF startnumber < 0 THEN

-    RAISE WARNING 'Negative house number range (% to %) on %, %', startnumber, endnumber, in_street, in_isin;
+    RAISE WARNING 'Negative house number range (% to %)', startnumber, endnumber;

     RETURN 0;
   END IF;
 
   numberrange := endnumber - startnumber;
 
     RETURN 0;
   END IF;
 
   numberrange := endnumber - startnumber;
 

-  IF (interpolationtype = 'odd' AND startnumber%2 = 0) OR (interpolationtype = 'even' AND startnumber%2 = 1) THEN
+  IF (interpolationtype = 'odd' AND startnumber % 2 = 0) OR (interpolationtype = 'even' AND startnumber % 2 = 1) THEN

     startnumber := startnumber + 1;
     stepsize := 2;
   ELSE
     startnumber := startnumber + 1;
     stepsize := 2;
   ELSE


@@ -45,22 +44,18 @@ BEGIN
   END IF;
 
   -- Filter out really broken tiger data
   END IF;
 
   -- Filter out really broken tiger data

-  IF numberrange > 0 AND (numberrange::float/stepsize::float > 500) 
+  IF numberrange > 0 AND (numberrange::float/stepsize::float > 500)

                     AND ST_length(linegeo)/(numberrange::float/stepsize::float) < 0.000001 THEN
                     AND ST_length(linegeo)/(numberrange::float/stepsize::float) < 0.000001 THEN

-    RAISE WARNING 'Road too short for number range % to % on %, % (%)',startnumber,endnumber,in_street,in_isin,
-                  ST_length(linegeo)/(numberrange::float/stepsize::float);    
+    RAISE WARNING 'Road too short for number range % to % (%)',startnumber,endnumber,
+                  ST_length(linegeo)/(numberrange::float/stepsize::float);

     RETURN 0;
   END IF;
 
   place_centroid := ST_Centroid(linegeo);
   out_partition := get_partition('us');
     RETURN 0;
   END IF;
 
   place_centroid := ST_Centroid(linegeo);
   out_partition := get_partition('us');

-  out_parent_place_id := null;

 
 

-  address_street_word_ids := word_ids_from_name(in_street);
-  IF address_street_word_ids IS NOT NULL THEN
-    out_parent_place_id := getNearestNamedRoadPlaceId(out_partition, place_centroid,
-                                                      address_street_word_ids);
-  END IF;
+  out_parent_place_id := getNearestNamedRoadPlaceId(out_partition, place_centroid,
+                                                    token_info);

 
   IF out_parent_place_id IS NULL THEN
     SELECT getNearestParallelRoadFeature(out_partition, linegeo)
 
   IF out_parent_place_id IS NULL THEN
     SELECT getNearestParallelRoadFeature(out_partition, linegeo)