update place address levels

Adds province and allotments and downgrades hamlet.

diff --git a/settings/address-levels.json b/settings/address-levels.json
index 8429a3cbd8c7f649ae7f0b7ae2227475cae7540b..c4fcf910e0411fc11e2e530d13b0328511f01fbb 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -5,21 +5,23 @@
           "continent" : [2, 0],
           "country" : [4, 0],
           "state" : [8, 0],
           "continent" : [2, 0],
           "country" : [4, 0],
           "state" : [8, 0],

+          "province" : [8, 0],

           "region" : [18, 0],
           "county" : 12,
           "city" : 16,
           "island" : [17, 0],
           "town" : [18, 16],
           "village" : [19, 16],
           "region" : [18, 0],
           "county" : 12,
           "city" : 16,
           "island" : [17, 0],
           "town" : [18, 16],
           "village" : [19, 16],

-          "hamlet" : [19, 16],

           "municipality" : [19, 16],
           "district" : [19, 16],
           "unincorporated_area" : [19, 16],
           "borough" : [19, 16],
           "municipality" : [19, 16],
           "district" : [19, 16],
           "unincorporated_area" : [19, 16],
           "borough" : [19, 16],

+          "hamlet" : 20,

           "suburb" : 20,
           "croft" : 20,
           "subdivision" : 20,
           "isolated_dwelling" : 20,
           "suburb" : 20,
           "croft" : 20,
           "subdivision" : 20,
           "isolated_dwelling" : 20,

+          "allotments" : 20,

           "farm" : [20, 0],
           "locality" : [20, 0],
           "islet" : [20, 0],
           "farm" : [20, 0],
           "locality" : [20, 0],
           "islet" : [20, 0],

diff --git a/test/bdd/db/import/placex.feature b/test/bdd/db/import/placex.feature
index f17d09dfd384f386a23d3d40662846f475e9d512..b04a971f17a862910c4a86f2594ab53b6e3487b5 100644 (file)
--- a/test/bdd/db/import/placex.feature
+++ b/test/bdd/db/import/placex.feature
@@ -175,7 +175,7 @@ Feature: Import into placex
           | N19    | 17          | 0 |
           | N20    | 18          | 16 |
           | N21    | 19          | 16 |
           | N19    | 17          | 0 |
           | N20    | 18          | 16 |
           | N21    | 19          | 16 |

-          | N22    | 19          | 16 |
+          | N22    | 20          | 20 |

           | N23    | 19          | 16 |
           | N24    | 19          | 16 |
           | N25    | 19          | 16 |
           | N23    | 19          | 16 |
           | N24    | 19          | 16 |
           | N25    | 19          | 16 |