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 7524a29b761716fe38dc49dff4e5760fb5fd0f20..766098dd80c1396fd55c5afe5acfe9b6b6f5f33f 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -2,30 +2,33 @@
 { "tags" : {
       "place" : {
           "sea" : [2, 0],
+          "island" : [17, 0],
+          "islet" : [20, 0],
           "continent" : [2, 0],
-          "country" : [4, 4],
-          "state" : [8, 8],
+          "country" : [4, 0],
+          "state" : [8, 0],
+          "province" : [8, 0],
           "region" : [18, 0],
           "county" : 12,
+          "municipality" : 14,
           "city" : 16,
-          "island" : [17, 0],
           "town" : [18, 16],
+          "borough" : 18,
           "village" : [19, 16],
-          "hamlet" : [19, 16],
-          "municipality" : [19, 16],
           "district" : [19, 16],
-          "unincorporated_area" : [19, 16],
-          "borough" : [19, 16],
-          "suburb" : 20,
+          "suburb" : [19, 20],
+          "hamlet" : 20,
           "croft" : 20,
           "subdivision" : 20,
-          "isolated_dwelling" : 20,
-          "farm" : [20, 0],
-          "locality" : [20, 0],
-          "islet" : [20, 0],
+          "allotments" : 20,
+          "neighbourhood" : [20, 22],
+          "quarter" : [20, 22],
+          "isolated_dwelling" : [22, 20],
+          "city_block" : 22,
           "mountain_pass" : [20, 0],
-          "neighbourhood" : 22,
-          "houses" : [28, 0]
+          "houses" : [28, 0],
+          "farm" : [20, 0],
+          "locality" : [20, 0]
       },
       "boundary" : {
           "administrative2" : 4,
@@ -60,7 +63,11 @@
           "sea" : [4, 0]
       },
       "waterway" : {
-          "" : [17, 0]
+          "river" : [19, 0],
+          "stream" : [22, 0],
+          "ditch" : [22, 0],
+          "drain" : [22, 0],
+          "" : [20, 0]
       },
       "highway" : {
           "" : 26,
@@ -78,6 +85,37 @@
       },
       "mountain_pass" : {
           "" : [20, 0]
+      },
+      "historic" : {
+          "neighbourhood" : [30, 0]
+      }
+  }
+},
+{ "countries" : [ "de" ],
+  "tags" : {
+      "place" : {
+          "region" : [10, 0],
+          "county" : [12, 0]
+      },
+      "boundary" : {
+          "administrative5" : [10, 0]
+      }
+  }
+},
+{ "countries" : [ "be" ],
+  "tags" : {
+      "boundary" : {
+          "administrative7" : [14, 0]
+      }
+  }
+},
+{ "countries" : ["se", "no"],
+  "tags" : {
+      "place" : {
+      },
+      "boundary" : {
+          "administrative3" : 8,
+          "administrative4" : 12
       }
   }
 }