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 ecbb1244c7caab45a1e90c25758062b4e065fa95..ccaacad046dac0031bfb618365a78f5486f9bd8c 100644 (file)
--- a/test/bdd/db/update/simple.feature
+++ b/test/bdd/db/update/simple.feature
@@ -28,17 +28,20 @@ Feature: Update of simple objects
 
     Scenario: Do delete large features of low rank
         Given the named places
 
     Scenario: Do delete large features of low rank
         Given the named places

-          | osm | class    | type          | geometry |
-          | W1  | place    | house         | poly-area:5.0 |
-          | R1  | boundary | national_park | poly-area:5.0 |
+          | osm | class    | type        | geometry |
+          | W1  | place    | house       | poly-area:5.0 |
+          | R1  | natural  | wood        | poly-area:5.0 |
+          | R2  | highway  | residential | poly-area:5.0 |

         When importing
         Then placex contains
           | object | rank_address |
           | R1     | 0 |
         When importing
         Then placex contains
           | object | rank_address |
           | R1     | 0 |

+          | R2     | 26 |

           | W1     | 30 |
           | W1     | 30 |

-        When marking for delete R1,W1
+        When marking for delete R1,R2,W1

         Then placex has no entry for W1
         Then placex has no entry for R1
         Then placex has no entry for W1
         Then placex has no entry for R1

+        Then placex has no entry for R2

 
     Scenario: type mutation
         Given the places
 
     Scenario: type mutation
         Given the places


@@ -85,3 +88,22 @@ Feature: Update of simple objects
           | osm | class    | type           | name | admin | geometry   |
           | W1  | boundary | administrative | Haha | 5     | 1, 2, 4, 3 |
         Then placex has no entry for W1
           | 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     | 0            |