X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9d9745b378aec1694298232df76a5a740f8bb703..5c187e131a372d0cbdbba3372668862e3f1c47f9:/tests/features/db/import/interpolation.feature diff --git a/tests/features/db/import/interpolation.feature b/tests/features/db/import/interpolation.feature index d70bf18a..1c05a882 100644 --- a/tests/features/db/import/interpolation.feature +++ b/tests/features/db/import/interpolation.feature @@ -2,41 +2,23 @@ Feature: Import of address interpolations Tests that interpolated addresses are added correctly - Scenario: Simple even two point interpolation + Scenario: Simple even interpolation line with two points Given the place nodes - | osm_id | class | type | housenumber | geometry - | 1 | place | house | 2 | 1 1 - | 2 | place | house | 6 | 1 1.001 + | osm_id | osm_type | class | type | housenumber | geometry + | 1 | N | place | house | 2 | 1 1 + | 2 | N | place | house | 6 | 1 1.001 And the place ways - | osm_id | class | type | housenumber | geometry - | 1 | place | houses | even | 1 1, 1 1.001 - And the ways - | id | nodes - | 1 | 1,2 - When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 4 | 1,1.0005 - - Scenario: Simple even two point interpolation with zero beginning - Given the place nodes - | osm_id | class | type | housenumber | geometry - | 1 | place | house | 0 | 1 1 - | 2 | place | house | 8 | 1 1.001 - And the place ways - | osm_id | class | type | housenumber | geometry - | 1 | place | houses | even | 1 1, 1 1.001 + | osm_id | osm_type | class | type | housenumber | geometry + | 1 | W | place | houses | even | 1 1, 1 1.001 And the ways | id | nodes | 1 | 1,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 2 | 1,1.00025 - | 4 | 1,1.0005 - | 6 | 1,1.00075 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 6 | 1 1, 1 1.001 - Scenario: Backwards even two point interpolation + Scenario: Backwards even two point interpolation line Given the place nodes | osm_id | class | type | housenumber | geometry | 1 | place | house | 2 | 1 1 @@ -48,77 +30,9 @@ Feature: Import of address interpolations | id | nodes | 1 | 2,1 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 4 | 1,1.0005 - - Scenario: Even two point interpolation with odd beginning - Given the place nodes - | osm_id | class | type | housenumber | geometry - | 1 | place | house | 11 | 1 1 - | 2 | place | house | 16 | 1 1.001 - And the place ways - | osm_id | class | type | housenumber | geometry - | 1 | place | houses | even | 1 1, 1 1.001 - And the ways - | id | nodes - | 1 | 1,2 - When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 12 | 1,1.0002 - | 14 | 1,1.0006 - - Scenario: Even two point interpolation with odd end - Given the place nodes - | osm_id | class | type | housenumber | geometry - | 1 | place | house | 10 | 1 1 - | 2 | place | house | 15 | 1 1.001 - And the place ways - | osm_id | class | type | housenumber | geometry - | 1 | place | houses | even | 1 1, 1 1.001 - And the ways - | id | nodes - | 1 | 1,2 - When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 12 | 1,1.0004 - | 14 | 1,1.0008 - - Scenario: Reverse even two point interpolation with odd beginning - Given the place nodes - | osm_id | class | type | housenumber | geometry - | 1 | place | house | 11 | 1 1 - | 2 | place | house | 16 | 1 1.001 - And the place ways - | osm_id | class | type | housenumber | geometry - | 1 | place | houses | even | 1 1.001, 1 1 - And the ways - | id | nodes - | 1 | 2,1 - When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 12 | 1,1.0002 - | 14 | 1,1.0006 - - Scenario: Reverse even two point interpolation with odd end - Given the place nodes - | osm_id | class | type | housenumber | geometry - | 1 | place | house | 10 | 1 1 - | 2 | place | house | 15 | 1 1.001 - And the place ways - | osm_id | class | type | housenumber | geometry - | 1 | place | houses | even | 1 1.001, 1 1 - And the ways - | id | nodes - | 1 | 2,1 - When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 12 | 1,1.0004 - | 14 | 1,1.0008 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 6 | 1 1, 1 1.001 Scenario: Simple odd two point interpolation Given the place nodes @@ -132,67 +46,64 @@ Feature: Import of address interpolations | id | nodes | 1 | 1,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 3 | 1,1.0002 - | 5 | 1,1.0004 - | 7 | 1,1.0006 - | 9 | 1,1.0008 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 1 | 11 | 1 1, 1 1.001 - Scenario: Odd two point interpolation with even beginning + Scenario: Simple all two point interpolation Given the place nodes | osm_id | class | type | housenumber | geometry - | 1 | place | house | 2 | 1 1 - | 2 | place | house | 7 | 1 1.001 + | 1 | place | house | 1 | 1 1 + | 2 | place | house | 3 | 1 1.001 And the place ways | osm_id | class | type | housenumber | geometry - | 1 | place | houses | odd | 1 1, 1 1.001 + | 1 | place | houses | all | 1 1, 1 1.001 And the ways | id | nodes | 1 | 1,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 3 | 1,1.0002 - | 5 | 1,1.0006 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 1 | 3 | 1 1, 1 1.001 - Scenario: Simple all two point interpolation + Scenario: Even two point interpolation line with intermediate empty node Given the place nodes | osm_id | class | type | housenumber | geometry - | 1 | place | house | 1 | 1 1 - | 2 | place | house | 3 | 1 1.001 + | 1 | place | house | 2 | 1 1 + | 2 | place | house | 10 | 1.001 1.001 And the place ways | osm_id | class | type | housenumber | geometry - | 1 | place | houses | all | 1 1, 1 1.001 + | 1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 And the ways | id | nodes - | 1 | 1,2 + | 1 | 1,3,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 2 | 1,1.0005 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 10 | 1 1, 1 1.001, 1.001 1.001 - Scenario: Simple numbered two point interpolation + Scenario: Even two point interpolation line with intermediate duplicated empty node Given the place nodes | osm_id | class | type | housenumber | geometry - | 1 | place | house | 3 | 1 1 - | 2 | place | house | 9 | 1 1.001 + | 1 | place | house | 2 | 1 1 + | 2 | place | house | 10 | 1.001 1.001 And the place ways | osm_id | class | type | housenumber | geometry - | 1 | place | houses | 3 | 1 1, 1 1.001 + | 1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 And the ways | id | nodes - | 1 | 1,2 + | 1 | 1,3,3,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 6 | 1,1.0005 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 10 | 1 1, 1 1.001, 1.001 1.001 - Scenario: Even two point interpolation with intermediate empty node + Scenario: Simple even three point interpolation line Given the place nodes | osm_id | class | type | housenumber | geometry | 1 | place | house | 2 | 1 1 - | 2 | place | house | 10 | 1.001 1.001 + | 2 | place | house | 14 | 1.001 1.001 + | 3 | place | house | 10 | 1 1.001 And the place ways | osm_id | class | type | housenumber | geometry | 1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 @@ -200,49 +111,50 @@ Feature: Import of address interpolations | id | nodes | 1 | 1,3,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 4 | 1,1.0005 - | 6 | 1,1.001 - | 8 | 1.0005,1.001 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 10 | 1 1, 1 1.001 + | 10 | 14 | 1 1.001, 1.001 1.001 - - Scenario: Even two point interpolation with intermediate duplicated empty node + Scenario: Simple even four point interpolation line Given the place nodes | osm_id | class | type | housenumber | geometry | 1 | place | house | 2 | 1 1 - | 2 | place | house | 10 | 1.001 1.001 + | 2 | place | house | 14 | 1.001 1.001 + | 3 | place | house | 10 | 1 1.001 + | 4 | place | house | 18 | 1.001 1.002 And the place ways | osm_id | class | type | housenumber | geometry - | 1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 + | 1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001, 1.001 1.002 And the ways | id | nodes - | 1 | 1,3,3,2 + | 1 | 1,3,2,4 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 4 | 1,1.0005 - | 6 | 1,1.001 - | 8 | 1.0005,1.001 + Then way 1 expands to lines + | startnumber | endnumber | 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 - Scenario: Simple even three point interpolation + Scenario: Reverse simple even three point interpolation line Given the place nodes | osm_id | class | type | housenumber | geometry | 1 | place | house | 2 | 1 1 - | 2 | place | house | 8 | 1.001 1.001 - | 3 | place | house | 4 | 1 1.001 + | 2 | place | house | 14 | 1.001 1.001 + | 3 | place | house | 10 | 1 1.001 And the place ways | osm_id | class | type | housenumber | geometry - | 1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 + | 1 | place | houses | even | 1.001 1.001, 1 1.001, 1 1 And the ways | id | nodes - | 1 | 1,3,2 + | 1 | 2,3,1 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 6 | 1.0005,1.001 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 10 | 1 1, 1 1.001 + | 10 | 14 | 1 1.001, 1.001 1.001 - Scenario: Even three point interpolation with odd center point + Scenario: Even three point interpolation line with odd center point Given the place nodes | osm_id | class | type | housenumber | geometry | 1 | place | house | 2 | 1 1 @@ -255,12 +167,12 @@ Feature: Import of address interpolations | id | nodes | 1 | 1,3,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 4 | 1,1.0004 - | 6 | 1,1.0008 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 7 | 1 1, 1 1.001 + | 7 | 8 | 1 1.001, 1.001 1.001 - Scenario: Interpolation on self-intersecting way + Scenario: Interpolation line with self-intersecting way Given the place nodes | osm_id | class | type | housenumber | geometry | 1 | place | house | 2 | 0 0 @@ -273,12 +185,13 @@ Feature: Import of address interpolations | id | nodes | 1 | 1,2,3,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 4 | 0,0.0005 - | 8 | 0,0.0015 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 6 | 0 0, 0 0.001 + | 6 | 10 | 0 0.001, 0 0.002 + | 6 | 10 | 0 0.001, 0 0.002 - Scenario: Interpolation on self-intersecting way II + Scenario: Interpolation line with self-intersecting way II Given the place nodes | osm_id | class | type | housenumber | geometry | 1 | place | house | 2 | 0 0 @@ -290,24 +203,24 @@ Feature: Import of address interpolations | id | nodes | 1 | 1,2,3,2 When importing - Then way 1 expands to housenumbers - | housenumber | centroid - | 4 | 0,0.0005 + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 6 | 0 0, 0 0.001 - Scenario: addr:street on interpolation way - Given the scene parallel-road - And the place nodes + Scenario: addr:street on interpolation way + Given the scene parallel-road + And the place nodes | osm_id | class | type | housenumber | geometry | 1 | place | house | 2 | :n-middle-w | 2 | place | house | 6 | :n-middle-e | 3 | place | house | 12 | :n-middle-w | 4 | place | house | 16 | :n-middle-e - And the place ways + And the place ways | osm_id | class | type | housenumber | street | geometry | 10 | place | houses | even | | :w-middle | 11 | place | houses | even | Cloud Street | :w-middle - And the place ways + And the place ways | osm_id | class | type | name | geometry | 2 | highway | tertiary | 'name' : 'Sun Way' | :w-north | 3 | highway | tertiary | 'name' : 'Cloud Street' | :w-south @@ -315,48 +228,81 @@ Feature: Import of address interpolations | id | nodes | 10 | 1,100,101,102,2 | 11 | 3,200,201,202,4 - When importing - Then table placex contains + When importing + Then table placex contains | object | parent_place_id | N1 | W2 | N2 | W2 | N3 | W3 | N4 | W3 - | W10 | W2 - | W11 | W3 - And way 10 expands exactly to housenumbers 4 - And way 11 expands exactly to housenumbers 14 + Then table location_property_osmline contains + | object | parent_place_id | startnumber | endnumber + | W10 | W2 | 2 | 6 + | W11 | W3 | 12 | 16 - Scenario: addr:street on housenumber way - Given the scene parallel-road - And the place nodes + Scenario: addr:street on housenumber way + Given the scene parallel-road + And the place nodes | osm_id | class | type | housenumber | street | geometry | 1 | place | house | 2 | | :n-middle-w | 2 | place | house | 6 | | :n-middle-e | 3 | place | house | 12 | Cloud Street | :n-middle-w | 4 | place | house | 16 | Cloud Street | :n-middle-e - And the place ways + And the place ways | osm_id | class | type | housenumber | geometry | 10 | place | houses | even | :w-middle | 11 | place | houses | even | :w-middle - And the place ways + And the place ways | osm_id | class | type | name | geometry | 2 | highway | tertiary | 'name' : 'Sun Way' | :w-north | 3 | highway | tertiary | 'name' : 'Cloud Street' | :w-south And the ways - | id | nodes + | id | nodes | 10 | 1,100,101,102,2 | 11 | 3,200,201,202,4 - When importing - Then table placex contains + When importing + Then table placex contains | object | parent_place_id | N1 | W2 | N2 | W2 | N3 | W3 | N4 | W3 - | W10 | W2 - | W11 | W3 - And way 10 expands exactly to housenumbers 4 - And way 11 expands exactly to housenumbers 14 + And table location_property_osmline contains + | object | parent_place_id | startnumber | endnumber + | W10 | W2 | 2 | 6 + | W11 | W3 | 12 | 16 + Scenario: Geometry of points and way don't match (github #253) + Given the place nodes + | osm_id | class | type | housenumber | geometry + | 1 | place | house | 10 | 144.9632341 -37.76163 + | 2 | place | house | 6 | 144.9630541 -37.7628174 + | 3 | shop | supermarket | 2 | 144.9629794 -37.7630755 + And the place ways + | osm_id | class | type | housenumber | geometry + | 1 | place | houses | even | 144.9632341 -37.76163,144.9630541 -37.7628172,144.9629794 -37.7630755 + And the ways + | id | nodes + | 1 | 1,2,3 + When importing + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 2 | 6 | 144.9629794 -37.7630755, 144.9630541 -37.7628174 + | 6 | 10 | 144.9630541 -37.7628174, 144.9632341 -37.76163 + Scenario: Place with missing address information + Given the place nodes + | osm_id | class | type | housenumber | geometry + | 1 | place | house | 23 | 0.0001 0.0001 + | 2 | amenity | school | | 0.0001 0.0002 + | 3 | place | house | 29 | 0.0001 0.0004 + And the place ways + | osm_id | class | type | housenumber | geometry + | 1 | place | houses | odd | 0.0001 0.0001,0.0001 0.0002,0.0001 0.0004 + And the ways + | id | nodes + | 1 | 1,2,3 + When importing + Then way 1 expands to lines + | startnumber | endnumber | geometry + | 23 | 29 | 0.0001 0.0001, 0.0001 0.0002, 0.0001 0.0004