hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt BDD tests for new postcode table structure

Browse Source
This commit is contained in:
Sarah Hoffmann
2025-12-23 22:26:43 +01:00
parent 354aa07cad
commit 3bcd1aa721
11 changed files with 167 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/bdd/features/db/import/addressing.feature
View File

@@ -268,33 +268,6 @@ Feature: Address computation
| W93 | R34 |
| W93 | R4 |
Scenario: postcode boundaries do appear in the address of a way
Given the grid with origin DE
| 1 | | | | | 8 | | 6 | | 2 |
| |10 |11 | | | | | | | |
| |13 |12 | | | | | | | |
| 20| | | 21| | | | | | |
| | | | | | | | | | |
| | | | | | 9 | | | | |
| 4 | | | | | | | 7 | | 3 |
And the named places
| osm | class | type | admin | addr+postcode | geometry |
| R1 | boundary | administrative | 6 | 10000 | (1,2,3,4,1) |
| R34 | boundary | administrative | 8 | 11000 | (1,6,7,4,1) |
And the places
| osm | class | type | addr+postcode | geometry |
| R4 | boundary | postal_code | 11200 | (1,8,9,4,1) |
And the named places
| osm | class | type | geometry |
| W93 | highway | residential | 20,21 |
And the places
| osm | class | type | addr+postcode | geometry |
| W22 | place | postcode | 11234 | (10,11,12,13,10) |
When importing
Then place_addressline contains
| object | address |
| W93 | R4 |
Scenario: squares do not appear in the address of a street
Given the grid
| | 1 | | 2 | |

15
test/bdd/features/db/import/linking.feature
View File

@@ -16,21 +16,6 @@ Feature: Linking of places
| R13 | - |
| N256 | - |
Scenario: Postcode areas cannot be linked
Given the grid with origin US
| 1 | | 2 |
| | 9 | |
| 4 | | 3 |
And the named places
| osm | class | type | addr+postcode | extra+wikidata | geometry |
| R13 | boundary | postal_code | 12345 | Q87493 | (1,2,3,4,1) |
| N25 | place | suburb | 12345 | Q87493 | 9 |
When importing
Then placex contains
| object | linked_place_id |
| R13 | - |
| N25 | - |
Scenario: Waterways are linked when in waterway relations
Given the grid
| 1 | | | | 3 | 4 | | | | 6 |

17
test/bdd/features/db/import/placex.feature
View File

@@ -46,23 +46,6 @@ Feature: Import into placex
| object | admin_level |
| N1 | 3 |
Scenario: postcode node without postcode is dropped
Given the places
| osm | class | type | name+ref |
| N1 | place | postcode | 12334 |
When importing
Then placex has no entry for N1
Scenario: postcode boundary without postcode is dropped
Given the 0.01 grid
| 1 | 2 |
| 3 | |
Given the places
| osm | class | type | name+ref | geometry |
| R1 | boundary | postal_code | 554476 | (1,2,3,1) |
When importing
Then placex has no entry for R1
Scenario: search and address ranks for boundaries are correctly assigned
Given the named places
| osm | class | type |

35
test/bdd/features/db/import/postcodes.feature
View File

@@ -121,8 +121,8 @@ Feature: Import of postcodes
| | 1 | 2 | | |
| | 4 | 3 | | |
And the named places
| osm | class | type | geometry |
| W93 | highway | pedestriant | (10,11,12,13,10) |
| osm | class | type | geometry |
| W93 | highway | pedestrian | (10,11,12,13,10) |
And the named places
| osm | class | type | addr+postcode | geometry |
| W22 | building | yes | 45023 | (1,2,3,4,1) |
@@ -134,14 +134,13 @@ Feature: Import of postcodes
Scenario: Roads get postcodes from nearby unnamed buildings without other info
Given the grid with origin US
| 10 | | | | 11 |
| | 1 | 2 | | |
| | 4 | 3 | | |
| | 1 | | | |
And the named places
| osm | class | type | geometry |
| W93 | highway | residential | 10,11 |
And the places
| osm | class | type | addr+postcode | geometry |
| W22 | place | postcode | 45023 | (1,2,3,4,1) |
And the postcodes
| osm | postcode | centroid |
| W22 | 45023 | 1 |
When importing
Then placex contains
| object | postcode |
@@ -172,26 +171,12 @@ Feature: Import of postcodes
Scenario: Postcodes are added to the postcode
Given the places
| osm | class | type | addr+postcode | addr+housenumber | geometry |
| N34 | place | house | 01982 | 111 |country:de |
| N34 | place | house | 01982 | 111 | country:de |
When importing
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt |
Then location_postcodes contains exactly
| country_code | postcode | centroid!wkt |
| de | 01982 | country:de |
@skip
Scenario: search and address ranks for GB post codes correctly assigned
Given the places
| osm | class | type | postcode | geometry |
| N1 | place | postcode | E45 2CD | country:gb |
| N2 | place | postcode | E45 2 | country:gb |
| N3 | place | postcode | Y45 | country:gb |
When importing
Then location_postcode contains exactly
| postcode | country_code | rank_search | rank_address |
| E45 2CD | gb | 25 | 5 |
| E45 2 | gb | 23 | 5 |
| Y45 | gb | 21 | 5 |
Scenario: Postcodes outside all countries are not added to the postcode table
Given the places
| osm | class | type | addr+postcode | addr+housenumber | addr+place | geometry |
@@ -200,7 +185,7 @@ Feature: Import of postcodes
| osm | class | type | name | geometry |
| N1 | place | hamlet | Null Island | 0 0 |
When importing
Then location_postcode contains exactly
Then location_postcodes contains exactly
| place_id |
When geocoding "111, 01982 Null Island"
Then the result set contains

13
test/bdd/features/db/query/normalization.feature
View File

@@ -154,19 +154,6 @@ Feature: Import and search of names
| object |
| R2 |
Scenario: Postcode boundaries without ref
Given the grid with origin FR
| | 2 | |
| 1 | | 3 |
Given the places
| osm | class | type | postcode | geometry |
| R1 | boundary | postal_code | 123-45 | (1,2,3,1) |
When importing
When geocoding "123-45"
Then result 0 contains
| object |
| R1 |
Scenario Outline: Housenumbers with special characters are found
Given the grid
| 1 | | | | 2 |

21
test/bdd/features/db/query/postcodes.feature
View File

@@ -78,8 +78,8 @@ Feature: Querying fo postcode variants
| N34 | place | house | EH4 7EA | 111 | country:gb |
| N35 | place | house | E4 7EA | 111 | country:gb |
When importing
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt |
Then location_postcodes contains exactly
| country_code | postcode | centroid!wkt |
| gb | EH4 7EA | country:gb |
| gb | E4 7EA | country:gb |
When geocoding "EH4 7EA"
@@ -90,20 +90,3 @@ Feature: Querying fo postcode variants
Then result 0 contains
| type | display_name |
| postcode | E4 7EA, United Kingdom |
Scenario: Postcode areas are preferred over postcode points
Given the grid with origin DE
| 1 | 2 |
| 4 | 3 |
Given the places
| osm | class | type | postcode | geometry |
| R23 | boundary | postal_code | 12345 | (1,2,3,4,1) |
When importing
Then location_postcode contains exactly
| country_code | postcode |
| de | 12345 |
When geocoding "12345, de"
Then result 0 contains
| object |
| R23 |

20
test/bdd/features/db/update/naming.feature
View File

@@ -1,20 +0,0 @@
Feature: Update of names in place objects
Test all naming related issues in updates
Scenario: Delete postcode from postcode boundaries without ref
Given the grid with origin DE
| 1 | 2 |
| 4 | 3 |
Given the places
| osm | class | type | postcode | geometry |
| R1 | boundary | postal_code | 123-45 | (1,2,3,4,1) |
When importing
And geocoding "123-45"
Then result 0 contains
| object |
| R1 |
When updating places
| osm | class | type | geometry |
| R1 | boundary | postal_code | (1,2,3,4,1) |
Then placex has no entry for R1

153
test/bdd/features/db/update/postcode.feature
View File

@@ -2,20 +2,22 @@ Feature: Update of postcode
Tests for updating of data related to postcodes
Scenario: Updating postcode in postcode boundaries without ref
Given the grid
| 1 | 2 |
| 4 | 3 |
Given the places
| osm | class | type | postcode | geometry |
| R1 | boundary | postal_code | 12345 | (1,2,3,4,1) |
Given the grid with origin FR
| 1 | | 2 |
| | 9 | |
| 4 | | 3 |
Given the postcodes
| osm | postcode | centroid | geometry |
| R1 | 12345 | 9 | (1,2,3,4,1) |
When importing
And geocoding "12345"
Then result 0 contains
| object |
| R1 |
When updating places
| osm | class | type | postcode | geometry |
| R1 | boundary | postal_code | 54321 | (1,2,3,4,1) |
Given the postcodes
| osm | postcode | centroid | geometry |
| R1 | 54321 | 9 | (1,2,3,4,1) |
When refreshing postcodes
And geocoding "12345"
Then exactly 0 results are returned
When geocoding "54321"
@@ -28,17 +30,21 @@ Feature: Update of postcode
| osm | class | type | addr+postcode | addr+housenumber | geometry |
| N34 | place | house | 01982 | 111 | country:de |
When importing
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt |
Then location_postcodes contains exactly
| country_code | postcode | centroid!wkt |
| de | 01982 | country:de |
Given the postcodes
| osm | postcode | centroid |
| N66 | 99201 | country:fr |
When updating places
| osm | class | type | addr+postcode | addr+housenumber | geometry |
| N35 | place | house | 4567 | 5 | country:ch |
And updating postcodes
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt |
And refreshing postcodes
Then location_postcodes contains exactly
| country_code | postcode | centroid!wkt |
| de | 01982 | country:de |
| ch | 4567 | country:ch |
| fr | 99201 | country:fr |
Scenario: When the last postcode is deleted, it is deleted from postcode
Given the places
@@ -47,9 +53,9 @@ Feature: Update of postcode
| N35 | place | house | 4567 | 5 | country:ch |
When importing
And marking for delete N34
And updating postcodes
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt |
And refreshing postcodes
Then location_postcodes contains exactly
| country_code | postcode | centroid!wkt |
| ch | 4567 | country:ch |
Scenario: A postcode is not deleted from postcode when it exist in another country
@@ -59,64 +65,24 @@ Feature: Update of postcode
| N35 | place | house | 01982 | 5 | country:fr |
When importing
And marking for delete N34
And updating postcodes
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt|
And refreshing postcodes
Then location_postcodes contains exactly
| country_code | postcode | centroid!wkt|
| fr | 01982 | country:fr |
Scenario: Updating a postcode is reflected in postcode table
Given the places
| osm | class | type | addr+postcode | geometry |
| osm | class | type | addr+postcode | geometry |
| N34 | place | postcode | 01982 | country:de |
When importing
And updating places
| osm | class | type | addr+postcode | geometry |
| N34 | place | postcode | 20453 | country:de |
And updating postcodes
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt |
And refreshing postcodes
Then location_postcodes contains exactly
| country_code | postcode | centroid!wkt |
| de | 20453 | country:de |
Scenario: When changing from a postcode type, the entry appears in placex
When importing
And updating places
| osm | class | type | addr+postcode | geometry |
| N34 | place | postcode | 01982 | country:de |
Then placex has no entry for N34
When updating places
| osm | class | type | addr+postcode | housenr | geometry |
| N34 | place | house | 20453 | 1 | country:de |
Then placex contains
| object | addr+housenumber | geometry!wkt |
| N34 | 1 | country:de |
And place contains exactly
| osm_type | osm_id | class | type |
| N | 34 | place | house |
When updating postcodes
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt |
| de | 20453 | country:de |
Scenario: When changing to a postcode type, the entry disappears from placex
When importing
And updating places
| osm | class | type | addr+postcode | housenr | geometry |
| N34 | place | house | 20453 | 1 | country:de |
Then placex contains
| object | addr+housenumber | geometry!wkt |
| N34 | 1 | country:de|
When updating places
| osm | class | type | addr+postcode | geometry |
| N34 | place | postcode | 01982 | country:de |
Then placex has no entry for N34
And place contains exactly
| osm_type | osm_id | class | type |
| N | 34 | place | postcode |
When updating postcodes
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt |
| de | 01982 | country:de |
Scenario: When a parent is deleted, the postcode gets a new parent
Given the grid with origin DE
| 1 | | 3 | 4 |
@@ -126,14 +92,59 @@ Feature: Update of postcode
| osm | class | type | name | admin | geometry |
| R1 | boundary | administrative | Big | 6 | (1,4,6,2,1) |
| R2 | boundary | administrative | Small | 6 | (1,3,5,2,1) |
Given the places
| osm | class | type | addr+postcode | geometry |
| N9 | place | postcode | 12345 | 9 |
Given the postcodes
| osm | postcode | centroid |
| N9 | 12345 | 9 |
When importing
Then location_postcode contains exactly
| postcode | geometry!wkt | parent_place_id |
Then location_postcodes contains exactly
| postcode | centroid!wkt | parent_place_id |
| 12345 | 9 | R2 |
When marking for delete R2
Then location_postcode contains exactly
| country_code | postcode | geometry!wkt | parent_place_id |
Then location_postcodes contains exactly
| country_code | postcode | centroid!wkt | parent_place_id |
| de | 12345 | 9 | R1 |
Scenario: When a postcode area appears, postcode points are shadowed
Given the grid with origin DE
| 1 | | 3 | |
| | 9 | | 8 |
| 2 | | 5 | |
Given the postcodes
| osm | postcode | centroid |
| N92 | 44321 | 9 |
| N4 | 00245 | 8 |
When importing
Then location_postcodes contains exactly
| country_code | postcode | osm_id | centroid!wkt |
| de | 44321 | - | 9 |
| de | 00245 | - | 8 |
Given the postcodes
| osm | postcode | centroid | geometry |
| R45 | 00245 | 9 | (1,3,5,2,1) |
When refreshing postcodes
Then location_postcodes contains exactly
| country_code | postcode | osm_id | centroid!wkt |
| de | 00245 | 45 | 9 |
Scenario: When a postcode area disappears, postcode points are unshadowed
Given the grid with origin DE
| 1 | | 3 | |
| | 9 | | 8 |
| 2 | | 5 | |
Given the postcodes
| osm | postcode | centroid | geometry |
| R45 | 00245 | 9 | (1,3,5,2,1) |
Given the postcodes
| osm | postcode | centroid |
| N92 | 44321 | 9 |
| N4 | 00245 | 8 |
When importing
Then location_postcodes contains exactly
| country_code | postcode | osm_id | centroid!wkt |
| de | 00245 | 45 | 9 |
When marking for delete R45
And refreshing postcodes
Then location_postcodes contains exactly
| country_code | postcode | osm_id | centroid!wkt |
| de | 44321 | - | 9 |
| de | 00245 | - | 8 |