hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-08 19:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt BDD tests to separate interpolation table

Browse Source
This commit is contained in:
Sarah Hoffmann
2026-02-17 16:29:47 +01:00
parent b43116ff52
commit c25204ce31
13 changed files with 290 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/bdd/features/osm2pgsql/import/tags.feature
View File

@@ -206,15 +206,21 @@ Feature: Tag evaluation
Scenario: Address interpolations
Given the grid
| 1 | 2 |
When loading osm data
"""
n13001 Taddr:interpolation=odd
n13002 Taddr:interpolation=even,place=city
n1
n2
w13001 Taddr:interpolation=odd Nn1,n2
w13002 Taddr:interpolation=even,place=city Nn1,n2
"""
Then place contains exactly
| object | class | type | address!dict |
| N13001 | place | houses | 'interpolation': 'odd' |
| N13002 | place | houses | 'interpolation': 'even' |
| object |
And place_interpolation contains exactly
| object | type | address!dict |
| W13001 | odd | - |
| W13002 | even | - |
Scenario: Footways

38
test/bdd/features/osm2pgsql/update/interpolations.feature
View File

@@ -14,20 +14,24 @@ Feature: Updates of address interpolation objects
n2 Taddr:housenumber=17
w33 Thighway=residential,name=Tao Nn1,n2
"""
Then place contains
Then place contains exactly
| object | class | type |
| N1 | place | house |
| N2 | place | house |
| W33 | highway | residential |
When updating osm data
"""
w99 Taddr:interpolation=odd Nn1,n2
"""
Then place contains
Then place contains exactly
| object | class | type |
| N1 | place | house |
| N2 | place | house |
| W99 | place | houses |
| W33 | highway | residential |
And place_interpolation contains exactly
| object | type |
| W99 | odd |
When indexing
Then placex contains exactly
| object | class | type |
@@ -46,11 +50,13 @@ Feature: Updates of address interpolation objects
n2 Taddr:housenumber=7
w99 Taddr:interpolation=odd Nn1,n2
"""
Then place contains
Then place contains exactly
| object | class | type |
| N1 | place | house |
| N2 | place | house |
| W99 | place | houses |
And place_interpolation contains exactly
| object | type |
| W99 | odd |
When updating osm data
"""
@@ -60,6 +66,8 @@ Feature: Updates of address interpolation objects
| object | class | type |
| N1 | place | house |
| N2 | place | house |
And place_interpolation contains exactly
| object |
When indexing
Then placex contains exactly
| object | class | type |
@@ -77,21 +85,27 @@ Feature: Updates of address interpolation objects
w33 Thighway=residential Nn1,n2
w99 Thighway=residential Nn1,n2
"""
Then place contains
Then place contains exactly
| object | class | type |
| N1 | place | house |
| N2 | place | house |
| W33 | highway | residential |
| W99 | highway | residential |
And place_interpolation contains exactly
| object |
When updating osm data
"""
w99 Taddr:interpolation=odd Nn1,n2
"""
Then place contains
Then place contains exactly
| object | class | type |
| N1 | place | house |
| N2 | place | house |
| W99 | place | houses |
| W33 | highway | residential |
And place_interpolation contains exactly
| object | type |
| W99 | odd |
When indexing
Then placex contains exactly
| object | class | type |
@@ -110,11 +124,13 @@ Feature: Updates of address interpolation objects
n2 Taddr:housenumber=17
w99 Taddr:interpolation=odd Nn1,n2
"""
Then place contains
Then place contains exactly
| object | class | type |
| N1 | place | house |
| N2 | place | house |
| W99 | place | houses |
And place_interpolation contains exactly
| object | type |
| W99 | odd |
When updating osm data
"""
@@ -125,6 +141,8 @@ Feature: Updates of address interpolation objects
| N1 | place | house |
| N2 | place | house |
| W99 | highway | residential |
And place_interpolation contains exactly
| object |
When indexing
Then placex contains exactly
| object | class | type |

12
test/bdd/features/osm2pgsql/update/postcodes.feature
View File

@@ -112,7 +112,9 @@ Feature: Update of postcode only objects
| object | class | type |
| N1 | place | house |
| N2 | place | house |
| W34 | place | houses |
And place_interpolation contains exactly
| object | type |
| W34 | odd |
When updating osm data
"""
@@ -122,9 +124,11 @@ Feature: Update of postcode only objects
| object | class | type |
| N1 | place | house |
| N2 | place | house |
Then place_postcode contains exactly
And place_postcode contains exactly
| object | postcode |
| W34 | 4456 |
And place_interpolation contains exactly
| object |
When indexing
Then location_property_osmline contains exactly
| osm_id |
@@ -158,7 +162,9 @@ Feature: Update of postcode only objects
| N1 | place | house |
| N2 | place | house |
| W33 | highway | residential |
| W34 | place | houses |
And place_interpolation contains exactly
| object | type |
| W34 | odd |
And place_postcode contains exactly
| object |
When indexing