X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/dd06638dec944a38826ad8bef4b86c7d0c858c4a..edb1eec46d0fd222f9b30e0e3d62e906c1c9059e:/test/bdd/db/import/rank_computation.feature diff --git a/test/bdd/db/import/rank_computation.feature b/test/bdd/db/import/rank_computation.feature index cea4d973..df01fd91 100644 --- a/test/bdd/db/import/rank_computation.feature +++ b/test/bdd/db/import/rank_computation.feature @@ -4,22 +4,21 @@ Feature: Rank assignment Scenario: Ranks for place nodes are assigned according to their type Given the named places - | osm | class | type | - | N1 | foo | bar | - | N11 | place | Continent | - | N12 | place | continent | - | N13 | place | sea | - | N14 | place | country | - | N15 | place | state | - | N16 | place | region | - | N17 | place | county | - | N18 | place | city | - | N19 | place | island | - | N36 | place | house | - | N38 | place | houses | + | osm | class | type | geometry | + | N1 | foo | bar | 0 0 | + | N11 | place | Continent | 0 0 | + | N12 | place | continent | 0 0 | + | N13 | place | sea | 0 0 | + | N14 | place | country | 0 0 | + | N15 | place | state | 0 0 | + | N16 | place | region | 0 0 | + | N17 | place | county | 0 0 | + | N18 | place | city | 0 0 | + | N19 | place | island | 0 0 | + | N36 | place | house | 0 0 | And the named places - | osm | class | type | extra+capital | - | N101 | place | city | yes | + | osm | class | type | extra+capital | geometry | + | N101 | place | city | yes | 0 0 | When importing Then placex contains | object | rank_search | rank_address | @@ -35,7 +34,6 @@ Feature: Rank assignment | N19 | 17 | 0 | | N101 | 15 | 16 | | N36 | 30 | 30 | - | N38 | 28 | 0 | Scenario: Ranks for boundaries are assigned according to admin level Given the named places @@ -74,15 +72,15 @@ Feature: Rank assignment | R21 | boundary | administrative | 9 | municipality | (0 0, 0 1, 1 1, 1 0, 0 0) | | R22 | boundary | administrative | 9 | suburb | (0 0, 0 1, 1 1, 1 0, 0 0) | When importing - Then place_addressline contains - | object | address | cached_rank_address | - | R21 | R20 | 16 | - | R22 | R20 | 16 | Then placex contains | object | rank_search | rank_address | | R20 | 16 | 16 | | R21 | 18 | 18 | | R22 | 18 | 20 | + Then place_addressline contains + | object | address | cached_rank_address | + | R21 | R20 | 16 | + | R22 | R20 | 16 | Scenario: Admin levels cannot overtake each other due to place address ranks Given the named places @@ -101,6 +99,20 @@ Feature: Rank assignment | R21 | R20 | 16 | | R22 | R20 | 16 | + Scenario: Admin levels cannot overtake each other due to place address ranks even when slightly misaligned + Given the named places + | osm | class | type | admin | extra+place | geometry | + | R20 | boundary | administrative | 6 | town | (0 0, 0 2, 2 2, 2 0, 0 0) | + | R21 | boundary | administrative | 8 | | (0 0, -0.0001 1, 1 1, 1 0, 0 0) | + When importing + Then placex contains + | object | rank_search | rank_address | + | R20 | 12 | 16 | + | R21 | 16 | 18 | + Then place_addressline contains + | object | address | cached_rank_address | + | R21 | R20 | 16 | + Scenario: Admin levels must not be larger than 25 Given the named places | osm | class | type | admin | extra+place | geometry | @@ -146,3 +158,112 @@ Feature: Rank assignment | object | rank_search | rank_address | | R10 | 16 | 16 | | R20 | 12 | 12 | + + + Scenario: adjacent admin_levels are considered the same object when they have the same wikidata + Given the named places + | osm | class | type | admin | extra+wikidata | geometry | + | N20 | place | square | 15 | Q123 | 0.1 0.1 | + | R23 | boundary | administrative | 10 | Q444 | (0 0, 0 1, 1 1, 1 0, 0 0) | + | R21 | boundary | administrative | 9 | Q444 | (0 0, 0 1, 1 1, 1 0, 0 0) | + | R22 | boundary | administrative | 8 | Q444 | (0 0, 0 1, 1 1, 1 0, 0 0) | + When importing + Then placex contains + | object | rank_search | rank_address | + | R23 | 20 | 0 | + | R21 | 18 | 0 | + | R22 | 16 | 16 | + Then place_addressline contains + | object | address | cached_rank_address | + | N20 | R22 | 16 | + Then place_addressline doesn't contain + | object | address | + | N20 | R21 | + | N20 | R23 | + + Scenario: adjacent admin_levels are considered different objects when they have different wikidata + Given the named places + | osm | class | type | admin | extra+wikidata | geometry | + | N20 | place | square | 15 | Q123 | 0.1 0.1 | + | R21 | boundary | administrative | 9 | Q4441 | (0 0, 0 1, 1 1, 1 0, 0 0) | + | R22 | boundary | administrative | 8 | Q444 | (0 0, 0 1, 1 1, 1 0, 0 0) | + When importing + Then placex contains + | object | rank_search | rank_address | + | R21 | 18 | 18 | + | R22 | 16 | 16 | + Then place_addressline contains + | object | address | cached_rank_address | + | N20 | R22 | 16 | + | N20 | R21 | 18 | + + Scenario: Mixes of admin boundaries and place areas I + Given the grid + | 1 | | 10 | | | 2 | + | | 9 | | | | | + | 20| | 21 | | | | + | 4 | | 11 | | | 3 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 5 | Greater London | (1,2,3,4,1) | + | R2 | boundary | administrative | 8 | Kensington | (1,10,11,4,1) | + And the places + | osm | class | type | name | geometry | + | R10 | place | city | London | (1,2,3,4,1) | + | N9 | place | town | Fulham | 9 | + | W1 | highway | residential | Lots Grove | 20,21 | + When importing + Then placex contains + | object | rank_search | rank_address | + | R1 | 10 | 10 | + | R10 | 16 | 16 | + | R2 | 16 | 18 | + | N9 | 18 | 18 | + And place_addressline contains + | object | address | isaddress | cached_rank_address | + | W1 | R1 | True | 10 | + | W1 | R10 | True | 16 | + | W1 | R2 | True | 18 | + | W1 | N9 | False | 18 | + + + Scenario: Mixes of admin boundaries and place areas II + Given the grid + | 1 | | 10 | | 5 | 2 | + | | 9 | | | | | + | 20| | 21 | | | | + | 4 | | 11 | | 6 | 3 | + And the places + | osm | class | type | admin | name | geometry | + | R1 | boundary | administrative | 5 | Greater London | (1,2,3,4,1) | + | R2 | boundary | administrative | 8 | London | (1,5,6,4,1) | + And the places + | osm | class | type | name | geometry | + | R10 | place | city | Westminster | (1,10,11,4,1) | + | N9 | place | town | Fulham | 9 | + | W1 | highway | residential | Lots Grove | 20,21 | + When importing + Then placex contains + | object | rank_search | rank_address | + | R1 | 10 | 10 | + | R2 | 16 | 16 | + | R10 | 16 | 18 | + | N9 | 18 | 18 | + And place_addressline contains + | object | address | isaddress | cached_rank_address | + | W1 | R1 | True | 10 | + | W1 | R10 | True | 18 | + | W1 | R2 | True | 16 | + | W1 | N9 | False | 18 | + + + Scenario: POI nodes with place tags + Given the places + | osm | class | type | name | extratags | + | N23 | amenity | playground | AB | "place": "city" | + | N23 | place | city | AB | "amenity": "playground" | + When importing + Then placex contains exactly + | object | rank_search | rank_address | + | N23:amenity | 30 | 30 | + | N23:place | 16 | 16 |