X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/dd06638dec944a38826ad8bef4b86c7d0c858c4a..690f9ec06fd7a08b41de027427d8a1d3d0e3ff2e:/test/bdd/db/import/addressing.feature diff --git a/test/bdd/db/import/addressing.feature b/test/bdd/db/import/addressing.feature index 52f966d8..b2437d71 100644 --- a/test/bdd/db/import/addressing.feature +++ b/test/bdd/db/import/addressing.feature @@ -5,11 +5,11 @@ Feature: Address computation Scenario: place nodes are added to the address when they are close enough Given the 0.002 grid | 2 | | | | | | 1 | | 3 | - And the named places - | osm | class | type | geometry | - | N1 | place | square | 1 | - | N2 | place | hamlet | 2 | - | N3 | place | hamlet | 3 | + And the places + | osm | class | type | name | geometry | + | N1 | place | square | Square | 1 | + | N2 | place | hamlet | West Farm | 2 | + | N3 | place | hamlet | East Farm | 3 | When importing Then place_addressline contains | object | address | fromarea | @@ -17,6 +17,10 @@ Feature: Address computation Then place_addressline doesn't contain | object | address | | N1 | N2 | + When sending search query "Square" + Then results contain + | osm | display_name | + | N1 | Square, East Farm | Scenario: given two place nodes, the closer one wins for the address Given the grid @@ -298,3 +302,207 @@ Feature: Address computation | object | address | | W1 | W2 | + Scenario: addr:* tags are honored even when a street is far away from the place + Given the grid + | 1 | | 2 | | | 5 | + | | | | 8 | 9 | | + | 4 | | 3 | | | 6 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 8 | Left | (1,2,3,4,1) | + | R2 | boundary | administrative | 8 | Right | (2,3,6,5,2) | + And the places + | osm | class | type | addr+city | geometry | + | W1 | highway | primary | Left | 8,9 | + | W2 | highway | primary | Right | 8,9 | + When importing + Then place_addressline contains + | object | address | isaddress | + | W1 | R1 | True | + | W1 | R2 | False | + | W2 | R2 | True | + And place_addressline doesn't contain + | object | address | + | W2 | R1 | + + + Scenario: addr:* tags are honored even when a POI is far away from the place + Given the grid + | 1 | | 2 | | | 5 | + | | | | 8 | 9 | | + | 4 | | 3 | | | 6 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 8 | Left | (1,2,3,4,1) | + | R2 | boundary | administrative | 8 | Right | (2,3,6,5,2) | + And the places + | osm | class | type | name | addr+city | geometry | + | W1 | highway | primary | Wonderway | Right | 8,9 | + | N1 | amenity | cafe | Bolder | Left | 9 | + When importing + Then place_addressline contains + | object | address | isaddress | + | W1 | R2 | True | + | N1 | R1 | True | + And place_addressline doesn't contain + | object | address | + | W1 | R1 | + When sending search query "Bolder" + Then results contain + | osm | display_name | + | N1 | Bolder, Wonderway, Left | + + Scenario: addr:* tags do not produce addresslines when the parent has the address part + Given the grid + | 1 | | | 5 | + | | 8 | 9 | | + | 4 | | | 6 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 8 | Outer | (1,5,6,4,1) | + And the places + | osm | class | type | name | addr+city | geometry | + | W1 | highway | primary | Wonderway | Outer | 8,9 | + | N1 | amenity | cafe | Bolder | Outer | 9 | + When importing + Then place_addressline contains + | object | address | isaddress | + | W1 | R1 | True | + And place_addressline doesn't contain + | object | address | + | N1 | R1 | + When sending search query "Bolder" + Then results contain + | osm | display_name | + | N1 | Bolder, Wonderway, Outer | + + Scenario: addr:* tags on outside do not produce addresslines when the parent has the address part + Given the grid + | 1 | | 2 | | | 5 | + | | | | 8 | 9 | | + | 4 | | 3 | | | 6 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 8 | Left | (1,2,3,4,1) | + | R2 | boundary | administrative | 8 | Right | (2,3,6,5,2) | + And the places + | osm | class | type | name | addr+city | geometry | + | W1 | highway | primary | Wonderway | Left | 8,9 | + | N1 | amenity | cafe | Bolder | Left | 9 | + When importing + Then place_addressline contains + | object | address | isaddress | + | W1 | R1 | True | + | W1 | R2 | False | + And place_addressline doesn't contain + | object | address | + | N1 | R1 | + When sending search query "Bolder" + Then results contain + | osm | display_name | + | N1 | Bolder, Wonderway, Left | + + Scenario: POIs can correct address parts on the fly + Given the grid + | 1 | | | | 2 | | 5 | + | | | | 9 | | 8 | | + | 4 | | | | 3 | | 6 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 8 | Left | (1,2,3,4,1) | + | R2 | boundary | administrative | 8 | Right | (2,3,6,5,2) | + And the places + | osm | class | type | name | geometry | + | W1 | highway | primary | Wonderway | 2,3 | + | N1 | amenity | cafe | Bolder | 9 | + | N2 | amenity | cafe | Leftside | 8 | + When importing + Then place_addressline contains + | object | address | isaddress | + | W1 | R1 | False | + | W1 | R2 | True | + And place_addressline doesn't contain + | object | address | + | N1 | R1 | + | N2 | R2 | + When sending search query "Bolder" + Then results contain + | osm | display_name | + | N1 | Bolder, Wonderway, Left | + When sending search query "Leftside" + Then results contain + | osm | display_name | + | N2 | Leftside, Wonderway, Right | + + + Scenario: POIs can correct address parts on the fly (with partial unmatching address) + Given the grid + | 1 | | | | 2 | | 5 | + | | | | 9 | | 8 | | + | | 10| 11| | | 12| | + | 4 | | | | 3 | | 6 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 8 | Left | (1,2,3,4,1) | + | R2 | boundary | administrative | 8 | Right | (2,3,6,5,2) | + And the places + | osm | class | type | name | geometry | + | W1 | highway | primary | Wonderway | 10,11,12 | + And the places + | osm | class | type | name | addr+suburb | geometry | + | N1 | amenity | cafe | Bolder | Boring | 9 | + | N2 | amenity | cafe | Leftside | Boring | 8 | + When importing + Then place_addressline contains + | object | address | isaddress | + | W1 | R1 | True | + | W1 | R2 | False | + And place_addressline doesn't contain + | object | address | + | N1 | R1 | + | N2 | R2 | + When sending search query "Bolder" + Then results contain + | osm | display_name | + | N1 | Bolder, Wonderway, Left | + When sending search query "Leftside" + Then results contain + | osm | display_name | + | N2 | Leftside, Wonderway, Right | + + + + Scenario: POIs can correct address parts on the fly (with partial matching address) + Given the grid + | 1 | | | | 2 | | 5 | + | | | | 9 | | 8 | | + | | 10| 11| | | 12| | + | 4 | | | | 3 | | 6 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 8 | Left | (1,2,3,4,1) | + | R2 | boundary | administrative | 8 | Right | (2,3,6,5,2) | + And the places + | osm | class | type | name | geometry | + | W1 | highway | primary | Wonderway | 10,11,12 | + And the places + | osm | class | type | name | addr+state | geometry | + | N1 | amenity | cafe | Bolder | Left | 9 | + | N2 | amenity | cafe | Leftside | Left | 8 | + When importing + Then place_addressline contains + | object | address | isaddress | + | W1 | R1 | True | + | W1 | R2 | False | + And place_addressline doesn't contain + | object | address | + | N1 | R1 | + | N2 | R2 | + When sending search query "Bolder" + Then results contain + | osm | display_name | + | N1 | Bolder, Wonderway, Left | + When sending search query "Leftside" + Then results contain + | osm | display_name | + | N2 | Leftside, Wonderway, Left |