Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / update / linked_places.feature

diff --git a/test/bdd/db/update/linked_places.feature b/test/bdd/db/update/linked_places.feature
index 647d5eafa1ea37db93585603af4be09a65fd38ea..7a0fa21a829667102a177e9abf3ad3671cd7c1a2 100644 (file)
--- a/test/bdd/db/update/linked_places.feature
+++ b/test/bdd/db/update/linked_places.feature
@@ -10,7 +10,9 @@ Feature: Updates of linked places
             | osm | class    | type           | name | admin | geometry |
             | R1  | boundary | administrative | foo  | 8     | poly-area:0.1 |
         When importing
-        And searching for "foo" with dups
+        And sending search query "foo"
+         | dups |
+         | 1    |
         Then results contain
          | osm_type |
          | R |
@@ -20,7 +22,9 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id |
          | N1     | - |
-        When searching for "foo" with dups
+        When sending search query "foo"
+         | dups |
+         | 1    |
         Then results contain
          | osm_type |
          | N |
@@ -33,7 +37,9 @@ Feature: Updates of linked places
             | osm | class    | type           | name | admin | geometry |
             | R1  | boundary | administrative | foo  | 8     | poly-area:0.1 |
         When importing
-        And searching for "foo" with dups
+        And sending search query "foo"
+         | dups |
+         | 1    |
         Then results contain
          | osm_type |
          | R |
@@ -41,7 +47,9 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id |
          | N1     | - |
-        When searching for "foo" with dups
+        When sending search query "foo"
+         | dups |
+         | 1    |
         Then results contain
          | osm_type |
          | N |
@@ -51,7 +59,9 @@ Feature: Updates of linked places
             | osm | class | type | name | geometry |
             | N1  | place | city | foo  | 0 0 |
         When importing
-        And searching for "foo" with dups
+        And sending search query "foo"
+         | dups |
+         | 1    |
         Then results contain
          | osm_type |
          | N |
@@ -61,7 +71,9 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id |
          | N1     | R1 |
-        When searching for "foo" with dups
+        When sending search query "foo"
+         | dups |
+         | 1    |
         Then results contain
          | osm_type |
          | R |
@@ -74,7 +86,9 @@ Feature: Updates of linked places
          | osm | class    | type           | name   | admin | geometry |
          | R1  | boundary | administrative | foobar | 8     | poly-area:0.1 |
         When importing
-        And searching for "foo" with dups
+        And sending search query "foo"
+         | dups |
+         | 1    |
         Then results contain
          | osm_type |
          | N |
@@ -84,7 +98,9 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id |
          | N1     | R1 |
-        When searching for "foo" with dups
+        When sending search query "foo"
+         | dups |
+         | 1    |
         Then results contain
          | osm_type |
          | R |
@@ -133,3 +149,36 @@ Feature: Updates of linked places
          | object | extratags |
          | R1     | 'wikidata' : '34', 'oneway' : 'yes', 'linked_place' : 'city' |
 
+    Scenario: Remove linked_place info when linkee is removed
+        Given the places
+            | osm | class | type | name | geometry |
+            | N1  | place | city | foo  | 0 0 |
+        And the places
+            | osm | class    | type           | name | admin | geometry |
+            | R1  | boundary | administrative | foo  | 8     | poly-area:0.1 |
+        When importing
+        Then placex contains
+            | object | extratags |
+            | R1     | 'linked_place' : 'city' |
+        When marking for delete N1
+        Then placex contains
+            | object | extratags |
+            | R1     |  |
+
+    Scenario: Update linked_place info when linkee type changes
+        Given the places
+            | osm | class | type | name | geometry |
+            | N1  | place | city | foo  | 0 0 |
+        And the places
+            | osm | class    | type           | name | admin | geometry |
+            | R1  | boundary | administrative | foo  | 8     | poly-area:0.1 |
+        When importing
+        Then placex contains
+            | object | extratags |
+            | R1     | 'linked_place' : 'city' |
+        When updating places
+            | osm | class | type | name | geometry |
+            | N1  | place | town | foo  | 0 0 |
+        Then placex contains
+            | object | extratags |
+            | R1     | 'linked_place' : 'town' |