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 10cbf307464f46aeb0ef255614e8afedeeafc27b..766098dd80c1396fd55c5afe5acfe9b6b6f5f33f 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -2,33 +2,33 @@
 { "tags" : {
       "place" : {
           "sea" : [2, 0],
 { "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,
           "continent" : [2, 0],
           "country" : [4, 0],
           "state" : [8, 0],
           "province" : [8, 0],
           "region" : [18, 0],
           "county" : 12,

+          "municipality" : 14,

           "city" : 16,
           "city" : 16,

-          "island" : [17, 0],

           "town" : [18, 16],
           "town" : [18, 16],

+          "borough" : 18,

           "village" : [19, 16],
           "village" : [19, 16],

-          "municipality" : [19, 16],

           "district" : [19, 16],
           "district" : [19, 16],

-          "borough" : [19, 18],
+          "suburb" : [19, 20],

           "hamlet" : 20,
           "hamlet" : 20,

-          "suburb" : 20,

           "croft" : 20,
           "subdivision" : 20,
           "croft" : 20,
           "subdivision" : 20,

-          "isolated_dwelling" : 20,

           "allotments" : 20,
           "allotments" : 20,

-          "farm" : [20, 0],
-          "locality" : [20, 0],
-          "islet" : [20, 0],
-          "mountain_pass" : [20, 0],
-          "neighbourhood" : 22,
-          "quarter" : 22,
+          "neighbourhood" : [20, 22],
+          "quarter" : [20, 22],
+          "isolated_dwelling" : [22, 20],

           "city_block" : 22,
           "city_block" : 22,

-          "houses" : [28, 0]
+          "mountain_pass" : [20, 0],
+          "houses" : [28, 0],
+          "farm" : [20, 0],
+          "locality" : [20, 0]

       },
       "boundary" : {
           "administrative2" : 4,
       },
       "boundary" : {
           "administrative2" : 4,


@@ -94,6 +94,7 @@
 { "countries" : [ "de" ],
   "tags" : {
       "place" : {
 { "countries" : [ "de" ],
   "tags" : {
       "place" : {

+          "region" : [10, 0],

           "county" : [12, 0]
       },
       "boundary" : {
           "county" : [12, 0]
       },
       "boundary" : {


@@ -107,6 +108,16 @@
           "administrative7" : [14, 0]
       }
   }
           "administrative7" : [14, 0]
       }
   }

+},
+{ "countries" : ["se", "no"],
+  "tags" : {
+      "place" : {
+      },
+      "boundary" : {
+          "administrative3" : 8,
+          "administrative4" : 12
+      }
+  }

 }
 ]
 
 }
 ]