X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8c3a0efe8b75a06279998e66a932d8a56c483961..37940803273aeab88ae37f8f6c9698478df52fc2:/test/bdd/db/import/interpolation.feature?ds=sidebyside diff --git a/test/bdd/db/import/interpolation.feature b/test/bdd/db/import/interpolation.feature index 52971295..3c67d652 100644 --- a/test/bdd/db/import/interpolation.feature +++ b/test/bdd/db/import/interpolation.feature @@ -3,230 +3,261 @@ Feature: Import of address interpolations Tests that interpolated addresses are added correctly Scenario: Simple even interpolation line with two points + Given the grid with origin 1,1 + | 1 | | 9 | | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 1 1 | - | N2 | place | house | 6 | 1 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 6 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1 1, 1 1.001 | + | W1 | place | houses | even | 1,2 | And the ways | id | nodes | | 1 | 1,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 6 | 1 1, 1 1.001 | + | 4 | 4 | 9 | Scenario: Backwards even two point interpolation line + Given the grid with origin 1,1 + | 1 | 8 | 9 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 1 1 | - | N2 | place | house | 6 | 1 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 8 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1 1.001, 1 1 | + | W1 | place | houses | even | 2,1 | And the ways | id | nodes | | 1 | 2,1 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 6 | 1 1, 1 1.001 | + | 4 | 6 | 9,8 | Scenario: Simple odd two point interpolation + Given the grid with origin 1,1 + | 1 | 8 | | | 9 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 1 | 1 1 | - | N2 | place | house | 11 | 1 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 1 | + | N2 | place | house | 11 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | odd | 1 1, 1 1.001 | + | W1 | place | houses | odd | 1,2 | And the ways | id | nodes | | 1 | 1,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 1 | 11 | 1 1, 1 1.001 | + | 3 | 9 | 8,9 | Scenario: Simple all two point interpolation + Given the grid with origin 1,1 + | 1 | 8 | 9 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 1 | 1 1 | - | N2 | place | house | 3 | 1 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 1 | + | N2 | place | house | 4 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | all | 1 1, 1 1.001 | + | W1 | place | houses | all | 1,2 | And the ways | id | nodes | | 1 | 1,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 1 | 3 | 1 1, 1 1.001 | + | 2 | 3 | 8,9 | Scenario: Even two point interpolation line with intermediate empty node + Given the grid + | 1 | 8 | | 3 | 9 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 1 1 | - | N2 | place | house | 10 | 1.001 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 12 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 | + | W1 | place | houses | even | 1,3,2 | And the ways | id | nodes | | 1 | 1,3,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 10 | 1 1, 1 1.001, 1.001 1.001 | + | 4 | 10 | 8,3,9 | Scenario: Even two point interpolation line with intermediate duplicated empty node + Given the grid + | 1 | 8 | 3 | 9 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 1 1 | - | N2 | place | house | 10 | 1.001 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 10 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 | + | W1 | place | houses | even | 1,3,2 | And the ways | id | nodes | | 1 | 1,3,3,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 10 | 1 1, 1 1.001, 1.001 1.001 | + | 4 | 8 | 8,3,9 | Scenario: Simple even three point interpolation line + Given the grid + | 1 | 8 | | 9 | 3 | 7 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 1 1 | - | N2 | place | house | 14 | 1.001 1.001 | - | N3 | place | house | 10 | 1 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 14 | + | N3 | place | house | 10 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 | + | W1 | place | houses | even | 1,3,2 | And the ways | id | nodes | | 1 | 1,3,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 10 | 1 1, 1 1.001 | - | 10 | 14 | 1 1.001, 1.001 1.001 | + | 4 | 8 | 8,9 | + | 12 | 12 | 7 | Scenario: Simple even four point interpolation line + Given the grid + | 1 | 10 | | 11 | 3 | + | | | | | 12| + | | | 4 | 13 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 1 1 | - | N2 | place | house | 14 | 1.001 1.001 | - | N3 | place | house | 10 | 1 1.001 | - | N4 | place | house | 18 | 1.001 1.002 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 14 | + | N3 | place | house | 10 | + | N4 | place | house | 18 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001, 1.001 1.002 | + | W1 | place | houses | even | 1,3,2,4 | And the ways | id | nodes | | 1 | 1,3,2,4 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 10 | 1 1, 1 1.001 | - | 10 | 14 | 1 1.001, 1.001 1.001 | - | 14 | 18 | 1.001 1.001, 1.001 1.002 | + | 4 | 8 | 10,11 | + | 12 | 12 | 12 | + | 16 | 16 | 13 | Scenario: Reverse simple even three point interpolation line + Given the grid + | 1 | 8 | | 9 | 3 | 7 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 1 1 | - | N2 | place | house | 14 | 1.001 1.001 | - | N3 | place | house | 10 | 1 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 14 | + | N3 | place | house | 10 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1.001 1.001, 1 1.001, 1 1 | + | W1 | place | houses | even | 2,3,1 | And the ways | id | nodes | | 1 | 2,3,1 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 10 | 1 1, 1 1.001 | - | 10 | 14 | 1 1.001, 1.001 1.001 | + | 4 | 8 | 8,9 | + | 12 | 12 | 7 | Scenario: Even three point interpolation line with odd center point + Given the grid + | 1 | | 10 | | | 11 | 3 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 1 1 | - | N2 | place | house | 8 | 1.001 1.001 | - | N3 | place | house | 7 | 1 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 8 | + | N3 | place | house | 7 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 | + | W1 | place | houses | even | 1,3,2 | And the ways | id | nodes | | 1 | 1,3,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 7 | 1 1, 1 1.001 | - | 7 | 8 | 1 1.001, 1.001 1.001 | + | 4 | 6 | 10,11 | Scenario: Interpolation line with self-intersecting way + Given the grid + | 1 | 9 | 2 | + | | | 8 | + | | | 3 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 0 0 | - | N2 | place | house | 6 | 0 0.001 | - | N3 | place | house | 10 | 0 0.002 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 6 | + | N3 | place | house | 10 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 0 0, 0 0.001, 0 0.002, 0 0.001 | + | W1 | place | houses | even | 1,2,3,2 | And the ways | id | nodes | | 1 | 1,2,3,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 6 | 0 0, 0 0.001 | - | 6 | 10 | 0 0.001, 0 0.002 | - | 6 | 10 | 0 0.001, 0 0.002 | + | 4 | 4 | 9 | + | 8 | 8 | 8 | + | 8 | 8 | 8 | Scenario: Interpolation line with self-intersecting way II + Given the grid + | 1 | 9 | 2 | + | | | 3 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | 0 0 | - | N2 | place | house | 6 | 0 0.001 | + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 6 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 0 0, 0 0.001, 0 0.002, 0 0.001 | + | W1 | place | houses | even | 1,2,3,2 | And the ways | id | nodes | | 1 | 1,2,3,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 6 | 0 0, 0 0.001 | + | 4 | 4 | 9 | Scenario: addr:street on interpolation way - Given the scene parallel-road + Given the grid + | | 1 | | 2 | | + | 10 | | | | 11 | + | 20 | | | | 21 | And the places | osm | class | type | housenr | geometry | - | N1 | place | house | 2 | :n-middle-w | - | N2 | place | house | 6 | :n-middle-e | - | N3 | place | house | 12 | :n-middle-w | - | N4 | place | house | 16 | :n-middle-e | + | N1 | place | house | 2 | 1 | + | N2 | place | house | 6 | 2 | + | N3 | place | house | 12 | 1 | + | N4 | place | house | 16 | 2 | And the places | osm | class | type | addr+interpolation | street | geometry | - | W10 | place | houses | even | | :w-middle | - | W11 | place | houses | even | Cloud Street | :w-middle | + | W10 | place | houses | even | | 1,2 | + | W11 | place | houses | even | Cloud Street | 1,2 | And the places | osm | class | type | name | geometry | - | W2 | highway | tertiary | Sun Way | :w-north | - | W3 | highway | tertiary | Cloud Street | :w-south | + | W2 | highway | tertiary | Sun Way | 10,11 | + | W3 | highway | tertiary | Cloud Street | 20,21 | And the ways | id | nodes | - | 10 | 1,100,101,102,2 | - | 11 | 3,200,201,202,4 | + | 10 | 1,2 | + | 11 | 3,4 | When importing Then placex contains | object | parent_place_id | @@ -236,39 +267,42 @@ Feature: Import of address interpolations | N4 | W3 | Then W10 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | Then W11 expands to interpolation | parent_place_id | start | end | - | W3 | 12 | 16 | - When searching for "16 Cloud Street" + | W3 | 14 | 14 | + When sending search query "16 Cloud Street" Then results contain - | ID | osm_type | osm_id | - | 0 | N | 4 | - When searching for "14 Cloud Street" + | ID | osm | + | 0 | N4 | + When sending search query "14 Cloud Street" Then results contain - | ID | osm_type | osm_id | - | 0 | W | 11 | + | ID | osm | + | 0 | W11 | Scenario: addr:street on housenumber way - Given the scene parallel-road + Given the grid + | | 1 | | 2 | | + | 10 | | | | 11 | + | 20 | | | | 21 | And the places | osm | class | type | housenr | street | geometry | - | N1 | place | house | 2 | | :n-middle-w | - | N2 | place | house | 6 | | :n-middle-e | - | N3 | place | house | 12 | Cloud Street | :n-middle-w | - | N4 | place | house | 16 | Cloud Street | :n-middle-e | + | N1 | place | house | 2 | | 1 | + | N2 | place | house | 6 | | 2 | + | N3 | place | house | 12 | Cloud Street | 1 | + | N4 | place | house | 16 | Cloud Street | 2 | And the places | osm | class | type | addr+interpolation | geometry | - | W10 | place | houses | even | :w-middle | - | W11 | place | houses | even | :w-middle | + | W10 | place | houses | even | 1,2 | + | W11 | place | houses | even | 1,2 | And the places | osm | class | type | name | geometry | - | W2 | highway | tertiary | Sun Way | :w-north | - | W3 | highway | tertiary | Cloud Street | :w-south | + | W2 | highway | tertiary | Sun Way | 10,11 | + | W3 | highway | tertiary | Cloud Street | 20,21 | And the ways | id | nodes | - | 10 | 1,100,101,102,2 | - | 11 | 3,200,201,202,4 | + | 10 | 1,2 | + | 11 | 3,4 | When importing Then placex contains | object | parent_place_id | @@ -278,18 +312,18 @@ Feature: Import of address interpolations | N4 | W3 | Then W10 expands to interpolation | parent_place_id | start | end | - | W2 | 2 | 6 | + | W2 | 4 | 4 | Then W11 expands to interpolation | parent_place_id | start | end | - | W3 | 12 | 16 | - When searching for "16 Cloud Street" + | W3 | 14 | 14 | + When sending search query "16 Cloud Street" Then results contain - | ID | osm_type | osm_id | - | 0 | N | 4 | - When searching for "14 Cloud Street" + | ID | osm | + | 0 | N4 | + When sending search query "14 Cloud Street" Then results contain - | ID | osm_type | osm_id | - | 0 | W | 11 | + | ID | osm | + | 0 | W11 | Scenario: Geometry of points and way don't match (github #253) Given the places @@ -306,8 +340,8 @@ Feature: Import of address interpolations When importing Then W1 expands to interpolation | start | end | geometry | - | 2 | 6 | 144.9629794 -37.7630755, 144.9630541 -37.7628174 | - | 6 | 10 | 144.9630541 -37.7628174, 144.9632341 -37.76163 | + | 4 | 4 | 144.963016 -37.762946 | + | 8 | 8 | 144.96314407 -37.762223692 | Scenario: Place with missing address information Given the grid @@ -326,7 +360,7 @@ Feature: Import of address interpolations When importing Then W1 expands to interpolation | start | end | geometry | - | 23 | 29 | 1,2,3 | + | 25 | 27 | 0.000016 0,0.00002 0,0.000033 0 | Scenario: Ways without node entries are ignored Given the places @@ -335,32 +369,156 @@ Feature: Import of address interpolations When importing Then W1 expands to no interpolation - Scenario: Ways without nodes without housenumbers are ignored + Scenario: Ways with nodes without housenumbers are ignored + Given the grid + | 1 | | 2 | + Given the places + | osm | class | type | + | N1 | place | house | + | N2 | place | house | 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 | + | W1 | place | houses | even | 1,2 | When importing Then W1 expands to no interpolation Scenario: Two point interpolation starting at 0 + Given the grid with origin 1,1 + | 1 | 10 | | | 11 | 2 | Given the places - | osm | class | type | housenr | geometry | - | N1 | place | house | 0 | 1 1 | - | N2 | place | house | 2 | 1 1.001 | + | osm | class | type | housenr | + | N1 | place | house | 0 | + | N2 | place | house | 10 | And the places | osm | class | type | addr+interpolation | geometry | - | W1 | place | houses | even | 1 1, 1 1.001 | + | W1 | place | houses | even | 1,2 | And the ways | id | nodes | | 1 | 1,2 | When importing Then W1 expands to interpolation | start | end | geometry | - | 0 | 2 | 1 1, 1 1.001 | - When sending jsonv2 reverse coordinates 1,1 + | 2 | 8 | 10,11 | + When sending v1/reverse at 1,1 Then results contain - | ID | osm_type | osm_id | type | display_name | - | 0 | way | 1 | house | 0 | + | ID | osm | type | display_name | + | 0 | N1 | house | 0 | + Scenario: Parenting of interpolation with additional tags + Given the grid + | 1 | | | | | | + | | | | | | | + | | 8 | | | 9 | | + | | | | | | | + | 2 | | | | | 3 | + Given the places + | osm | class | type | housenr | addr+street | + | N8 | place | house | 10 | Horiz St | + | N9 | place | house | 16 | Horiz St | + And the places + | osm | class | type | name | geometry | + | W1 | highway | residential | Vert St | 1,2 | + | W2 | highway | residential | Horiz St | 2,3 | + And the places + | osm | class | type | addr+interpolation | addr+inclusion | geometry | + | W10 | place | houses | even | actual | 8,9 | + And the ways + | id | nodes | + | 10 | 8,9 | + When importing + Then placex contains + | object | parent_place_id | + | N8 | W2 | + | N9 | W2 | + And W10 expands to interpolation + | start | end | parent_place_id | + | 12 | 14 | W2 | + + + Scenario Outline: Bad interpolation values are ignored + Given the grid with origin 1,1 + | 1 | | 9 | | 2 | + Given the places + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 6 | + And the places + | osm | class | type | addr+interpolation | geometry | + | W1 | place | houses | | 1,2 | + And the ways + | id | nodes | + | 1 | 1,2 | + When importing + Then W1 expands to no interpolation + + Examples: + | value | + | foo | + | x | + | 12-2 | + + + Scenario: Interpolation line where points have been moved (Github #3022) + Given the 0.00001 grid + | 1 | | | | | | | | 2 | 3 | 9 | | | | | | | | 4 | + Given the places + | osm | class | type | housenr | geometry | + | N1 | place | house | 2 | 1 | + | N2 | place | house | 18 | 3 | + | N3 | place | house | 24 | 9 | + | N4 | place | house | 42 | 4 | + And the places + | osm | class | type | addr+interpolation | geometry | + | W1 | place | houses | even | 1,2,3,4 | + And the ways + | id | nodes | + | 1 | 1,2,3,4 | + When importing + Then W1 expands to interpolation + | start | end | + | 4 | 16 | + | 20 | 22 | + | 26 | 40 | + + + Scenario: Interpolation line with duplicated points + Given the grid + | 7 | 10 | 8 | 11 | 9 | + Given the places + | osm | class | type | housenr | geometry | + | N1 | place | house | 2 | 7 | + | N2 | place | house | 6 | 8 | + | N3 | place | house | 10 | 8 | + | N4 | place | house | 14 | 9 | + And the places + | osm | class | type | addr+interpolation | geometry | + | W1 | place | houses | even | 7,8,8,9 | + And the ways + | id | nodes | + | 1 | 1,2,3,4 | + When importing + Then W1 expands to interpolation + | start | end | geometry | + | 4 | 4 | 10 | + | 12 | 12 | 11 | + + + Scenario: Interpolaton line with broken way geometry (Github #2986) + Given the grid + | 1 | 8 | 10 | 11 | 9 | 2 | 3 | 4 | + Given the places + | osm | class | type | housenr | + | N1 | place | house | 2 | + | N2 | place | house | 8 | + | N3 | place | house | 12 | + | N4 | place | house | 14 | + And the places + | osm | class | type | addr+interpolation | geometry | + | W1 | place | houses | even | 8,9 | + And the ways + | id | nodes | + | 1 | 1,8,9,2,3,4 | + When importing + Then W1 expands to interpolation + | start | end | geometry | + | 4 | 6 | 10,11 |