consider side_streams as part of waterways if they have the same name

fixes #155
This commit is contained in:
Sarah Hoffmann
2014-07-21 23:11:28 +02:00
parent 2643225b72
commit 8a4bd7fa4c

View File

@@ -1375,9 +1375,12 @@ BEGIN
FOR relation IN select * from planet_osm_rels r where r.id = NEW.osm_id and r.parts != array[]::bigint[]
LOOP
FOR i IN 1..array_upper(relation.members, 1) BY 2 LOOP
IF relation.members[i+1] in ('', 'main_stream') AND substring(relation.members[i],1,1) = 'w' THEN
IF relation.members[i+1] in ('', 'main_stream', 'side_stream') AND substring(relation.members[i],1,1) = 'w' THEN
--DEBUG: RAISE WARNING 'waterway parent %, child %/%', NEW.osm_id, i, relation.parts[i];
FOR location IN SELECT * FROM placex WHERE osm_type = 'W' and osm_id = substring(relation.members[i],2,200)::bigint and class = NEW.class and type = NEW.type
FOR location IN SELECT * FROM placex
WHERE osm_type = 'W' and osm_id = substring(relation.members[i],2,200)::bigint
and class = NEW.class and type = NEW.type
and ( relation.members[i+1] != 'side_stream' or NEW.name->'name' = name->'name')
LOOP
UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = location.place_id;
END LOOP;