diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss index d3636ecde4..bea7198a07 100644 --- a/data/styles/clear/include/Roads_label.mapcss +++ b/data/styles/clear/include/Roads_label.mapcss @@ -331,17 +331,40 @@ line|z15-[aerialway=t-bar], line|z15-[aerialway=magic_carpet], line|z15-[aerialway=platter], line|z15-[aerialway=rope_tow], -{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: line;} +line|z15-[piste:type=downhill], +line|z15-[piste:type=nordic], +line|z15-[piste:type=sled], +{font-size: 9; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; text-position: line;} -/* 10.3 Piste & Route 14-22 ZOOM */ -/* -line[piste:type=downhill], -line[piste:type=nordic], -line[piste:type=sled] -{color: @piste;opacity: 1;} -line|z14[route=ski], -line|z14[leisure=skiing] -*/ +line|z16-17[aerialway=cable_car], +line|z16-17[aerialway=gondola], +line|z16-17[aerialway=mixed_lift], +line|z16-17[aerialway=chair_lift], +line|z16-17[aerialway=drag_lift], +line|z16-17[aerialway=j-bar], +line|z16-17[aerialway=t-bar], +line|z16-17[aerialway=magic_carpet], +line|z16-17[aerialway=platter], +line|z16-17[aerialway=rope_tow], +line|z16-17[piste:type=downhill], +line|z16-17[piste:type=nordic], +line|z16-17[piste:type=sled], +{font-size: 10;} + +line|z18-[aerialway=cable_car], +line|z18-[aerialway=gondola], +line|z18-[aerialway=mixed_lift], +line|z18-[aerialway=chair_lift], +line|z18-[aerialway=drag_lift], +line|z18-[aerialway=j-bar], +line|z18-[aerialway=t-bar], +line|z18-[aerialway=magic_carpet], +line|z18-[aerialway=platter], +line|z18-[aerialway=rope_tow], +line|z18-[piste:type=downhill], +line|z18-[piste:type=nordic], +line|z18-[piste:type=sled], +{font-size: 12;} /* 11. FERRY */ diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index 0301e95a79..746e1b45ec 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -389,15 +389,15 @@ building-has_parts # area z14- (also has captio building-train_station # area z14- (also has caption z16-) === 130 -piste:type-downhill # line z14- -piste:type-downhill-advanced # line z14- -piste:type-downhill-easy # line z14- -piste:type-downhill-expert # line z14- -piste:type-downhill-freeride # line z14- -piste:type-downhill-intermediate # line z14- -piste:type-downhill-novice # line z14- -piste:type-nordic # line z14- -piste:type-sled # line z14- +piste:type-downhill # line z14- (also has pathtext z15-) +piste:type-downhill-advanced # line z14- (also has pathtext z15-) +piste:type-downhill-easy # line z14- (also has pathtext z15-) +piste:type-downhill-expert # line z14- (also has pathtext z15-) +piste:type-downhill-freeride # line z14- (also has pathtext z15-) +piste:type-downhill-intermediate # line z14- (also has pathtext z15-) +piste:type-downhill-novice # line z14- (also has pathtext z15-) +piste:type-nordic # line z14- (also has pathtext z15-) +piste:type-sled # line z14- (also has pathtext z15-) === 120 building:part # area z16- diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 3ad10e90b6..1a271a8312 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -469,16 +469,6 @@ amenity-pub # icon z15- (also has captio barrier-border_control # icon z15- (also has caption(optional) z15-) === 3900 -aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) -aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) -aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) -aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-) shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) === 3850 @@ -670,6 +660,16 @@ amenity-fountain # icon z16- (also has captio highway-raceway # pathtext z16- (also has line z14-) === 3050 +aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) +aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) +aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) +aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) +aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) +aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) +aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) +aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-) +aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-) +aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-) highway-residential # pathtext z13- (also has shield::shield z15-, line z12-) highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-) highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) @@ -719,6 +719,15 @@ highway-footway-tunnel # pathtext z15- (also has li highway-tertiary_link # pathtext z18- (also has line z15-) highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-) +piste:type-downhill # pathtext z15- (also has line z14-) +piste:type-downhill-advanced # pathtext z15- (also has line z14-) +piste:type-downhill-easy # pathtext z15- (also has line z14-) +piste:type-downhill-expert # pathtext z15- (also has line z14-) +piste:type-downhill-freeride # pathtext z15- (also has line z14-) +piste:type-downhill-intermediate # pathtext z15- (also has line z14-) +piste:type-downhill-novice # pathtext z15- (also has line z14-) +piste:type-nordic # pathtext z15- (also has line z14-) +piste:type-sled # pathtext z15- (also has line z14-) === 2950 historic-mine # icon z15- (also has caption(optional) z15-)