hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-10 03:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

add more interpolation update scenarios (currently failing)

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-02-26 13:41:37 +01:00
parent 6551399bcc
commit e5c79a1d1f
3 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/bdd/api/search/queries.feature
View File

@@ -58,6 +58,7 @@ Feature: Search queries
| 30 | | 30 |
# https://trac.openstreetmap.org/ticket/5094 # https://trac.openstreetmap.org/ticket/5094
@Fail
Scenario: housenumbers are ordered by complete match first Scenario: housenumbers are ordered by complete match first
When sending json search query "6395 geminis, montevideo" with address When sending json search query "6395 geminis, montevideo" with address
Then result addresses contain Then result addresses contain

90
test/bdd/db/update/interpolation.feature
View File

@@ -2,7 +2,6 @@
Feature: Update of address interpolations Feature: Update of address interpolations
Test the interpolated address are updated correctly Test the interpolated address are updated correctly
@wip
Scenario: new interpolation added to existing street Scenario: new interpolation added to existing street
Given the scene parallel-road Given the scene parallel-road
And the places And the places
@@ -267,3 +266,92 @@ Feature: Update of address interpolations
Then W1 expands to interpolation Then W1 expands to interpolation
| parent_place_id | start | end | | parent_place_id | start | end |
| W2 | 2 | 6 | | W2 | 2 | 6 |
@Fail
Scenario: housenumber added in middle of interpolation
Given the grid
| 1 | | | | | 2 |
| 3 | | | 4 | | 5 |
And the places
| osm | class | type | name | geometry |
| W1 | highway | unclassified | Cloud Street | 1, 2 |
And the ways
| id | nodes |
| 2 | 3,4,5 |
And the places
| osm | class | type | housenr | geometry |
| W2 | place | houses | even | 3,4,5 |
And the places
| osm | class | type | housenr |
| N3 | place | house | 2 |
| N5 | place | house | 10 |
When importing
Then W2 expands to interpolation
| parent_place_id | start | end | geometry |
| W1 | 2 | 10 | 3,4,5 |
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 |
@Fail
Scenario: housenumber removed in middle of interpolation
Given the grid
| 1 | | | | | 2 |
| 3 | | | 4 | | 5 |
And the places
| osm | class | type | name | geometry |
| W1 | highway | unclassified | Cloud Street | 1, 2 |
And the ways
| id | nodes |
| 2 | 3,4,5 |
And the places
| osm | class | type | housenr | geometry |
| W2 | place | houses | even | 3,4,5 |
And the places
| osm | class | type | housenr |
| N3 | place | house | 2 |
| N4 | place | house | 6 |
| 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 |
When marking for delete N4
Then W2 expands to interpolation
| parent_place_id | start | end | geometry |
| W1 | 2 | 10 | 3,4,5 |
@Fail
Scenario: Change the start housenumber
Given the grid
| 1 | | 2 |
| 3 | | 4 |
And the places
| osm | class | type | name | geometry |
| W1 | highway | unclassified | Cloud Street | 1, 2 |
And the ways
| id | nodes |
| 2 | 3,4 |
And the places
| osm | class | type | housenr | geometry |
| W2 | place | houses | even | 3,4 |
And the places
| osm | class | type | housenr |
| N3 | place | house | 2 |
| N4 | place | house | 6 |
When importing
Then W2 expands to interpolation
| parent_place_id | start | end | geometry |
| W1 | 2 | 6 | 3,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 |

40
test/bdd/osm2pgsql/update/interpolation.feature
View File

@@ -1,40 +0,0 @@
@DB
Feature: Update of interpolations
@wip
# Test case for #598
Scenario: add an interpolation way
Given the grid
| 4 | 7 | 5 |
| 10| | 12|
When loading osm data
"""
n3
n4 Taddr:housenumber=1
n5 Taddr:housenumber=5
n10
n12
w11 Thighway=residential,name=X Nn4,n5
w12 Thighway=residential,name=Highway Nn10,n12
"""
And updating osm data
"""
n4 Taddr:housenumber=1
n5 Taddr:housenumber=5
w1 Taddr:interpolation=odd Nn4,n5
w2 Tbuilding=yes,name=ggg Nn4,n10,n7,n4
w3 Tbuilding=yes,name=ggg Nn4,n10,n7,n4
w4 Tbuilding=yes,name=ggg Nn4,n10,n7,n4
w5 Tbuilding=yes,name=ggg Nn4,n10,n7,n4
w6 Tbuilding=yes,name=ggg Nn4,n10,n7,n4
w7 Tbuilding=yes,name=ggg Nn4,n10,n7,n4
w11 dD
"""
Then place contains
| object | housenumber |
| N4:place | 1 |
| N5:place | 5 |
| W1:place | odd |
And W1 expands to interpolation
| start | end |
| 1 | 5 |