Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / query / postcodes.feature

diff --git a/test/bdd/db/query/postcodes.feature b/test/bdd/db/query/postcodes.feature
index 78a26a90f5dfd723a2d3511e23a03a0293023536..e8a2ccc2bb8fde4b24ebfeaf9c73ce69f7256e89 100644 (file)
--- a/test/bdd/db/query/postcodes.feature
+++ b/test/bdd/db/query/postcodes.feature
@@ -14,7 +14,6 @@ Feature: Querying fo postcode variants
             | 0  | postcode | 399174, Singapore |
 
 
-    @fail-legacy
     Scenario Outline: Postcodes in the Netherlands (mixed postcode with spaces)
         Given the grid with origin NL
             | 10 |   |   |   | 11 |
@@ -38,7 +37,6 @@ Feature: Querying fo postcode variants
             | 3993 dx  |
 
 
-    @fail-legacy
     Scenario: Postcodes in Singapore (6-digit postcode)
         Given the grid with origin SG
             | 10 |   |   |   | 11 |
@@ -52,7 +50,6 @@ Feature: Querying fo postcode variants
             | 0  | postcode | 399174, Singapore       |
 
 
-    @fail-legacy
     Scenario Outline: Postcodes in Andorra (with country code)
         Given the grid with origin AD
             | 10 |   |   |   | 11 |
@@ -95,3 +92,19 @@ Feature: Querying fo postcode variants
            | 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 | postcode |
+          | de      | 12345    |
+        When sending search query "12345, de"
+        Then results contain
+          | osm |
+          | R23 |