Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15419)
+++ 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 15419)
+++ 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],