Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / functions.sql

diff --git a/sql/functions.sql b/sql/functions.sql
index d86f4a9be321dfb69e8d07847a13ac4e8670199c..ac726cb331a66366a090073bcd87fa260cb5c8e5 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1377,7 +1377,7 @@ BEGIN
 
     -- waterway ways are linked when they are part of a relation and have the same class/type
     IF NEW.osm_type = 'R' and NEW.class = 'waterway' THEN
 
     -- waterway ways are linked when they are part of a relation and have the same class/type
     IF NEW.osm_type = 'R' and NEW.class = 'waterway' THEN

-        FOR relation IN select * from planet_osm_rels r where r.id = NEW.osm_id
+        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
         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