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..99614b7f749aa4f7bf1b082ff7974aca259e1d41 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
             | 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 |
         Then results contain
          | osm_type |
          | R |


@@ -20,7 +22,9 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id |
          | N1     | - |
         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 |
         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
             | 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 |
         Then results contain
          | osm_type |
          | R |


@@ -41,7 +47,9 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id |
          | N1     | - |
         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 |
         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
             | 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 |
         Then results contain
          | osm_type |
          | N |


@@ -61,7 +71,9 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id |
          | N1     | R1 |
         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 |
         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
          | 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 |
         Then results contain
          | osm_type |
          | N |


@@ -84,7 +98,9 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id |
          | N1     | R1 |
         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 |
         Then results contain
          | osm_type |
          | R |


@@ -101,8 +117,10 @@ Feature: Updates of linked places
          | 1  | N3:label |
         When importing
         Then placex contains
          | 1  | N3:label |
         When importing
         Then placex contains

-         | object | linked_place_id | name+name:de |
+         | object | linked_place_id | name+_place_name:de |

          | R1     | -               | pnt  |
          | R1     | -               | pnt  |

+        And placex contains
+         | object | linked_place_id | name+name:de |

          | N3     | R1              | pnt  |
         When updating places
          | osm | class    | type        | name+name:de | admin | geometry |
          | N3     | R1              | pnt  |
         When updating places
          | osm | class    | type        | name+name:de | admin | geometry |


@@ -110,8 +128,43 @@ Feature: Updates of linked places
         Then placex contains
          | object | linked_place_id | name+name:de |
          | N3     | R1              | newname  |
         Then placex contains
          | object | linked_place_id | name+name:de |
          | N3     | R1              | newname  |

+        And placex contains
+         | object | linked_place_id | name+_place_name:de |

          | R1     | -               | newname  |
 
          | R1     | -               | newname  |
 

+    Scenario: Update linking relation when linkee name is deleted
+        Given the places
+         | osm | class    | type           | name | admin | geometry |
+         | R1  | boundary | administrative | rel  | 8     | poly-area:0.1 |
+        And the places
+         | osm | class    | type           | name | admin | geometry |
+         | N3  | place    | city           | pnt  | 30    | 0.00001 0 |
+        And the relations
+         | id | members  |
+         | 1  | N3:label |
+        When importing
+        Then placex contains
+         | object | linked_place_id | name+_place_name | name+name |
+         | R1     | -               | pnt              | rel       |
+        And placex contains
+         | object | linked_place_id | name+name |
+         | N3     | R1              | pnt  |
+        When sending search query "pnt"
+        Then results contain
+          | osm |
+          | R1  |
+        When updating places
+         | osm | class    | type        | name+name:de | admin | geometry |
+         | N3  | place    | city        | depnt        | 30    | 0.00001 0 |
+        Then placex contains
+         | object | linked_place_id | name+name:de |
+         | N3     | R1              | depnt  |
+        And placex contains
+         | object | linked_place_id | name+_place_name:de | name+name |
+         | R1     | -               | depnt               | rel       |
+        When sending search query "pnt"
+        Then exactly 0 results are returned
+

     Scenario: Updating linkee extratags keeps linker's extratags
         Given the named places
          | osm | class    | type           | extra+wikidata | admin | geometry |
     Scenario: Updating linkee extratags keeps linker's extratags
         Given the named places
          | osm | class    | type           | extra+wikidata | admin | geometry |


@@ -133,3 +186,36 @@ Feature: Updates of linked places
          | object | extratags |
          | R1     | 'wikidata' : '34', 'oneway' : 'yes', 'linked_place' : 'city' |
 
          | 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' |