Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15432)
+++ trunk/data/defaultpresets.xml	(revision 15433)
@@ -855,4 +855,6 @@
                 <check key="toll" text="Toll" />
                 <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
+                <check key="winter_road" text="Winter road" disable_off="true" />
+                <check key="ice_road" text="Ice road" disable_off="true" />
             </checkgroup>
             <space />
@@ -2095,4 +2097,16 @@
             </optional>
         </item> <!-- Goods -->
+        <item name="Zip line" icon="presets/transport/aerialway/zip_line.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:aerialway=zip_line" />
+            <space />
+            <key key="aerialway" value="zip_line" />
+            <optional>
+                <reference ref="name_ref_operator" />
+                <reference ref="oh" />
+                <reference ref="fee" />
+                <reference ref="min_age" />
+                <text key="maxweight" text="Max. weight (tonnes)" />
+            </optional>
+        </item> <!-- Zip line -->
         <separator/>
         <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway" preset_name_label="true">
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15432)
+++ trunk/data/validator/combinations.mapcss	(revision 15433)
@@ -94,4 +94,5 @@
 
 /* {0.key} without {1.tag}, #17997 */
+node[railway:switch            ][railway!=switch],
 *[generator:source             ][power!=generator],
 *[generator:method             ][power!=generator],
Index: trunk/images/presets/transport/aerialway/zip_line.svg
===================================================================
--- trunk/images/presets/transport/aerialway/zip_line.svg	(revision 15433)
+++ trunk/images/presets/transport/aerialway/zip_line.svg	(revision 15433)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="zip_line5.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="48.59375"
+     inkscape:cx="5.1618791"
+     inkscape:cy="11.549778"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect4590"
+       width="16"
+       height="16"
+       x="0"
+       y="1037.3622"
+       ry="0.60000002" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -0.83536977,1038.3133 c 18.99999977,5 18.99999977,5 18.99999977,5"
+       id="path4516"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.91057003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="path4518"
+       cx="2.4546618"
+       cy="1043.9462"
+       rx="1.3807074"
+       ry="1.3456593" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.5061093,1041.0947 v 8"
+       id="path4520"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46761996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="path4518-4"
+       cx="7.5199366"
+       cy="1038.8925"
+       r="0.69999999" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.46761996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="path4518-4-4"
+       cx="10.586173"
+       cy="1039.8392"
+       r="0.69999999" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4.6096455,1046.5097 4.1569133,3.5807"
+       id="path4552"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.0463017,1043.32 c -0.7606329,1.2927 -1.5306123,2.5481 -2.6135049,2.5518"
+       id="path4520-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14.672657,1048.9168 -3.915014,-0.789 -2.2586087,2.5589"
+       id="path4520-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 9.8347248,1050.5309 4.8565902,2.1403"
+       id="path4520-26"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 15432)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 15433)
@@ -3912,4 +3912,9 @@
     dashes: 2,2;
 }
+way[aerialway=zip_line] {
+    width: 1;
+    color: aerialway#663300;
+    dashes: 3,3;
+}
 area[aerialway=station] {
     fill-color: aerialway#663300;
@@ -3933,5 +3938,6 @@
 node[aerialway=magic_carpet],
 node[aerialway=rope_tow],
-node[aerialway=goods] {
+node[aerialway=goods],
+node[aerialway=zip_line] {
     icon-image: "presets/misc/deprecated.svg";
     set icon_z17;