X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/49d0ce1de4106914d90f6a9c959c7c804e960aba..8bc3bb16a116f0152b49b00dff53fb1f37f0fb31:/sql/tiger_import_start.sql diff --git a/sql/tiger_import_start.sql b/sql/tiger_import_start.sql index c3e1ed02..5acb3e59 100644 --- a/sql/tiger_import_start.sql +++ b/sql/tiger_import_start.sql @@ -1,5 +1,5 @@ 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, street TEXT, isin TEXT, postcode TEXT); +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, @@ -10,7 +10,6 @@ DECLARE endnumber INTEGER; stepsize INTEGER; numberrange INTEGER; - rangestartnumber INTEGER; place_centroid GEOMETRY; out_partition INTEGER; out_parent_place_id BIGINT; @@ -28,8 +27,7 @@ BEGIN END IF; 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; @@ -73,8 +71,8 @@ BEGIN END IF; --insert street(line) into import table -insert into location_property_tiger_import (linegeo, place_id, partition, parent_place_id, startnumber, endnumber, interpolationtype, street, isin, postcode) -values (linegeo, nextval('seq_place'), out_partition, out_parent_place_id, startnumber, endnumber, interpolationtype, in_street, in_isin, in_postcode); +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 1; END;