Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/db/query/linking.feature b/test/bdd/db/query/linking.feature
index cf1fa20c243691e48a4e3d98f707ee03a1845785..351f88710bd0c14de08b99a6e67e0e14b5c444d4 100644 (file)
--- a/test/bdd/db/query/linking.feature
+++ b/test/bdd/db/query/linking.feature
@@ -3,12 +3,16 @@ Feature: Searching linked places
     Tests that information from linked places can be searched correctly
 
     Scenario: Additional names from linked places are searchable
+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 2 |    |
+         | 13 |   | 12 |
         Given the places
          | osm  | class    | type           | admin | name  | geometry |
-         | R13  | boundary | administrative | 6     | Garbo | poly-area:0.1 |
+         | R13  | boundary | administrative | 6     | Garbo | (10,11,12,13,10) |
         Given the places
-         | osm  | class    | type           | admin | name+name:it | geometry |
-         | N2   | place    | hamlet         | 15    | Vario        | 0.006 0.00001 |
+         | osm  | class    | type           | admin | name+name:it |
+         | N2   | place    | hamlet         | 15    | Vario        |
         And the relations
          | id | members       | tags+type |
          | 13 | N2:label      | boundary |
@@ -17,9 +21,11 @@ Feature: Searching linked places
          | object  | linked_place_id |
          | N2      | R13 |
         When sending search query "Vario"
+         | namedetails |
+         | 1 |
         Then results contain
-         | osm | display_name |
-         | R13 | Garbo |
+         | osm | display_name | namedetails |
+         | R13 | Garbo | "name": "Garbo", "name:it": "Vario" |
         When sending search query "Vario"
          | accept-language |
          | it |
@@ -29,12 +35,16 @@ Feature: Searching linked places
 
 
     Scenario: Differing names from linked places are searchable
+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 2 |    |
+         | 13 |   | 12 |
         Given the places
          | osm  | class    | type           | admin | name  | geometry |
-         | R13  | boundary | administrative | 6     | Garbo | poly-area:0.1 |
+         | R13  | boundary | administrative | 6     | Garbo | (10,11,12,13,10) |
         Given the places
-         | osm  | class    | type           | admin | name  | geometry |
-         | N2   | place    | hamlet         | 15    | Vario | 0.006 0.00001 |
+         | osm  | class    | type           | admin | name  |
+         | N2   | place    | hamlet         | 15    | Vario |
         And the relations
          | id | members       | tags+type |
          | 13 | N2:label      | boundary |
@@ -43,9 +53,11 @@ Feature: Searching linked places
          | object  | linked_place_id |
          | N2      | R13 |
         When sending search query "Vario"
+         | namedetails |
+         | 1 |
         Then results contain
-         | osm | display_name |
-         | R13 | Garbo |
+         | osm | display_name | namedetails |
+         | R13 | Garbo        | "name": "Garbo", "_place_name": "Vario" |
         When sending search query "Garbo"
         Then results contain
          | osm | display_name |