hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

bdd: remove special case for osm_type field

Browse Source 
The fuzzy field check hide cover formatting errors. Use 'osm' when
only caring about the conent.
This commit is contained in:
Sarah Hoffmann
2023-03-09 17:44:34 +01:00
parent da0a7a765e
commit 01010e443f
6 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,12 +273,12 @@ Feature: Import of address interpolations
| W3 | 14 | 14 | | W3 | 14 | 14 |
When sending search query "16 Cloud Street" When sending search query "16 Cloud Street"
Then results contain Then results contain
| ID | osm_type | osm_id | | ID | osm |
| 0 | N | 4 | | 0 | N4 |
When sending search query "14 Cloud Street" When sending search query "14 Cloud Street"
Then results contain Then results contain
| ID | osm_type | osm_id | | ID | osm |
| 0 | W | 11 | | 0 | W11 |
Scenario: addr:street on housenumber way Scenario: addr:street on housenumber way
Given the grid Given the grid
@@ -318,12 +318,12 @@ Feature: Import of address interpolations
| W3 | 14 | 14 | | W3 | 14 | 14 |
When sending search query "16 Cloud Street" When sending search query "16 Cloud Street"
Then results contain Then results contain
| ID | osm_type | osm_id | | ID | osm |
| 0 | N | 4 | | 0 | N4 |
When sending search query "14 Cloud Street" When sending search query "14 Cloud Street"
Then results contain Then results contain
| ID | osm_type | osm_id | | ID | osm |
| 0 | W | 11 | | 0 | W11 |
Scenario: Geometry of points and way don't match (github #253) Scenario: Geometry of points and way don't match (github #253)
Given the places Given the places
@@ -401,8 +401,8 @@ Feature: Import of address interpolations
| 2 | 8 | 10,11 | | 2 | 8 | 10,11 |
When sending jsonv2 reverse coordinates 1,1 When sending jsonv2 reverse coordinates 1,1
Then results contain Then results contain
| ID | osm_type | osm_id | type | display_name | | ID | osm | type | display_name |
| 0 | node | 1 | house | 0 | | 0 | N1 | house | 0 |
Scenario: Parenting of interpolation with additional tags Scenario: Parenting of interpolation with additional tags
Given the grid Given the grid

30
test/bdd/db/import/linking.feature
View File

@@ -55,8 +55,8 @@ Feature: Linking of places
| R23 | - | | R23 | - |
When sending search query "rhein" When sending search query "rhein"
Then results contain Then results contain
| osm_type | | osm |
| R | | R13 |
Scenario: Relations are not linked when in waterway relations Scenario: Relations are not linked when in waterway relations
Given the grid Given the grid
@@ -81,9 +81,9 @@ Feature: Linking of places
| R2 | - | | R2 | - |
When sending search query "rhein" When sending search query "rhein"
Then results contain Then results contain
| ID | osm_type | | ID | osm |
| 0 | R | | 0 | R1 |
| 1 | W | | 1 | W2 |
Scenario: Empty waterway relations are handled correctly Scenario: Empty waterway relations are handled correctly
@@ -138,8 +138,8 @@ Feature: Linking of places
| W2 | R1 | | W2 | R1 |
When sending search query "rhein2" When sending search query "rhein2"
Then results contain Then results contain
| osm_type | | osm |
| W | | W1 |
# github #573 # github #573
Scenario: Boundaries should only be linked to places Scenario: Boundaries should only be linked to places
@@ -205,14 +205,14 @@ Feature: Linking of places
| city | | city |
| Berlin | | Berlin |
Then results contain Then results contain
| ID | osm_type | osm_id | | ID | osm |
| 0 | R | 13 | | 0 | R13 |
When sending search query "" When sending search query ""
| state | | state |
| Berlin | | Berlin |
Then results contain Then results contain
| ID | osm_type | osm_id | | ID | osm |
| 0 | R | 13 | | 0 | R13 |
Scenario: Boundaries without place tags only link against same admin level Scenario: Boundaries without place tags only link against same admin level
@@ -237,14 +237,14 @@ Feature: Linking of places
| state | | state |
| Berlin | | Berlin |
Then results contain Then results contain
| ID | osm_type | osm_id | | ID | osm |
| 0 | R | 13 | | 0 | R13 |
When sending search query "" When sending search query ""
| city | | city |
| Berlin | | Berlin |
Then results contain Then results contain
| ID | osm_type | osm_id | | ID | osm |
| 0 | N | 2 | | 0 | N2 |
# github #1352 # github #1352
Scenario: Do not use linked centroid when it is outside the area Scenario: Do not use linked centroid when it is outside the area

8
test/bdd/db/import/parenting.feature
View File

@@ -23,12 +23,12 @@ Feature: Parenting of objects
| N2 | W1 | | N2 | W1 |
When sending search query "4 galoo" When sending search query "4 galoo"
Then results contain Then results contain
| ID | osm_type | osm_id | display_name | | ID | osm | display_name |
| 0 | N | 1 | 4, galoo, 12345, Deutschland | | 0 | N1 | 4, galoo, 12345, Deutschland |
When sending search query "5 galoo" When sending search query "5 galoo"
Then results contain Then results contain
| ID | osm_type | osm_id | display_name | | ID | osm | display_name |
| 0 | N | 2 | 5, galoo, 99999, Deutschland | | 0 | N2 | 5, galoo, 99999, Deutschland |
Scenario: Address without tags, closest street Scenario: Address without tags, closest street
Given the grid Given the grid

2
test/bdd/db/query/interpolation.feature
View File

@@ -43,7 +43,7 @@ Feature: Query of address interpolations
And the places And the places
| osm | class | type | housenr | geometry | | osm | class | type | housenr | geometry |
| N1 | place | house | 2 | 1 | | N1 | place | house | 2 | 1 |
| N3 | place | house | 16 | 3 | | N3 | place | house | 18 | 3 |
And the ways And the ways
| id | nodes | | id | nodes |
| 1 | 1,3 | | 1 | 1,3 |

32
test/bdd/db/update/linked_places.feature
View File

@@ -44,8 +44,8 @@ Feature: Updates of linked places
| dups | | dups |
| 1 | | 1 |
Then results contain Then results contain
| osm_type | | osm |
| R | | R1 |
When updating places When updating places
| osm | class | type | name | admin | geometry | | osm | class | type | name | admin | geometry |
| R1 | boundary | administrative | foobar | 8 | (10,11,12,13,10) | | R1 | boundary | administrative | foobar | 8 | (10,11,12,13,10) |
@@ -56,8 +56,8 @@ Feature: Updates of linked places
| dups | | dups |
| 1 | | 1 |
Then results contain Then results contain
| osm_type | | osm |
| N | | N1 |
Scenario: Add linked place when linking relation is removed Scenario: Add linked place when linking relation is removed
Given the 0.1 grid Given the 0.1 grid
@@ -75,8 +75,8 @@ Feature: Updates of linked places
| dups | | dups |
| 1 | | 1 |
Then results contain Then results contain
| osm_type | | osm |
| R | | R1 |
When marking for delete R1 When marking for delete R1
Then placex contains Then placex contains
| object | linked_place_id | | object | linked_place_id |
@@ -85,8 +85,8 @@ Feature: Updates of linked places
| dups | | dups |
| 1 | | 1 |
Then results contain Then results contain
| osm_type | | osm |
| N | | N1 |
Scenario: Remove linked place when linking relation is added Scenario: Remove linked place when linking relation is added
Given the 0.1 grid Given the 0.1 grid
@@ -101,8 +101,8 @@ Feature: Updates of linked places
| dups | | dups |
| 1 | | 1 |
Then results contain Then results contain
| osm_type | | osm |
| N | | N1 |
When updating places When updating places
| osm | class | type | name | admin | geometry | | osm | class | type | name | admin | geometry |
| R1 | boundary | administrative | foo | 8 | (10,11,12,13,10) | | R1 | boundary | administrative | foo | 8 | (10,11,12,13,10) |
@@ -113,8 +113,8 @@ Feature: Updates of linked places
| dups | | dups |
| 1 | | 1 |
Then results contain Then results contain
| osm_type | | osm |
| R | | R1 |
Scenario: Remove linked place when linking relation is renamed Scenario: Remove linked place when linking relation is renamed
Given the 0.1 grid Given the 0.1 grid
@@ -132,8 +132,8 @@ Feature: Updates of linked places
| dups | | dups |
| 1 | | 1 |
Then results contain Then results contain
| osm_type | | osm |
| N | | N1 |
When updating places When updating places
| osm | class | type | name | admin | geometry | | osm | class | type | name | admin | geometry |
| R1 | boundary | administrative | foo | 8 | (10,11,12,13,10) | | R1 | boundary | administrative | foo | 8 | (10,11,12,13,10) |
@@ -144,8 +144,8 @@ Feature: Updates of linked places
| dups | | dups |
| 1 | | 1 |
Then results contain Then results contain
| osm_type | | osm |
| R | | R1 |
Scenario: Update linking relation when linkee name is updated Scenario: Update linking relation when linkee name is updated
Given the 0.1 grid Given the 0.1 grid

6
test/bdd/steps/http_responses.py
View File

@@ -137,8 +137,6 @@ class GenericResponse:
elif name == 'osm': elif name == 'osm':
self.check_row_field(i, 'osm_type', OsmType(value[0])) self.check_row_field(i, 'osm_type', OsmType(value[0]))
self.check_row_field(i, 'osm_id', Field(value[1:])) self.check_row_field(i, 'osm_id', Field(value[1:]))
elif name == 'osm_type':
self.check_row_field(i, 'osm_type', OsmType(value[0]))
elif name == 'centroid': elif name == 'centroid':
if ' ' in value: if ' ' in value:
lon, lat = value.split(' ') lon, lat = value.split(' ')
@@ -146,8 +144,8 @@ class GenericResponse:
lon, lat = context.osm.grid_node(int(value)) lon, lat = context.osm.grid_node(int(value))
else: else:
raise RuntimeError("Context needed when using grid coordinates") raise RuntimeError("Context needed when using grid coordinates")
self.check_row_field(i, 'lat', Field(float(lat)), base=subdict) self.check_row_field(i, 'lat', Field(float(lat)))
self.check_row_field(i, 'lon', Field(float(lon)), base=subdict) self.check_row_field(i, 'lon', Field(float(lon)))
elif '+' in name: elif '+' in name:
self.assert_subfield(i, name.split('+'), value) self.assert_subfield(i, name.split('+'), value)
else: else: