improve fallback ranking

Boundaries and places now always get a rank < 26 to make sure that
they do not parent to a street. Skip boundary=place completely
because they will be covered throught the secondary place tag.

diff --git a/settings/address-levels.json b/settings/address-levels.json
index dff0e250fdbd2cb634ade170b34751709b75f82e..377a45761986734b75f8ae5c1be2b9a89d41e63d 100644 (file)
--- a/settings/address-levels.json
+++ b/settings/address-levels.json
@@ -29,7 +29,9 @@
           "square" : 25,
           "houses" : [28, 0],
           "farm" : [20, 0],
-          "locality" : [20, 0]
+          "locality" : [20, 0],
+          "house" : 30,
+          "" : [22, 0]
       },
       "boundary" : {
           "administrative2" : 4,
@@ -42,7 +44,8 @@
           "administrative9" : 18,
           "administrative10" : 20,
           "administrative11" : 22,
-          "administrative12" : 24
+          "administrative12" : 24,
+          "" : [25, 0]
       },
       "landuse" : {
           "residential" : 22,
@@ -88,7 +91,7 @@
           "" : [20, 0]
       },
       "historic" : {
-          "neighbourhood" : [30, 0]
+          "neighbourhood" : [22, 0]
       }
   }
 },

diff --git a/settings/import-extratags.style b/settings/import-extratags.style
index d1ae5511f0c95a8335fa2d01342ff57c0d46162b..184650f303c95e75479924b5a10a6a6dad9826e4 100644 (file)
--- a/settings/import-extratags.style
+++ b/settings/import-extratags.style
@@ -124,6 +124,7 @@
 {
     "keys" : ["boundary"],
     "values" : {
+        "place" : "skip",
         "" : "main,with_name"
     }
 },

diff --git a/settings/import-full.style b/settings/import-full.style
index 0e2d62e7ca992917a62579a21f8a5dd6af0ff74b..0c49f23d4daa71185873a6f970180d1ded170640 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -124,6 +124,7 @@
 {
     "keys" : ["boundary"],
     "values" : {
+        "place" : "skip",
         "" : "main,with_name"
     }
 },