Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / address-levels.json

diff --git a/settings/address-levels.json b/settings/address-levels.json
index 8a47f7e5e0ce5e77ccb77f839fa1e417513d4b4a..9f32fc985696cc96cc593ec4752eb4a1b8d056bf 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -5,26 +5,29 @@
           "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],
-          "hamlet" : [19, 16],
           "municipality" : [19, 16],
           "district" : [19, 16],
-          "unincorporated_area" : [19, 16],
-          "borough" : [19, 16],
+          "borough" : [19, 18],
+          "hamlet" : 20,
           "suburb" : 20,
           "croft" : 20,
           "subdivision" : 20,
           "isolated_dwelling" : 20,
+          "allotments" : 20,
           "farm" : [20, 0],
           "locality" : [20, 0],
           "islet" : [20, 0],
           "mountain_pass" : [20, 0],
           "neighbourhood" : 22,
+          "quarter" : 22,
+          "city_block" : 22,
           "houses" : [28, 0]
       },
       "boundary" : {
@@ -83,6 +86,23 @@
           "neighbourhood" : [30, 0]
       }
   }
+},
+{ "countries" : [ "de" ],
+  "tags" : {
+      "place" : {
+          "county" : [12, 0]
+      },
+      "boundary" : {
+          "administrative5" : [10, 0]
+      }
+  }
+},
+{ "countries" : [ "be" ],
+  "tags" : {
+      "boundary" : {
+          "administrative7" : [14, 0]
+      }
+  }
 }
 ]