Tested Version of new Tiger line storage format.

[nominatim.git] / sql / tiger_import_start.sql

diff --git a/sql/tiger_import_start.sql b/sql/tiger_import_start.sql
index 9846f6092e255b7c984d9995e818149e8da37e00..f6d65ae238e954416fa2c35b39ec7d0366d20334 100644 (file)
--- a/sql/tiger_import_start.sql
+++ b/sql/tiger_import_start.sql
@@ -1,17 +1,14 @@
 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) {ts:aux-data};
+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, 
+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_endnumber INTEGER, interpolationtype TEXT, 
   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;
   rangestartnumber INTEGER;
   place_centroid GEOMETRY;
   numberrange INTEGER;
   rangestartnumber INTEGER;
   place_centroid GEOMETRY;


@@ -32,7 +29,7 @@ BEGIN
 
   numberrange := endnumber - startnumber;
   rangestartnumber := startnumber;
 
   numberrange := endnumber - startnumber;
   rangestartnumber := startnumber;

-
+  

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


@@ -75,15 +72,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_LineInterpolatePoint(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;