Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / import / country.feature

diff --git a/test/bdd/db/import/country.feature b/test/bdd/db/import/country.feature
index 354d5c2f7262224aad612346805fb582f612b475..070baeef17fe1f7354bb66563f0242ccfc8c9843 100644 (file)
--- a/test/bdd/db/import/country.feature
+++ b/test/bdd/db/import/country.feature
@@ -21,9 +21,12 @@ Feature: Country handling
             | osm | display_name |
             | N1  | Wenig, Loudou |
     Scenario: OSM country relations outside expected boundaries are ignored
             | osm | display_name |
             | N1  | Wenig, Loudou |
     Scenario: OSM country relations outside expected boundaries are ignored

+        Given the grid
+            | 1 |  | 2 |
+            | 4 |  | 3 |

         Given the places
             | osm  | class    | type           | admin | name+name:xy | country | geometry |
         Given the places
             | osm  | class    | type           | admin | name+name:xy | country | geometry |

-            | R1   | boundary | administrative | 2     | Loudou       | de      | poly-area:0.1 |
+            | R1   | boundary | administrative | 2     | Loudou       | de      | (1,2,3,4,1) |

         Given the places
             | osm  | class    | type          | name  | geometry   |
             | N1   | place    | town          | Wenig | country:de |
         Given the places
             | osm  | class    | type          | name  | geometry   |
             | N1   | place    | town          | Wenig | country:de |


@@ -35,9 +38,11 @@ Feature: Country handling
             | osm | display_name |
             | N1  | Wenig, Germany |
     Scenario: Pre-defined country names are used
             | osm | display_name |
             | N1  | Wenig, Germany |
     Scenario: Pre-defined country names are used

+        Given the grid with origin CH
+            | 1 |

         Given the places
             | osm  | class    | type          | name  | geometry   |
         Given the places
             | osm  | class    | type          | name  | geometry   |

-            | N1   | place    | town          | Ingb  | country:ch |
+            | N1   | place    | town          | Ingb  | 1          |

         When importing
         And sending search query "Ingb"
             | accept-language |
         When importing
         And sending search query "Ingb"
             | accept-language |