X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e5c79a1d1f3192c9e0b1f180ec334ec69ac967aa..6be2077d922098d65f069557dea55542c15a5c98:/test/bdd/db/update/interpolation.feature?ds=sidebyside diff --git a/test/bdd/db/update/interpolation.feature b/test/bdd/db/update/interpolation.feature index 0eaa97fd..5c07f434 100644 --- a/test/bdd/db/update/interpolation.feature +++ b/test/bdd/db/update/interpolation.feature @@ -17,14 +17,16 @@ Feature: Update of address interpolations | osm | class | type | housenr | geometry | | N1 | place | house | 2 | :n-middle-w | | N2 | place | house | 6 | :n-middle-e | - | W10 | place | houses | even | :w-middle | + And updating places + | osm | class | type | addr+interpolation | geometry | + | W10 | place | houses | even | :w-middle | Then placex contains | object | parent_place_id | | N1 | W2 | | N2 | W2 | And W10 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | Scenario: addr:street added to interpolation Given the scene parallel-road @@ -32,6 +34,8 @@ Feature: Update of address interpolations | osm | class | type | housenr | geometry | | N1 | place | house | 2 | :n-middle-w | | N2 | place | house | 6 | :n-middle-e | + And the places + | osm | class | type | addr+interpolation | geometry | | W10 | place | houses | even | :w-middle | And the places | osm | class | type | name | geometry | @@ -47,9 +51,9 @@ Feature: Update of address interpolations | N2 | W2 | And W10 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | When updating places - | osm | class | type | housenr | street | geometry | + | osm | class | type | addr+interpolation | street | geometry | | W10 | place | houses | even | Cloud Street | :w-middle | Then placex contains | object | parent_place_id | @@ -57,7 +61,7 @@ Feature: Update of address interpolations | N2 | W3 | And W10 expands to interpolation | parent_place_id | start | end | - | W3 | 2 | 6 | + | W3 | 4 | 4 | Scenario: addr:street added to housenumbers Given the scene parallel-road @@ -65,6 +69,8 @@ Feature: Update of address interpolations | osm | class | type | housenr | geometry | | N1 | place | house | 2 | :n-middle-w | | N2 | place | house | 6 | :n-middle-e | + And the places + | osm | class | type | addr+interpolation | geometry | | W10 | place | houses | even | :w-middle | And the places | osm | class | type | name | geometry | @@ -80,7 +86,7 @@ Feature: Update of address interpolations | N2 | W2 | And W10 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | When updating places | osm | class | type | street | housenr | geometry | | N1 | place | house | Cloud Street| 2 | :n-middle-w | @@ -91,7 +97,7 @@ Feature: Update of address interpolations | N2 | W3 | And W10 expands to interpolation | parent_place_id | start | end | - | W3 | 2 | 6 | + | W3 | 4 | 4 | Scenario: interpolation tag removed Given the scene parallel-road @@ -99,6 +105,8 @@ Feature: Update of address interpolations | osm | class | type | housenr | geometry | | N1 | place | house | 2 | :n-middle-w | | N2 | place | house | 6 | :n-middle-e | + And the places + | osm | class | type | addr+interpolation | geometry | | W10 | place | houses | even | :w-middle | And the places | osm | class | type | name | geometry | @@ -114,7 +122,7 @@ Feature: Update of address interpolations | N2 | W2 | And W10 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | When marking for delete W10 Then W10 expands to no interpolation And placex contains @@ -129,7 +137,7 @@ Feature: Update of address interpolations | N1 | place | house | 2 | :n-middle-w | | N2 | place | house | 6 | :n-middle-e | And the places - | osm | class | type | housenr | street | geometry | + | osm | class | type | addr+interpolation | street | geometry | | W10 | place | houses | even | Cloud Street| :w-middle | And the places | osm | class | type | name | geometry | @@ -144,7 +152,7 @@ Feature: Update of address interpolations | N2 | W2 | And W10 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | When updating places | osm | class | type | name | geometry | | W3 | highway | unclassified | Cloud Street | :w-south | @@ -154,7 +162,7 @@ Feature: Update of address interpolations | N2 | W3 | And W10 expands to interpolation | parent_place_id | start | end | - | W3 | 2 | 6 | + | W3 | 4 | 4 | Scenario: referenced road deleted Given the scene parallel-road @@ -163,7 +171,7 @@ Feature: Update of address interpolations | N1 | place | house | 2 | :n-middle-w | | N2 | place | house | 6 | :n-middle-e | And the places - | osm | class | type | housenr | street | geometry | + | osm | class | type | addr+interpolation | street | geometry | | W10 | place | houses | even | Cloud Street| :w-middle | And the places | osm | class | type | name | geometry | @@ -179,7 +187,7 @@ Feature: Update of address interpolations | N2 | W3 | And W10 expands to interpolation | parent_place_id | start | end | - | W3 | 2 | 6 | + | W3 | 4 | 4 | When marking for delete W3 Then placex contains | object | parent_place_id | @@ -187,7 +195,7 @@ Feature: Update of address interpolations | N2 | W2 | And W10 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | Scenario: building becomes interpolation Given the scene building-with-parallel-streets @@ -209,12 +217,12 @@ Feature: Update of address interpolations | N1 | place | house | 2 | :n-north-w | | N2 | place | house | 6 | :n-north-e | And updating places - | osm | class | type | housenr | street | geometry | + | osm | class | type | addr+interpolation | street | geometry | | W1 | place | houses | even | Cloud Street| :w-north | Then placex has no entry for W1 And W1 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | Scenario: interpolation becomes building Given the scene building-with-parallel-streets @@ -229,13 +237,13 @@ Feature: Update of address interpolations | id | nodes | | 1 | 1,100,101,102,2 | And the places - | osm | class | type | housenr | street | geometry | + | osm | class | type | addr+interpolation | street | geometry | | W1 | place | houses | even | Cloud Street| :w-north | When importing Then placex has no entry for W1 And W1 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | When updating places | osm | class | type | housenr | geometry | | W1 | place | house | 3 | :w-building | @@ -252,7 +260,7 @@ Feature: Update of address interpolations | id | nodes | | 1 | 1,100,101,102,2 | And the places - | osm | class | type | housenr | geometry | + | osm | class | type | addr+interpolation | geometry | | W1 | place | houses | even | :w-north | When importing Then W1 expands to no interpolation @@ -261,13 +269,12 @@ Feature: Update of address interpolations | N1 | place | house | 2 | :n-north-w | | N2 | place | house | 6 | :n-north-e | And updating places - | osm | class | type | housenr | street | geometry | + | osm | class | type | addr+interpolation | street | geometry | | W1 | place | houses | even | Cloud Street| :w-north | Then W1 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | - @Fail Scenario: housenumber added in middle of interpolation Given the grid | 1 | | | | | 2 | @@ -279,7 +286,7 @@ Feature: Update of address interpolations | id | nodes | | 2 | 3,4,5 | And the places - | osm | class | type | housenr | geometry | + | osm | class | type | addr+interpolation | geometry | | W2 | place | houses | even | 3,4,5 | And the places | osm | class | type | housenr | @@ -287,15 +294,15 @@ Feature: Update of address interpolations | N5 | place | house | 10 | When importing Then W2 expands to interpolation - | parent_place_id | start | end | geometry | - | W1 | 2 | 10 | 3,4,5 | + | parent_place_id | start | end | + | W1 | 4 | 8 | When updating places | osm | class | type | housenr | | N4 | place | house | 6 | Then W2 expands to interpolation - | parent_place_id | start | end | geometry | - | W1 | 2 | 6 | 3,4 | - | W1 | 6 | 10 | 4,5 | + | parent_place_id | start | end | + | W1 | 4 | 4 | + | W1 | 8 | 8 | @Fail Scenario: housenumber removed in middle of interpolation @@ -309,7 +316,7 @@ Feature: Update of address interpolations | id | nodes | | 2 | 3,4,5 | And the places - | osm | class | type | housenr | geometry | + | osm | class | type | addr+interpolation | geometry | | W2 | place | houses | even | 3,4,5 | And the places | osm | class | type | housenr | @@ -318,15 +325,14 @@ Feature: Update of address interpolations | N5 | place | house | 10 | When importing Then W2 expands to interpolation - | parent_place_id | start | end | geometry | - | W1 | 2 | 6 | 3,4 | - | W1 | 6 | 10 | 4,5 | + | parent_place_id | start | end | + | W1 | 4 | 4 | + | W1 | 8 | 8 | When marking for delete N4 Then W2 expands to interpolation - | parent_place_id | start | end | geometry | - | W1 | 2 | 10 | 3,4,5 | + | parent_place_id | start | end | + | W1 | 4 | 8 | - @Fail Scenario: Change the start housenumber Given the grid | 1 | | 2 | @@ -338,7 +344,7 @@ Feature: Update of address interpolations | id | nodes | | 2 | 3,4 | And the places - | osm | class | type | housenr | geometry | + | osm | class | type | addr+interpolation | geometry | | W2 | place | houses | even | 3,4 | And the places | osm | class | type | housenr | @@ -346,12 +352,12 @@ Feature: Update of address interpolations | N4 | place | house | 6 | When importing Then W2 expands to interpolation - | parent_place_id | start | end | geometry | - | W1 | 2 | 6 | 3,4 | + | parent_place_id | start | end | + | W1 | 4 | 4 | When updating places | osm | class | type | housenr | | N4 | place | house | 8 | Then W2 expands to interpolation - | parent_place_id | start | end | geometry | - | W1 | 2 | 8 | 3,4 | + | parent_place_id | start | end | + | W1 | 4 | 6 |