Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / import / placex.feature

diff --git a/test/bdd/db/import/placex.feature b/test/bdd/db/import/placex.feature
index b04a971f17a862910c4a86f2594ab53b6e3487b5..db36ab58b3e52c7f815ce2addfef7a111c6c3c26 100644 (file)
--- a/test/bdd/db/import/placex.feature
+++ b/test/bdd/db/import/placex.feature
@@ -69,10 +69,10 @@ Feature: Import into placex
          | N3   | place | postcode | Y45      | country:gb |
         When importing
         Then placex contains
-         | object | postcode | country_code | rank_search | rank_address |
-         | N1     | E45 2CD  | gb           | 25          | 0 |
-         | N2     | E45 2    | gb           | 23          | 0 |
-         | N3     | Y45      | gb           | 21          | 0 |
+         | object | addr+postcode | country_code | rank_search | rank_address |
+         | N1     | E45 2CD       | gb           | 25          | 5 |
+         | N2     | E45 2         | gb           | 23          | 5 |
+         | N3     | Y45           | gb           | 21          | 5 |
 
     Scenario: wrongly formatted GB postcodes are down-ranked
         Given the places
@@ -82,8 +82,8 @@ Feature: Import into placex
         When importing
         Then placex contains
          | object | country_code | rank_search | rank_address |
-         | N1     | gb           | 30          | 0 |
-         | N2     | gb           | 30          | 0 |
+         | N1     | gb           | 30          | 30 |
+         | N2     | gb           | 30          | 30 |
 
     Scenario: search and address rank for DE postcodes correctly assigned
         Given the places
@@ -95,10 +95,10 @@ Feature: Import into placex
         When importing
         Then placex contains
          | object | country_code | rank_search | rank_address |
-         | N1     | de           | 21          | 0 |
-         | N2     | de           | 30          | 0 |
-         | N3     | de           | 30          | 0 |
-         | N4     | de           | 30          | 0 |
+         | N1     | de           | 21          | 11 |
+         | N2     | de           | 30          | 30 |
+         | N3     | de           | 30          | 30 |
+         | N4     | de           | 30          | 30 |
 
     Scenario: search and address rank for other postcodes are correctly assigned
         Given the places
@@ -115,84 +115,15 @@ Feature: Import into placex
         When importing
         Then placex contains
          | object | country_code | rank_search | rank_address |
-         | N1     | ca           | 21          | 0 |
-         | N2     | ca           | 21          | 0 |
-         | N3     | ca           | 21          | 0 |
-         | N4     | ca           | 21          | 0 |
-         | N5     | ca           | 21          | 0 |
-         | N6     | ca           | 21          | 0 |
-         | N7     | ca           | 25          | 0 |
-         | N8     | ca           | 25          | 0 |
-         | N9     | ca           | 25          | 0 |
-
-    Scenario: search and address ranks for places are correctly assigned
-        Given the named places
-          | osm  | class     | type      |
-          | N1   | foo       | bar       |
-          | N11  | place     | Continent |
-          | N12  | place     | continent |
-          | N13  | place     | sea       |
-          | N14  | place     | country   |
-          | N15  | place     | state     |
-          | N16  | place     | region    |
-          | N17  | place     | county    |
-          | N18  | place     | city      |
-          | N19  | place     | island    |
-          | N20  | place     | town      |
-          | N21  | place     | village   |
-          | N22  | place     | hamlet    |
-          | N23  | place     | municipality |
-          | N24  | place     | district     |
-          | N25  | place     | unincorporated_area |
-          | N26  | place     | borough             |
-          | N27  | place     | suburb              |
-          | N28  | place     | croft               |
-          | N29  | place     | subdivision         |
-          | N30  | place     | isolated_dwelling   |
-          | N31  | place     | farm                |
-          | N32  | place     | locality            |
-          | N33  | place     | islet               |
-          | N34  | place     | mountain_pass       |
-          | N35  | place     | neighbourhood       |
-          | N36  | place     | house               |
-          | N37  | place     | building            |
-          | N38  | place     | houses              |
-        And the named places
-          | osm  | class     | type      | extra+capital |
-          | N101 | place     | city      | yes |
-        When importing
-        Then placex contains
-          | object | rank_search | rank_address |
-          | N1     | 30          | 30 |
-          | N11    | 30          | 30 |
-          | N12    | 2           | 0 |
-          | N13    | 2           | 0 |
-          | N14    | 4           | 0 |
-          | N15    | 8           | 0 |
-          | N16    | 18          | 0 |
-          | N17    | 12          | 12 |
-          | N18    | 16          | 16 |
-          | N19    | 17          | 0 |
-          | N20    | 18          | 16 |
-          | N21    | 19          | 16 |
-          | N22    | 20          | 20 |
-          | N23    | 19          | 16 |
-          | N24    | 19          | 16 |
-          | N25    | 19          | 16 |
-          | N26    | 19          | 16 |
-          | N27    | 20          | 20 |
-          | N28    | 20          | 20 |
-          | N29    | 20          | 20 |
-          | N30    | 20          | 20 |
-          | N31    | 20          | 0 |
-          | N32    | 20          | 0 |
-          | N33    | 20          | 0 |
-          | N34    | 20          | 0 |
-          | N101   | 15          | 16 |
-          | N35    | 22          | 22 |
-          | N36    | 30          | 30 |
-          | N37    | 30          | 30 |
-          | N38    | 28          | 0 |
+         | N1     | ca           | 21          | 11 |
+         | N2     | ca           | 21          | 11 |
+         | N3     | ca           | 21          | 11 |
+         | N4     | ca           | 21          | 11 |
+         | N5     | ca           | 21          | 11 |
+         | N6     | ca           | 21          | 11 |
+         | N7     | ca           | 25          | 11 |
+         | N8     | ca           | 25          | 11 |
+         | N9     | ca           | 25          | 11 |
 
     Scenario: search and address ranks for boundaries are correctly assigned
         Given the named places
@@ -217,9 +148,9 @@ Feature: Import into placex
         And placex contains
           | object | rank_search | rank_address |
           | R20    | 4           | 4 |
-          | R21    | 30          | 30 |
-          | R22    | 30          | 30 |
-          | R23    | 30          | 30 |
+          | R21    | 25          | 0 |
+          | R22    | 25          | 0 |
+          | R23    | 25          | 0 |
           | R40    | 4           | 0 |
           | R41    | 8           | 0 |
 
@@ -239,7 +170,7 @@ Feature: Import into placex
         When importing
         Then placex contains
           | object | rank_search | rank_address |
-          | N1     | 30          |  0 |
+          | N1     | 30          | 30 |
           | W1     | 26          | 26 |
           | W2     | 26          | 26 |
           | W3     | 26          | 26 |
@@ -260,8 +191,8 @@ Feature: Import into placex
         When importing
         Then placex contains
           | object | rank_search | rank_address |
-          | N2     | 30          |  0 |
-          | W2     | 30          |  0 |
+          | N2     | 30          | 30 |
+          | W2     | 30          | 30 |
           | W4     | 22          | 22 |
           | R2     | 22          | 22 |
           | R3     | 22          |  0 |
@@ -285,13 +216,13 @@ Feature: Import into placex
           | object | rank_search | rank_address |
           | N2     | 18          | 0 |
           | N4     | 18          | 0 |
-          | N5     | 30          | 30 |
+          | N5     | 22          | 0 |
           | W2     | 18          | 0 |
           | R3     | 18          | 0 |
-          | R4     | 30          | 30 |
+          | R4     | 22          | 0 |
           | R5     | 4           | 0 |
           | R6     | 4           | 0 |
-          | W3     | 30          | 30 |
+          | W3     | 22          | 0 |
 
     Scenario: boundary ways for countries and states are ignored
         Given the named places