Changeset 15201 in josm

Timestamp:

2019-07-01T21:59:18+02:00 (6 years ago)

Author:

Klumbumbus

Message:

• see #10618 - move cycleway=asl icon
• fix #16989 - add highway=toll_gantry (icon self created, derived from our toll_station icon, CC0 and PD licensed)
• add enforcement=toll to enforcement relation preset, sort values

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (3 diffs)
• images/presets/vehicle/asl.svg (moved) (moved from trunk/images/presets/transport/way/asl.svg )
• images/presets/vehicle/restriction/toll_gantry.svg (added)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -1124 +1124 @@
             </optional>
         </item> <!-- Give Way -->
-        <item name="Advanced stop line" icon="presets/transport/way/asl.svg" type="node" preset_name_label="true">
+        <item name="Advanced stop line" icon="presets/vehicle/asl.svg" type="node" preset_name_label="true">
             <link wiki="Tag:cycleway=asl" />
             <key key="cycleway" value="asl" />
@@ -1239 +1239 @@
             </optional>
         </item> <!-- Speed Camera -->
+        <item name="Toll gantry" icon="presets/vehidle/restriction/toll_gantry.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:highway=toll_gantry" />
+            <key key="highway" value="toll_gantry" />
+            <optional>
+                <text key="operator" text="Operator" />
+            </optional>
+        </item> <!-- Toll gantry -->
         <item name="Traffic Mirror" icon="presets/vehicle/traffic_mirror.svg" type="node" preset_name_label="true">
             <link wiki="Tag:highway=traffic_mirror" />
@@ -7440 +7447 @@
             <space />
             <key key="type" value="enforcement" />
-            <combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check" />
+            <combo key="enforcement" text="Type of enforcement" values="check,maxheight,maxspeed,maxweight,mindistance,toll,traffic_signals" />
             <text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" />
             <text key="maxweight" text="Max. weight (tonnes, only if enforcement=maxweight)" />

trunk/styles/standard/elemstyles.mapcss

@@ -700 +700 @@
 }
 node[cycleway=asl] {
-    icon-image: "presets/transport/way/asl.svg";
+    icon-image: "presets/vehicle/asl.svg";
     set icon_z17;
 }
@@ -733 +733 @@
 relation[type=enforcement] >[role="device"] node {
     icon-image: "presets/vehicle/restriction/speed_camera.svg";
+    set icon_z17;
+}
+node[highway=toll_gantry] {
+    icon-image: "presets/vehicle/restriction/toll_gantry.svg";
     set icon_z17;
 }