X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b3215b802d233010579abe6ecea598ea01c26afa..9e21c6a8621661f0641a40875b1093b85adc68d1:/settings/address-levels.json

diff --git a/settings/address-levels.json b/settings/address-levels.json
index 9f32fc98..377a4576 100644
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -2,33 +2,36 @@
 { "tags" : {
       "place" : {
           "sea" : [2, 0],
+          "island" : [17, 0],
+          "islet" : [20, 0],
           "continent" : [2, 0],
           "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],
-          "municipality" : [19, 16],
           "district" : [19, 16],
-          "borough" : [19, 18],
+          "suburb" : [19, 20],
           "hamlet" : 20,
-          "suburb" : 20,
           "croft" : 20,
           "subdivision" : 20,
-          "isolated_dwelling" : 20,
           "allotments" : 20,
+          "neighbourhood" : [20, 22],
+          "quarter" : [20, 22],
+          "isolated_dwelling" : [22, 20],
+          "city_block" : 22,
+          "mountain_pass" : [20, 0],
+          "square" : 25,
+          "houses" : [28, 0],
           "farm" : [20, 0],
           "locality" : [20, 0],
-          "islet" : [20, 0],
-          "mountain_pass" : [20, 0],
-          "neighbourhood" : 22,
-          "quarter" : 22,
-          "city_block" : 22,
-          "houses" : [28, 0]
+          "house" : 30,
+          "" : [22, 0]
       },
       "boundary" : {
           "administrative2" : 4,
@@ -41,7 +44,8 @@
           "administrative9" : 18,
           "administrative10" : 20,
           "administrative11" : 22,
-          "administrative12" : 24
+          "administrative12" : 24,
+          "" : [25, 0]
       },
       "landuse" : {
           "residential" : 22,
@@ -63,7 +67,11 @@
           "sea" : [4, 0]
       },
       "waterway" : {
-          "" : [17, 0]
+          "river" : [19, 0],
+          "stream" : [22, 0],
+          "ditch" : [22, 0],
+          "drain" : [22, 0],
+          "" : [20, 0]
       },
       "highway" : {
           "" : 26,
@@ -83,13 +91,14 @@
           "" : [20, 0]
       },
       "historic" : {
-          "neighbourhood" : [30, 0]
+          "neighbourhood" : [22, 0]
       }
   }
 },
 { "countries" : [ "de" ],
   "tags" : {
       "place" : {
+          "region" : [10, 0],
           "county" : [12, 0]
       },
       "boundary" : {
@@ -103,6 +112,16 @@
           "administrative7" : [14, 0]
       }
   }
+},
+{ "countries" : ["se", "no"],
+  "tags" : {
+      "place" : {
+      },
+      "boundary" : {
+          "administrative3" : 8,
+          "administrative4" : 12
+      }
+  }
 }
 ]