Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / tiger_import_start.sql

diff --git a/sql/tiger_import_start.sql b/sql/tiger_import_start.sql
index f40f544bd2a74d6937dffa753d369766d9a634b2..b9c4fcfc86e83e9855c4c63b7e5d7e23cc72a08a 100644 (file)
--- a/sql/tiger_import_start.sql
+++ b/sql/tiger_import_start.sql
@@ -1,24 +1,20 @@
 DROP TABLE IF EXISTS location_property_tiger_import;
 DROP TABLE IF EXISTS location_property_tiger_import;

-CREATE TABLE location_property_tiger_import () INHERITS (location_property);
+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 tigger_create_interpolation(linegeo GEOMETRY, in_startnumber INTEGER, 
-  in_endnumber INTEGER, interpolationtype 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
   AS $$
 DECLARE
   in_street TEXT, in_isin TEXT, in_postcode TEXT) RETURNS INTEGER
   AS $$
 DECLARE

-  

   startnumber INTEGER;
   endnumber INTEGER;
   stepsize INTEGER;
   startnumber INTEGER;
   endnumber INTEGER;
   stepsize INTEGER;

-  housenum INTEGER;
-  newpoints INTEGER;

   numberrange INTEGER;
   numberrange INTEGER;

-  rangestartnumber INTEGER;

   place_centroid GEOMETRY;
   out_partition INTEGER;
   out_parent_place_id BIGINT;
   location RECORD;
   place_centroid GEOMETRY;
   out_partition INTEGER;
   out_parent_place_id BIGINT;
   location RECORD;

-  address_street_word_id INTEGER;  
+  address_street_word_ids INTEGER[];

 
 BEGIN
 
 
 BEGIN
 


@@ -30,8 +26,12 @@ BEGIN
     endnumber = in_startnumber;
   END IF;
 
     endnumber = in_startnumber;
   END IF;
 

+  IF startnumber < 0 THEN
+    RAISE WARNING 'Negative house number range (% to %) on %, %', startnumber, endnumber, in_street, in_isin;
+    RETURN 0;
+  END IF;
+

   numberrange := endnumber - startnumber;
   numberrange := endnumber - startnumber;

-  rangestartnumber := startnumber;

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


@@ -53,14 +53,13 @@ BEGIN
   END IF;
 
   place_centroid := ST_Centroid(linegeo);
   END IF;
 
   place_centroid := ST_Centroid(linegeo);

-  out_partition := get_partition(place_centroid, 'us');
+  out_partition := get_partition('us');

   out_parent_place_id := null;
 
   out_parent_place_id := null;
 

-  address_street_word_id := get_name_id(make_standard_name(in_street));
-  IF address_street_word_id IS NOT NULL THEN
-    FOR location IN SELECT * from getNearestNamedRoadFeature(out_partition, place_centroid, address_street_word_id) LOOP
-      out_parent_place_id := location.place_id;
-    END LOOP;
+  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;
 
   IF out_parent_place_id IS NULL THEN
   END IF;
 
   IF out_parent_place_id IS NULL THEN


@@ -75,15 +74,11 @@ BEGIN
     END LOOP;    
   END IF;
 
     END LOOP;    
   END IF;
 

-  newpoints := 0;
-  FOR housenum IN startnumber..endnumber BY stepsize LOOP
-    insert into location_property_tiger_import (place_id, partition, parent_place_id, housenumber, postcode, centroid)
-    values (nextval('seq_place'), out_partition, out_parent_place_id, housenum, in_postcode,
-      ST_Line_Interpolate_Point(linegeo, (housenum::float-rangestartnumber::float)/numberrange::float));
-    newpoints := newpoints + 1;
-  END LOOP;
+--insert street(line) into import table
+insert into location_property_tiger_import (linegeo, place_id, partition, parent_place_id, startnumber, endnumber, interpolationtype, postcode)
+values (linegeo, nextval('seq_place'), out_partition, out_parent_place_id, startnumber, endnumber, interpolationtype, in_postcode);

 
 

-  RETURN newpoints;
+  RETURN 1;

 END;
 $$
 LANGUAGE plpgsql;
 END;
 $$
 LANGUAGE plpgsql;