Changeset 7815 in josm for trunk

Timestamp:

2014-12-17T01:20:30+01:00 (9 years ago)

Author:

Klumbumbus

Message:

fix #10831 - refine crossing icons when used together with highway=traffic_signals

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• images/presets/traffic-light.png (deleted)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -1035 +1035 @@
         </item> <!-- Rest Area -->
         <separator/>
-        <item name="Traffic Signal" icon="presets/traffic-light.png" type="node" preset_name_label="true">
+        <item name="Traffic Signal" icon="styles/standard/vehicle/traffic_signals.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_signals"

trunk/styles/standard/elemstyles.mapcss

@@ -650 +650 @@
 }
 node[highway=traffic_signals] {
-    icon-image: "vehicle/restriction/traffic-light.png";
+    icon-image: "vehicle/traffic_signals.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=traffic_signals][crossing] {
+    icon-image: "vehicle/traffic_signals_crossing.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=traffic_signals][crossing_ref=zebra] {
+    icon-image: "vehicle/traffic_signals_crossing_ref_zebra.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=traffic_signals][crossing=island] {
+    icon-image: "vehicle/traffic_signals_crossing_island.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=traffic_signals][crossing=traffic_signals] {
+    icon-image: "vehicle/traffic_signals_crossing_traffic_signals.svg";
     set icon_z17;
     text: auto;
@@ -690 +710 @@
 }
 node[highway=crossing][crossing=traffic_signals] {
-    icon-image: "vehicle/crossing_traffic_signals.png";
+    icon-image: "vehicle/crossing_traffic_signals.svg";
     set icon_z17;
     text: auto;