Changeset 13083 in josm for trunk

Timestamp:

2017-11-05T16:23:08+01:00 (6 years ago)

Author:

Klumbumbus

Message:

fix #15503 - draw administrative boundaries only if boundary=administrative is tagged; add a warning for usage on nodes (used 330 times atm)

Location:

trunk

Files:

• data/validator/geometry.mapcss (modified) (1 diff)
• styles/standard/elemstyles.mapcss (modified) (5 diffs)

trunk/data/validator/geometry.mapcss

@@ -46 +46 @@
   assertMatch: "node bridge=yes";
   assertMatch: "node bridge=viaduct";
+}
+
+/* {0} on a node, should be a way or relation */
+node[boundary=administrative] {
+  throwWarning: tr("{0} on a node. Should be used on a way or relation.", "{0.tag}");
 }
 

trunk/styles/standard/elemstyles.mapcss

@@ -4425 +4425 @@
     dashes: 9,9;
 }
-way[admin_level=9]::core_boundary,
-relation[admin_level=9] > way::core_boundary,
-way[admin_level=10]::core_boundary,
-relation[admin_level=10] > way::core_boundary {
+way[boundary=administrative][admin_level=9]::core_boundary,
+relation[boundary=administrative][admin_level=9] > way::core_boundary,
+way[boundary=administrative][admin_level=10]::core_boundary,
+relation[boundary=administrative][admin_level=10] > way::core_boundary {
     z-index: 2;
     modifier: false;
@@ -4435 +4435 @@
     dashes: 9,9;
 }
-way[admin_level=7]::core_boundary,
-relation[admin_level=7] > way::core_boundary,
-way[admin_level=8]::core_boundary,
-relation[admin_level=8] > way::core_boundary {
+way[boundary=administrative][admin_level=7]::core_boundary,
+relation[boundary=administrative][admin_level=7] > way::core_boundary,
+way[boundary=administrative][admin_level=8]::core_boundary,
+relation[boundary=administrative][admin_level=8] > way::core_boundary {
     z-index: 2;
     modifier: false;
@@ -4445 +4445 @@
     dashes: 9,9;
 }
-way[admin_level=5]::core_boundary,
-relation[admin_level=5] > way::core_boundary,
-way[admin_level=6]::core_boundary,
-relation[admin_level=6] > way::core_boundary {
+way[boundary=administrative][admin_level=5]::core_boundary,
+relation[boundary=administrative][admin_level=5] > way::core_boundary,
+way[boundary=administrative][admin_level=6]::core_boundary,
+relation[boundary=administrative][admin_level=6] > way::core_boundary {
     z-index: 2;
     modifier: false;
@@ -4455 +4455 @@
     dashes: 9,9;
 }
-way[admin_level=3]::core_boundary,
-relation[admin_level=3] > way::core_boundary,
-way[admin_level=4]::core_boundary,
-relation[admin_level=4] > way::core_boundary {
+way[boundary=administrative][admin_level=3]::core_boundary,
+relation[boundary=administrative][admin_level=3] > way::core_boundary,
+way[boundary=administrative][admin_level=4]::core_boundary,
+relation[boundary=administrative][admin_level=4] > way::core_boundary {
     z-index: 2;
     modifier: false;
@@ -4465 +4465 @@
     dashes: 9,9;
 }
-way[admin_level=1]::core_boundary,
-relation[admin_level=1] > way::core_boundary,
-way[admin_level=2]::core_boundary,
-relation[admin_level=2] > way::core_boundary {
+way[boundary=administrative][admin_level=1]::core_boundary,
+relation[boundary=administrative][admin_level=1] > way::core_boundary,
+way[boundary=administrative][admin_level=2]::core_boundary,
+relation[boundary=administrative][admin_level=2] > way::core_boundary {
     z-index: 2;
     modifier: false;