abort osmline update correctly when way nodes are missing

Fixes #695.

diff --git a/sql/functions.sql b/sql/functions.sql
index be67cf011d7481c2d0d3158c1906f9db22af009c..e6938866d7d02553ca15374294dc97357ac2bbcb 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1026,7 +1026,7 @@ BEGIN
   select nodes from planet_osm_ways where id = NEW.osm_id INTO waynodes;
 
   IF array_upper(waynodes, 1) IS NULL THEN
-    RETURN 0;
+    RETURN NEW;
   END IF;
 
   linegeo := NEW.linegeo;

diff --git a/test/bdd/db/import/interpolation.feature b/test/bdd/db/import/interpolation.feature
index 4ed66b91980e2dbc1306b61c196475b8c90b08ab..7dfc6b238818d1c1e7952d1753b859c3a3c24a20 100644 (file)
--- a/test/bdd/db/import/interpolation.feature
+++ b/test/bdd/db/import/interpolation.feature
@@ -301,3 +301,20 @@ Feature: Import of address interpolations
         Then W1 expands to interpolation
           | start | end | geometry |
           | 23    | 29  | 0.0001 0.0001, 0.0001 0.0002, 0.0001 0.0004 |
+
+    Scenario: Ways without node entries are ignored
+        Given the places
+          | osm | class | type   | housenr | geometry |
+          | W1  | place | houses | even    | 1 1, 1 1.001 |
+        When importing
+        Then W1 expands to no interpolation
+
+    Scenario: Ways without nodes without housenumbers are ignored
+        Given the places
+          | osm | class | type   | housenr | geometry |
+          | N1  | place | house  |         | 1 1 |
+          | N2  | place | house  |         | 1 1.001 |
+          | W1  | place | houses | even    | 1 1, 1 1.001 |
+        When importing
+        Then W1 expands to no interpolation
+