safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

improve address ordering with mixes of place and admin areas

Browse Source 
Resolves a couple of situations where a mixed use of places areas and
administrative boundaries would result in a hierarchy that did not
properly respect the contains relation.
This commit is contained in:
Sarah Hoffmann
2022-06-16 10:44:16 +02:00
parent 800240550b
commit df0142678a
3 changed files with 94 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/bdd/db/import/addressing.feature
View File

@@ -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

58
test/bdd/db/import/rank_computation.feature
View File

@@ -197,3 +197,61 @@ Feature: Rank assignment
| 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 |