safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

add step column to tiger data table

Browse Source 
This replaces the interpolationtype column.
This commit is contained in:
Sarah Hoffmann
2022-01-27 11:54:12 +01:00
parent 98432395c3
commit 788505095e
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-sql/tables.sql
View File

@@ -80,9 +80,9 @@ CREATE TABLE location_property_tiger (
parent_place_id BIGINT,
startnumber INTEGER,
endnumber INTEGER,
step SMALLINT,
partition SMALLINT,
linegeo GEOMETRY,
interpolationtype TEXT,
postcode TEXT);
GRANT SELECT ON location_property_tiger TO "{{config.DATABASE_WEBUSER}}";

2
lib-sql/tiger_import_finish.sql
View File

@@ -9,7 +9,7 @@
CREATE INDEX IF NOT EXISTS idx_location_property_tiger_parent_place_id_imp
ON location_property_tiger_import (parent_place_id)
{% if postgres.has_index_non_key_column %}
INCLUDE (startnumber, endnumber)
INCLUDE (startnumber, endnumber, step)
{% endif %}
{{db.tablespace.aux_index}};
CREATE UNIQUE INDEX IF NOT EXISTS idx_location_property_tiger_place_id_imp

23
lib-sql/tiger_import_start.sql
View File

@@ -24,11 +24,12 @@ DECLARE
BEGIN
IF in_endnumber > in_startnumber THEN
startnumber = in_startnumber;
endnumber = in_endnumber;
startnumber := in_startnumber;
endnumber := in_endnumber;
ELSE
startnumber = in_endnumber;
endnumber = in_startnumber;
startnumber := in_endnumber;
endnumber := in_startnumber;
linegeo := ST_Reverse(linegeo);
END IF;
IF startnumber < 0 THEN
@@ -50,8 +51,10 @@ BEGIN
END IF;
-- Filter out really broken tiger data
IF numberrange > 0 AND (numberrange::float/stepsize::float > 500)
AND ST_length(linegeo)/(numberrange::float/stepsize::float) < 0.000001 THEN
IF numberrange > 0
and numberrange::float/stepsize::float > 500
and ST_length(linegeo)/(numberrange::float/stepsize::float) < 0.000001
THEN
RAISE WARNING 'Road too short for number range % to % (%)',startnumber,endnumber,
ST_length(linegeo)/(numberrange::float/stepsize::float);
RETURN 0;
@@ -74,8 +77,12 @@ 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, postcode)
values (linegeo, nextval('seq_place'), out_partition, out_parent_place_id, startnumber, endnumber, interpolationtype, in_postcode);
insert into location_property_tiger_import (linegeo, place_id, partition,
parent_place_id, startnumber, endnumber,
step, postcode)
values (linegeo, nextval('seq_place'), out_partition,
out_parent_place_id, startnumber, endnumber,
stepsize, in_postcode);
RETURN 1;
END;