Merge pull request #219 from mizabrik/master

[nominatim.git] / tests / features / db / update / interpolation.feature

diff --git a/tests/features/db/update/interpolation.feature b/tests/features/db/update/interpolation.feature
index bfc93b12962f3cd6117358d42f767a846449b92c..66367b108156523cfade47d8b5013610f93cf861 100644 (file)
--- a/tests/features/db/update/interpolation.feature
+++ b/tests/features/db/update/interpolation.feature
@@ -23,19 +23,20 @@ Feature: Update of address interpolations
           | object | parent_place_id
           | N1     | W2
           | N2     | W2
-          | W10    | W2
-      And way 10 expands exactly to housenumbers 4
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W2              | 2           | 6
       When updating place ways
           | osm_id | class   | type    | housenumber | street       | geometry
           | 10     | place   | houses  | even        | Cloud Street | :w-middle
-      Then way 10 expands exactly to housenumbers 4
-      And table placex contains
+      Then table placex contains
           | object | parent_place_id
           | N1     | W3
           | N2     | W3
-          | W10    | W3
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W3              | 2           | 6
 
-    @Fail
     Scenario: addr:street added to housenumbers
       Given the scene parallel-road
       And the place nodes
@@ -57,18 +58,20 @@ Feature: Update of address interpolations
           | object | parent_place_id
           | N1     | W2
           | N2     | W2
-          | W10    | W2
-      And way 10 expands exactly to housenumbers 4
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W2              | 2           | 6
       When updating place nodes
           | osm_id | class | type  | street      | housenumber | geometry
           | 1      | place | house | Cloud Street| 2           | :n-middle-w
           | 2      | place | house | Cloud Street| 6           | :n-middle-e
-      Then way 10 expands exactly to housenumbers 4
-      And table placex contains
+      Then table placex contains
           | object | parent_place_id
           | N1     | W3
           | N2     | W3
-          | W10    | W3
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W3              | 2           | 6
 
 
     Scenario: interpolation tag removed
@@ -92,10 +95,11 @@ Feature: Update of address interpolations
           | object | parent_place_id
           | N1     | W2
           | N2     | W2
-          | W10    | W2
-      And way 10 expands exactly to housenumbers 4
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W2              | 2           | 6
       When marking for delete W10
-      Then way 10 expands to no housenumbers
+      Then table location_property_osmline has no entry for W10
       And table placex contains
           | object | parent_place_id
           | N1     | W2
@@ -122,17 +126,19 @@ Feature: Update of address interpolations
           | object | parent_place_id
           | N1     | W2
           | N2     | W2
-          | W10    | W2
-      And way 10 expands exactly to housenumbers 4
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W2              | 2           | 6
       When updating place ways
           | osm_id | class   | type         | name                    | geometry
           | 3      | highway | unclassified | 'name' : 'Cloud Street' | :w-south
-      Then way 10 expands exactly to housenumbers 4
-      And table placex contains
+      Then table placex contains
           | object | parent_place_id
           | N1     | W3
           | N2     | W3
-          | W10    | W3
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W3              | 2           | 6
 
 
     Scenario: referenced road deleted
@@ -156,12 +162,97 @@ Feature: Update of address interpolations
           | object | parent_place_id
           | N1     | W3
           | N2     | W3
-          | W10    | W3
-      And way 10 expands exactly to housenumbers 4
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W3              | 2           | 6
       When marking for delete W3
-      Then way 10 expands exactly to housenumbers 4
-      And table placex contains
+      Then table placex contains
           | object | parent_place_id
           | N1     | W2
           | N2     | W2
-          | W10    | W2
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W10    | W2              | 2           | 6
+
+    Scenario: building becomes interpolation
+      Given the scene building-with-parallel-streets
+      And the place ways
+          | osm_id | class    | type  | housenumber | geometry
+          | 1      | place    | house | 3           | :w-building
+      And the place ways
+          | osm_id | class   | type         | name                    | geometry
+          | 2      | highway | unclassified | 'name' : 'Cloud Street' | :w-south
+      When importing
+      Then table placex contains
+          | object | parent_place_id
+          | W1     | W2
+      When updating place nodes
+          | osm_id | class | type  | housenumber | geometry
+          | 1      | place | house | 2           | :n-north-w
+          | 2      | place | house | 6           | :n-north-e
+      And the ways
+          | id  | nodes
+          | 1   | 1,100,101,102,2
+      And updating place ways
+          | osm_id | class   | type    | housenumber | street      | geometry
+          | 1      | place   | houses  | even        | Cloud Street| :w-north
+      Then table placex has no entry for W1
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W1     | W2              | 2           | 6
+
+
+
+    Scenario: interpolation becomes building
+      Given the scene building-with-parallel-streets
+      And the place nodes
+          | osm_id | class | type  | housenumber | geometry
+          | 1      | place | house | 2           | :n-north-w
+          | 2      | place | house | 6           | :n-north-e
+      And the place ways
+          | osm_id | class   | type         | name                    | geometry
+          | 2      | highway | unclassified | 'name' : 'Cloud Street' | :w-south
+      And the ways
+          | id  | nodes
+          | 1   | 1,100,101,102,2
+      And the place ways
+          | osm_id | class   | type    | housenumber | street      | geometry
+          | 1      | place   | houses  | even        | Cloud Street| :w-north
+      When importing
+      Then table placex has no entry for W1
+      And table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W1     | W2              | 2           | 6
+      When updating place ways
+          | osm_id | class    | type  | housenumber | geometry
+          | 1      | place    | house | 3           | :w-building
+      Then table placex contains
+          | object | parent_place_id
+          | W1     | W2
+
+    Scenario: housenumbers added to interpolation
+      Given the scene building-with-parallel-streets
+      And the place ways
+          | osm_id | class   | type         | name                    | geometry
+          | 2      | highway | unclassified | 'name' : 'Cloud Street' | :w-south
+      And the ways
+          | id  | nodes
+          | 1   | 1,100,101,102,2
+      And the place ways
+          | osm_id | class   | type    | housenumber | geometry
+          | 1      | place   | houses  | even        | :w-north
+      When importing
+      Then table location_property_osmline has no entry for W1
+      When updating place nodes
+          | osm_id | class | type  | housenumber | geometry
+          | 1      | place | house | 2           | :n-north-w
+          | 2      | place | house | 6           | :n-north-e
+      And updating place ways
+          | osm_id | class   | type    | housenumber | street      | geometry
+          | 1      | place   | houses  | even        | Cloud Street| :w-north
+      Then table location_property_osmline contains
+          | object | parent_place_id | startnumber | endnumber
+          | W1     | W2              | 2           | 6
+
+
+