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 090c9365ea7ef15e556bc08b3e6ba1fa0bab7fe6..fc31a6542e3f6927ee5edde542a78f3f4b84d9b8 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -10,26 +10,26 @@
           "province" : [8, 0],
           "region" : [18, 0],
           "county" : 12,
           "province" : [8, 0],
           "region" : [18, 0],
           "county" : 12,

+          "district" : 12,

           "municipality" : 14,
           "city" : 16,
           "town" : [18, 16],
           "borough" : 18,
           "village" : [19, 16],
           "municipality" : 14,
           "city" : 16,
           "town" : [18, 16],
           "borough" : 18,
           "village" : [19, 16],

-          "district" : [19, 16],

           "suburb" : [19, 20],
           "hamlet" : 20,
           "croft" : 20,
           "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],
           "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,
           "square" : 25,

+          "locality" : 25,

           "houses" : [28, 0],
           "houses" : [28, 0],

-          "farm" : [20, 0],
-          "locality" : [20, 0],

           "house" : 30,
           "" : [22, 0]
       },
           "house" : 30,
           "" : [22, 0]
       },


@@ -64,7 +64,15 @@
           "peak" : [18, 0],
           "volcano" : [18, 0],
           "mountain_range" : [18, 0],
           "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],
       },
       "waterway" : {
           "river" : [19, 0],


@@ -109,7 +117,14 @@
 { "countries" : [ "be" ],
   "tags" : {
       "boundary" : {
 { "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

       }
   }
 },
       }
   }
 },


@@ -137,6 +152,56 @@
           "administrative10" : 24
       }
   }
           "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
+      }
+  }

 }
 }

+

 ]
 
 ]