Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/db/import/linking.feature b/test/bdd/db/import/linking.feature
index 1e0d131a385abf896ca098ab429e0af5ea44b5d3..915c13b3a9e184376a12792ba3d49e38338af9e5 100644 (file)
--- a/test/bdd/db/import/linking.feature
+++ b/test/bdd/db/import/linking.feature
@@ -47,7 +47,7 @@ Feature: Linking of places
          | W2     | R13 |
          | R13    | -   |
          | R23    | -   |
-        When searching for "rhein"
+        When sending search query "rhein"
         Then results contain
          | osm_type |
          | R |
@@ -98,7 +98,7 @@ Feature: Linking of places
          | object | linked_place_id |
          | W1     | - |
          | R1     | - |
-        When searching for "rhein"
+        When sending search query "rhein"
         Then results contain
           | ID | osm_type |
           |  0 | R |
@@ -119,7 +119,7 @@ Feature: Linking of places
          | object | linked_place_id |
          | W1     | -  |
          | W2     | R1 |
-        When searching for "rhein2"
+        When sending search query "rhein2"
         Then results contain
          | osm_type |
          | W |
@@ -172,13 +172,13 @@ Feature: Linking of places
         And placex contains
          | object | rank_address |
          | R13    | 16 |
-        When searching for ""
+        When sending search query ""
          | city |
          | Berlin |
         Then results contain
           | ID | osm_type | osm_id |
           |  0 | R | 13 |
-        When searching for ""
+        When sending search query ""
          | state |
          | Berlin |
         Then results contain
@@ -200,13 +200,13 @@ Feature: Linking of places
         And placex contains
          | object | rank_address |
          | R13    | 8 |
-        When searching for ""
+        When sending search query ""
          | state |
          | Berlin |
         Then results contain
           | ID | osm_type | osm_id |
           |  0 | R | 13 |
-        When searching for ""
+        When sending search query ""
          | city |
          | Berlin |
         Then results contain
@@ -231,3 +231,21 @@ Feature: Linking of places
         And placex contains
          | object | centroid |
          | R13    | in geometry  |
+
+    Scenario: Place nodes can only be linked once
+        Given the named places
+         | osm  | class    | type | extra+wikidata | geometry |
+         | N2   | place    | city | Q1234          | 0 0 |
+        And the named places
+         | osm  | class    | type           | extra+wikidata | admin | geometry |
+         | R1   | boundary | administrative | Q1234          | 8     | poly-area:0.1 |
+         | R2   | boundary | administrative | Q1234          | 9     | poly-area:0.01 |
+        When importing
+        Then placex contains
+         | object | linked_place_id |
+         | N2     | R1              |
+        And placex contains
+         | object | extratags                |
+         | R1     | 'linked_place' : 'city', 'wikidata': 'Q1234'  |
+         | R2     | 'wikidata': 'Q1234'                     |
+