Merge pull request #3301 from lonvia/fix-class-search-regression

[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 99614b7f749aa4f7bf1b082ff7974aca259e1d41..539d928543e5942f3d3647ded9a3be010b3df24d 100644 (file)
--- a/test/bdd/db/update/linked_places.feature
+++ b/test/bdd/db/update/linked_places.feature
@@ -2,23 +2,53 @@
 Feature: Updates of linked places
     Tests that linked places are correctly added and deleted.
 
 Feature: Updates of linked places
     Tests that linked places are correctly added and deleted.
 

+    Scenario: Linking is kept when boundary is updated
+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 1 |    |
+         | 13 |   | 12 |
+        Given the places
+            | osm | class | type | name |
+            | N1  | place | city | foo  |
+        And the places
+            | osm | class    | type           | name | admin | geometry |
+            | R1  | boundary | administrative | foo  | 8     | (10,11,12,13,10) |
+        When importing
+        Then placex contains
+         | object | linked_place_id |
+         | N1     | R1 |
+        When updating places
+         | osm | class    | type           | name | name+name:de | admin | geometry |
+         | R1  | boundary | administrative | foo  | Dingens      | 8     | (10,11,12,13,10) |
+        Then placex contains
+         | object | linked_place_id |
+         | N1     | R1 |
+
+

     Scenario: Add linked place when linking relation is renamed
     Scenario: Add linked place when linking relation is renamed

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 1 |    |
+         | 13 |   | 12 |

         Given the places
         Given the places

-            | osm | class | type | name | geometry |
-            | N1  | place | city | foo  | 0 0 |
+            | osm | class | type | name |
+            | N1  | place | city | foo  |

         And the places
             | osm | class    | type           | name | admin | geometry |
         And the places
             | osm | class    | type           | name | admin | geometry |

-            | R1  | boundary | administrative | foo  | 8     | poly-area:0.1 |
+            | R1  | boundary | administrative | foo  | 8     | (10,11,12,13,10) |

         When importing
         When importing

-        And sending search query "foo"
+        Then placex contains
+         | object | linked_place_id |
+         | N1     | R1 |
+        When sending search query "foo"

          | dups |
          | 1    |
         Then results contain
          | dups |
          | 1    |
         Then results contain

-         | osm_type |
-         | R |
+         | osm |
+         | R1 |

         When updating places
          | osm | class    | type           | name   | admin | geometry |
         When updating places
          | osm | class    | type           | name   | admin | geometry |

-         | R1  | boundary | administrative | foobar | 8     | poly-area:0.1 |
+         | R1  | boundary | administrative | foobar | 8     | (10,11,12,13,10) |

         Then placex contains
          | object | linked_place_id |
          | N1     | - |
         Then placex contains
          | object | linked_place_id |
          | N1     | - |


@@ -26,23 +56,27 @@ Feature: Updates of linked places
          | dups |
          | 1    |
         Then results contain
          | dups |
          | 1    |
         Then results contain

-         | osm_type |
-         | N |
+         | osm |
+         | N1 |

 
     Scenario: Add linked place when linking relation is removed
 
     Scenario: Add linked place when linking relation is removed

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 1 |    |
+         | 13 |   | 12 |

         Given the places
         Given the places

-            | osm | class | type | name | geometry |
-            | N1  | place | city | foo  | 0 0 |
+            | osm | class | type | name |
+            | N1  | place | city | foo  |

         And the places
             | osm | class    | type           | name | admin | geometry |
         And the places
             | osm | class    | type           | name | admin | geometry |

-            | R1  | boundary | administrative | foo  | 8     | poly-area:0.1 |
+            | R1  | boundary | administrative | foo  | 8     | (10,11,12,13,10) |

         When importing
         And sending search query "foo"
          | dups |
          | 1    |
         Then results contain
         When importing
         And sending search query "foo"
          | dups |
          | 1    |
         Then results contain

-         | osm_type |
-         | R |
+         | osm |
+         | R1 |

         When marking for delete R1
         Then placex contains
          | object | linked_place_id |
         When marking for delete R1
         Then placex contains
          | object | linked_place_id |


@@ -51,23 +85,27 @@ Feature: Updates of linked places
          | dups |
          | 1    |
         Then results contain
          | dups |
          | 1    |
         Then results contain

-         | osm_type |
-         | N |
+         | osm |
+         | N1 |

 
     Scenario: Remove linked place when linking relation is added
 
     Scenario: Remove linked place when linking relation is added

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 1 |    |
+         | 13 |   | 12 |

         Given the places
         Given the places

-            | osm | class | type | name | geometry |
-            | N1  | place | city | foo  | 0 0 |
+            | osm | class | type | name |
+            | N1  | place | city | foo  |

         When importing
         And sending search query "foo"
          | dups |
          | 1    |
         Then results contain
         When importing
         And sending search query "foo"
          | dups |
          | 1    |
         Then results contain

-         | osm_type |
-         | N |
+         | osm |
+         | N1 |

         When updating places
          | osm | class    | type           | name   | admin | geometry |
         When updating places
          | osm | class    | type           | name   | admin | geometry |

-         | R1  | boundary | administrative | foo    | 8     | poly-area:0.1 |
+         | R1  | boundary | administrative | foo    | 8     | (10,11,12,13,10) |

         Then placex contains
          | object | linked_place_id |
          | N1     | R1 |
         Then placex contains
          | object | linked_place_id |
          | N1     | R1 |


@@ -75,26 +113,30 @@ Feature: Updates of linked places
          | dups |
          | 1    |
         Then results contain
          | dups |
          | 1    |
         Then results contain

-         | osm_type |
-         | R |
+         | osm |
+         | R1 |

 
     Scenario: Remove linked place when linking relation is renamed
 
     Scenario: Remove linked place when linking relation is renamed

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 1 |    |
+         | 13 |   | 12 |

         Given the places
         Given the places

-            | osm | class | type | name | geometry |
-            | N1  | place | city | foo  | 0 0 |
+            | osm | class | type | name |
+            | N1  | place | city | foo  |

         And the places
          | osm | class    | type           | name   | admin | geometry |
         And the places
          | osm | class    | type           | name   | admin | geometry |

-         | R1  | boundary | administrative | foobar | 8     | poly-area:0.1 |
+         | R1  | boundary | administrative | foobar | 8     | (10,11,12,13,10) |

         When importing
         And sending search query "foo"
          | dups |
          | 1    |
         Then results contain
         When importing
         And sending search query "foo"
          | dups |
          | 1    |
         Then results contain

-         | osm_type |
-         | N |
+         | osm |
+         | N1 |

         When updating places
          | osm | class    | type           | name   | admin | geometry |
         When updating places
          | osm | class    | type           | name   | admin | geometry |

-         | R1  | boundary | administrative | foo    | 8     | poly-area:0.1 |
+         | R1  | boundary | administrative | foo    | 8     | (10,11,12,13,10) |

         Then placex contains
          | object | linked_place_id |
          | N1     | R1 |
         Then placex contains
          | object | linked_place_id |
          | N1     | R1 |


@@ -102,16 +144,20 @@ Feature: Updates of linked places
          | dups |
          | 1    |
         Then results contain
          | dups |
          | 1    |
         Then results contain

-         | osm_type |
-         | R |
+         | osm |
+         | R1 |

 
     Scenario: Update linking relation when linkee name is updated
 
     Scenario: Update linking relation when linkee name is updated

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 3 |    |
+         | 13 |   | 12 |

         Given the places
          | osm | class    | type           | name | admin | geometry |
         Given the places
          | osm | class    | type           | name | admin | geometry |

-         | R1  | boundary | administrative | rel  | 8     | poly-area:0.1 |
+         | R1  | boundary | administrative | rel  | 8     | (10,11,12,13,10) |

         And the places
         And the places

-         | osm | class    | type        | name+name:de | admin | geometry |
-         | N3  | place    | city           | pnt  | 30    | 0.00001 0 |
+         | osm | class    | type        | name+name:de |
+         | N3  | place    | city        | pnt          |

         And the relations
          | id | members  |
          | 1  | N3:label |
         And the relations
          | id | members  |
          | 1  | N3:label |


@@ -123,8 +169,8 @@ Feature: Updates of linked places
          | object | linked_place_id | name+name:de |
          | N3     | R1              | pnt  |
         When updating places
          | object | linked_place_id | name+name:de |
          | N3     | R1              | pnt  |
         When updating places

-         | osm | class    | type        | name+name:de | admin | geometry |
-         | N3  | place    | city        | newname  | 30    | 0.00001 0 |
+         | osm | class    | type        | name+name:de |
+         | N3  | place    | city        | newname      |

         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  |


@@ -133,12 +179,16 @@ Feature: Updates of linked places
          | R1     | -               | newname  |
 
     Scenario: Update linking relation when linkee name is deleted
          | R1     | -               | newname  |
 
     Scenario: Update linking relation when linkee name is deleted

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 3 |    |
+         | 13 |   | 12 |

         Given the places
          | osm | class    | type           | name | admin | geometry |
         Given the places
          | osm | class    | type           | name | admin | geometry |

-         | R1  | boundary | administrative | rel  | 8     | poly-area:0.1 |
+         | R1  | boundary | administrative | rel  | 8     | (10,11,12,13,10) |

         And the places
         And the places

-         | osm | class    | type           | name | admin | geometry |
-         | N3  | place    | city           | pnt  | 30    | 0.00001 0 |
+         | osm | class    | type           | name |
+         | N3  | place    | city           | pnt  |

         And the relations
          | id | members  |
          | 1  | N3:label |
         And the relations
          | id | members  |
          | 1  | N3:label |


@@ -154,8 +204,8 @@ Feature: Updates of linked places
           | osm |
           | R1  |
         When updating places
           | osm |
           | R1  |
         When updating places

-         | osm | class    | type        | name+name:de | admin | geometry |
-         | N3  | place    | city        | depnt        | 30    | 0.00001 0 |
+         | osm | class    | type        | name+name:de |
+         | N3  | place    | city        | depnt        |

         Then placex contains
          | object | linked_place_id | name+name:de |
          | N3     | R1              | depnt  |
         Then placex contains
          | object | linked_place_id | name+name:de |
          | N3     | R1              | depnt  |


@@ -166,12 +216,16 @@ Feature: Updates of linked places
         Then exactly 0 results are returned
 
     Scenario: Updating linkee extratags keeps linker's extratags
         Then exactly 0 results are returned
 
     Scenario: Updating linkee extratags keeps linker's extratags

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 3 |    |
+         | 13 |   | 12 |

         Given the named places
          | osm | class    | type           | extra+wikidata | admin | geometry |
         Given the named places
          | osm | class    | type           | extra+wikidata | admin | geometry |

-         | R1  | boundary | administrative | 34             | 8     | poly-area:0.1 |
+         | R1  | boundary | administrative | 34             | 8     | (10,11,12,13,10) |

         And the named places
         And the named places

-         | osm | class    | type           | geometry |
-         | N3  | place    | city           | 0.00001 0 |
+         | osm | class    | type           |
+         | N3  | place    | city           |

         And the relations
          | id | members  |
          | 1  | N3:label |
         And the relations
          | id | members  |
          | 1  | N3:label |


@@ -180,19 +234,23 @@ Feature: Updates of linked places
          | object | extratags |
          | R1     | 'wikidata' : '34', 'linked_place' : 'city' |
         When updating places
          | object | extratags |
          | R1     | 'wikidata' : '34', 'linked_place' : 'city' |
         When updating places

-         | osm | class    | type        | name    | extra+oneway | admin | geometry |
-         | N3  | place    | city        | newname | yes          | 30    | 0.00001 0 |
+         | osm | class    | type        | name    | extra+oneway |
+         | N3  | place    | city        | newname | yes          |

         Then placex contains
          | object | extratags |
          | R1     | 'wikidata' : '34', 'oneway' : 'yes', 'linked_place' : 'city' |
 
     Scenario: Remove linked_place info when linkee is removed
         Then placex contains
          | object | extratags |
          | R1     | 'wikidata' : '34', 'oneway' : 'yes', 'linked_place' : 'city' |
 
     Scenario: Remove linked_place info when linkee is removed

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 1 |    |
+         | 13 |   | 12 |

         Given the places
         Given the places

-            | osm | class | type | name | geometry |
-            | N1  | place | city | foo  | 0 0 |
+            | osm | class | type | name |
+            | N1  | place | city | foo  |

         And the places
             | osm | class    | type           | name | admin | geometry |
         And the places
             | osm | class    | type           | name | admin | geometry |

-            | R1  | boundary | administrative | foo  | 8     | poly-area:0.1 |
+            | R1  | boundary | administrative | foo  | 8     | (10,11,12,13,10) |

         When importing
         Then placex contains
             | object | extratags |
         When importing
         Then placex contains
             | object | extratags |


@@ -203,19 +261,81 @@ Feature: Updates of linked places
             | R1     |  |
 
     Scenario: Update linked_place info when linkee type changes
             | R1     |  |
 
     Scenario: Update linked_place info when linkee type changes

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 1 |    |
+         | 13 |   | 12 |

         Given the places
         Given the places

-            | osm | class | type | name | geometry |
-            | N1  | place | city | foo  | 0 0 |
+            | osm | class | type | name |
+            | N1  | place | city | foo  |

         And the places
             | osm | class    | type           | name | admin | geometry |
         And the places
             | osm | class    | type           | name | admin | geometry |

-            | R1  | boundary | administrative | foo  | 8     | poly-area:0.1 |
+            | R1  | boundary | administrative | foo  | 8     | (10,11,12,13,10) |

         When importing
         Then placex contains
             | object | extratags |
             | R1     | 'linked_place' : 'city' |
         When updating places
         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 |
+            | osm | class | type | name |
+            | N1  | place | town | foo  |

         Then placex contains
             | object | extratags |
             | R1     | 'linked_place' : 'town' |
         Then placex contains
             | object | extratags |
             | R1     | 'linked_place' : 'town' |

+
+
+    Scenario: Keep linking and ranks when place type changes
+        Given the grid
+            | 1 |   |   | 2 |
+            |   |   | 9 |   |
+            | 4 |   |   | 3 |
+        And the places
+            | osm | class    | type           | name | admin | geometry    |
+            | R1  | boundary | administrative | foo  | 8     | (1,2,3,4,1) |
+        And the places
+            | osm | class | type | name | geometry |
+            | N1  | place | city | foo  | 9        |
+        When importing
+        Then placex contains
+            | object | linked_place_id | rank_address |
+            | N1     | R1              | 16           |
+            | R1     | -               | 16           |
+
+        When updating places
+            | osm | class | type | name | geometry |
+            | N1  | place | town | foo  | 9        |
+        Then placex contains
+            | object | linked_place_id | rank_address |
+            | N1     | R1              | 16           |
+            | R1     | -               | 16           |
+
+
+    Scenario: Invalidate surrounding place nodes when place type changes
+        Given the grid
+            | 1 |   |   | 2 |
+            |   | 8 | 9 |   |
+            | 4 |   |   | 3 |
+        And the places
+            | osm | class    | type           | name | admin | geometry    |
+            | R1  | boundary | administrative | foo  | 8     | (1,2,3,4,1) |
+        And the places
+            | osm | class | type | name | geometry |
+            | N1  | place | town | foo  | 9        |
+            | N2  | place | city | bar  | 8        |
+        And the relations
+         | id | members  |
+         | 1  | N1:label |
+        When importing
+        Then placex contains
+            | object | linked_place_id | rank_address |
+            | N1     | R1              | 16           |
+            | R1     | -               | 16           |
+            | N2     | -               | 18           |
+
+        When updating places
+            | osm | class | type   | name | geometry |
+            | N1  | place | suburb | foo  | 9        |
+        Then placex contains
+            | object | linked_place_id | rank_address |
+            | N1     | R1              | 20           |
+            | R1     | -               | 20           |
+            | N2     | -               | 16           |