Merge remote-tracking branch 'upstream/master'

[nominatim.git] / tests / features / db / import / placex.feature

diff --git a/tests/features/db/import/placex.feature b/tests/features/db/import/placex.feature
index a429202a3cf45484f8849a61592e257ea2c03f5e..7e9ae62026db22b0e2cf94d28b4143708b4fdff6 100644 (file)
--- a/tests/features/db/import/placex.feature
+++ b/tests/features/db/import/placex.feature
@@ -319,6 +319,7 @@ Feature: Import into placex
           | osm_type | osm_id | class   | type        | geometry
           | W        | 4      | landuse | residential | poly-area:0.1
           | R        | 2      | landuse | residential | poly-area:0.05
           | osm_type | osm_id | class   | type        | geometry
           | W        | 4      | landuse | residential | poly-area:0.1
           | R        | 2      | landuse | residential | poly-area:0.05

+          | R        | 3      | landuse | forrest     | poly-area:0.5

         When importing
         Then table placex has no entry for N1
         And table placex has no entry for W1
         When importing
         Then table placex has no entry for N1
         And table placex has no entry for W1


@@ -331,6 +332,7 @@ Feature: Import into placex
           | W2     | 30          | 30
           | W4     | 22          | 22
           | R2     | 22          | 22
           | W2     | 30          | 30
           | W4     | 22          | 22
           | R2     | 22          | 22

+          | R3     | 22          | 0

 
     Scenario: rank and inclusion of naturals
        Given the place nodes
 
     Scenario: rank and inclusion of naturals
        Given the place nodes


@@ -376,7 +378,7 @@ Feature: Import into placex
           | N5     | 30          | 30
           | W2     | 18          | 0
           | R3     | 18          | 0
           | N5     | 30          | 30
           | W2     | 18          | 0
           | R3     | 18          | 0

-          | R4     | 22          | 22
+          | R4     | 22          | 0

           | R5     | 4           | 4
           | R6     | 4           | 4
           | W3     | 30          | 30
           | R5     | 4           | 4
           | R6     | 4           | 4
           | W3     | 30          | 30