From: Sarah Hoffmann Date: Thu, 9 Mar 2023 16:44:34 +0000 (+0100) Subject: bdd: remove special case for osm_type field X-Git-Tag: v4.3.0~90^2~10 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/01010e443f5cde6d3ecd52d73009a81d71d307e2 bdd: remove special case for osm_type field The fuzzy field check hide cover formatting errors. Use 'osm' when only caring about the conent. --- diff --git a/test/bdd/db/import/interpolation.feature b/test/bdd/db/import/interpolation.feature index 56ca4cc1..ddaae631 100644 --- a/test/bdd/db/import/interpolation.feature +++ b/test/bdd/db/import/interpolation.feature @@ -273,12 +273,12 @@ Feature: Import of address interpolations | W3 | 14 | 14 | When sending search query "16 Cloud Street" Then results contain - | ID | osm_type | osm_id | - | 0 | N | 4 | + | ID | osm | + | 0 | N4 | When sending search query "14 Cloud Street" Then results contain - | ID | osm_type | osm_id | - | 0 | W | 11 | + | ID | osm | + | 0 | W11 | Scenario: addr:street on housenumber way Given the grid @@ -318,12 +318,12 @@ Feature: Import of address interpolations | W3 | 14 | 14 | When sending search query "16 Cloud Street" Then results contain - | ID | osm_type | osm_id | - | 0 | N | 4 | + | ID | osm | + | 0 | N4 | When sending search query "14 Cloud Street" Then results contain - | ID | osm_type | osm_id | - | 0 | W | 11 | + | ID | osm | + | 0 | W11 | Scenario: Geometry of points and way don't match (github #253) Given the places @@ -401,8 +401,8 @@ Feature: Import of address interpolations | 2 | 8 | 10,11 | When sending jsonv2 reverse coordinates 1,1 Then results contain - | ID | osm_type | osm_id | type | display_name | - | 0 | node | 1 | house | 0 | + | ID | osm | type | display_name | + | 0 | N1 | house | 0 | Scenario: Parenting of interpolation with additional tags Given the grid diff --git a/test/bdd/db/import/linking.feature b/test/bdd/db/import/linking.feature index 0fb3f76d..dfa4b77c 100644 --- a/test/bdd/db/import/linking.feature +++ b/test/bdd/db/import/linking.feature @@ -55,8 +55,8 @@ Feature: Linking of places | R23 | - | When sending search query "rhein" Then results contain - | osm_type | - | R | + | osm | + | R13 | Scenario: Relations are not linked when in waterway relations Given the grid @@ -81,9 +81,9 @@ Feature: Linking of places | R2 | - | When sending search query "rhein" Then results contain - | ID | osm_type | - | 0 | R | - | 1 | W | + | ID | osm | + | 0 | R1 | + | 1 | W2 | Scenario: Empty waterway relations are handled correctly @@ -138,8 +138,8 @@ Feature: Linking of places | W2 | R1 | When sending search query "rhein2" Then results contain - | osm_type | - | W | + | osm | + | W1 | # github #573 Scenario: Boundaries should only be linked to places @@ -205,14 +205,14 @@ Feature: Linking of places | city | | Berlin | Then results contain - | ID | osm_type | osm_id | - | 0 | R | 13 | + | ID | osm | + | 0 | R13 | When sending search query "" | state | | Berlin | Then results contain - | ID | osm_type | osm_id | - | 0 | R | 13 | + | ID | osm | + | 0 | R13 | Scenario: Boundaries without place tags only link against same admin level @@ -237,14 +237,14 @@ Feature: Linking of places | state | | Berlin | Then results contain - | ID | osm_type | osm_id | - | 0 | R | 13 | + | ID | osm | + | 0 | R13 | When sending search query "" | city | | Berlin | Then results contain - | ID | osm_type | osm_id | - | 0 | N | 2 | + | ID | osm | + | 0 | N2 | # github #1352 Scenario: Do not use linked centroid when it is outside the area diff --git a/test/bdd/db/import/parenting.feature b/test/bdd/db/import/parenting.feature index 5de3fde6..c349b69f 100644 --- a/test/bdd/db/import/parenting.feature +++ b/test/bdd/db/import/parenting.feature @@ -23,12 +23,12 @@ Feature: Parenting of objects | N2 | W1 | When sending search query "4 galoo" Then results contain - | ID | osm_type | osm_id | display_name | - | 0 | N | 1 | 4, galoo, 12345, Deutschland | + | ID | osm | display_name | + | 0 | N1 | 4, galoo, 12345, Deutschland | When sending search query "5 galoo" Then results contain - | ID | osm_type | osm_id | display_name | - | 0 | N | 2 | 5, galoo, 99999, Deutschland | + | ID | osm | display_name | + | 0 | N2 | 5, galoo, 99999, Deutschland | Scenario: Address without tags, closest street Given the grid diff --git a/test/bdd/db/query/interpolation.feature b/test/bdd/db/query/interpolation.feature index 602ac434..e709787d 100644 --- a/test/bdd/db/query/interpolation.feature +++ b/test/bdd/db/query/interpolation.feature @@ -43,7 +43,7 @@ Feature: Query of address interpolations And the places | osm | class | type | housenr | geometry | | N1 | place | house | 2 | 1 | - | N3 | place | house | 16 | 3 | + | N3 | place | house | 18 | 3 | And the ways | id | nodes | | 1 | 1,3 | diff --git a/test/bdd/db/update/linked_places.feature b/test/bdd/db/update/linked_places.feature index c277e8bd..539d9285 100644 --- a/test/bdd/db/update/linked_places.feature +++ b/test/bdd/db/update/linked_places.feature @@ -44,8 +44,8 @@ Feature: Updates of linked places | dups | | 1 | Then results contain - | osm_type | - | R | + | osm | + | R1 | When updating places | osm | class | type | name | admin | geometry | | R1 | boundary | administrative | foobar | 8 | (10,11,12,13,10) | @@ -56,8 +56,8 @@ Feature: Updates of linked places | dups | | 1 | Then results contain - | osm_type | - | N | + | osm | + | N1 | Scenario: Add linked place when linking relation is removed Given the 0.1 grid @@ -75,8 +75,8 @@ Feature: Updates of linked places | dups | | 1 | Then results contain - | osm_type | - | R | + | osm | + | R1 | When marking for delete R1 Then placex contains | object | linked_place_id | @@ -85,8 +85,8 @@ Feature: Updates of linked places | dups | | 1 | Then results contain - | osm_type | - | N | + | osm | + | N1 | Scenario: Remove linked place when linking relation is added Given the 0.1 grid @@ -101,8 +101,8 @@ Feature: Updates of linked places | dups | | 1 | Then results contain - | osm_type | - | N | + | osm | + | N1 | When updating places | osm | class | type | name | admin | geometry | | R1 | boundary | administrative | foo | 8 | (10,11,12,13,10) | @@ -113,8 +113,8 @@ Feature: Updates of linked places | dups | | 1 | Then results contain - | osm_type | - | R | + | osm | + | R1 | Scenario: Remove linked place when linking relation is renamed Given the 0.1 grid @@ -132,8 +132,8 @@ Feature: Updates of linked places | dups | | 1 | Then results contain - | osm_type | - | N | + | osm | + | N1 | When updating places | osm | class | type | name | admin | geometry | | R1 | boundary | administrative | foo | 8 | (10,11,12,13,10) | @@ -144,8 +144,8 @@ Feature: Updates of linked places | dups | | 1 | Then results contain - | osm_type | - | R | + | osm | + | R1 | Scenario: Update linking relation when linkee name is updated Given the 0.1 grid diff --git a/test/bdd/steps/http_responses.py b/test/bdd/steps/http_responses.py index 266a3663..a3493b97 100644 --- a/test/bdd/steps/http_responses.py +++ b/test/bdd/steps/http_responses.py @@ -137,8 +137,6 @@ class GenericResponse: elif name == 'osm': self.check_row_field(i, 'osm_type', OsmType(value[0])) 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': if ' ' in value: lon, lat = value.split(' ') @@ -146,8 +144,8 @@ class GenericResponse: lon, lat = context.osm.grid_node(int(value)) else: raise RuntimeError("Context needed when using grid coordinates") - self.check_row_field(i, 'lat', Field(float(lat)), base=subdict) - self.check_row_field(i, 'lon', Field(float(lon)), base=subdict) + self.check_row_field(i, 'lat', Field(float(lat))) + self.check_row_field(i, 'lon', Field(float(lon))) elif '+' in name: self.assert_subfield(i, name.split('+'), value) else: