hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

get housenumber data for interpolations from place table

Browse Source 
The placex table may not yet be filled when the interpolation
lines are computed.
This commit is contained in:
Sarah Hoffmann
2016-05-15 09:44:00 +02:00
parent 0fcab79486
commit 821949f087
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/functions.sql
View File

@@ -693,15 +693,10 @@ BEGIN
FOR nodeidpos in 1..array_upper(waynodes, 1) LOOP FOR nodeidpos in 1..array_upper(waynodes, 1) LOOP
-- If there is a place of a type other than place/house, use that because select * from place where osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT
-- it is guaranteed to be the original node. For place/house types use the and housenumber is not NULL limit 1 INTO nextnode;
-- one with the smallest id because the original node was created first.
-- Ignore all nodes marked for deletion. (Might happen when the type changes.)
select * from placex where osm_type = 'N' and osm_id = waynodes[nodeidpos]::BIGINT
and indexed_status < 100 and housenumber is not NULL
order by (type = 'address'),place_id limit 1 INTO nextnode;
--RAISE NOTICE 'Nextnode.place_id: %s', nextnode.place_id; --RAISE NOTICE 'Nextnode.place_id: %s', nextnode.place_id;
IF nextnode.place_id IS NOT NULL THEN IF nextnode.osm_id IS NOT NULL THEN
--RAISE NOTICE 'place_id is not null'; --RAISE NOTICE 'place_id is not null';
IF nodeidpos > 1 and nodeidpos < array_upper(waynodes, 1) THEN IF nodeidpos > 1 and nodeidpos < array_upper(waynodes, 1) THEN
-- Make sure that the point is actually on the line. That might -- Make sure that the point is actually on the line. That might
@@ -725,14 +720,7 @@ BEGIN
startnumber := housenum; startnumber := housenum;
sectiongeo := ST_Reverse(sectiongeo); sectiongeo := ST_Reverse(sectiongeo);
END IF; END IF;
-- a correction for odd/even is NOT necessary anymore (e.g. if interpolationtype=even, but start/endnumber != even)
-- see PlaceLookup.php
-- keep for compatibility with previous versions
delete from placex where osm_type = 'N' and osm_id = prevnode.osm_id
and place_id != prevnode.place_id and class = 'place'
and type = 'house';
insert into location_property_osmline insert into location_property_osmline
values (sectiongeo, nextval('seq_place'), partition, wayid, NULL, startnumber, endnumber, values (sectiongeo, nextval('seq_place'), partition, wayid, NULL, startnumber, endnumber,
interpolationtype, street, coalesce(prevnode.postcode, defpostalcode), interpolationtype, street, coalesce(prevnode.postcode, defpostalcode),