Ticket #19573: josm_19573.patch

resources/data/defaultpresets.xml

@@ -1750 +1750 @@
             <key key="barrier" value="jersey_barrier" />
             <combo key="material" text="Material" values="concrete,plastic" />
         </item> <!-- Jersey Barrier -->
+        <item name="Log" icon="presets/barrier/log.svg"  type="node,way" preset_name_label="true">
+            <link wiki="Tag:barrier=log" />
+            <key key="barrier" value="log" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
+        </item> <!-- Log -->
         <item name="Ditch" name_context="Barrier" type="way,closedway" preset_name_label="true">
             <link wiki="Tag:barrier=ditch" />
             <key key="barrier" value="ditch" />
@@ -1849 +1858 @@
             <reference ref="check_access_nomotor" />
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Kissing Gate -->
+        <item name="Height Restrictor" icon="presets/barrier/height_restrictor" type="node" preset_name_label="true">
+            <link wiki="Tag:barrier=height_restrictor" />
+            <key key="barrier" value="height_restrictor" />
+            <reference ref="optional_maxheight_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
+        </item> <!-- Height Restrictor -->
         <item name="Chain" icon="presets/barrier/chain.svg" type="node,way,closedway" preset_name_label="true">
             <link wiki="Tag:barrier=chain" />
             <key key="barrier" value="chain" />
@@ -1876 +1896 @@
             <link wiki="Tag:barrier=turnstile" />
             <key key="barrier" value="turnstile" />
             <reference ref="optional_maxwidth" />
+            <text key="maxlength" text="Max. length (meters)" match="key" />
             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             <space />
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Turnstile -->
+        <item name="Full-Height Turnstile" icon="presets/barrier/full-height_turnstile.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:barrier=full-height_turnstile" />
+            <key key="barrier" value="full-height_turnstile" />
+            <reference ref="optional_maxheight_maxwidth" />
+            <text key="maxlength" text="Max. length (meters)" match="key" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <preset_link preset_name="Access Restrictions" />
+        </item> <!-- Full-Height Turnstile -->
         <item name="Sally Port" icon="presets/barrier/sally_port.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=sally_port" />
             <space />
@@ -1905 +1937 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
                 <text key="width" text="Width (meters)" />
                 <text key="maxheight" text="Max. height (meters)" />
+                <text key="maxwidth" text="Max. width (meters)" match="key" />
                 <space />
                 <text key="maxspeed" text="Max. speed (km/h)" />
                 <text key="maxspeed:forward" text="Max. speed in way direction" />

resources/styles/standard/elemstyles.mapcss

@@ -406 +406 @@
 way[barrier=chain],
 way[barrier=ditch],
 way[barrier=jersey_barrier],
+way[barrier=log],
 way[barrier=kerb] {
     width: 2;
     color: barrier#F0F050;
@@ -460 +461 @@
     icon-image: "presets/barrier/turnstile.svg";
     set icon_z17;
 }
+node[barrier=full-height_turnstile] {
+    icon-image: "presets/barrier/full-height_turnstile.svg";
+    set icon_z17;
+}
 node[barrier=cycle_barrier] {
     icon-image: "presets/barrier/cycle_barrier.svg";
     set icon_z17;
@@ -472 +477 @@
     icon-image: "presets/barrier/swing_gate.svg";
     set icon_z17;
 }
+node[barrier=kissing_gate] {
+    icon-image: "presets/barrier/kissing_gate.svg";
+    set icon_z17;
+}
+node[barrier=height_restrictor] {
+    icon-image: "presets/barrier/height_restrictor.svg";
+    set icon_z17;
+}
 area[barrier=toll_booth]:closed {
     fill-color: barrier#F0F050;
 }
@@ -503 +516 @@
     icon-image: "presets/barrier/jersey_barrier.svg";
     set icon_z17;
 }
-node[barrier=kissing_gate] {
-    icon-image: "presets/barrier/kissing_gate.svg";
+node[barrier=log] {
+    icon-image: "presets/barrier/log.svg";
     set icon_z17;
 }
 node[barrier=bus_trap] {