X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a9357b4dce19f21885992820235ec999a818679d..df0142678a10eaf51f2acac40bcff6350211b305:/test/bdd/db/import/addressing.feature?ds=inline diff --git a/test/bdd/db/import/addressing.feature b/test/bdd/db/import/addressing.feature index 479ddd31..1d6ba5bd 100644 --- a/test/bdd/db/import/addressing.feature +++ b/test/bdd/db/import/addressing.feature @@ -17,10 +17,10 @@ Feature: Address computation Then place_addressline doesn't contain | object | address | | N1 | N2 | - When searching for "Square" + When sending search query "Square" Then results contain - | osm_type | osm_id | name | - | N | 1 | Square, East Farm | + | osm | display_name | + | N1 | Square, East Farm | Scenario: given two place nodes, the closer one wins for the address Given the grid @@ -74,20 +74,22 @@ Feature: Address computation Scenario: boundary areas are preferred over place nodes in the address Given the grid - | 1 | | | | | | 3 | - | | 5 | | | | | | - | | 6 | | | | | | - | 2 | | | | | | 4 | + | 1 | | | | 10 | | 3 | + | | 5 | | | | | | + | | 6 | | | | | | + | 2 | | | | 11 | | 4 | And the named places - | osm | class | type | admin | geometry | - | N1 | place | square | 15 | 5 | - | N2 | place | city | 15 | 6 | - | R1 | place | city | 8 | (1,2,4,3,1) | + | osm | class | type | admin | geometry | + | N1 | place | square | 15 | 5 | + | N2 | place | city | 15 | 6 | + | R1 | place | city | 8 | (1,2,4,3,1) | + | R2 | boundary | administrative | 9 | (1,10,11,2,1) | When importing Then place_addressline contains | object | address | isaddress | cached_rank_address | | N1 | R1 | True | 16 | - | N1 | N2 | False | 16 | + | N1 | R2 | True | 18 | + | N1 | N2 | False | 18 | Scenario: place nodes outside a smaller ranked area are ignored Given the grid @@ -347,10 +349,10 @@ Feature: Address computation And place_addressline doesn't contain | object | address | | W1 | R1 | - When searching for "Bolder" + When sending search query "Bolder" Then results contain - | osm_type | osm_id | name | - | N | 1 | Bolder, Wonderway, Left | + | osm | display_name | + | N1 | Bolder, Wonderway, Left | Scenario: addr:* tags do not produce addresslines when the parent has the address part Given the grid @@ -371,10 +373,10 @@ Feature: Address computation And place_addressline doesn't contain | object | address | | N1 | R1 | - When searching for "Bolder" + When sending search query "Bolder" Then results contain - | osm_type | osm_id | name | - | N | 1 | Bolder, Wonderway, Outer | + | 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 @@ -397,10 +399,10 @@ Feature: Address computation And place_addressline doesn't contain | object | address | | N1 | R1 | - When searching for "Bolder" + When sending search query "Bolder" Then results contain - | osm_type | osm_id | name | - | N | 1 | Bolder, Wonderway, Left | + | osm | display_name | + | N1 | Bolder, Wonderway, Left | Scenario: POIs can correct address parts on the fly Given the grid @@ -425,11 +427,104 @@ Feature: Address computation | object | address | | N1 | R1 | | N2 | R2 | - When searching for "Bolder" + When sending search query "Bolder" Then results contain - | osm_type | osm_id | name | - | N | 1 | Bolder, Wonderway, Left | - When searching for "Leftside" + | osm | display_name | + | N1 | Bolder, Wonderway, Left | + When sending search query "Leftside" Then results contain - | osm_type | osm_id | name | - | N | 2 | Leftside, Wonderway, Right | + | 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 | + + + Scenario: addr:* tags always match the closer area + Given the grid + | 1 | | | | 2 | | 5 | + | | | | | | | | + | | 10| 11| | | | | + | 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 | Left | (2,3,6,5,2) | + And the places + | osm | class | type | name | addr+city | geometry | + | W1 | highway | primary | Wonderway | Left | 10,11 | + When importing + Then place_addressline doesn't contain + | object | address | + | W1 | R2 | +