Changeset 7744 in josm

Timestamp:

2014-11-24T15:36:37+01:00 (10 years ago)

Author:

Klumbumbus

Message:

fix #10769 - drop support of restriction=* on nodes

Location:

trunk

Files:

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

trunk/data/validator/geometry.mapcss

@@ -37 +37 @@
 node[source:outline] {
   throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
+}
+
+/* {0} on a node, should be a relation; see #10252, #10769 */
+node[route],
+node[restriction] {
+  throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
+}
+
+/* {0} on a way, should be a relation; see #10252 */
+way[route=bus] {
+  throwWarning: tr("{0} on a way. Should be used in a relation", "{0.tag}"); 
 }
 
@@ -96 +107 @@
   throwWarning: tr("{0} inside {1}", concat("power=", tag("power")), concat("power=", tag("power")));
 }
-
-/* see #10252 */
-way[route=bus] {
-  throwWarning: tr("{0} on a way. Should be used in a relation", "{0.tag}"); 
-}
-node[route] {
-  throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
-}

trunk/styles/standard/elemstyles.mapcss

@@ -43 +43 @@
 /*********************/
 
-relation[restriction=no_left_turn],
-node[restriction=no_left_turn] {
+relation[restriction=no_left_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/no_left_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=no_right_turn],
-node[restriction=no_right_turn] {
+relation[restriction=no_right_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/no_right_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=no_straight_on],
-node[restriction=no_straight_on] {
+relation[restriction=no_straight_on] {
     icon-image: "vehicle/restriction/turn_restrictions/no_straight_on.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=no_u_turn],
-node[restriction=no_u_turn] {
+relation[restriction=no_u_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/no_u_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=only_left_turn],
-node[restriction=only_left_turn] {
+relation[restriction=only_left_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/only_left_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=only_right_turn],
-node[restriction=only_right_turn] {
+relation[restriction=only_right_turn] {
     icon-image: "vehicle/restriction/turn_restrictions/only_right_turn.png";
     set icon_z17;
     text: auto;
 }
-relation[restriction=only_straight_on],
-node[restriction=only_straight_on] {
+relation[restriction=only_straight_on] {
     icon-image: "vehicle/restriction/turn_restrictions/only_straight_on.png";
+    set icon_z17;
+    text: auto;
+}
+node[restriction] {
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;