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 766098dd80c1396fd55c5afe5acfe9b6b6f5f33f..b63eac4efa065de8c3782cd1d75658af0197283c 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -10,25 +10,28 @@
           "province" : [8, 0],
           "region" : [18, 0],
           "county" : 12,
+          "district" : 12,
           "municipality" : 14,
           "city" : 16,
           "town" : [18, 16],
           "borough" : 18,
           "village" : [19, 16],
-          "district" : [19, 16],
           "suburb" : [19, 20],
           "hamlet" : 20,
           "croft" : 20,
-          "subdivision" : 20,
-          "allotments" : 20,
+          "subdivision" : 22,
+          "allotments" : 22,
           "neighbourhood" : [20, 22],
           "quarter" : [20, 22],
           "isolated_dwelling" : [22, 20],
-          "city_block" : 22,
-          "mountain_pass" : [20, 0],
+          "farm" : [22, 20],
+          "city_block" : 25,
+          "mountain_pass" : 25,
+          "square" : 25,
+          "locality" : 25,
           "houses" : [28, 0],
-          "farm" : [20, 0],
-          "locality" : [20, 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,
@@ -60,7 +64,15 @@
           "peak" : [18, 0],
           "volcano" : [18, 0],
           "mountain_range" : [18, 0],
-          "sea" : [4, 0]
+          "sea" : [4, 0],
+          "tree" : 30,
+          "spring"  : 30,
+          "cave_entrance" : 30,
+          "geyser" : 30,
+          "hot_spring" : 30,
+          "rock" : 30,
+          "stone" : 30,
+          "" : [22, 0]
       },
       "waterway" : {
           "river" : [19, 0],
@@ -70,7 +82,7 @@
           "" : [20, 0]
       },
       "highway" : {
-          "" : 26,
+          "" : 30,
           "service" : 27,
           "cycleway" : 27,
           "path" : 27,
@@ -81,13 +93,32 @@
           "primary_link" : 27,
           "trunk_link" : 27,
           "secondary_link" : 27,
-          "tertiary_link" : 27
+          "tertiary_link" : 27,
+          "residential" : 26,
+          "track" : 26,
+          "unclassified" : 26,
+          "tertiary" : 26,
+          "secondary" : 26,
+          "primary" : 26,
+          "living_street" : 26,
+          "trunk" : 26,
+          "motorway" : 26,
+          "pedestrian" : 26,
+          "road" : 26,
+          "construction" : 26
       },
       "mountain_pass" : {
           "" : [20, 0]
       },
       "historic" : {
-          "neighbourhood" : [30, 0]
+          "neighbourhood" : [22, 0]
+      }
+  }
+},
+{ "countries" : [ "ca" ],
+  "tags" : {
+      "place" : {
+          "county" : [12, 0]
       }
   }
 },
@@ -105,7 +136,14 @@
 { "countries" : [ "be" ],
   "tags" : {
       "boundary" : {
-          "administrative7" : [14, 0]
+          "administrative3" : [5, 0],
+          "administrative4" : 6,
+          "administrative5" : [7, 0],
+          "administrative6" : 8,
+          "administrative7" : 12,
+          "administrative8" : 14,
+          "administrative9" : 16,
+          "administrative10" : 18
       }
   }
 },
@@ -118,6 +156,71 @@
           "administrative4" : 12
       }
   }
+},
+{ "countries" : ["id"],
+  "tags" : {
+      "place" : {
+          "municipality" : 18
+      },
+      "boundary" : {
+          "administrative5" : 12,
+          "administrative6" : 14,
+          "administrative7" : 16,
+          "administrative8" : 20,
+          "administrative9" : 22,
+          "administrative10" : 24
+      }
+  }
+},
+{ "countries" : ["ru"],
+  "tags" : {
+      "place" : {
+          "municipality" : 18
+      },
+      "boundary" : {
+          "administrative5" : [10, 0],
+          "administrative7" : [13, 0],
+          "administrative8" : 14
+      }
+  }
+},
+{ "countries" : [ "nl" ],
+  "tags" : {
+      "boundary" : {
+          "administrative7" : [13, 0],
+          "administrative8" : 14,
+          "administrative9" : [15, 0],
+          "administrative10" : 16
+      }
+  }
+},
+{ "countries" : ["es"],
+  "tags" : {
+      "place" : {
+          "province" : 10,
+          "civil_parish" : 18
+      },
+      "boundary" : {
+          "administrative5" : [10, 0],
+          "administrative6" : 10,
+          "administrative7" : 12,
+          "administrative10" : 22
+      }
+  }
+},
+{ "countries" : ["sk"],
+  "tags" : {
+      "boundary" : {
+          "administrative5" : [10, 0],
+          "administrative6" : 11,
+          "administrative7" : [11, 0],
+          "administrative8" : 12,
+          "administrative9" : 16,
+          "administrative10" : 18,
+          "administrative11" : 20
+      }
+  }
 }
+
 ]