Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/db/update/simple.feature b/test/bdd/db/update/simple.feature
index 0833c90c9248427beca621182980751579c058cd..195d101e1485b56dda71f1d8788c1705cdeafcef 100644 (file)
--- a/test/bdd/db/update/simple.feature
+++ b/test/bdd/db/update/simple.feature
@@ -34,7 +34,7 @@ Feature: Update of simple objects
         When importing
         Then placex contains
           | object | rank_address |
         When importing
         Then placex contains
           | object | rank_address |

-          | R1     | 0 |
+          | R1     | 30 |

           | W1     | 30 |
         When marking for delete R1,W1
         Then placex has no entry for W1
           | W1     | 30 |
         When marking for delete R1,W1
         Then placex has no entry for W1


@@ -69,3 +69,38 @@ Feature: Update of simple objects
         Then placex contains
           | object | class | type |
           | N3     | place | house |
         Then placex contains
           | object | class | type |
           | N3     | place | house |

+
+    Scenario: remove boundary when changing from polygon to way
+        Given the grid
+          | 1 | 2 |
+          | 3 | 4 |
+        And the places
+          | osm | class    | type           | name | admin | geometry        |
+          | W1  | boundary | administrative | Haha | 5     | (1, 2, 4, 3, 1) |
+        When importing
+        Then placex contains
+          | object |
+          | W1 |
+        When updating places
+          | osm | class    | type           | name | admin | geometry   |
+          | W1  | boundary | administrative | Haha | 5     | 1, 2, 4, 3 |
+        Then placex has no entry for W1
+
+     #895
+     Scenario: update rank when boundary is downgraded from admin to historic
+        Given the grid
+          | 1 | 2 |
+          | 3 | 4 |
+        And the places
+          | osm | class    | type           | name | admin | geometry        |
+          | W1  | boundary | administrative | Haha | 5     | (1, 2, 4, 3, 1) |
+        When importing
+        Then placex contains
+          | object | rank_address |
+          | W1     | 10           |
+        When updating places
+          | osm | class    | type           | name | admin | geometry        |
+          | W1  | boundary | historic       | Haha | 5     | (1, 2, 4, 3, 1) |
+        Then placex contains
+          | object | rank_address |
+          | W1     | 30            |