Index: osm-map-features-z13.xml
===================================================================
--- osm-map-features-z13.xml	(Revision 7211)
+++ osm-map-features-z13.xml	(Arbeitskopie)
@@ -283,6 +283,9 @@
             <rule e="way" k="railway" v="light_rail">
                 <line class='railway-casing railway-light-rail-casing' />
             </rule>
+            <rule e="way" k="railway" v="incline">
+                <line class='railway-casing railway-incline-casing' />
+            </rule>
             <rule e="way" k="railway" v="rail">
                 <line class='railway-casing railway-rail-casing' />
             </rule>
@@ -401,6 +404,9 @@
             <rule e="way" k="railway" v="light_rail">
                 <line class='railway-core railway-light-rail-core' />
             </rule>
+            <rule e="way" k="railway" v="incline">
+                <line class='railway-core railway-incline-core' />
+            </rule>
             <rule e="way" k="railway" v="rail">
                 <line class='railway-core railway-rail-1-core' />
                 <line class='railway-core railway-rail-2-core' smart-linecap='no'/>
@@ -511,6 +517,10 @@
 				<line class='tunnel-casing railway-light-rail-casing tunnel' mask-class='tunnel-core railway-light-rail-core'/>
 				<line class='railway-light-rail-casing highway-tunnel-ends'/>
             </rule>
+            <rule e="way" k="railway" v="incline">
+                <line class='tunnel-casing railway-incline-casing tunnel' mask-class='tunnel-core railway-incline-core'/>
+                <line class='railway-incline-casing highway-tunnel-ends'/>
+            </rule>
 			<rule e="way" k="railway" v="rail">
 				<line class='tunnel-casing railway-rail-casing tunnel' mask-class='tunnel-core railway-rail-1-core'/>
 				<line class='railway-rail-casing highway-tunnel-ends'/>
@@ -518,14 +528,48 @@
         </rule>
 
 
-        <!-- Aerialways -->
+        <!-- Piste maps -->
+        <rule e="way" k="piste:type" v="downhill">
+            <rule e="way" k="piste:difficulty" v="novice">
+            	<line class='piste-difficulty-novice'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="easy">
+            	<line class='piste-difficulty-easy'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="intermediate">
+            	<line class='piste-difficulty-intermediate'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="advanced">
+            	<line class='piste-difficulty-advanced'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="expert">
+            	<line class='piste-difficulty-expert'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="freeride">
+            	<line class='piste-difficulty-freeride'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="~">
+            	<line class='piste-difficulty-other'/>
+            </rule>
+        </rule>
+        <rule e="way" k="piste:type" v="sled">
+            <line class="piste-type-sled"/>
+        </rule>
+        <rule e="way" k="piste:type" v="nordic">
+            <line class="piste-type-nordic"/>
+        </rule>
+
+        <!-- Aerialways (render over pistes) -->
         <rule e="node|way" k="aerialway" v="*">
             <line class='aerialway-line'/>
-            <line class='aerialway-struts'/>
+            <line smart-linecap="no" class='aerialway-struts'/>
+            <rule e="node" k="aerialway" v="station">
+                <circle r='1.5px' class="aerialway-station"/>
+            </rule>
+            <!-- no names are rendered in this level -->
         </rule>
 
 
-
 		<!-- Natural features -->
 		<rule e="node" k="natural" v="peak">
 			<symbol xlink:href="#symbol-peak" width='18px' height='18px' transform='translate(-9,-9)' />
@@ -739,6 +783,9 @@
             .railway-light-rail-casing              { stroke-width: 4.0px; stroke: #666666; }
             .railway-light-rail-core                { stroke-width: 3.0px; stroke: #666666; }
 
+            .railway-incline-casing                 { stroke-width: 3.5px; stroke: #666666; }
+            .railway-incline-core                   { stroke-width: 2.8px; stroke: #666666; }
+
             .railway-subway-casing                  { stroke-width: 4.0px; stroke: #aaaaaa; }
             .railway-subway-core                    { stroke-width: 3.0px; stroke: #ffffff; stroke-dasharray: 3, 9; }
 
@@ -1313,6 +1360,7 @@
 
 
             /* Aerialway */
+
             .aerialway-line {
                 fill: none;
                 stroke: #202020;
@@ -1322,10 +1370,93 @@
             .aerialway-struts {
                 fill: none;
                 stroke: #202020;
-                stroke-width: 2px;
+                stroke-width: 4px;
                 stroke-dasharray: 0.2,10;
+                stroke-linecap: butt;
             }
 
+            .aerialway-station {
+                fill: black;
+                stroke: black;
+                stroke-width: 1px;
+            }
+
+            .aerialway-name {
+                fill: black;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 5px;
+                stroke: none;
+				text-anchor: middle;
+            }
+
+            /* Piste maps */
+
+            .piste-difficulty-novice {
+                fill: none;
+                stroke: #00cd00;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-easy {
+                fill: none;
+                stroke: #0000cd;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-intermediate {
+                fill: none;
+                stroke: #cd0000;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-advanced {
+                fill: none;
+                stroke: #060606;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-expert {
+                fill: none;
+                stroke: #f6800a;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-freeride {
+                fill: none;
+                stroke: #f6dd0a;
+                stroke-width: 5px;
+                opacity: 0.40;
+            }
+
+            .piste-difficulty-other {
+                fill: none;
+                stroke: #505050;
+                stroke-width: 4px;
+                opacity: 0.4;
+            }
+
+            .piste-type-sled {
+                fill: none;
+                /* stroke: #8040a0; */
+                stroke: #cdabde;
+                stroke-width: 2.5px;
+                marker-start:url(#marker-piste-type-sled);
+            }
+
+            .piste-type-nordic {
+                fill: none;
+                stroke: #c00000;
+                stroke-width: 1px;
+                stroke-dasharray: 3,0.5;
+                marker-start:url(#marker-piste-type-nordic);
+            }
+
             /* Power line */
             .power-line {
                 stroke-width: 0.1px;
Index: osm-map-features-z14.xml
===================================================================
--- osm-map-features-z14.xml	(Revision 7211)
+++ osm-map-features-z14.xml	(Arbeitskopie)
@@ -299,6 +299,9 @@
             <rule e="way" k="railway" v="light_rail">
                 <line class='railway-casing railway-light-rail-casing' />
             </rule>
+            <rule e="way" k="railway" v="incline">
+                <line class='railway-casing railway-incline-casing' />
+            </rule>
             <rule e="way" k="railway" v="rail">
                 <line class='railway-casing railway-rail-casing' />
             </rule>
@@ -496,6 +499,9 @@
             <rule e="way" k="railway" v="light_rail">
                 <line class='railway-core railway-light-rail-core' />
             </rule>
+            <rule e="way" k="railway" v="incline">
+                <line class='railway-core railway-incline-core' />
+            </rule>
             <rule e="way" k="railway" v="rail">
                 <line class='railway-core railway-rail-1-core' />
                 <line class='railway-core railway-rail-2-core' smart-linecap='no'/>
@@ -606,6 +612,10 @@
 				<line class='tunnel-casing railway-light-rail-casing tunnel' mask-class='tunnel-core railway-light-rail-core'/>
 				<line class='railway-light-rail-casing highway-tunnel-ends'/>
             </rule>
+            <rule e="way" k="railway" v="incline">
+                <line class='tunnel-casing railway-incline-casing tunnel' mask-class='tunnel-core railway-incline-core'/>
+                <line class='railway-incline-casing highway-tunnel-ends'/>
+            </rule>
 			<rule e="way" k="railway" v="rail">
 				<line class='tunnel-casing railway-rail-casing tunnel' mask-class='tunnel-core railway-rail-1-core'/>
 				<line class='railway-rail-casing highway-tunnel-ends'/>
@@ -694,14 +704,70 @@
         </rule>
 
 
-        <!-- Aerialways -->
+        <!-- Piste maps -->
+        <rule e="way" k="piste:type" v="downhill">
+            <rule e="way" k="piste:difficulty" v="novice">
+            	<line class='piste-difficulty-novice'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="easy">
+            	<line class='piste-difficulty-easy'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="intermediate">
+            	<line class='piste-difficulty-intermediate'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="advanced">
+            	<line class='piste-difficulty-advanced'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="expert">
+            	<line class='piste-difficulty-expert'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="freeride">
+            	<line class='piste-difficulty-freeride'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="~">
+            	<line class='piste-difficulty-other'/>
+            </rule>
+        </rule>
+        <rule e="way" k="piste:type" v="sled">
+            <line class="piste-type-sled"/>
+        </rule>
+        <rule e="way" k="piste:type" v="nordic">
+            <line class="piste-type-nordic"/>
+        </rule>
+        <rule e="way" k="man_made" v="piste:halfpipe">
+            <area class="man-made-piste-halfpipe"/>
+        </rule>
+
+        <!-- Surface lifts (render over pistes) -->
+        <rule e="way" k="piste:lift" v="*">
+            <rule e="way" k="piste:lift" v="t-bar|j-bar|platter">
+                <line class="aerialway-line piste-lift-t-bar-marker"/>
+                <line smart-linecap="no" class='aerialway-struts'/>
+                <rule e="way" k="name" v="*">
+                    <text k="name" dx='0px' dy='-3px' class="aerialway-name" text-anchor='middle' startOffset='50%'/>
+                </rule>
+            </rule>
+            <rule e="way" k="piste:lift" v="rope_tow">
+                <line smart-linecap="no" class="piste-lift-rope-tow"/>
+            </rule>
+            <rule e="way" k="piste:lift" v="magic_carpet">
+                <line smart-linecap="no" class="piste-lift-magic-carpet"/>
+            </rule>
+        </rule>
+
+        <!-- Aerialways (render over pistes) -->
         <rule e="node|way" k="aerialway" v="*">
             <line class='aerialway-line'/>
-            <line class='aerialway-struts'/>
+            <line smart-linecap="no" class='aerialway-struts'/>
+            <rule e="node" k="aerialway" v="station">
+                <circle r='1.5px' class="aerialway-station"/>
+            </rule>
+            <rule e="way" k="name" v="*">
+                <text k="name" dx='0px' dy='-2px' class="aerialway-name" text-anchor='middle' startOffset='50%'/>
+            </rule>
         </rule>
 
 
-
 		<!-- Natural features -->
 		<rule e="node" k="natural" v="peak">
 			<symbol xlink:href="#symbol-peak" width='12px' height='12px' transform='translate(-6,-6)' />
@@ -1019,6 +1085,9 @@
             .railway-light-rail-casing              { stroke-width: 2.4px; stroke: #666666; }
             .railway-light-rail-core                { stroke-width: 1.8px; stroke: #666666; }
 
+            .railway-incline-casing                 { stroke-width: 2.4px; stroke: #666666; }
+            .railway-incline-core                   { stroke-width: 1.8px; stroke: #666666; }
+
             .railway-subway-bridge-casing           { stroke-width: 4.6px; }
             .railway-subway-bridge-core             { stroke-width: 3.6px; }
             .railway-subway-casing                  { stroke-width: 2.4px; stroke: #aaaaaa; }
@@ -1702,6 +1771,7 @@
 
 
             /* Aerialway */
+
             .aerialway-line {
                 fill: none;
                 stroke: #202020;
@@ -1713,8 +1783,97 @@
                 stroke: #202020;
                 stroke-width: 4px;
                 stroke-dasharray: 0.4,20;
+                stroke-linecap: butt;
             }
 
+            .aerialway-station {
+                fill: black;
+                stroke: black;
+                stroke-width: 1px;
+            }
+
+            .aerialway-name {
+                fill: black;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 7px;
+                stroke: none;
+				text-anchor: middle;
+            }
+
+            /* Piste maps */
+
+            .piste-difficulty-novice {
+                fill: none;
+                stroke: #00cd00;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-easy {
+                fill: none;
+                stroke: #0000cd;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-intermediate {
+                fill: none;
+                stroke: #cd0000;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-advanced {
+                fill: none;
+                stroke: #060606;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-expert {
+                fill: none;
+                stroke: #f6800a;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-freeride {
+                fill: none;
+                stroke: #f6dd0a;
+                stroke-width: 5px;
+                opacity: 0.40;
+            }
+
+            .piste-difficulty-other {
+                fill: none;
+                stroke: #505050;
+                stroke-width: 4px;
+                opacity: 0.4;
+            }
+
+            .piste-type-sled {
+                fill: none;
+                /* stroke: #8040a0; */
+                stroke: #cdabde;
+                stroke-width: 2.5px;
+                marker-start:url(#marker-piste-type-sled);
+            }
+
+            .piste-type-nordic {
+                fill: none;
+                stroke: #c00000;
+                stroke-width: 1px;
+                stroke-dasharray: 3,0.5;
+                marker-start:url(#marker-piste-type-nordic);
+            }
+
+            .man-made-piste-halfpipe {
+                fill: #a0f0ff;
+                stroke: #00bcdf;
+                stroke-width: 0.4px;
+            }
+
             /* Power line */
             .power-line {
                 stroke-width: 0.1px;
Index: osm-map-features-z15.xml
===================================================================
--- osm-map-features-z15.xml	(Revision 7211)
+++ osm-map-features-z15.xml	(Arbeitskopie)
@@ -712,11 +712,111 @@
         </rule>
 
 
+        <!-- Piste maps -->
+        <rule e="way" k="piste:type" v="downhill">
+            <rule e="way" k="piste:difficulty" v="novice">
+            	<line class='piste-difficulty-novice'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="easy">
+            	<line class='piste-difficulty-easy'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="intermediate">
+            	<line class='piste-difficulty-intermediate'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="advanced">
+            	<line class='piste-difficulty-advanced'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="expert">
+            	<line class='piste-difficulty-expert'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="freeride">
+            	<line class='piste-difficulty-freeride'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="~">
+            	<line class='piste-difficulty-other'/>
+            </rule>
+            <rule e="way" k="name|ref" v="*">
+                <!-- prefer to render name, otherwise render ref -->
+                <rule e="way" k="name" v="~">
+                    <rule e="way" k="ref" v="*">
+                        <text k="ref" dy="2px" class="piste-downhill-ref" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                </rule>
+                <else>
+                    <rule e="way" k="ref" v="*">
+                        <text k="ref" dy="2px" class="piste-downhill-ref" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                    <rule e="way" k="name" v="*">
+                        <text k="name" dy="2px" class="piste-downhill-name" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                </else>
+            </rule>
+        </rule>
+        <rule e="way" k="piste:type" v="sled">
+            <line class="piste-type-sled"/>
+        </rule>
+        <rule e="way" k="piste:type" v="nordic">
+            <line class="piste-type-nordic"/>
+        </rule>
+        <rule e="way" k="man_made" v="piste:halfpipe">
+            <area class="man-made-piste-halfpipe"/>
+            <areaSymbol xlink:href="#symbol-man-made-halfpipe" width='7px' height='7px' transform='translate(-3.5,-3.5)' />
+        </rule>
 
-        <!-- Aerialways -->
+        <!-- Surface lifts (render over pistes) -->
+        <rule e="way" k="piste:lift" v="*">
+            <rule e="way" k="piste:lift" v="t-bar|j-bar|platter">
+                <line class="aerialway-line piste-lift-t-bar-marker"/>
+                <line smart-linecap="no" class='aerialway-struts'/>
+            </rule>
+            <rule e="way" k="piste:lift" v="rope_tow">
+                <line smart-linecap="no" class="piste-lift-rope-tow"/>
+            </rule>
+            <rule e="way" k="piste:lift" v="magic_carpet">
+                <line smart-linecap="no" class="piste-lift-magic-carpet"/>
+            </rule>
+            <rule e="way" k="name" v="*">
+                <text k="name" dx='0px' dy='-3px' class="aerialway-name" text-anchor='middle' startOffset='50%'/>
+            </rule>
+        </rule>
+
+        <!-- Aerialways (render over pistes) -->
         <rule e="node|way" k="aerialway" v="*">
-            <line class='aerialway-line'/>
-            <line class='aerialway-struts'/>
+            <rule e="way" k="aerialway" v="cable_car">
+                <line class="aerialway-line aerialway-cablecar-marker"/>
+            </rule>
+            <else>
+                <rule e="way" k="aerialway" v="gondola">
+                    <line class="aerialway-line aerialway-gondola-marker"/>
+                </rule>
+                <else>
+                    <rule e="way" k="aerialway" v="chair_lift">
+                        <rule e="way" k="piste:lift:occupancy" v="4|5|6">
+                            <line class="aerialway-line aerialway-chairlift4-marker"/>
+                        </rule>
+                        <else>
+                            <line class="aerialway-line aerialway-chairlift2-marker"/>
+                        </else>
+                    </rule>
+                    <else>
+                        <rule e="way" k="aerialway" v="mixed_lift">
+                            <line class="aerialway-line aerialway-mixedlift-marker"/>
+                        </rule>
+                        <else>
+                            <rule e="way" k="aerialway" v="*">
+                                <line class='aerialway-line'/>
+                            </rule>
+                        </else>
+                    </else>
+                </else>
+            </else>
+            <line smart-linecap="no" class='aerialway-struts'/>
+            <rule e="node" k="aerialway" v="station">
+                <circle r='1.5px' class="aerialway-station"/>
+            </rule>
+            <rule e="way" k="name" v="*">
+                <text k="name" dx='0px' dy='-3px' class="aerialway-name" text-anchor='middle' startOffset='50%'/>
+            </rule>
         </rule>
 
 
@@ -1713,6 +1813,26 @@
                 stroke-width: 0.4px;
             }
 
+            .aerialway-cablecar-marker {
+                marker-start:url(#marker-cablecar);
+            }
+
+            .aerialway-gondola-marker {
+                marker-start:url(#marker-gondola);
+            }
+
+            .aerialway-chairlift2-marker {
+                marker-start:url(#marker-chair-lift-2);
+            }
+
+            .aerialway-chairlift4-marker {
+                marker-start:url(#marker-chair-lift-4);
+            }
+
+            .aerialway-mixedlift-marker {
+                marker-start:url(#marker-mixed-lift);
+            }
+
             .aerialway-struts {
                 fill: none;
                 stroke: #202020;
@@ -1720,6 +1840,130 @@
                 stroke-dasharray: 0.4,20;
             }
 
+            .aerialway-station {
+                fill: black;
+                stroke: black;
+                stroke-width: 1px;
+            }
+
+            .aerialway-name {
+                fill: #606060;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 5px;
+                stroke: none;
+				text-anchor: middle;
+            }
+
+            /* surface lifts */
+
+            .piste-lift-t-bar-marker {
+                marker-start:url(#marker-piste-lift-t-bar);
+            }
+
+            .piste-lift-rope-tow {
+                fill: none;
+                stroke: #a47c41;
+                stroke-width: 0.5px;
+                stroke-dasharray: 1,1;
+                stroke-linecap: square;
+            }
+
+            .piste-lift-magic-carpet {
+                fill: none;
+                stroke: #101010;
+                stroke-width: 0.8px;
+            }
+
+            /* Piste maps */
+
+            .piste-difficulty-novice {
+                fill: none;
+                stroke: #00cd00;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-easy {
+                fill: none;
+                stroke: #0000cd;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-intermediate {
+                fill: none;
+                stroke: #cd0000;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-advanced {
+                fill: none;
+                stroke: #060606;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-expert {
+                fill: none;
+                stroke: #f6800a;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-freeride {
+                fill: none;
+                stroke: #f6dd0a;
+                stroke-width: 5px;
+                opacity: 0.40;
+            }
+
+            .piste-difficulty-other {
+                fill: none;
+                stroke: #505050;
+                stroke-width: 4px;
+                opacity: 0.4;
+            }
+
+            .piste-downhill-name {
+                fill: #ffffff;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 5px;
+				text-anchor: middle;
+            }
+
+            .piste-downhill-ref {
+                fill: #000000;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 5px;
+				text-anchor: middle;
+            }
+
+            .piste-type-sled {
+                fill: none;
+                /* stroke: #8040a0; */
+                stroke: #cdabde;
+                stroke-width: 2.5px;
+                marker-start:url(#marker-piste-type-sled);
+            }
+
+            .piste-type-nordic {
+                fill: none;
+                stroke: #c00000;
+                stroke-width: 1px;
+                stroke-dasharray: 3,0.5;
+                marker-start:url(#marker-piste-type-nordic);
+            }
+
+            .man-made-piste-halfpipe {
+                fill: #a0f0ff;
+                stroke: #00bcdf;
+                stroke-width: 0.4px;
+            }
+
             /* Power line */
             .power-line {
                 stroke-width: 0.1px;
@@ -1730,7 +1974,6 @@
                 fill: none;
             }
 
-
 			/* Area captions */
             .park-name {
                 fill: #444444;
@@ -2309,6 +2552,113 @@
             <svg:path d="M1,0 L1,2 M1,4 L1,6 M1,8 L1,10" />
         </svg:marker>
 
+        <!-- aerialway and surface lift icons -->
+
+        <svg:marker
+            id="marker-cablecar"
+            viewBox="0 0 10 9"
+            refX="-18px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="10px"
+            markerHeight="10px"
+            orient="auto">
+            <svg:path d="M 2.9,2.7 L 0,2.7 L 0,8.8 L 10,8.8 L 10,2.7 L 7.3,2.7 L 5.7,0.1 L 4.5,0 L 2.9,2.7 z M 5,0.3 L 6.3,2.7 L 3.8,2.7 L 5,0.3 z M 6.5,3.3 L 6.5,5.2 L 3.8,5.2 L 3.8,3.3 L 6.5,3.3 z M 0.9,3.3 L 3,3.3 L 3,5.2 L 0.9,5.2 L 0.9,3.3 z M 9.4,3.3 L 9.4,5.2 L 7.2,5.2 L 7.2,3.3 L 9.4,3.3 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-gondola"
+            viewBox="0 0 10 11"
+            refX="-30px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="9px"
+            markerHeight="10px"
+            orient="auto">
+            <svg:path d="M 4.6,0 L 4.6,2.9 L 1.4,2.9 C 0,3.5 0.2,10.7 1.3,11.1 L 8.7,11.1 C 9.7,10.6 10,4 8.6,2.9 L 5.6,2.9 L 5.6,0 L 4.6,0 z M 4.5,3.8 L 4.5,6.5 L 1.4,6.5 L 1.4,3.8 L 4.5,3.8 z M 5.6,3.8 L 8.5,3.8 L 8.5,6.5 L 5.6,6.5 L 5.6,3.8 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-chair-lift-2"
+            viewBox="0 0 10 22"
+            refX="-25px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="5px"
+            markerHeight="11px"
+            orient="auto">
+            <svg:path d="M 3.6,0 L 3.6,4.3 L 0,6.2 L 0,17.5 L 5.1,17.5 L 5.1,16.6 L 1.1,16.6 L 1.1,6.6 L 7.4,3.4 L 7.4,12.3 L 8.5,12.3 L 8.5,1.7 L 4.9,3.6 L 4.9,0 L 3.6,0 z M 5.7,4.7 C 5.1,4.7 4.5,5.3 4.5,6.2 C 4.5,6.8 5.1,7.5 5.7,7.5 C 6.4,7.5 7,6.8 7,6.2 C 7,5.3 6.4,4.7 5.7,4.7 z M 3,6.4 C 2.3,6.4 1.7,7 1.7,7.9 C 1.7,8.5 2.3,9.2 3,9.2 C 3.6,9.2 4.3,8.5 4.3,7.9 C 4.3,7 3.6,6.4 3,6.4 z M 4.5,7.7 L 4.5,14.5 L 8.5,14.5 L 8.5,19.6 L 10,19.6 L 10,13 L 7,13 L 7,7.7 L 4.5,7.7 z M 1.7,9.4 L 1.7,16.2 L 5.7,16.2 L 5.7,21.3 L 7.2,21.3 L 7.2,14.7 L 4.3,14.7 L 4.3,9.4 L 1.7,9.4 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-chair-lift-4"
+            viewBox="0 0 10 17"
+            refX="-20px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="6px"
+            markerHeight="10px"
+            orient="auto">
+            <svg:path d="M 4.3,0 L 4.3,3.3 L 0,5.7 L 0,14.3 L 2.9,14.3 L 2.9,13.5 L 0.7,13.5 L 0.7,6.7 L 8.6,2 L 8.6,8.5 L 9.3,8.5 L 9.3,0.4 L 5,2.8 L 5,0 L 4.3,0 z M 7.4,3.4 C 7,3.4 6.6,3.8 6.6,4.3 C 6.6,4.7 7,5.1 7.4,5.1 C 7.9,5.1 8.3,4.7 8.3,4.3 C 8.3,3.8 7.9,3.4 7.4,3.4 z M 5.6,4.5 C 5.1,4.5 4.7,4.9 4.7,5.4 C 4.7,5.9 5.1,6.3 5.6,6.3 C 6,6.3 6.4,5.9 6.4,5.4 C 6.4,4.9 6,4.6 5.6,4.5 z M 6.6,5.3 L 6.6,9.8 L 9,9.8 L 9,13.3 L 10,13.3 L 10,8.8 L 8.3,8.8 L 8.3,5.3 L 6.6,5.3 z M 3.7,5.7 C 3.2,5.7 2.9,6.1 2.9,6.5 C 2.9,7 3.2,7.4 3.7,7.4 C 4.2,7.4 4.6,7 4.6,6.5 C 4.6,6.1 4.2,5.7 3.7,5.7 z M 4.7,6.4 L 4.7,11 L 7.4,11 L 7.4,14.3 L 8.4,14.3 L 8.4,10 L 6.4,10 L 6.4,6.4 L 4.7,6.4 z M 1.9,6.7 C 1.4,6.7 1,7.1 1,7.5 C 1,8 1.4,8.4 1.9,8.4 C 2.3,8.4 2.7,8 2.7,7.5 C 2.7,7.1 2.3,6.7 1.9,6.7 z M 2.8,7.5 L 2.8,12.3 L 5.6,12.3 L 5.6,15.5 L 6.6,15.5 L 6.6,11.1 L 4.6,11.1 L 4.6,7.5 L 2.8,7.5 z M 1,8.5 L 1,13.3 L 3.6,13.3 L 3.6,16.4 L 4.6,16.4 L 4.6,12.4 L 2.7,12.4 L 2.7,8.6 L 1,8.5 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-piste-lift-t-bar"
+            viewBox="0 0 10 13"
+            refX="-5px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="8px"
+            markerHeight="10px"
+            orient="auto">
+            <svg:path d="M 8.1,0 L 5.1,3.2 L 0,3.2 L 0.6,7.1 L 4.5,11.6 L 0,12.9 L 0,13.2 L 9.6,10.3 L 10,9.6 L 9.6,10 L 5.6,11.1 L 2.1,7.4 L 8.7,0 L 8.1,0 z M 1,0.6 C 0.4,0.6 0,1.1 0,1.6 C 0,2.1 0.4,2.6 1,2.6 C 1.5,2.6 1.9,2.1 1.9,1.6 C 1.9,1.1 1.5,0.6 1,0.6 z M 1.9,3.9 L 4.5,3.9 L 1.9,6.8 L 1.9,3.9 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-mixed-lift"
+            viewBox="0 0 10 6"
+            refX="-15px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="14px"
+            markerHeight="9px"
+            orient="auto">
+            <svg:path d="M 1.6,0.1 L 1.6,2.9 L 0,3.9 L 0,7.1 L 1.1,7.1 L 1.1,6.8 L 0.3,6.8 L 0.3,4.1 L 3.5,2.3 L 3.5,4.8 L 3.8,4.8 L 3.8,1.7 L 2.1,2.6 L 2.1,0.1 L 7.5,0.1 L 7.5,1.8 L 5.9,1.9 C 5.8,1.9 5.8,2 5.7,2.1 C 5.5,2.8 5.4,3.3 5.4,4.6 C 5.4,5.3 5.5,6.8 5.8,7.1 L 9.5,7.2 C 9.9,6.9 10,5.2 10,4.6 C 10,3.4 9.9,2.6 9.7,2.1 C 9.6,2 9.6,1.9 9.5,1.9 L 8,1.8 L 8,0 L 1.6,0.1 z M 8,2.4 L 9.5,2.4 L 9.5,4.2 L 8,4.2 L 8,2.4 z M 7.5,2.4 L 7.5,4.2 L 5.9,4.2 L 5.9,2.5 L 7.5,2.4 z M 3,2.6 C 2.6,2.7 2.6,3.2 2.9,3.4 C 3.1,3.4 3.2,3.4 3.3,3.3 C 3.5,3 3.3,2.6 3,2.6 z M 2.3,3.1 C 1.9,3.1 1.8,3.7 2.1,3.8 C 2.3,3.9 2.5,3.8 2.6,3.7 C 2.7,3.5 2.6,3.1 2.3,3.1 z M 2.7,3.4 L 2.7,5.4 L 3.8,5.3 L 3.8,6.8 C 3.9,6.8 4.2,6.8 4.3,6.8 L 4.2,4.9 L 3.4,4.9 L 3.4,3.4 L 2.7,3.4 z M 1.5,3.6 C 1.1,3.6 1,4.1 1.4,4.3 C 1.5,4.3 1.6,4.3 1.7,4.3 C 2,4.1 1.9,3.6 1.5,3.6 z M 1.9,3.9 L 1.9,5.8 L 3.1,5.8 L 3.1,7.3 C 3.2,7.3 3.4,7.3 3.5,7.3 L 3.5,5.4 L 2.7,5.4 L 2.7,3.9 L 1.9,3.9 z M 0.8,4 C 0.7,4 0.7,4.1 0.6,4.1 C 0.3,4.2 0.3,4.7 0.7,4.8 C 0.8,4.8 1,4.7 1.1,4.6 C 1.2,4.4 1,4 0.8,4 z M 1.2,4.4 L 1.2,6.3 L 2.3,6.3 L 2.3,7.8 L 2.7,7.8 L 2.7,5.9 L 1.9,5.9 L 1.9,4.4 L 1.2,4.4 z M 0.4,4.9 L 0.4,6.8 L 1.5,6.8 L 1.5,8.2 L 2,8.2 L 2,6.4 L 1.1,6.4 L 1.1,4.9 L 0.4,4.9 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-piste-type-sled"
+            viewBox="0 0 10 10"
+            refX="-1px" refY="10px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="7px"
+            markerHeight="7px"
+            orient="auto">
+            <svg:path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0 z M 0.1,0.1 L 9.9,0.1 L 9.9,9.9 L 0.1,9.9 L 0.1,0.1 z M 8.5,4.9 C 8.5,5.8 7.8,6.6 6.9,6.6 L 5.6,6.6 L 5.6,5.3 L 6.9,5.3 L 6.9,5 L 1.9,5 L 1.9,5.3 L 2.9,5.3 L 2.9,6.6 L 1.2,6.6 L 1.2,6.9 L 6.9,6.9 C 7.9,6.9 8.7,5.9 8.7,4.9 L 8.5,4.9 z M 3.1,5.3 L 5.4,5.3 L 5.4,6.6 L 3.1,6.6 L 3.1,5.3 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-piste-type-nordic"
+            viewBox="0 0 10 10"
+            refX="-1px" refY="10px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="7px"
+            markerHeight="7px"
+            orient="auto">
+            <svg:path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0 z M 0.1,0.1 L 9.9,0.1 L 9.9,9.9 L 0.1,9.9 L 0.1,0.1 z M 7,1.1 C 6.6,1.1 6.3,1.4 6.3,1.7 C 6.3,2.1 6.6,2.4 7,2.4 C 7.3,2.4 7.6,2.1 7.6,1.7 C 7.6,1.4 7.3,1.1 7,1.1 z M 6,2.2 L 4.4,2.5 L 3.5,3.7 L 3.5,3.8 L 0.5,3.8 L 0.5,3.9 L 3.5,3.9 L 3.6,4 L 3.7,3.9 L 4.5,2.9 L 5.3,2.9 L 4.1,4.3 L 3,6.1 L 1,6.9 L 1.3,7.1 L 3.3,6.4 L 4.6,5.2 L 5.8,6.3 L 5.4,8.5 L 5.8,8.5 L 6.3,6.3 L 5.1,4.8 L 6.5,3.1 L 7.6,3.9 L 8.5,3.1 L 7.7,8.6 L 3.5,8.6 L 0.8,6.9 L 0.4,6.9 L 3.1,8.6 L 2.1,8.6 L 2.1,8.9 L 8.8,8.9 L 9.2,8.4 L 8.7,8.6 L 7.9,8.6 L 8.6,3 L 8.7,2.9 L 8.7,2.6 L 7.6,3.4 L 6.5,2.6 L 6,2.2 z" />
+        </svg:marker>
+
+
         <svg:symbol
           id="church"
           viewBox="0 0 5 10"
@@ -2508,10 +2858,11 @@
 			<svg:path  fill="#d1adc6" stroke="#1f151d" stroke-width="5" d="M 0,90 L 50,10 L 100,90 Z"/>
 		</svg:symbol>
 
+        <!-- piste maps -->
+		<svg:symbol id="symbol-man-made-halfpipe" viewBox="0 0 48 48">
+			<svg:path  fill="#000000" d="M 0,0 L 0,48 L 48,48 L 48,0 L 0,0 z M 1,1 L 47,1 L 47,47 L 1,47 L 1,1 z M 46,20 L 42,20 C 42,38 35,40 25,40 C 15,40 7,38 7,20 L 2,20 L 2,46 L 46,46 L 46,20 z"/>
+		</svg:symbol>
 
-
-
-
     </defs>
 
 </rules>
Index: osm-map-features-z16.xml
===================================================================
--- osm-map-features-z16.xml	(Revision 7211)
+++ osm-map-features-z16.xml	(Arbeitskopie)
@@ -941,10 +941,118 @@
  		</rule>
         </rule>
 
-        <!-- Aerialways -->
+
+        <!-- Piste maps -->
+        <rule e="way" k="piste:type" v="downhill">
+            <rule e="way" k="piste:difficulty" v="novice">
+            	<line class='piste-difficulty-novice'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="easy">
+            	<line class='piste-difficulty-easy'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="intermediate">
+            	<line class='piste-difficulty-intermediate'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="advanced">
+            	<line class='piste-difficulty-advanced'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="expert">
+            	<line class='piste-difficulty-expert'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="freeride">
+            	<line class='piste-difficulty-freeride'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="~">
+            	<line class='piste-difficulty-other'/>
+            </rule>
+            <rule e="way" k="name|ref" v="*">
+                <!-- prefer to render name, otherwise render ref -->
+                <!-- text is rendered at 75%, refs at 25%, aerialway name at 50% -->
+                <rule e="way" k="name" v="~">
+                    <rule e="way" k="ref" v="*">
+                        <text k="ref" dy="2px" class="piste-downhill-ref" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                </rule>
+                <else>
+                    <rule e="way" k="ref" v="*">
+                        <text k="ref" dy="2px" class="piste-downhill-ref" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                    <rule e="way" k="name" v="*">
+                        <text k="name" dy="2px" class="piste-downhill-name" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                </else>
+            </rule>
+        </rule>
+        <rule e="way" k="piste:type" v="sled">
+            <line class="piste-type-sled"/>
+        </rule>
+        <rule e="way" k="piste:type" v="nordic">
+            <line class="piste-type-nordic"/>
+        </rule>
+        <rule e="way" k="man_made" v="piste:halfpipe">
+            <area class="man-made-piste-halfpipe"/>
+            <areaSymbol xlink:href="#symbol-man-made-halfpipe" width='7px' height='7px' transform='translate(-3.5,-3.5)' />
+        </rule>
+
+        <!-- Surface lifts (render over pistes) -->
+        <rule e="way" k="piste:lift" v="*">
+            <rule e="way" k="piste:lift" v="t-bar|j-bar|platter">
+                <line class="aerialway-line piste-lift-t-bar-marker"/>
+                <line smart-linecap="no" class='aerialway-struts'/>
+            </rule>
+            <rule e="way" k="piste:lift" v="rope_tow">
+                <line smart-linecap="no" class="piste-lift-rope-tow"/>
+            </rule>
+            <rule e="way" k="piste:lift" v="magic_carpet">
+                <line smart-linecap="no" class="piste-lift-magic-carpet"/>
+            </rule>
+            <rule e="way" k="name" v="*">
+                <text k="name" dx='0px' dy='-3px' class="aerialway-name" text-anchor='middle' startOffset='50%'/>
+            </rule>
+        </rule>
+
+        <!-- Aerialways (render over pistes) -->
         <rule e="node|way" k="aerialway" v="*">
-            <line class='aerialway-line'/>
-            <line class='aerialway-struts'/>
+            <rule e="way" k="aerialway" v="cable_car">
+                <line class="aerialway-line aerialway-cablecar-marker"/>
+            </rule>
+            <else>
+                <rule e="way" k="aerialway" v="gondola">
+                    <line class="aerialway-line aerialway-gondola-marker"/>
+                </rule>
+                <else>
+                    <rule e="way" k="aerialway" v="chair_lift">
+                        <rule e="way" k="piste:lift:occupancy" v="4|5|6">
+                            <line class="aerialway-line aerialway-chairlift4-marker"/>
+                        </rule>
+                        <else>
+                            <line class="aerialway-line aerialway-chairlift2-marker"/>
+                        </else>
+                    </rule>
+                    <else>
+                        <rule e="way" k="aerialway" v="mixed_lift">
+                            <line class="aerialway-line aerialway-mixedlift-marker"/>
+                        </rule>
+                        <else>
+                            <rule e="way" k="aerialway" v="*">
+                                <line class='aerialway-line'/>
+                            </rule>
+                        </else>
+                    </else>
+                </else>
+            </else>
+            <line smart-linecap="no" class='aerialway-struts'/>
+            <rule e="node" k="aerialway" v="station">
+                <circle r='1.5px' class="aerialway-station"/>
+            </rule>
+            <rule e="node" s="way" k="aerialway" v="*">
+                <rule e="node" k="ele" v="*">
+                    <text k="ele" dx="0px" dy="-2px" class="aerialway-elevation-text"/>
+                </rule>
+            </rule>
+            <rule e="way" k="name" v="*">
+                <text k="name" dx='0px' dy='-3px' class="aerialway-name" text-anchor='middle' startOffset='50%'/>
+            </rule>
         </rule>
 
 
@@ -2116,6 +2224,26 @@
                 stroke-width: 0.4px;
             }
 
+            .aerialway-cablecar-marker {
+                marker-start:url(#marker-cablecar);
+            }
+
+            .aerialway-gondola-marker {
+                marker-start:url(#marker-gondola);
+            }
+
+            .aerialway-chairlift2-marker {
+                marker-start:url(#marker-chair-lift-2);
+            }
+
+            .aerialway-chairlift4-marker {
+                marker-start:url(#marker-chair-lift-4);
+            }
+
+            .aerialway-mixedlift-marker {
+                marker-start:url(#marker-mixed-lift);
+            }
+
             .aerialway-struts {
                 fill: none;
                 stroke: #202020;
@@ -2123,6 +2251,138 @@
                 stroke-dasharray: 0.4,20;
             }
 
+            .aerialway-station {
+                fill: black;
+                stroke: black;
+                stroke-width: 1px;
+            }
+
+            .aerialway-name {
+                fill: #606060;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 4px;
+                stroke: none;
+				text-anchor: middle;
+            }
+
+            .aerialway-elevation-text {
+                fill: #606060;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 3px;
+				text-anchor: middle;
+            }
+
+            /* surface lifts */
+
+            .piste-lift-t-bar-marker {
+                marker-start:url(#marker-piste-lift-t-bar);
+            }
+
+            .piste-lift-rope-tow {
+                fill: none;
+                stroke: #a47c41;
+                stroke-width: 0.5px;
+                stroke-dasharray: 1,1;
+                stroke-linecap: square;
+            }
+
+            .piste-lift-magic-carpet {
+                fill: none;
+                stroke: #101010;
+                stroke-width: 0.8px;
+            }
+
+            /* Piste maps */
+
+            .piste-difficulty-novice {
+                fill: none;
+                stroke: #00cd00;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-easy {
+                fill: none;
+                stroke: #0000cd;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-intermediate {
+                fill: none;
+                stroke: #cd0000;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-advanced {
+                fill: none;
+                stroke: #060606;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-expert {
+                fill: none;
+                stroke: #f6800a;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-freeride {
+                fill: none;
+                stroke: #f6dd0a;
+                stroke-width: 5px;
+                opacity: 0.40;
+            }
+
+            .piste-difficulty-other {
+                fill: none;
+                stroke: #505050;
+                stroke-width: 4px;
+                opacity: 0.4;
+            }
+
+            .piste-downhill-name {
+                fill: #ffffff;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 5px;
+				text-anchor: middle;
+            }
+
+            .piste-downhill-ref {
+                fill: #000000;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 5px;
+				text-anchor: middle;
+            }
+
+            .piste-type-sled {
+                fill: none;
+                /* stroke: #8040a0; */
+                stroke: #cdabde;
+                stroke-width: 2.5px;
+                marker-start:url(#marker-piste-type-sled);
+            }
+
+            .piste-type-nordic {
+                fill: none;
+                stroke: #c00000;
+                stroke-width: 1px;
+                stroke-dasharray: 3,0.5;
+                marker-start:url(#marker-piste-type-nordic);
+            }
+
+            .man-made-piste-halfpipe {
+                fill: #a0f0ff;
+                stroke: #00bcdf;
+                stroke-width: 0.4px;
+            }
+
             /* Power line */
             .power-line {
                 stroke-width: 0.1px;
@@ -2735,7 +2995,113 @@
             orient="auto">
             <svg:path d="M 10,4 L 4,4 L 4,2 L 0,5 L 4,8 L 4,6 L 10,6 z" />
         </svg:marker>
-        
+
+        <!-- aerialway and surface lift icons -->
+
+        <svg:marker
+            id="marker-cablecar"
+            viewBox="0 0 10 9"
+            refX="-18px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="10px"
+            markerHeight="10px"
+            orient="auto">
+            <svg:path d="M 2.9,2.7 L 0,2.7 L 0,8.8 L 10,8.8 L 10,2.7 L 7.3,2.7 L 5.7,0.1 L 4.5,0 L 2.9,2.7 z M 5,0.3 L 6.3,2.7 L 3.8,2.7 L 5,0.3 z M 6.5,3.3 L 6.5,5.2 L 3.8,5.2 L 3.8,3.3 L 6.5,3.3 z M 0.9,3.3 L 3,3.3 L 3,5.2 L 0.9,5.2 L 0.9,3.3 z M 9.4,3.3 L 9.4,5.2 L 7.2,5.2 L 7.2,3.3 L 9.4,3.3 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-gondola"
+            viewBox="0 0 10 11"
+            refX="-30px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="9px"
+            markerHeight="10px"
+            orient="auto">
+            <svg:path d="M 4.6,0 L 4.6,2.9 L 1.4,2.9 C 0,3.5 0.2,10.7 1.3,11.1 L 8.7,11.1 C 9.7,10.6 10,4 8.6,2.9 L 5.6,2.9 L 5.6,0 L 4.6,0 z M 4.5,3.8 L 4.5,6.5 L 1.4,6.5 L 1.4,3.8 L 4.5,3.8 z M 5.6,3.8 L 8.5,3.8 L 8.5,6.5 L 5.6,6.5 L 5.6,3.8 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-chair-lift-2"
+            viewBox="0 0 10 22"
+            refX="-25px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="5px"
+            markerHeight="11px"
+            orient="auto">
+            <svg:path d="M 3.6,0 L 3.6,4.3 L 0,6.2 L 0,17.5 L 5.1,17.5 L 5.1,16.6 L 1.1,16.6 L 1.1,6.6 L 7.4,3.4 L 7.4,12.3 L 8.5,12.3 L 8.5,1.7 L 4.9,3.6 L 4.9,0 L 3.6,0 z M 5.7,4.7 C 5.1,4.7 4.5,5.3 4.5,6.2 C 4.5,6.8 5.1,7.5 5.7,7.5 C 6.4,7.5 7,6.8 7,6.2 C 7,5.3 6.4,4.7 5.7,4.7 z M 3,6.4 C 2.3,6.4 1.7,7 1.7,7.9 C 1.7,8.5 2.3,9.2 3,9.2 C 3.6,9.2 4.3,8.5 4.3,7.9 C 4.3,7 3.6,6.4 3,6.4 z M 4.5,7.7 L 4.5,14.5 L 8.5,14.5 L 8.5,19.6 L 10,19.6 L 10,13 L 7,13 L 7,7.7 L 4.5,7.7 z M 1.7,9.4 L 1.7,16.2 L 5.7,16.2 L 5.7,21.3 L 7.2,21.3 L 7.2,14.7 L 4.3,14.7 L 4.3,9.4 L 1.7,9.4 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-chair-lift-4"
+            viewBox="0 0 10 17"
+            refX="-20px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="6px"
+            markerHeight="10px"
+            orient="auto">
+            <svg:path d="M 4.3,0 L 4.3,3.3 L 0,5.7 L 0,14.3 L 2.9,14.3 L 2.9,13.5 L 0.7,13.5 L 0.7,6.7 L 8.6,2 L 8.6,8.5 L 9.3,8.5 L 9.3,0.4 L 5,2.8 L 5,0 L 4.3,0 z M 7.4,3.4 C 7,3.4 6.6,3.8 6.6,4.3 C 6.6,4.7 7,5.1 7.4,5.1 C 7.9,5.1 8.3,4.7 8.3,4.3 C 8.3,3.8 7.9,3.4 7.4,3.4 z M 5.6,4.5 C 5.1,4.5 4.7,4.9 4.7,5.4 C 4.7,5.9 5.1,6.3 5.6,6.3 C 6,6.3 6.4,5.9 6.4,5.4 C 6.4,4.9 6,4.6 5.6,4.5 z M 6.6,5.3 L 6.6,9.8 L 9,9.8 L 9,13.3 L 10,13.3 L 10,8.8 L 8.3,8.8 L 8.3,5.3 L 6.6,5.3 z M 3.7,5.7 C 3.2,5.7 2.9,6.1 2.9,6.5 C 2.9,7 3.2,7.4 3.7,7.4 C 4.2,7.4 4.6,7 4.6,6.5 C 4.6,6.1 4.2,5.7 3.7,5.7 z M 4.7,6.4 L 4.7,11 L 7.4,11 L 7.4,14.3 L 8.4,14.3 L 8.4,10 L 6.4,10 L 6.4,6.4 L 4.7,6.4 z M 1.9,6.7 C 1.4,6.7 1,7.1 1,7.5 C 1,8 1.4,8.4 1.9,8.4 C 2.3,8.4 2.7,8 2.7,7.5 C 2.7,7.1 2.3,6.7 1.9,6.7 z M 2.8,7.5 L 2.8,12.3 L 5.6,12.3 L 5.6,15.5 L 6.6,15.5 L 6.6,11.1 L 4.6,11.1 L 4.6,7.5 L 2.8,7.5 z M 1,8.5 L 1,13.3 L 3.6,13.3 L 3.6,16.4 L 4.6,16.4 L 4.6,12.4 L 2.7,12.4 L 2.7,8.6 L 1,8.5 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-piste-lift-t-bar"
+            viewBox="0 0 10 13"
+            refX="-5px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="8px"
+            markerHeight="10px"
+            orient="auto">
+            <svg:path d="M 8.1,0 L 5.1,3.2 L 0,3.2 L 0.6,7.1 L 4.5,11.6 L 0,12.9 L 0,13.2 L 9.6,10.3 L 10,9.6 L 9.6,10 L 5.6,11.1 L 2.1,7.4 L 8.7,0 L 8.1,0 z M 1,0.6 C 0.4,0.6 0,1.1 0,1.6 C 0,2.1 0.4,2.6 1,2.6 C 1.5,2.6 1.9,2.1 1.9,1.6 C 1.9,1.1 1.5,0.6 1,0.6 z M 1.9,3.9 L 4.5,3.9 L 1.9,6.8 L 1.9,3.9 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-mixed-lift"
+            viewBox="0 0 10 6"
+            refX="-15px" refY="0px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="14px"
+            markerHeight="9px"
+            orient="auto">
+            <svg:path d="M 1.6,0.1 L 1.6,2.9 L 0,3.9 L 0,7.1 L 1.1,7.1 L 1.1,6.8 L 0.3,6.8 L 0.3,4.1 L 3.5,2.3 L 3.5,4.8 L 3.8,4.8 L 3.8,1.7 L 2.1,2.6 L 2.1,0.1 L 7.5,0.1 L 7.5,1.8 L 5.9,1.9 C 5.8,1.9 5.8,2 5.7,2.1 C 5.5,2.8 5.4,3.3 5.4,4.6 C 5.4,5.3 5.5,6.8 5.8,7.1 L 9.5,7.2 C 9.9,6.9 10,5.2 10,4.6 C 10,3.4 9.9,2.6 9.7,2.1 C 9.6,2 9.6,1.9 9.5,1.9 L 8,1.8 L 8,0 L 1.6,0.1 z M 8,2.4 L 9.5,2.4 L 9.5,4.2 L 8,4.2 L 8,2.4 z M 7.5,2.4 L 7.5,4.2 L 5.9,4.2 L 5.9,2.5 L 7.5,2.4 z M 3,2.6 C 2.6,2.7 2.6,3.2 2.9,3.4 C 3.1,3.4 3.2,3.4 3.3,3.3 C 3.5,3 3.3,2.6 3,2.6 z M 2.3,3.1 C 1.9,3.1 1.8,3.7 2.1,3.8 C 2.3,3.9 2.5,3.8 2.6,3.7 C 2.7,3.5 2.6,3.1 2.3,3.1 z M 2.7,3.4 L 2.7,5.4 L 3.8,5.3 L 3.8,6.8 C 3.9,6.8 4.2,6.8 4.3,6.8 L 4.2,4.9 L 3.4,4.9 L 3.4,3.4 L 2.7,3.4 z M 1.5,3.6 C 1.1,3.6 1,4.1 1.4,4.3 C 1.5,4.3 1.6,4.3 1.7,4.3 C 2,4.1 1.9,3.6 1.5,3.6 z M 1.9,3.9 L 1.9,5.8 L 3.1,5.8 L 3.1,7.3 C 3.2,7.3 3.4,7.3 3.5,7.3 L 3.5,5.4 L 2.7,5.4 L 2.7,3.9 L 1.9,3.9 z M 0.8,4 C 0.7,4 0.7,4.1 0.6,4.1 C 0.3,4.2 0.3,4.7 0.7,4.8 C 0.8,4.8 1,4.7 1.1,4.6 C 1.2,4.4 1,4 0.8,4 z M 1.2,4.4 L 1.2,6.3 L 2.3,6.3 L 2.3,7.8 L 2.7,7.8 L 2.7,5.9 L 1.9,5.9 L 1.9,4.4 L 1.2,4.4 z M 0.4,4.9 L 0.4,6.8 L 1.5,6.8 L 1.5,8.2 L 2,8.2 L 2,6.4 L 1.1,6.4 L 1.1,4.9 L 0.4,4.9 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-piste-type-sled"
+            viewBox="0 0 10 10"
+            refX="-1px" refY="10px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="7px"
+            markerHeight="7px"
+            orient="auto">
+            <svg:path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0 z M 0.1,0.1 L 9.9,0.1 L 9.9,9.9 L 0.1,9.9 L 0.1,0.1 z M 8.5,4.9 C 8.5,5.8 7.8,6.6 6.9,6.6 L 5.6,6.6 L 5.6,5.3 L 6.9,5.3 L 6.9,5 L 1.9,5 L 1.9,5.3 L 2.9,5.3 L 2.9,6.6 L 1.2,6.6 L 1.2,6.9 L 6.9,6.9 C 7.9,6.9 8.7,5.9 8.7,4.9 L 8.5,4.9 z M 3.1,5.3 L 5.4,5.3 L 5.4,6.6 L 3.1,6.6 L 3.1,5.3 z" />
+        </svg:marker>
+
+        <svg:marker
+            id="marker-piste-type-nordic"
+            viewBox="0 0 10 10"
+            refX="-1px" refY="10px"
+            markerUnits="userSpaceOnUse"
+            fill='#000000'
+            stroke='none'
+            markerWidth="7px"
+            markerHeight="7px"
+            orient="auto">
+            <svg:path d="M 0,0 L 0,10 L 10,10 L 10,0 L 0,0 z M 0.1,0.1 L 9.9,0.1 L 9.9,9.9 L 0.1,9.9 L 0.1,0.1 z M 7,1.1 C 6.6,1.1 6.3,1.4 6.3,1.7 C 6.3,2.1 6.6,2.4 7,2.4 C 7.3,2.4 7.6,2.1 7.6,1.7 C 7.6,1.4 7.3,1.1 7,1.1 z M 6,2.2 L 4.4,2.5 L 3.5,3.7 L 3.5,3.8 L 0.5,3.8 L 0.5,3.9 L 3.5,3.9 L 3.6,4 L 3.7,3.9 L 4.5,2.9 L 5.3,2.9 L 4.1,4.3 L 3,6.1 L 1,6.9 L 1.3,7.1 L 3.3,6.4 L 4.6,5.2 L 5.8,6.3 L 5.4,8.5 L 5.8,8.5 L 6.3,6.3 L 5.1,4.8 L 6.5,3.1 L 7.6,3.9 L 8.5,3.1 L 7.7,8.6 L 3.5,8.6 L 0.8,6.9 L 0.4,6.9 L 3.1,8.6 L 2.1,8.6 L 2.1,8.9 L 8.8,8.9 L 9.2,8.4 L 8.7,8.6 L 7.9,8.6 L 8.6,3 L 8.7,2.9 L 8.7,2.6 L 7.6,3.4 L 6.5,2.6 L 6,2.2 z" />
+        </svg:marker>
+
         <svg:symbol
           id="church"
           viewBox="0 0 5 10"
@@ -2954,6 +3320,11 @@
                 style="fill:#ffffff;stroke:#000000;stroke-width:0.34999999" />
           </svg:g>
         </svg:symbol>
+
+        <!-- piste maps -->
+		<svg:symbol id="symbol-man-made-halfpipe" viewBox="0 0 48 48">
+			<svg:path  fill="#000000" d="M 0,0 L 0,48 L 48,48 L 48,0 L 0,0 z M 1,1 L 47,1 L 47,47 L 1,47 L 1,1 z M 46,20 L 42,20 C 42,38 35,40 25,40 C 15,40 7,38 7,20 L 2,20 L 2,46 L 46,46 L 46,20 z"/>
+		</svg:symbol>
     </defs>
 
 </rules>
Index: osm-map-features-z17.xml
===================================================================
--- osm-map-features-z17.xml	(Revision 7211)
+++ osm-map-features-z17.xml	(Arbeitskopie)
@@ -969,12 +969,120 @@
  		</rule>
         </rule>	
 
-        <!-- Aerialways -->
+        <!-- Piste maps -->
+        <rule e="way" k="piste:type" v="downhill">
+            <rule e="way" k="piste:difficulty" v="novice">
+            	<line class='piste-difficulty-novice'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="easy">
+            	<line class='piste-difficulty-easy'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="intermediate">
+            	<line class='piste-difficulty-intermediate'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="advanced">
+            	<line class='piste-difficulty-advanced'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="expert">
+            	<line class='piste-difficulty-expert'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="freeride">
+            	<line class='piste-difficulty-freeride'/>
+            </rule>
+            <rule e="way" k="piste:difficulty" v="~">
+            	<line class='piste-difficulty-other'/>
+            </rule>
+            <rule e="way" k="name|ref" v="*">
+                <!-- prefer to render name, otherwise render ref -->
+                <!-- text is rendered at 75%, refs at 25%, aerialway name at 50% -->
+                <rule e="way" k="name" v="~">
+                    <rule e="way" k="ref" v="*">
+                        <text k="ref" dy="2px" class="piste-downhill-ref" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                </rule>
+                <else>
+                    <rule e="way" k="ref" v="*">
+                        <text k="ref" dy="2px" class="piste-downhill-ref" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                    <rule e="way" k="name" v="*">
+                        <text k="name" dy="2px" class="piste-downhill-name" text-anchor="middle" startOffset="75%"/>
+                    </rule>
+                </else>
+            </rule>
+        </rule>
+        <rule e="way" k="piste:type" v="sled">
+            <line class="piste-type-sled"/>
+        </rule>
+        <rule e="way" k="piste:type" v="nordic">
+            <line class="piste-type-nordic"/>
+        </rule>
+        <rule e="way" k="man_made" v="piste:halfpipe">
+            <area class="man-made-piste-halfpipe"/>
+            <areaSymbol xlink:href="#symbol-man-made-halfpipe" width='7px' height='7px' transform='translate(-3.5,-3.5)' />
+        </rule>
+
+        <!-- Surface lifts (render over pistes) -->
+        <rule e="way" k="piste:lift" v="*">
+            <rule e="way" k="piste:lift" v="t-bar|j-bar|platter">
+                <line class="aerialway-line piste-lift-t-bar-marker"/>
+                <line smart-linecap="no" class='aerialway-struts'/>
+            </rule>
+            <rule e="way" k="piste:lift" v="rope_tow">
+                <line smart-linecap="no" class="piste-lift-rope-tow"/>
+            </rule>
+            <rule e="way" k="piste:lift" v="magic_carpet">
+                <line smart-linecap="no" class="piste-lift-magic-carpet"/>
+            </rule>
+            <rule e="way" k="name" v="*">
+                <text k="name" dx='0px' dy='-3px' class="aerialway-name" text-anchor='middle' startOffset='50%'/>
+            </rule>
+        </rule>
+
+        <!-- Aerialways (render over pistes) -->
         <rule e="node|way" k="aerialway" v="*">
-            <line class='aerialway-line'/>
-            <line class='aerialway-struts'/>
+            <rule e="way" k="aerialway" v="cable_car">
+                <line class="aerialway-line aerialway-cablecar-marker"/>
+            </rule>
+            <else>
+                <rule e="way" k="aerialway" v="gondola">
+                    <line class="aerialway-line aerialway-gondola-marker"/>
+                </rule>
+                <else>
+                    <rule e="way" k="aerialway" v="chair_lift">
+                        <rule e="way" k="piste:lift:occupancy" v="4|5|6">
+                            <line class="aerialway-line aerialway-chairlift4-marker"/>
+                        </rule>
+                        <else>
+                            <line class="aerialway-line aerialway-chairlift2-marker"/>
+                        </else>
+                    </rule>
+                    <else>
+                        <rule e="way" k="aerialway" v="mixed_lift">
+                            <line class="aerialway-line aerialway-mixedlift-marker"/>
+                        </rule>
+                        <else>
+                            <rule e="way" k="aerialway" v="*">
+                                <line class='aerialway-line'/>
+                            </rule>
+                        </else>
+                    </else>
+                </else>
+            </else>
+            <line smart-linecap="no" class='aerialway-struts'/>
+            <rule e="node" k="aerialway" v="station">
+                <circle r='0.75px' class="aerialway-station"/>
+            </rule>
+            <rule e="node" s="way" k="aerialway" v="*">
+                <rule e="node" k="ele" v="*">
+                    <text k="ele" dx="0px" dy="-2.5px" class="aerialway-elevation-text"/>
+                </rule>
+            </rule>
+            <rule e="way" k="name" v="*">
+                <text k="name" dx='0px' dy='-3px' class="aerialway-name" text-anchor='middle' startOffset='50%'/>
+            </rule>
         </rule>
 
+
 		<!-- Natural features -->
 		<rule e="node" k="natural" v="peak">
 			<symbol xlink:href="#symbol-peak" width='2px' height='2px' transform='translate(-1,-1)' />
@@ -2385,16 +2493,169 @@
             .aerialway-line {
                 fill: none;
                 stroke: #202020;
-                stroke-width: 0.2px;
+                stroke-width: 0.4px;
             }
 
+            .aerialway-cablecar-marker {
+                marker-start:url(#marker-cablecar);
+            }
+
+            .aerialway-gondola-marker {
+                marker-start:url(#marker-gondola);
+            }
+
+            .aerialway-chairlift2-marker {
+                marker-start:url(#marker-chair-lift-2);
+            }
+
+            .aerialway-chairlift4-marker {
+                marker-start:url(#marker-chair-lift-4);
+            }
+
+            .aerialway-mixedlift-marker {
+                marker-start:url(#marker-mixed-lift);
+            }
+
             .aerialway-struts {
                 fill: none;
                 stroke: #202020;
-                stroke-width: 2px;
-                stroke-dasharray: 0.2,10;
+                stroke-width: 4px;
+                stroke-dasharray: 0.2,20;
             }
 
+            .aerialway-station {
+                fill: black;
+                stroke: black;
+                stroke-width: 1px;
+            }
+
+            .aerialway-name {
+                fill: #606060;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 4px;
+                stroke: none;
+				text-anchor: middle;
+            }
+
+            .aerialway-elevation-text {
+                fill: #606060;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 3px;
+				text-anchor: middle;
+            }
+
+            /* surface lifts */
+
+            .piste-lift-t-bar-marker {
+                marker-start:url(#marker-piste-lift-t-bar);
+            }
+
+            .piste-lift-rope-tow {
+                fill: none;
+                stroke: #a47c41;
+                stroke-width: 0.5px;
+                stroke-dasharray: 1,1;
+                stroke-linecap: square;
+            }
+
+            .piste-lift-magic-carpet {
+                fill: none;
+                stroke: #101010;
+                stroke-width: 0.8px;
+            }
+
+            /* Piste maps */
+
+            .piste-difficulty-novice {
+                fill: none;
+                stroke: #00cd00;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-easy {
+                fill: none;
+                stroke: #0000cd;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-intermediate {
+                fill: none;
+                stroke: #cd0000;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-advanced {
+                fill: none;
+                stroke: #060606;
+                stroke-width: 5px;
+                opacity: 0.4;
+            }
+
+            .piste-difficulty-expert {
+                fill: none;
+                stroke: #f6800a;
+                stroke-width: 5px;
+                opacity: 0.45;
+            }
+
+            .piste-difficulty-freeride {
+                fill: none;
+                stroke: #f6dd0a;
+                stroke-width: 5px;
+                opacity: 0.40;
+            }
+
+            .piste-difficulty-other {
+                fill: none;
+                stroke: #505050;
+                stroke-width: 4px;
+                opacity: 0.4;
+            }
+
+            .piste-downhill-name {
+                fill: #ffffff;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 5px;
+				text-anchor: middle;
+            }
+
+            .piste-downhill-ref {
+                fill: #000000;
+                font-family: "DejaVu Sans";
+                font-weight: normal;
+                font-size: 5px;
+				text-anchor: middle;
+            }
+
+            .piste-type-sled {
+                fill: none;
+                /* stroke: #8040a0; */
+                stroke: #cdabde;
+                stroke-width: 2.5px;
+                marker-start:url(#marker-piste-type-sled);
+            }
+
+            .piste-type-nordic {
+                fill: none;
+                stroke: #c00000;
+                stroke-width: 1px;
+                stroke-dasharray: 3,0.5;
+                marker-start:url(#marker-piste-type-nordic);
+            }
+
+            .man-made-piste-halfpipe {
+                fill: #a0f0ff;
+                stroke: #00bcdf;
+                stroke-width: 0.4px;
+            }
+
+
             /* Power line */
             .power-line {
                 stroke-width: 0.1px;
