diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index e67702fbbf..096d5f83a7 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -45,18 +45,18 @@ area|z10-[place=islet] /* 3.BOUNDARIES */ line|z2-[boundary=administrative] -{color: @border_country;opacity: 1;} +{color: @border_country;opacity: 0.7;} line|z4[boundary=administrative][admin_level=3], line|z5-[boundary=administrative][admin_level=4] -{color: @border_region;opacity: 1;} +{color: @border_region;opacity: 0.7;} /* 3.1 Country */ line|z2[boundary=administrative][admin_level=2] -{width: 0.5;opacity: 0.7;} +{width: 0.5;opacity: 0.5;} line|z3[boundary=administrative][admin_level=2] -{width: 0.5;opacity: 0.8;} +{width: 0.5;opacity: 0.6;} line|z4[boundary=administrative][admin_level=2] {width: 0.6;} line|z5[boundary=administrative][admin_level=2] @@ -226,7 +226,7 @@ line|z13-[waterway=stream], line|z13-[waterway=canal], line|z13-[waterway=fish_pass], line|z13-[natural=strait], -{opacity: 1; color: @river;} +{opacity: 0.7; color: @river;} /* 6.1 Area water(lake,pond etc.) */ @@ -302,12 +302,12 @@ node|z16-[waterway=lock_gate], line|z13-[waterway=ditch], line|z13-[waterway=drain], -{opacity: 1; color: @water_bad; width: 1.5; dashes: 2.7,2.7;} +{opacity: 0.7; color: @water_bad; width: 1.5; dashes: 2.7,2.7;} line|z16-[waterway=ditch], line|z16-[waterway=drain], {width: 3;} -/* Do not draw tunnel waterways */ +/* Do not draw tunnel waterways */ line[waterway][tunnel] {width: 0;} @@ -474,11 +474,11 @@ area|z14-[man_made=bridge], line|z14-[man_made=pier], line|z14-[man_made=breakwater], -{width: 1.5;color: @background;opacity: 1;} +{width: 1.5;color: @background; opacity: 0.7;} line|z14-[waterway=dam], line|z14-[waterway=weir], -{width: 1.5;color: @building_dark;opacity: 0.7;} +{width: 1.5;color: @building_dark; opacity: 0.5;} line|z15[man_made=pier], line|z15[man_made=breakwater], @@ -511,7 +511,7 @@ line|z19-[waterway=weir], {width: 8;} line|z14-[man_made=cutline], -{width: 1;color: @green0;opacity: 0.6;} +{width: 1;color: @green0; opacity: 0.4;} line|z15[man_made=cutline], {width: 1.5;} line|z16[man_made=cutline], @@ -551,23 +551,23 @@ area|z17-[waterway=dam], line|z16-[barrier=fence], line|z16-[barrier=wall], -{color: @fence; width: 1; opacity: 0.7;} +{color: @fence; width: 1; opacity: 0.5;} line|z17[barrier=fence], line|z17[barrier=wall], -{width: 1.3; opacity: 0.8;} +{width: 1.3; opacity: 0.6;} line|z18-[barrier=fence], line|z18-[barrier=wall], -{width: 1.5; opacity: 1;} +{width: 1.5; opacity: 0.8;} line|z16-[barrier=hedge], -{color: @hedge; width: 1.6; opacity: 0.6;} +{color: @hedge; width: 1.6; opacity: 0.4;} line|z17[barrier=hedge], -{width: 2.2; opacity: 0.7;} +{width: 2.2; opacity: 0.5;} line|z18[barrier=hedge], -{width: 3; opacity: 0.8;} +{width: 3; opacity: 0.7;} line|z19-[barrier=hedge], -{width: 4; opacity: 1;} +{width: 4; opacity: 0.8;} /* @@ -581,7 +581,7 @@ line|z19-[barrier=hedge], line|z14-[barrier=city_wall], line|z14-[historic=citywalls], -{color: @building_dark; width: 2; opacity: 1;} +{color: @building_dark; width: 2; opacity: 0.7;} line|z15[barrier=city_wall], line|z15[historic=citywalls], {width: 2.8;} @@ -601,30 +601,30 @@ line|z19-[historic=citywalls], line|z14-[natural=cliff], line|z14-[natural=earth_bank], -{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.6;} +{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.4;} line|z15[natural=cliff], line|z15[natural=earth_bank], -{width: 3; dashes: 1.5,1.5; opacity: 0.6;} +{width: 3; dashes: 1.5,1.5;} line|z16[natural=cliff], line|z16[natural=earth_bank], -{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.6;} +{width: 6.2; dashes: 3,3.5,4.5,1.2;} line|z17[natural=cliff], line|z17[natural=earth_bank], -{width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.6;} +{width: 7.4; dashes: 3.5,5,6,1.4;} line|z18[natural=cliff], line|z18[natural=earth_bank], -{width: 9.5; dashes: 4,6,8,1.5; opacity: 0.7;} +{width: 9.5; dashes: 4,6,8,1.5; opacity: 0.5;} line|z19-[natural=cliff], line|z19-[natural=earth_bank], -{width: 11.9; dashes: 5,7,10,1.9; opacity: 0.7;} +{width: 11.9; dashes: 5,7,10,1.9; opacity: 0.5;} line|z16-[barrier=ditch], -{width: 1.8;opacity: 1;color: @cliff;dashes: 0.9,0.9;} +{width: 1.8; opacity: 0.7; color: @cliff; dashes: 0.9,0.9;} line|z16-[barrier=retaining_wall], -{color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 1;} +{color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 0.7;} line|z17[barrier=retaining_wall], {width: 3.2; dashes: 4,2,2,1.2;} line|z18-[barrier=retaining_wall], @@ -632,7 +632,7 @@ line|z18-[barrier=retaining_wall], line|z16-[man_made=embankment], -{color: @building_dark; width: 3.5; dashes: 4,2,2,1.5; opacity: 1;} +{color: @building_dark; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.7;} line|z17[man_made=embankment], {width: 5; dashes: 6,3,3,2;} line|z18-[man_made=embankment], @@ -656,41 +656,44 @@ line|z15-[isoline=zero], line|z15-[isoline=step_10], {color: @isoline10;} -line|z11-[isoline=step_1000], -{width: 1.3;opacity: 0.8;} + +line|z11[isoline=step_1000], +{width: 0.8; opacity: 0.4;} line|z11[isoline=step_500], -{width: 1.0;opacity: 0.5;} +{width: 0.8; opacity: 0.2;} -line|z12[isoline=step_500], -{width: 1.3;opacity: 0.6;} -line|z12[isoline=step_100], -{width: 0.9;opacity: 0.3;} +line|z12-13[isoline=step_1000], +{width: 1.0; opacity: 0.4;} +line|z12-13[isoline=step_500], +{width: 0.8; opacity: 0.35;} +line|z12-13[isoline=step_100], +{width: 0.8; opacity: 0.2;} -line|z13-[isoline=step_500], -{width: 1.3;opacity: 0.8;} -line|z13[isoline=step_100], -{width: 1.0;opacity: 0.5;} +line|z14-[isoline=step_1000], +{width: 1.2; opacity: 0.5;} +line|z14-15[isoline=step_500], +{width: 1.0; opacity: 0.4;} +line|z14-15[isoline=step_100], +{width: 0.8; opacity: 0.35;} +line|z14-15[isoline=step_50], +{width: 0.8; opacity: 0.2;} -line|z14[isoline=step_100], -{width: 1.3;opacity: 0.6;} -line|z14[isoline=step_50], -{width: 0.9;opacity: 0.3;} +line|z15[isoline=zero], +line|z15[isoline=step_10], +{width: 0.8; opacity: 0.2;} -line|z15-16[isoline=step_100], -{width: 1.3;opacity: 0.8;} -line|z15-16[isoline=step_50], -line|z15-16[isoline=zero], -line|z15-16[isoline=step_10], -{width: 1.0;opacity: 0.5;} - -line|z17-[isoline=step_100], -{width: 1.3;opacity: 0.8;} -line|z17[isoline=step_50], -line|z17[isoline=zero], -line|z17[isoline=step_10], -{width: 1.0;opacity: 0.6;} +line|z16-[isoline=step_500], +{width: 1.2; opacity: 0.5;} +line|z16-[isoline=step_100], +{width: 1.0; opacity: 0.4;} +line|z16-17[isoline=step_50], +{width: 0.8; opacity: 0.35;} +line|z16-17[isoline=zero], +line|z16-17[isoline=step_10], +{width: 0.8; opacity: 0.35;} line|z18-[isoline=step_50], +{width: 1.0; opacity: 0.4;} line|z18-[isoline=zero], line|z18-[isoline=step_10], -{width: 1.3;opacity: 0.8;} +{width: 0.8; opacity: 0.4;} diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index 0a1363b982..1d330f4fea 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -28,7 +28,7 @@ 8.2 Pedestrian & ford tunnel 16-22 ZOOM 8.3 Pedestrian & other brige 13-22 ZOOM 8.4 Cycleway 13-22 ZOOM - 8.5 Construction & Proposed 13-22 ZOOM + 8.5 Construction 13-22 ZOOM 8.6 Track & Path 14-22 ZOOM 8.7 Footway 15-22 ZOOM 8.8 Steps 15-22 ZOOM @@ -75,28 +75,28 @@ line|z9[highway=world_level] line|z7-[highway=trunk], line|z7-[highway=motorway], -{color: @trunk_orange_medium;opacity: 1;} +{color: @trunk_orange_medium; opacity: 0.7;} line|z10-[highway=trunk], line|z10-[highway=motorway], line|z10-[highway=motorway_link], line|z10-[highway=trunk_link], -{color: @trunk_orange_light;opacity: 1;} +{color: @trunk_orange_light; opacity: 0.7;} line|z12-[highway=motorway][tunnel?], line|z12-[highway=trunk][tunnel?], line|z12-[highway=motorway_link][tunnel?], line|z12-[highway=trunk_link][tunnel?], -{casing-width: 1;casing-linecap: butt;casing-color:@trunk_tunnel_casing;} +{casing-width: 1; casing-linecap: butt; casing-color: @trunk_tunnel_casing; casing-opacity: 0.7;} line|z13-[highway=motorway][bridge?]::bridgewhite, line|z13-[highway=trunk][bridge?]::bridgewhite, line|z14-[highway=motorway_link][bridge?]::bridgewhite, line|z14-[highway=trunk_link][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt; casing-color: @bridge_background; casing-opacity: 0.8;} line|z13-[highway=motorway][bridge?]::bridgeblack, line|z13-[highway=trunk][bridge?]::bridgeblack, line|z14-[highway=motorway_link][bridge?]::bridgeblack, line|z14-[highway=trunk_link][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt; casing-color: @bridge_casing; casing-opacity: 0.7;} /* 3.1 Trunk & Motorway 7-22 ZOOM */ @@ -109,6 +109,7 @@ line|z8[highway=motorway] line|z9[highway=trunk], line|z9[highway=motorway] {width: 1.2;} + line|z10[highway=trunk], line|z10[highway=motorway] {width: 1.5;} @@ -139,52 +140,52 @@ line|z14[highway=motorway], line|z14[highway=motorway_link], line|z14[highway=trunk_link] {width: 2.0;} -line|z15[highway=trunk], -line|z15[highway=motorway], -{width: 4.8;} +line|z15-[highway=trunk], +line|z15-[highway=motorway], +{width: 4.4; opacity: 1;} line|z15[highway=motorway_link], line|z15[highway=trunk_link] {width: 2.4;} line|z16[highway=trunk], line|z16[highway=motorway], -{width: 6;} +{width: 5.5;} line|z16[highway=motorway_link], line|z16[highway=trunk_link] {width: 3;} line|z17[highway=trunk], line|z17[highway=motorway], -{width: 9;} +{width: 8.2;} line|z17[highway=motorway_link], line|z17[highway=trunk_link] {width: 4.5;} line|z18[highway=trunk], line|z18[highway=motorway], -{width: 12;} -line|z18[highway=motorway_link], -line|z18[highway=trunk_link] -{width: 6;} +{width: 11;} +line|z18-[highway=motorway_link], +line|z18-[highway=trunk_link] +{width: 5.6; opacity: 1;} line|z19-[highway=trunk], line|z19-[highway=motorway], -{width: 15;} +{width: 13.5;} line|z19-[highway=motorway_link], line|z19-[highway=trunk_link] -{width: 7.5;} +{width: 6.8;} /* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */ line|z12[highway=motorway][tunnel?], line|z12[highway=trunk][tunnel?] -{color: @trunk_tunnel_orange;opacity: 1;casing-width: 0.5;casing-dashes: 2,2;} +{color: @trunk_tunnel_orange; opacity: 0.7; casing-width: 0.5; casing-dashes: 2,2;} line|z13-14[highway=motorway][tunnel?], line|z13-14[highway=trunk][tunnel?], line|z13-14[highway=motorway_link][tunnel?], line|z13-14[highway=trunk_link][tunnel?] -{color: @trunk_tunnel_orange;casing-dashes: 5,5;} +{color: @trunk_tunnel_orange; opacity: 0.7; casing-dashes: 5,5;} line|z15-[highway=motorway][tunnel?], line|z15-[highway=trunk][tunnel?], line|z15-[highway=motorway_link][tunnel?], line|z15-[highway=trunk_link][tunnel?] -{casing-dashes: 5,5;} +{casing-dashes: 5,5; opacity: 1;} /* 3.3 Trunk & Motorway bridge 13-22 ZOOM */ @@ -226,22 +227,22 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack /* 4.PRIMARY 8-22 ZOOM */ line|z8-10[highway=primary], -{color: @primary_orange;opacity: 1;} +{color: @primary_orange; opacity: 0.7;} line|z11-14[highway=primary], line|z11-14[highway=primary_link] -{color: @primary_orange_medium;opacity: 1;} +{color: @primary_orange_medium; opacity: 0.7;} line|z15-[highway=primary], line|z15-[highway=primary_link] -{color: @primary_orange_light;opacity: 1;} +{color: @primary_orange_light; opacity: 0.7;} line|z14-[highway=primary][tunnel?], line|z14-[highway=primary_link][tunnel?] -{casing-width: 1;casing-linecap: butt;casing-color: @primary_tunnel_casing;} +{casing-width: 1;casing-linecap: butt;casing-color: @primary_tunnel_casing;casing-opacity: 0.7;} line|z14-[highway=primary][bridge?]::bridgewhite, line|z14-[highway=primary_link][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;} line|z14-[highway=primary][bridge?]::bridgeblack, line|z14-[highway=primary_link][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} /* 4.1 Primary 8-22 ZOOM */ @@ -263,30 +264,30 @@ line|z13[highway=primary_link] line|z14[highway=primary], line|z14[highway=primary_link] {width: 3.2;} -line|z15[highway=primary], -line|z15[highway=primary_link] -{width: 4.2;} +line|z15-[highway=primary], +line|z15-[highway=primary_link] +{width: 3.8; opacity: 1;} line|z16[highway=primary], line|z16[highway=primary_link] -{width: 4.8;} +{width: 4.4;} line|z17[highway=primary], line|z17[highway=primary_link] -{width: 7;} +{width: 6.6;} line|z18[highway=primary], line|z18[highway=primary_link] -{width: 10;} +{width: 9.4;} line|z19-[highway=primary], line|z19-[highway=primary_link] -{width: 13;} +{width: 11.6;} /* 4.2 Primary tunnel 14-22 ZOOM */ line|z14[highway=primary][tunnel?], line|z14[highway=primary_link][tunnel?] -{color: @primary_tunnel_orange;casing-dashes: 5,5;} +{color: @primary_tunnel_orange; casing-dashes: 5,5; opacity: 0.7;} line|z15-[highway=primary][tunnel?], line|z15-[highway=primary_link][tunnel?] -{casing-dashes: 5,5;} +{casing-dashes: 5,5; opacity: 1;} /* 4.3 Primary bridge 14-22 ZOOM */ @@ -314,16 +315,16 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack, line|z10-[highway=secondary], line|z13-[highway=secondary_link] -{color: @secondary;opacity: 1;} +{color: @secondary;opacity: 0.8;} line|z16-[highway=secondary][tunnel?], line|z16-[highway=secondary_link][tunnel?] -{casing-width: 1;casing-linecap: butt;casing-color: @secondary_tunnel_casing;} +{casing-width: 1;casing-linecap: butt;casing-color: @secondary_tunnel_casing;casing-opacity: 0.7;} line|z14-[highway=secondary][bridge?]::bridgewhite, line|z14-[highway=secondary_link][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;} line|z14-[highway=secondary][bridge?]::bridgeblack, line|z14-[highway=secondary_link][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} /* 5.1 Secondary 10-22 ZOOM */ @@ -341,28 +342,28 @@ line|z14[highway=secondary_link] {width: 3;} line|z15[highway=secondary], line|z15[highway=secondary_link] -{width: 4;} -line|z16[highway=secondary], -line|z16[highway=secondary_link] -{width: 4.8;} +{width: 3.9;} +line|z16-[highway=secondary], +line|z16-[highway=secondary_link] +{width: 4.4; opacity: 1;} line|z17[highway=secondary], line|z17[highway=secondary_link] -{width: 7;} +{width: 6.6;} line|z18[highway=secondary], line|z18[highway=secondary_link] -{width: 10;} +{width: 9.4;} line|z19-[highway=secondary], line|z19-[highway=secondary_link] -{width: 13;} +{width: 11.6;} /* 5.2 Secondary tunnel 16-22 ZOOM */ line|z16-17[highway=secondary][tunnel?], line|z16-17[highway=secondary_link][tunnel?] -{casing-dashes: 5,5;} +{casing-dashes: 5,5; opacity: 1;} line|z18-[highway=secondary][tunnel?], line|z18-[highway=secondary_link][tunnel?] -{color: @secondary_tunnel;casing-dashes: 5,5;} +{color: @secondary_tunnel;casing-dashes: 5,5; opacity: 1;} /* 5.3 Secondary bridge 14-22 ZOOM */ @@ -391,19 +392,19 @@ line|z18-[highway=secondary_link][bridge?]::bridgeblack line|z12-[highway=residential], line|z11-[highway=tertiary], line|z14-[highway=tertiary_link], -{color: @residential; opacity: 1;} +{color: @residential; opacity: 0.85;} line|z16-[highway=tertiary][tunnel?], line|z16-[highway=residential][tunnel?], line|z16-[highway=tertiary_link][tunnel?], -{color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;} +{color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;casing-opacity: 0.7;} line|z14-[highway=tertiary][bridge?]::bridgewhite, line|z14-[highway=residential][bridge?]::bridgewhite, line|z14-[highway=tertiary_link][bridge?]::bridgewhite -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;} line|z14-[highway=tertiary][bridge?]::bridgeblack, line|z14-[highway=residential][bridge?]::bridgeblack, line|z14-[highway=tertiary_link][bridge?]::bridgeblack -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} /* 6.1 Residential & Tertiary 11-22 ZOOM */ @@ -419,30 +420,34 @@ line|z15[highway=tertiary_link] line|z15[highway=residential], line|z15[highway=tertiary], line|z15[highway=tertiary_link] -{width: 3.2;} +{width: 3;} line|z16[highway=residential], line|z16[highway=tertiary], line|z16[highway=tertiary_link] -{width: 4.4;} -line|z17[highway=residential], -line|z17[highway=tertiary], -line|z17[highway=tertiary_link] -{width: 6;} +{width: 4.2;} +line|z17-[highway=residential], +line|z17-[highway=tertiary], +line|z17-[highway=tertiary_link] +{width: 5.5; opacity: 1;} line|z18[highway=residential], line|z18[highway=tertiary], line|z18[highway=tertiary_link] -{width: 9;} +{width: 8.2;} line|z19-[highway=residential], line|z19-[highway=tertiary], line|z19-[highway=tertiary_link] -{width: 12;} +{width: 10.4;} /* 6.2 Residential & Tertiary tunnel 16-22 ZOOM */ -line|z16-[highway=tertiary][tunnel?], -line|z16-[highway=residential][tunnel?], -line|z16-[highway=tertiary_link][tunnel?], -{casing-dashes: 5,5;} +line|z16[highway=tertiary][tunnel?], +line|z16[highway=residential][tunnel?], +line|z16[highway=tertiary_link][tunnel?], +{casing-dashes: 5,5; opacity: 0.85;} +line|z17-[highway=tertiary][tunnel?], +line|z17-[highway=residential][tunnel?], +line|z17-[highway=tertiary_link][tunnel?], +{casing-dashes: 5,5; opacity: 1;} /* 6.3 Residential & Tertiary bridge 14-22 ZOOM */ @@ -482,14 +487,14 @@ line|z14-[aeroway=taxiway], line|z15-[highway=service], line|z15-[highway=service][service=busway], line|z15-[highway=busway], -{color: @unclassified; opacity: 1;} +{color: @unclassified; opacity: 0.85;} line|z16-[highway=unclassified][tunnel?], line|z16-[highway=living_street][tunnel?], -{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;} +{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;casing-opacity: 0.7;} line|z14-[highway=unclassified][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.85;} line|z14-[highway=unclassified][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} /* 7.1 Road, Street, Unclassified 12-22 ZOOM */ line|z11[highway=unclassified] @@ -514,18 +519,18 @@ line|z16[highway=unclassified], line|z16[highway=road], line|z16[highway=living_street] {width: 4;} -line|z17[highway=unclassified], -line|z17[highway=road], -line|z17[highway=living_street] -{width: 6;} -line|z18[highway=unclassified], -line|z18[highway=road], -line|z18[highway=living_street] -{width: 9;} +line|z17-[highway=unclassified], +line|z17-[highway=road], +line|z17-[highway=living_street] +{width: 5.4; opacity: 1;} +line|z18-[highway=unclassified], +line|z18-[highway=road], +line|z18-[highway=living_street] +{width: 8;} line|z19-[highway=unclassified], line|z19-[highway=road], line|z19-[highway=living_street] -{width: 12;} +{width: 10;} /* 7.2 Road, Street, Unclassified tunnel 16-22 ZOOM */ @@ -578,11 +583,11 @@ line|z19-[highway=busway], line|z13-[highway=pedestrian], line|z13-[highway=ford] -{color: @pedestrian;opacity: 1;} +{color: @pedestrian;opacity: 0.85;} line|z13-[highway=cycleway] -{color: @cycleway;opacity: 1;} +{color: @cycleway;opacity: 0.7;} line|z13-[highway=construction], -{color: @construction;opacity: 1;} +{color: @construction;opacity: 0.7;} line|z13-[highway=pedestrian][bridge?]::bridgewhite, line|z15-[highway=footway][bridge?]::bridgewhite, line|z15-[highway=cycleway][bridge?]::bridgewhite, @@ -592,7 +597,7 @@ line|z15-[highway=bridleway][bridge?]::bridgewhite, line|z15-[highway=steps][bridge?]::bridgewhite, line|z16-[highway=road][bridge?]::bridgewhite, line|z16-[highway=service][bridge?]::bridgewhite -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;} line|z13-[highway=pedestrian][bridge?]::bridgeblack, line|z17-[highway=footway][bridge?]::bridgeblack, line|z17-[highway=cycleway][bridge?]::bridgeblack, @@ -602,29 +607,31 @@ line|z17-[highway=bridleway][bridge?]::bridgeblack, line|z17-[highway=steps][bridge?]::bridgeblack, line|z16-[highway=road][bridge?]::bridgeblack, line|z16-[highway=service][bridge?]::bridgeblack -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} line|z14-[highway=track], +{color: @track;opacity: 0.6;} line|z14-[highway=raceway], -{color: @track;opacity: 1;} +{color: @track;opacity: 0.7;} line|z15-[leisure=track][!area], -{color: @sport;opacity: 1;} +{color: @sport;opacity: 0.7;} line|z14-[highway=path], line|z14-[highway=footway][sac_scale], -{color: @path;opacity: 1;} +{color: @path;opacity: 0.6;} line|z14-[highway=bridleway] -{color: @bridleway;opacity: 1;} +{color: @bridleway;opacity: 0.6;} line|z15-[highway=footway], -line|z15-[highway=steps] -{color: @footway;opacity: 1;} +{color: @footway;opacity: 0.75;} +line|z15-[highway=steps], +{color: @footway;opacity: 0.85;} line|z16-[highway=pedestrian][tunnel?] -{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;} +{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing; casing-opacity: 0.7;} line|z17-[highway=footway][tunnel?]::tunnelBackground, line|z17-[highway=cycleway][tunnel?]::tunnelBackground, line|z17-[highway=path][tunnel?]::tunnelBackground, line|z17-[highway=track][tunnel?]::tunnelBackground, line|z17-[highway=bridleway][tunnel?]::tunnelBackground, line|z17-[highway=steps][tunnel?]::tunnelBackground, -{casing-color: @bridge_background;} +{casing-color: @bridge_background;casing-opacity: 0.7;} line|z17-[highway=footway][tunnel?]::tunnelCasing, line|z17-[highway=cycleway][tunnel?]::tunnelCasing, line|z17-[highway=path][tunnel?]::tunnelCasing, @@ -634,6 +641,7 @@ line|z17-[highway=steps][tunnel?]::tunnelCasing, { casing-color: @bridge_casing; casing-dashes: 2,2; + casing-opacity: 0.7; } /* 8.1 Pedestrian & ford 13-22 ZOOM */ @@ -655,10 +663,10 @@ line|z17[highway=ford] {width: 3;dashes: 5,2;} line|z18[highway=pedestrian], line|z18[highway=ford] -{width: 4;dashes: 7,3;} +{width: 4;dashes: 7,3;opacity: 1;} line|z19-[highway=pedestrian], line|z19-[highway=ford] -{width: 5;dashes: 16.2,8.1;} +{width: 5;dashes: 16.2,8.1;opacity: 1;} /* 8.2 Pedestrian & ford tunnel 16-22 ZOOM */ @@ -696,9 +704,9 @@ line|z16[highway=cycleway] line|z17[highway=cycleway] {width: 1.8;} line|z18[highway=cycleway] -{width: 2;} +{width: 2; opacity: 0.9;} line|z19-[highway=cycleway] -{width: 2.2;} +{width: 2.2; opacity: 0.9;} line|z17[highway=cycleway][tunnel?]::tunnelBackground {casing-width-add: 1;} @@ -728,7 +736,7 @@ line|z18[highway=cycleway][bridge?]::bridgeblack line|z19-[highway=cycleway][bridge?]::bridgeblack {casing-width-add: 3;} -/* 8.5 Construction & Proposed 13-22 ZOOM */ +/* 8.5 Construction 13-22 ZOOM */ line|z13[highway=construction], {width: 1.2;dashes: 3.6,1.8;} @@ -761,11 +769,11 @@ line|z16[leisure=track][!area] line|z17-18[highway=track][tracktype=grade1], line|z17-18[highway=raceway], line|z17-18[leisure=track][!area] -{width:3;} +{width:3; opacity: 0.8;} line|z19-[highway=track][tracktype=grade1], line|z19-[highway=raceway], line|z19-[leisure=track][!area] -{width:4;} +{width:4; opacity: 0.8;} line|z14[highway=track], {width: 1.1; dashes: 6,2.5;} @@ -776,9 +784,9 @@ line|z16[highway=track], line|z17[highway=track], {width: 2.5; dashes: 7,3;} line|z18[highway=track], -{width: 3.5; dashes: 9,3.5;} +{width: 3.3; dashes: 9,3.5; opacity: 0.8;} line|z19-[highway=track], -{width: 4.5; dashes: 12,3.5;} +{width: 4.2; dashes: 12,3.5; opacity: 0.8;} line|z14[highway=path], line|z14[highway=footway][sac_scale], @@ -794,10 +802,10 @@ line|z17[highway=footway][sac_scale], {width: 2; dashes: 4,2.5;} line|z18[highway=path], line|z18[highway=footway][sac_scale], -{width: 3; dashes: 6,3.5;} +{width: 2.8; dashes: 6,3.5; opacity: 0.8;} line|z19-[highway=path], line|z19-[highway=footway][sac_scale], -{width: 4; dashes: 8,4.5;} +{width: 3.7; dashes: 8,4.5; opacity: 0.8;} line|z17-[highway=path][tunnel?]::tunnelBackground {casing-width-add: 0.5;} @@ -829,9 +837,9 @@ line|z16[highway=footway] line|z17[highway=footway] {width: 2.4; dashes: 6,2.5;} line|z18[highway=footway] -{width: 3.4; dashes: 8,3;} +{width: 3.2; dashes: 8,3; opacity: 1;} line|z19-[highway=footway], -{width: 4.5; dashes: 10,3.5;} +{width: 4.2; dashes: 10,3.5; opacity: 1;} line|z17-[highway=footway][tunnel?]::tunnelBackground {casing-width-add: 0.5;} @@ -846,15 +854,15 @@ line|z17-[highway=footway][bridge?]::bridgeblack /* 8.8 Steps 15-22 ZOOM */ line|z15[highway=steps] -{width: 2.2;dashes: 1.5,1.5;} +{width: 2.4; dashes: 1.5,1.3;} line|z16[highway=steps] -{width: 4;dashes: 1.8,1.8;} -line|z17[highway=steps] -{width: 6;dashes: 2.5,2.5;} +{width: 4; dashes: 1.8,1.6;} +line|z17-[highway=steps] +{width: 6; dashes: 2.5,2.2; opacity: 1;} line|z18[highway=steps] -{width: 8;dashes: 3.2,3.2;} +{width: 8; dashes: 3.2,2.8;} line|z19-[highway=steps] -{width: 10;dashes: 4,4;} +{width: 10; dashes: 4,3.5;} line|z17-[highway=steps][tunnel?]::tunnelBackground {casing-width: 0.5;} @@ -908,33 +916,33 @@ line|z17-[highway=bridleway][bridge?]::bridgeblack /* 8.11 Runway 12-22 ZOOM */ line|z12[aeroway=runway] -{width: 1; opacity: 0.5;} +{width: 1; opacity: 0.4;} line|z13[aeroway=runway] -{width: 1.5; opacity: 0.8;} +{width: 1.5; opacity: 0.5;} line|z14-15[aeroway=runway] -{width: 2.4;} +{width: 2.4; opacity: 0.7;} line|z16-[aeroway=runway] -{width: 4;} +{width: 3.5;} line|z14[aeroway=taxiway] -{width: 0.6;opacity: 0.6;} +{width: 0.6; opacity: 0.4;} line|z15-[aeroway=taxiway] -{width: 1.2; opacity: 0.6;} +{width: 1.2; opacity: 0.5;} /* 9.RAIL 11-22 ZOOM */ line|z11-[railway=rail], -{color: @railway_light; opacity: 1;} +{color: @railway_light; opacity: 0.7;} line|z16-[railway=rail]::dash, -{color: @railway_dash; opacity:1;} +{color: @railway_dash; opacity: 1;} line|z10-[railway=rail][highspeed?], line|z10-[railway=rail][usage=main], line|z11-[railway=rail][usage=branch], -{color: @railway; opacity: 1;} +{color: @railway; opacity: 0.7;} line|z10-[railway=rail][usage=tourism], -{color: @railway_tourism; opacity: 1;} +{color: @railway_tourism; opacity: 0.7;} line|z16-[railway=rail][highspeed?]::dash, line|z16-[railway=rail][usage=main]::dash, @@ -945,7 +953,7 @@ line|z16-[railway=rail][usage=branch]::dash, line|z13-[railway=rail][usage=utility], line|z15-[railway=rail][service=spur], line|z16-[railway=rail][service=service], -{color: @railway_light; opacity: 1;} +{color: @railway_light; opacity: 0.7;} line|z17-[railway=rail][usage=utility]::dash, line|z17-[railway=rail][service=spur]::dash, line|z17-[railway=rail][service=service]::dash, @@ -959,31 +967,31 @@ line|z15-[railway=construction], line|z15-[railway=preserved], line|z16-[railway=disused], line|z16-[railway=abandoned], -{color: @railway;opacity:1;} +{color: @railway; opacity: 0.7;} line|z13-[railway=light_rail][!tunnel], line|z13-[railway=subway][!tunnel], -{color: @railway_light; opacity:1;} +{color: @railway_light; opacity: 0.7;} line|z13-[railway=tram] -{color: @tram;opacity:1;} +{color: @tram;} line|z16-[railway=subway][!tunnel]::dash, line|z16-[railway=light_rail][!tunnel]::dash, -{color: @railway_dash;opacity:1;} +{color: @railway_dash; opacity: 1;} line|z13-[railway=rail][bridge?]::bridgewhite, line|z13-[railway=subway][bridge?]::bridgewhite, line|z13-[railway=light_rail][bridge?]::bridgewhite, line|z15-[railway=preserved][bridge?]::bridgewhite, line|z16-[railway=abandoned][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;} line|z16-[railway=rail][bridge?]::bridgeblack, line|z16-[railway=subway][bridge?]::bridgeblack, line|z16-[railway=light_rail][bridge?]::bridgeblack, line|z16-[railway=preserved][bridge?]::bridgeblack, line|z16-[railway=abandoned][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} /* 9.1 RAIL 11-22 ZOOM */ @@ -998,7 +1006,7 @@ line|z15[railway=rail], line|z16[railway=rail], {width: 2.6;} line|z17-[railway=rail], -{width: 3;} +{width: 3; opacity: 1;} line|z16[railway=rail]::dash, {width: 1.3; dashes: 4.5,4.5;} @@ -1066,7 +1074,7 @@ line|z17[railway=rail][usage=branch], line|z17[railway=rail][usage=utility], line|z17[railway=rail][service=spur], line|z17[railway=rail][service=service], -{width: 3;} +{width: 2.9; opacity: 1;} line|z18-[railway=rail][highspeed?], line|z18-[railway=rail][usage=main], line|z18-[railway=rail][usage=tourism], @@ -1074,7 +1082,7 @@ line|z18-[railway=rail][usage=branch], line|z18-[railway=rail][usage=utility], line|z18-[railway=rail][service=spur], line|z18-[railway=rail][service=service], -{width: 3.6;} +{width: 3.4; opacity: 1;} line|z16[railway=rail][highspeed?]::dash, @@ -1118,7 +1126,7 @@ line|z16[railway=light_rail][!tunnel], {width: 2.6;} line|z17-[railway=subway][!tunnel], line|z17-[railway=light_rail][!tunnel], -{width: 3;} +{width: 2.9; opacity: 1;} line|z16[railway=subway][!tunnel]::dash, line|z16[railway=light_rail][!tunnel]::dash, @@ -1142,7 +1150,7 @@ line|z16-[railway=disused], /* 9.2 Rail tunnel 14-22 ZOOM */ line|z14-[railway=rail][tunnel?], -{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;} +{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;casing-opacity: 0.7;} /* 9.3 Rail bridge 14-22 ZOOM */ @@ -1219,18 +1227,18 @@ line|z15-16[railway=narrow_gauge] {width: 1.2;} line|z17-[railway=monorail], line|z17-[railway=narrow_gauge] -{width: 2;} +{width: 2; opacity: 1;} /* 9.5 Tram line 13-22 ZOOM */ line|z13-14[railway=tram] -{width: 0.6;opacity:0.6;} +{width: 0.6; opacity: 0.5;} line|z15[railway=tram] -{width: 0.7;opacity:0.8;} +{width: 0.7; opacity: 0.7;} line|z16[railway=tram] -{width: 0.8;opacity:0.9;} +{width: 0.8; opacity: 0.8;} line|z17-[railway=tram] -{width: 1;} +{width: 1; opacity: 1;} /* 9.6 Funicular 12-22 ZOOM */ @@ -1240,6 +1248,8 @@ line|z13-14[railway=funicular], {width: 2;} line|z15-[railway=funicular], {width: 3;} +line|z17-[railway=funicular], +{opacity: 1;} /* 10.PISTE 12-22 ZOOM */ @@ -1253,7 +1263,7 @@ line|z13-[aerialway=t-bar], line|z13-[aerialway=magic_carpet], line|z13-[aerialway=platter], line|z13-[aerialway=rope_tow], -{color: @aerialway; opacity: 1;} +{color: @aerialway; opacity: 0.7;} line|z12-[aerialway=cable_car]::dash, line|z12-[aerialway=gondola]::dash, @@ -1265,7 +1275,7 @@ line|z13-[aerialway=t-bar]::dash, line|z13-[aerialway=magic_carpet]::dash, line|z13-[aerialway=platter]::dash, line|z13-[aerialway=rope_tow]::dash, -{color: @aerialway; opacity: 0.8;} +{color: @aerialway; opacity: 0.7;} /* 10.2 Aerialway 12-22 ZOOM */ @@ -1289,7 +1299,7 @@ line|z14-15[aerialway=mixed_lift]::dash, line|z16-[aerialway=cable_car]::dash, line|z16-[aerialway=gondola]::dash, line|z16-[aerialway=mixed_lift]::dash, -{width: 4; dashes: 4,45; opacity: 1;} +{width: 4; dashes: 4,45; opacity: 0.7;} line|z13-15[aerialway=chair_lift], line|z13-15[aerialway=drag_lift], @@ -1315,7 +1325,7 @@ line|z13-14[aerialway=t-bar]::dash, line|z13-14[aerialway=magic_carpet]::dash, line|z13-14[aerialway=platter]::dash, line|z13-14[aerialway=rope_tow]::dash, -{width: 2.5; dashes: 1,10; opacity: 0.6;} +{width: 2.5; dashes: 1,10; opacity: 0.5;} line|z15-16[aerialway=chair_lift]::dash, line|z15-16[aerialway=drag_lift]::dash, line|z15-16[aerialway=j-bar]::dash, @@ -1334,16 +1344,16 @@ line|z17-[aerialway=rope_tow]::dash, {width: 4; dashes: 1,22; opacity: 1;} line|z19-[power=line], -{color: @powerline; width: 1; opacity: 0.6;} +{color: @powerline; width: 1; opacity: 0.4;} line|z19-[power=line]::dash, -{color: @powerline; width: 4; opacity: 1; dashes: 1,80;} +{color: @powerline; width: 4; opacity: 0.5; dashes: 1,80;} /* 10.3 Piste & Route 14-22 ZOOM */ line|z14-[piste:type=downhill], line|z14-[piste:type=nordic], line|z14-[piste:type=sled] -{color: @piste;opacity: 1;} +{color: @piste;opacity: 0.6;} line|z14-[piste:type=downhill][piste:difficulty=novice] {color: @piste_novice;} @@ -1403,4 +1413,4 @@ line|z17-[leisure=skiing] /* 11. FERRY */ line|z7-[route=ferry], -{color: @ferry;width: 1;opacity: 1;dashes: 5.4,2.7;} +{color: @ferry;width: 1;opacity: 0.6;dashes: 5.4,2.7;} diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index f5f3ec51e3..bd76b0637c 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -105,10 +105,10 @@ @primary_orange_medium: #FF9440; @primary_orange_light: #FFA14C; @secondary: #FFFFFF; -@residential: #FFFFFF; -@unclassified: #FFFFFF; -@pedestrian: #FFFFFF; -@footway: #FFFFFF; +@residential: #F8F8F8; +@unclassified: #F8F8F8; +@pedestrian: #F8F8F8; +@footway: #F8F8F8; @cycleway: #FF87AD; @construction: #BBBBAA; @track: #635730; diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index 641d46c946..62f3478695 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -193,11 +193,11 @@ @isoline1000: #496149; @isoline500: #496149; @isoline100: #496149; -@isoline50: #567556; -@isoline10: #567556; +@isoline50: #496149; +@isoline10: #496149; @label_isoline1000: #496149; @label_isoline500: #496149; @label_isoline100: #496149; -@label_isoline50: #567556; -@label_isoline10: #567556; +@label_isoline50: #496149; +@label_isoline10: #496149; diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss index 61bfff1f8e..34a6d581b7 100644 --- a/data/styles/outdoors/include/Basemap.mapcss +++ b/data/styles/outdoors/include/Basemap.mapcss @@ -26,15 +26,15 @@ line|z13-[waterway=fish_pass], line|z10[waterway=river], line|z10[waterway=riverbank], -{width: 1.4;} +{width: 1.4; opacity: 0.7;} line|z11-12[waterway=river], line|z11-12[waterway=riverbank], line|z11-12[natural=strait], -{width: 2;} +{width: 2; opacity: 0.7;} line|z11-12[waterway=stream], line|z11-12[waterway=canal], -{width: 1;} +{width: 1; opacity: 0.6;} line|z13[waterway=river], line|z13[waterway=riverbank], @@ -43,11 +43,11 @@ line|z13[natural=strait], line|z13[waterway=stream], line|z13[waterway=canal], line|z13[waterway=fish_pass], -{width: 1.3;} +{width: 1.3; opacity: 0.8;} line|z11-12[waterway=stream][intermittent], {width: 0;} line|z13[waterway=stream][intermittent], -{width: 1; dashes: 2.7,2.7;} +{width: 1; dashes: 2.7,2.7; opacity: 0.8;} line|z14[waterway=river], line|z14[waterway=riverbank], @@ -71,25 +71,19 @@ line|z15-[waterway=fish_pass], line|z15-[waterway=stream][intermittent], {width: 2; dashes: 5,5;} -line|z15-[waterway=ditch], -line|z15-[waterway=drain], -{width: 1.6; dashes: 0.9,0.9;} -line|z17-[waterway=ditch], -line|z17-[waterway=drain], -{width: 2;} +line|z13-[waterway=ditch], +line|z13-[waterway=drain], +{opacity: 1; color: @water_bad;} /* Do not draw tunnel waterways */ - line[waterway][tunnel] {width: 0;} -/* 8.1 Pier, dam, cutline */ - line|z13-[man_made=cutline], -{width: 1.5; color: @green0; opacity: 0.6;} +{width: 1.7; color: @green0; opacity: 0.6;} line|z14[man_made=cutline], -{width: 2;} +{width: 2.2;} line|z15[man_made=cutline], {width: 3;} line|z16[man_made=cutline], @@ -99,7 +93,19 @@ line|z17[man_made=cutline], line|z18-[man_made=cutline], {width: 8;} -/* 8.3 Barriers, cliffs */ + +line|z16-[barrier=fence], +line|z16-[barrier=wall], +{color: @fence; width: 1; opacity: 0.7;} +line|z17[barrier=fence], +line|z17[barrier=wall], +{width: 1.3; opacity: 0.8;} +line|z18-[barrier=fence], +line|z18-[barrier=wall], +{width: 1.5; opacity: 1;} + +line|z16-[barrier=ditch], +{width: 1.8; opacity: 0.8; color: @cliff; dashes: 0.9,0.9;} /* The triangles pattern uses "dashes: " parameter as a 4 values tuple: @@ -112,13 +118,13 @@ line|z18-[man_made=cutline], line|z12-13[natural=cliff], line|z12-13[natural=earth_bank], -{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.7;} +{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.5;} line|z14[natural=cliff], line|z14[natural=earth_bank], -{width: 3; dashes: 1.5,1.5; opacity: 0.7;} +{width: 3; dashes: 1.5,1.5; opacity: 0.6;} line|z15[natural=cliff], line|z15[natural=earth_bank], -{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.7;} +{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.6;} line|z16[natural=cliff], line|z16[natural=earth_bank], {width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.7;} @@ -151,42 +157,42 @@ line|z15-[isoline=step_10], line|z10-11[isoline=step_1000], -{width: 0.8; opacity: 0.6;} +{width: 0.8; opacity: 0.45;} line|z10-11[isoline=step_500], -{width: 0.8; opacity: 0.35;} +{width: 0.8; opacity: 0.25;} line|z12-13[isoline=step_1000], -{width: 1.0; opacity: 0.6;} +{width: 1.0; opacity: 0.45;} line|z12-13[isoline=step_500], -{width: 0.8; opacity: 0.5;} -line|z12-13[isoline=step_100], {width: 0.8; opacity: 0.35;} +line|z12-13[isoline=step_100], +{width: 0.8; opacity: 0.25;} line|z14-[isoline=step_1000], -{width: 1.2; opacity: 0.8;} +{width: 1.2; opacity: 0.5;} line|z14-15[isoline=step_500], -{width: 1.0; opacity: 0.6;} +{width: 1.0; opacity: 0.45;} line|z14-15[isoline=step_100], -{width: 0.8; opacity: 0.5;} -line|z14-15[isoline=step_50], {width: 0.8; opacity: 0.35;} +line|z14-15[isoline=step_50], +{width: 0.8; opacity: 0.25;} line|z15[isoline=zero], line|z15[isoline=step_10], -{width: 0.8; opacity: 0.35;} +{width: 0.8; opacity: 0.25;} line|z16-[isoline=step_500], -{width: 1.2; opacity: 0.8;} +{width: 1.2; opacity: 0.5;} line|z16-[isoline=step_100], -{width: 1.0; opacity: 0.6;} +{width: 1.0; opacity: 0.45;} line|z16-17[isoline=step_50], -{width: 0.8; opacity: 0.5;} +{width: 0.8; opacity: 0.35;} line|z16-17[isoline=zero], line|z16-17[isoline=step_10], -{width: 0.8; opacity: 0.5;} +{width: 0.8; opacity: 0.35;} line|z18-[isoline=step_50], -{width: 1.0; opacity: 0.6;} +{width: 1.0; opacity: 0.45;} line|z18-[isoline=zero], line|z18-[isoline=step_10], -{width: 0.8; opacity: 0.6;} +{width: 0.8; opacity: 0.45;} diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index 0c58cd54b3..90d4584586 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -2,11 +2,33 @@ @import("../../clear/include/Roads.mapcss"); -/* 7.4 Service 15-22 ZOOM */ +/* Make all roads more contrast */ +line|z7-[highway=trunk], +line|z7-[highway=motorway], +line|z10-[highway=motorway_link], +line|z10-[highway=trunk_link], +line|z8-[highway=primary], +line|z11-[highway=primary_link], +line|z10-[highway=secondary], +line|z13-[highway=secondary_link], +line|z12-[highway=residential], +line|z11-[highway=tertiary], +line|z14-[highway=tertiary_link], +line|z11-[highway=unclassified], +line|z12-[highway=road], +line|z12-[highway=living_street], +{opacity: 1;} +/* Display earlier, as its an important obstacle / landmark*/ +line|z11-[highway=construction], +{color: @construction; opacity: 1;} +line|z11-12[highway=construction], +{width: 1.2; dashes: 3.6,1.8; opacity: 0.8;} +/* see base style for other zooms */ + +/* Make service roads more pronounced - they lead to trailheads quite often. */ line|z13-[highway=service], {color: @unclassified; opacity: 1;} - line|z13[highway=service], {width: 0.8;} line|z14[highway=service], @@ -45,32 +67,19 @@ line|z19-[highway=service][service=driveway], line|z19-[highway=service][service=parking_aisle], {width: 4;} -/* 8.OTHERS ROADS 13-22 ZOOM */ +/* High visibility of tracks & paths is very important */ line|z11-[highway=track], -{color: @track;opacity: 1;} +{color: @track; opacity: 1;} line|z11-[highway=path], line|z11-[highway=footway][sac_scale], -{color: @path;opacity: 1;} - -/* 8.5 Construction & Proposed 13-22 ZOOM */ - -line|z11-[highway=construction], -line|z11-[highway=proposed] -{color: @construction; opacity: 1;} - -line|z11-12[highway=construction], -line|z11-12[highway=proposed] -{width: 1.2; dashes: 3.6,1.8;} -/* see base style for other zooms */ - -/* 8.6 Track & Path 14-22 ZOOM */ +{color: @path; opacity: 1;} line|z11[highway=track], -{width: 1.1; dashes: 6,2.5;} +{width: 1.1; dashes: 6,2.5; opacity: 0.6;} line|z12[highway=track], -{width: 1.3; dashes: 6,2.5;} +{width: 1.3; dashes: 6,2.5; opacity: 0.7;} line|z13[highway=track], {width: 1.6; dashes: 7,3;} line|z14[highway=track], @@ -86,10 +95,10 @@ line|z18-[highway=track], line|z11[highway=path], line|z11[highway=footway][sac_scale], -{width: 1; dashes: 3.5,2;} +{width: 1; dashes: 3.5,2; opacity: 0.6;} line|z12[highway=path], line|z12[highway=footway][sac_scale], -{width: 1.1; dashes: 3.5,2;} +{width: 1.1; dashes: 3.5,2; opacity: 0.7;} line|z13[highway=path], line|z13[highway=footway][sac_scale], {width: 1.3; dashes: 4,2.5;} @@ -109,7 +118,14 @@ line|z18-[highway=path], line|z18-[highway=footway][sac_scale], {width: 4; dashes: 8,4.5;} -/* 9.RAIL 11-22 ZOOM */ + +line|z13-[highway=cycleway], +{color: @cycleway; opacity: 1;} +line|z14-[highway=bridleway], +{color: @bridleway; opacity: 1;} + + +/* Rail lines are important landmarks / obstacles */ line|z10-[railway=rail], {color: @railway; opacity: 1;} @@ -118,7 +134,6 @@ line|z15-[railway=rail], line|z15-[railway=rail]::dash, {color: @railway_dash; opacity:1;} - line|z10-[railway=rail][highspeed?], line|z10-[railway=rail][usage=main], line|z10-[railway=rail][usage=branch], @@ -149,16 +164,6 @@ line|z16-[railway=rail][service=spur]::dash, line|z16-[railway=rail][service=service]::dash, {color: @industrial; opacity: 1;} - -line|z13-[railway=construction], -line|z13-[railway=preserved], -line|z13-[railway=disused], -line|z13-[railway=abandoned], -{color: @railway;opacity:1;} - - -/* 9.1 RAIL 10-22 ZOOM */ - line|z10[railway=rail], {width: 1;} line|z11[railway=rail], @@ -287,6 +292,12 @@ line|z18-[railway=rail][service=service]::dash, {width: 2.8; dashes: 8.1,8.1;} +line|z13-[railway=construction], +line|z13-[railway=preserved], +line|z13-[railway=disused], +line|z13-[railway=abandoned], +{color: @railway; opacity:1;} + line|z13-[railway=preserved], line|z13-[railway=abandoned] {width: 1.6; dashes: 6.3,6.3;} @@ -302,16 +313,13 @@ line|z16-[railway=disused] {width: 1.7; dashes: 2.5,7;} -/* 10.PISTE 12-22 ZOOM */ - -/* 10.2 Aerialway 12-22 ZOOM */ - +/* Power lines are good for orienteering */ line|z15-[power=line], -{color: @powerline; width: 1; opacity: 0.6;} +{color: @powerline; width: 1; opacity: 0.5;} line|z17-[power=line], -{width: 1.3; opacity: 0.7;} +{width: 1.3; opacity: 0.6;} line|z15-[power=line]::dash, -{color: @powerline; width: 4; opacity: 1; dashes: 1,50;} +{color: @powerline; width: 4; opacity: 0.5; dashes: 1,50;} line|z17-[power=line]::dash, -{width: 4.5; dashes: 1,80;} +{width: 4.5; opacity:0.6; dashes: 1,80;} diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 034a728dce..bb4cb81f88 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -43,18 +43,18 @@ area|z10-[place=islet] /* 3.BOUNDARIES */ line|z2-[boundary=administrative] -{color: @border_country;opacity: 1;} +{color: @border_country; opacity: 0.7;} line|z4[boundary=administrative][admin_level=3], line|z5-[boundary=administrative][admin_level=4] -{color: @border_region;opacity: 1;} +{color: @border_region; opacity: 0.7;} /* 3.1 Country */ line|z2[boundary=administrative][admin_level=2] -{width: 0.5;opacity: 0.7;} +{width: 0.5; opacity: 0.5;} line|z3[boundary=administrative][admin_level=2] -{width: 0.5;opacity: 0.8;} +{width: 0.5; opacity: 0.6;} line|z4[boundary=administrative][admin_level=2] {width: 0.6;} line|z5[boundary=administrative][admin_level=2] @@ -208,7 +208,7 @@ line|z10-[waterway=riverbank], line|z13-[waterway=stream], line|z13-[waterway=canal], line|z13-[natural=strait], -{opacity: 1; color: @river;} +{opacity: 0.6; color: @river;} /* 6.1 Area water(lake,pond etc.) */ @@ -407,11 +407,11 @@ area|z16-[man_made=bridge], line|z15-[man_made=pier], line|z15-[man_made=breakwater], -{width: 2;color: @background;opacity: 0.7;} +{width: 2; color: @background; opacity: 0.5;} line|z15-[waterway=dam], line|z15-[waterway=weir], -{width: 2;color: @building_dark;opacity: 0.5;} +{width: 2; color: @building_dark; opacity: 0.4;} line|z16[man_made=pier], line|z16[man_made=breakwater], @@ -438,7 +438,7 @@ line|z19-[waterway=weir], {width: 8;} line|z15-[man_made=cutline], -{width: 1.5;color: @green0;opacity: 0.4;} +{width: 1.5; color: @green0; opacity: 0.3;} line|z16[man_made=cutline], {width: 2;} line|z17[man_made=cutline], @@ -466,16 +466,16 @@ area|z16-[waterway=dam], line|z17-[barrier=fence], line|z17-[barrier=wall], -{color: @fence; width: 1; opacity: 0.7;} +{color: @fence; width: 1; opacity: 0.5;} line|z18-[barrier=fence], line|z18-[barrier=wall], -{width: 1.3; opacity:0.8;} +{width: 1.3; opacity:0.6;} line|z18-[barrier=hedge], -{color: @hedge; width: 2; opacity: 0.6;} +{color: @hedge; width: 2; opacity: 0.3;} line|z19-[barrier=hedge], -{width: 3; opacity: 0.7;} +{width: 3; opacity: 0.4;} /* @@ -489,7 +489,7 @@ line|z19-[barrier=hedge], line|z15-[barrier=city_wall], line|z15-[historic=citywalls], -{color: @building_dark; width: 2; opacity: 1;} +{color: @building_dark; width: 2; opacity: 0.7;} line|z16[barrier=city_wall], line|z16[historic=citywalls], {width: 2.8;} @@ -506,29 +506,29 @@ line|z19-[historic=citywalls], line|z16-[natural=cliff], line|z16-[natural=earth_bank], -{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.6;} +{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.4;} line|z17[natural=cliff], line|z17[natural=earth_bank], -{width: 3; dashes: 1.5,1.5; opacity: 0.6;} +{width: 3; dashes: 1.5,1.5;} line|z18[natural=cliff], line|z18[natural=earth_bank], -{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.6;} +{width: 6.2; dashes: 3,3.5,4.5,1.2;} line|z19-[natural=cliff], line|z19-[natural=earth_bank], -{width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.6;} +{width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.5;} line|z17-[barrier=ditch], -{width: 1.8;opacity: 1;color: @cliff;dashes: 0.9,0.9;} +{width: 1.8; opacity: 0.7; color: @cliff; dashes: 0.9,0.9;} line|z17-[barrier=retaining_wall], -{color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 1;} +{color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 0.6;} line|z18-[barrier=retaining_wall], {width: 3.2; dashes: 4,2,2,1.2;} line|z17-[man_made=embankment], -{color: @building_dark; width: 3.5; dashes: 4,2,2,1.5; opacity: 1;} +{color: @building_dark; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.6;} line|z18-[man_made=embankment], -{width: 5; dashes: 6,3,3,2; opacity: 1;} +{width: 5; dashes: 6,3,3,2;} diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index 559039e03b..e9dd49a814 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -74,24 +74,28 @@ line|z9[highway=world_level] line|z7-[highway=trunk], line|z7-[highway=motorway], +{color: @trunk_orange_medium; opacity: 0.7;} + +line|z10-[highway=trunk], +line|z10-[highway=motorway], line|z10-[highway=motorway_link], line|z10-[highway=trunk_link] -{color: @trunk_orange_light;opacity: 1;casing-color:@casing_road;} +{color: @trunk_orange_light; opacity: 0.7; casing-color:@casing_road; casing-opacity: 0.7;} line|z12-[highway=motorway][tunnel?], line|z12-[highway=trunk][tunnel?], line|z12-[highway=motorway_link][tunnel?], line|z12-[highway=trunk_link][tunnel?], -{casing-width: 1;casing-linecap: butt;casing-color:@trunk_tunnel_casing;} +{casing-width: 1;casing-linecap: butt;casing-color:@trunk_tunnel_casing; casing-opacity: 0.7;} line|z13-[highway=motorway][bridge?]::bridgewhite, line|z13-[highway=trunk][bridge?]::bridgewhite, line|z14-[highway=motorway_link][bridge?]::bridgewhite, line|z14-[highway=trunk_link][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background; casing-opacity: 0.8;} line|z13-[highway=motorway][bridge?]::bridgeblack, line|z13-[highway=trunk][bridge?]::bridgeblack, line|z14-[highway=motorway_link][bridge?]::bridgeblack, line|z14-[highway=trunk_link][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing; casing-opacity: 0.7;} /* 3.1 Trunk & Motorway 7-22 ZOOM */ @@ -123,70 +127,70 @@ line|z11[highway=motorway] line|z11[highway=motorway_link], line|z11[highway=trunk_link], {width: 2.0;} -line|z12[highway=trunk], -line|z12[highway=motorway] -{width: 4;} +line|z12-[highway=trunk], +line|z12-[highway=motorway] +{width: 3.7; opacity: 1;} line|z12[highway=motorway_link], line|z12[highway=trunk_link], {width: 2.5;} line|z13[highway=trunk], line|z13[highway=motorway], -{width: 5;} +{width: 4.6;} line|z13[highway=motorway_link], line|z13[highway=trunk_link] {width: 2.8;} line|z14[highway=trunk], line|z14[highway=motorway] -{width: 5.25;casing-width: 0.75;} +{width: 4.9;casing-width: 0.75;} line|z14[highway=motorway_link], line|z14[highway=trunk_link] {width: 3.37;casing-width: 0.45;} line|z15[highway=trunk], line|z15[highway=motorway], -{width: 6.5;casing-width: 0.85;} +{width: 6;casing-width: 0.85;} line|z15[highway=motorway_link], line|z15[highway=trunk_link] -{width: 5.5;casing-width: 0.55;} +{width: 5;casing-width: 0.55; opacity: 1;} line|z16[highway=trunk], line|z16[highway=motorway], -{width: 9.85;casing-width: 1.1;} +{width: 9;casing-width: 1.1;} line|z16[highway=motorway_link], line|z16[highway=trunk_link] -{width: 7.95;casing-width: 0.8;} +{width: 7.2;casing-width: 0.8;} line|z17[highway=trunk], line|z17[highway=motorway], -{width: 16;casing-width: 1.1;} +{width: 15;casing-width: 1.1;} line|z17[highway=motorway_link], line|z17[highway=trunk_link] -{width: 13;casing-width: 1.0;} +{width: 12;casing-width: 1.0;} line|z18[highway=trunk], line|z18[highway=motorway], -{width: 26;casing-width: 1.35;} +{width: 25;casing-width: 1.35;} line|z18[highway=motorway_link], line|z18[highway=trunk_link] -{width: 20;casing-width: 1.15;} +{width: 18;casing-width: 1.15;} line|z19-[highway=trunk], line|z19-[highway=motorway], -{width: 36;casing-width: 1.5;} +{width: 34;casing-width: 1.5;} line|z19-[highway=motorway_link], line|z19-[highway=trunk_link] -{width: 26;casing-width: 1.25;} +{width: 24;casing-width: 1.25;} /* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */ line|z12[highway=motorway][tunnel?], line|z12[highway=trunk][tunnel?] -{color: @trunk_tunnel_orange;opacity: 1;casing-width: 0.5;casing-dashes: 2,2;} +{color: @trunk_tunnel_orange;opacity: 0.7;casing-width: 0.5;casing-dashes: 2,2;} line|z13-14[highway=motorway][tunnel?], line|z13-14[highway=trunk][tunnel?], line|z13-14[highway=motorway_link][tunnel?], line|z13-14[highway=trunk_link][tunnel?] -{color: @trunk_tunnel_orange;casing-dashes: 5,5;} +{color: @trunk_tunnel_orange;casing-dashes: 5,5; opacity: 1;} line|z15-[highway=motorway][tunnel?], line|z15-[highway=trunk][tunnel?], line|z15-[highway=motorway_link][tunnel?], line|z15-[highway=trunk_link][tunnel?] -{casing-dashes: 5,5;} +{casing-dashes: 5,5; opacity: 1;} /* 3.3 Trunk & Motorway bridge 13-22 ZOOM */ @@ -228,25 +232,25 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack, /* 4.PRIMARY 8-22 ZOOM */ line|z8-10[highway=primary], -{color: @primary_orange;opacity: 1;casing-linecap: butt;} +{color: @primary_orange;opacity: 0.7;casing-linecap: butt;} line|z11-14[highway=primary], line|z11-14[highway=primary_link] -{color: @primary_orange_medium;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} +{color: @primary_orange_medium;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} line|z15-17[highway=primary], line|z15-17[highway=primary_link] -{color: @primary_orange_light;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} +{color: @primary_orange_light;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} line|z18-[highway=primary], line|z18-[highway=primary_link] -{color: @primary_orange_light;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} +{color: @primary_orange_light;opacity: 0.7;casing-linecap: butt; casing-color:@casing_road; casing-opacity: 0.7;} line|z14-[highway=primary][tunnel?], line|z14-[highway=primary_link][tunnel?] -{casing-width: 1;casing-linecap: butt;casing-color: @primary_tunnel_casing;} +{casing-width: 1;casing-linecap: butt;casing-color: @primary_tunnel_casing; casing-opacity: 0.7;} line|z14-[highway=primary][bridge?]::bridgewhite, line|z14-[highway=primary_link][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;} line|z14-[highway=primary][bridge?]::bridgeblack, line|z14-[highway=primary_link][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.7;} /* 4.1 Primary 8-22 ZOOM */ @@ -254,6 +258,7 @@ line|z8[highway=primary] {width: 0.9;} line|z9[highway=primary] {width: 1.2;} + line|z10[highway=primary] {width: 1.5;} line|z11[highway=primary], @@ -268,30 +273,30 @@ line|z13[highway=primary_link], line|z14[highway=primary], line|z14[highway=primary_link] {width: 3.5;casing-width: 0.35;} -line|z15[highway=primary], -line|z15[highway=primary_link] -{width: 4.7;casing-width: 0.55;} +line|z15-[highway=primary], +line|z15-[highway=primary_link] +{width: 4.2;casing-width: 0.55; opacity: 1;} line|z16[highway=primary], line|z16[highway=primary_link] -{width: 7.2;casing-width: 0.8;} +{width: 6.5;casing-width: 0.8;} line|z17[highway=primary], line|z17[highway=primary_link] -{width: 14;casing-width: 0.9;} +{width: 13;casing-width: 0.9;} line|z18[highway=primary], line|z18[highway=primary_link] -{width: 23;casing-width: 1.1;} +{width: 22;casing-width: 1.1;} line|z19-[highway=primary], line|z19-[highway=primary_link] -{width: 30;casing-width: 1.3;} +{width: 27;casing-width: 1.3;} /* 4.2 Primary tunnel 14-22 ZOOM */ line|z14[highway=primary][tunnel?], line|z14[highway=primary_link][tunnel?] -{color: @primary_tunnel_orange;casing-dashes: 5,5;} +{color: @primary_tunnel_orange;casing-dashes: 5,5; opacity: 0.7;} line|z15-[highway=primary][tunnel?], line|z15-[highway=primary_link][tunnel?] -{casing-dashes: 5,5;} +{casing-dashes: 5,5; opacity: 1;} /* 4.3 Primary bridge 14-22 ZOOM */ @@ -319,16 +324,16 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack, line|z10-[highway=secondary], line|z14-[highway=secondary_link] -{color: @secondary;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} +{color: @secondary;opacity: 0.8;casing-linecap: butt; casing-color:@casing_road;} line|z16-[highway=secondary][tunnel?], line|z16-[highway=secondary_link][tunnel?] -{casing-width: 1;casing-linecap: butt;casing-color: @secondary_tunnel_casing;} +{casing-width: 1;casing-linecap: butt;casing-color: @secondary_tunnel_casing; casing-opacity: 0.7;} line|z14-[highway=secondary][bridge?]::bridgewhite, line|z14-[highway=secondary_link][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;} line|z14-[highway=secondary][bridge?]::bridgeblack, line|z14-[highway=secondary_link][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.7;} /* 5.1 Secondary 10-22 ZOOM */ @@ -343,30 +348,30 @@ line|z13[highway=secondary] line|z14[highway=secondary], line|z14[highway=secondary_link] {width: 3.2;casing-width: 0.35;} -line|z15[highway=secondary], -line|z15[highway=secondary_link] -{width: 4.5;casing-width: 0.55;} +line|z15-[highway=secondary], +line|z15-[highway=secondary_link] +{width: 4.2;casing-width: 0.55; opacity: 1;} line|z16[highway=secondary], line|z16[highway=secondary_link] -{width: 6.5;casing-width: 0.8;} +{width: 6;casing-width: 0.8;} line|z17[highway=secondary], line|z17[highway=secondary_link] -{width: 10.5;casing-width: 0.9;} +{width: 9.6;casing-width: 0.9;} line|z18[highway=secondary], line|z18[highway=secondary_link] -{width: 16;casing-width: 1.1;} +{width: 15;casing-width: 1.1;} line|z19-[highway=secondary], line|z19-[highway=secondary_link] -{width: 24;casing-width: 1.3;} +{width: 22;casing-width: 1.3;} /* 5.2 Secondary tunnel 16-22 ZOOM */ line|z16-17[highway=secondary][tunnel?], line|z16-17[highway=secondary_link][tunnel?] -{casing-dashes: 5,5;} +{casing-dashes: 5,5; opacity: 1;} line|z18-[highway=secondary][tunnel?], line|z18-[highway=secondary_link][tunnel?] -{color: @secondary_tunnel;casing-dashes: 5,5;} +{color: @secondary_tunnel;casing-dashes: 5,5; opacity: 1;} /* 5.3 Secondary bridge 14-22 ZOOM */ @@ -395,19 +400,19 @@ line|z18-[highway=secondary_link][bridge?]::bridgeblack line|z12-[highway=residential], line|z11-[highway=tertiary], line|z14-[highway=tertiary_link], -{color: @residential; opacity: 1;casing-linecap: butt; casing-color:@casing_road;} +{color: @residential; opacity: 0.7;casing-linecap: butt; casing-color:@casing_road;} line|z16-[highway=tertiary][tunnel?], line|z16-[highway=residential][tunnel?], line|z16-[highway=tertiary_link][tunnel?], -{color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;} +{color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing; casing-opacity: 0.7;} line|z14-[highway=tertiary][bridge?]::bridgewhite, line|z14-[highway=residential][bridge?]::bridgewhite, line|z14-[highway=tertiary_link][bridge?]::bridgewhite -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;} line|z14-[highway=tertiary][bridge?]::bridgeblack, line|z14-[highway=residential][bridge?]::bridgeblack, line|z14-[highway=tertiary_link][bridge?]::bridgeblack -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.7;} /* 6.1 Residential & Tertiary 11-22 ZOOM */ @@ -418,24 +423,22 @@ line|z12[highway=tertiary] line|z13[highway=tertiary] {width: 1.85;} line|z14[highway=tertiary], -line|z15[highway=tertiary_link] -{width: 3.3;} -line|z15[highway=tertiary], -line|z15[highway=tertiary_link] -{width: 5;casing-width: 0.45;} +{width: 3.2;} +line|z15-[highway=tertiary], +line|z15-[highway=tertiary_link] +{width: 3.8;casing-width: 0.45; opacity: 1;} line|z16[highway=tertiary], line|z16[highway=tertiary_link] -{width: 7.5;casing-width: 0.55;} +{width: 5.4;casing-width: 0.55;} line|z17[highway=tertiary], line|z17[highway=tertiary_link] -{width: 10;casing-width: 0.75;} +{width: 8.4;casing-width: 0.75;} line|z18[highway=tertiary], line|z18[highway=tertiary_link] -{width: 15;casing-width: 0.9;} +{width: 14;casing-width: 0.9;} line|z19-[highway=tertiary], line|z19-[highway=tertiary_link] -{width: 21;casing-width: 1.1;} - +{width: 20;casing-width: 1.1;} line|z12[highway=residential], {width: 0.8;} @@ -443,23 +446,23 @@ line|z13[highway=residential], {width: 1.6;} line|z14[highway=residential], {width: 2.2;} -line|z15[highway=residential], -{width: 4.8;casing-width: 0.45;} +line|z15-[highway=residential], +{width: 3.6;casing-width: 0.4; opacity: 1;} line|z16[highway=residential], -{width: 7;casing-width: 0.55;} +{width: 5.1;casing-width: 0.5;} line|z17[highway=residential], -{width: 13;casing-width: 0.75;} +{width: 8;casing-width: 0.7;} line|z18[highway=residential], -{width: 17;casing-width: 0.9;} +{width: 12;casing-width: 0.8;} line|z19-[highway=residential], -{width: 22;casing-width: 1.1;} +{width: 17;casing-width: 1;} /* 6.2 Residential & Tertiary tunnel 16-22 ZOOM */ line|z16-[highway=tertiary][tunnel?], line|z16-[highway=residential][tunnel?], line|z16-[highway=tertiary_link][tunnel?], -{casing-dashes: 5,5;} +{casing-dashes: 5,5; opacity: 1;} /* 6.3 Residential & Tertiary bridge 14-22 ZOOM */ @@ -491,65 +494,60 @@ line|z18-[highway=residential][bridge?]::bridgeblack, /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 12-22 ZOOM */ -line|z11-13[highway=unclassified], -line|z12-13[highway=road], -line|z12-13[highway=living_street], -line|z12-13[aeroway=runway], -{color: @unclassified;opacity: 1;casing-linecap: butt;} +line|z11-[highway=unclassified], +line|z12-[highway=road], +line|z12-[highway=living_street], +line|z12-[aeroway=runway], line|z14-[aeroway=taxiway], -line|z14-[highway=unclassified], -line|z14-[highway=road], -line|z14-[highway=living_street], -line|z14-[aeroway=runway], line|z14-[highway=service], -{color: @unclassified; opacity: 1;casing-linecap: butt;} +{color: @unclassified; opacity: 0.7;casing-linecap: butt;} line|z16-[highway=unclassified][tunnel?], line|z16-[highway=living_street][tunnel?], -{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;} +{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing; casing-opacity: 0.7;} line|z14-[highway=unclassified][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;} line|z14-[highway=unclassified][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.7;} /* 7.1 Road, Street, Unclassified 12-22 ZOOM */ line|z11-12[highway=unclassified], line|z12[highway=road], line|z12[highway=living_street] -{color: @residential;width: 0.85;} +{width: 0.8;} line|z13[highway=unclassified], line|z13[highway=road], line|z13[highway=living_street] -{width: 1.5;} +{width: 1.6;} line|z14[highway=unclassified], line|z14[highway=road], line|z14[highway=living_street] -{width: 1.95;} -line|z15[highway=unclassified], -line|z15[highway=road], -line|z15[highway=living_street] -{width: 3.5;} +{width: 2.2;} +line|z15-[highway=unclassified], +line|z15-[highway=road], +line|z15-[highway=living_street] +{width: 3.6; opacity: 1;} line|z16[highway=unclassified], line|z16[highway=road], line|z16[highway=living_street] -{width: 7;} +{width: 5.1;} line|z17[highway=unclassified], line|z17[highway=road], line|z17[highway=living_street] -{width: 10;} +{width: 8;} line|z18[highway=unclassified], line|z18[highway=road], line|z18[highway=living_street] -{width: 14;} +{width: 12;} line|z19-[highway=unclassified], line|z19-[highway=road], line|z19-[highway=living_street] -{width: 16;} +{width: 17;} /* 7.2 Road, Street, Unclassified tunnel 16-22 ZOOM */ line|z16-[highway=unclassified][tunnel?], line|z16-[highway=living_street][tunnel?], -{casing-dashes: 5,5;} +{casing-dashes: 5,5; opacity: 1;} /* 7.3 Road, Street, Unclassified bridge 14-22 ZOOM */ @@ -577,67 +575,44 @@ line|z15[highway=service] {width: 1.6;} line|z16[highway=service] {width: 3;} -line|z17[highway=service] -{width: 6;} +line|z17-[highway=service] +{width: 5.6; opacity: 1;} line|z18[highway=service] -{width: 7;} +{width: 6.4;} line|z19-[highway=service] -{width: 8;} +{width: 7.2;} /* 8.OTHERS ROADS 13-22 ZOOM */ line|z13-[highway=construction], -{color: @construction;opacity: 1;} +{color: @construction; opacity: 0.7;} line|z18-[highway=pedestrian][bridge?]::bridgewhite, line|z18-[highway=footway][bridge?]::bridgewhite, line|z18-[highway=steps][bridge?]::bridgewhite, line|z16-[highway=road][bridge?]::bridgewhite, line|z16-[highway=service][bridge?]::bridgewhite -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;} line|z18-[highway=pedestrian][bridge?]::bridgeblack, line|z18-[highway=footway][bridge?]::bridgeblack, line|z18-[highway=steps][bridge?]::bridgeblack, line|z16-[highway=road][bridge?]::bridgeblack, line|z16-[highway=service][bridge?]::bridgeblack -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.7;} /* 8.1 Pedestrian 18-22 ZOOM */ line|z18-[highway=pedestrian], -{color: @pedestrian; opacity: 1; width: 2; dashes: 7,3;} +{color: @pedestrian; opacity: 0.7; width: 2; dashes: 7,3;} line|z18-[highway=pedestrian][tunnel?], {width: 0;} /* 8.3 Pedestrian & other brige 13-22 ZOOM */ -/*line|z13[highway=pedestrian][bridge?]::bridgewhite, -line|z13[highway=footway][bridge?]::bridgewhite, -{casing-width: eval(prop("width")-0.2;} -line|z14-[highway=pedestrian][bridge?]::bridgewhite, -line|z14-[highway=footway][bridge?]::bridgewhite, -line|z16-[highway=steps][bridge?]::bridgewhite, -line|z16-[highway=road][bridge?]::bridgewhite, -line|z16-[highway=service][bridge?]::bridgewhite -{casing-width-add: 0;} -line|z16-[highway=pedestrian][bridge?]::bridgewhite, -line|z16-[highway=footway][bridge?]::bridgewhite -{casing-width-add: 0.2;} - -line|z14-[highway=pedestrian][bridge?]::bridgeblack, -line|z14-[highway=footway][bridge?]::bridgeblack, -line|z16-[highway=steps][bridge?]::bridgeblack, -line|z16-[highway=road][bridge?]::bridgeblack, -line|z16-[highway=service][bridge?]::bridgeblack -{casing-width-add: 0.2;} -line|z16-[highway=pedestrian][bridge?]::bridgeblack, -line|z16-[highway=footway][bridge?]::bridgeblack, -{casing-width-add: 0.6;}*/ - /* 8.4 Cycleway 18-22 ZOOM */ line|z18-[highway=cycleway], -{color: @cycleway; opacity: 1; width: 1;} +{color: @cycleway; opacity: 0.6; width: 1;} line|z18-[highway=cycleway][tunnel?], {width: 0;} @@ -663,7 +638,7 @@ line|z19-[highway=construction], line|z14-[highway=track][tracktype=grade1], line|z14-[psurface=unpaved_good], line|z14-[psurface=unpaved_bad] -{color: @pedestrian;opacity: 1;} +{color: @pedestrian; opacity: 0.7;} line|z14[highway=track][tracktype=grade1], line|z14[psurface=unpaved_good], @@ -688,7 +663,7 @@ line|z19-[psurface=unpaved_bad] line|z16-[highway=track], -{color: @track; opacity: 1; width: 1.1; dashes: 6,2.5;} +{color: @track; opacity: 0.6; width: 1.1; dashes: 6,2.5;} line|z17[highway=track], {width: 1.4; dashes: 6,2.5;} line|z18[highway=track], @@ -700,7 +675,7 @@ line|z16-[highway=track][tunnel?], line|z17-[highway=path], line|z17-[highway=footway][sac_scale], -{color: @path; opacity: 1; width: 0.9; dashes: 3.5,2;} +{color: @path; opacity: 0.6; width: 0.9; dashes: 3.5,2;} line|z18[highway=path], line|z18[highway=footway][sac_scale], {width: 1.1; dashes: 3.5,2;} @@ -714,7 +689,7 @@ line|z17-[highway=path][tunnel?], line|z18-[highway=footway], line|z18-[highway=steps], -{color: @footway; opacity: 1; width: 1.5; dashes: 5,2;} +{color: @footway; opacity: 0.7; width: 1.5; dashes: 5,2;} line|z18-[highway=footway][tunnel?], line|z18-[highway=steps][tunnel?], {width: 0;} @@ -722,55 +697,41 @@ line|z18-[highway=steps][tunnel?], /* 8.9 Bridleway 18-22 ZOOM */ line|z18-[highway=bridleway], -{color: @bridleway; opacity: 1; width: 0.9; dashes: 3.6,1.8;} +{color: @bridleway; opacity: 0.6; width: 0.9; dashes: 3.6,1.8;} line|z18-[highway=bridleway][tunnel?], {width: 0;} /* 8.11 Runway 12-22 ZOOM */ -/*line|z12[aeroway=runway] -{width: 1; opacity: 0.5;} -line|z13[aeroway=runway] -{width: 1.5; opacity: 0.8;} -line|z14-15[aeroway=runway] -{width: 2.4;} -line|z16-[aeroway=runway] -{width: 4;} - -line|z14[aeroway=taxiway] -{width: 0.6;opacity: 0.6;} -line|z15-[aeroway=taxiway] -{width: 1.2; opacity: 0.6;}*/ - /* 9.RAIL 11-22 ZOOM */ line|z11-[railway=rail], -{color: @railway_light; opacity: 1;} +{color: @railway_light; opacity: 0.5;} line|z16-[railway=rail]::dash, -{color: @railway_dash; opacity:1;} +{color: @railway_dash; opacity: 0.7;} line|z10-[railway=rail][highspeed?], line|z10-[railway=rail][usage=main], line|z11-[railway=rail][usage=branch], -{color: @railway; opacity: 1;} +{color: @railway; opacity: 0.5;} line|z10-[railway=rail][usage=tourism], -{color: @railway_tourism; opacity: 1;} +{color: @railway_tourism; opacity: 0.5;} line|z16-[railway=rail][highspeed?]::dash, line|z16-[railway=rail][usage=main]::dash, line|z16-[railway=rail][usage=tourism]::dash, line|z16-[railway=rail][usage=branch]::dash, -{color: @railway_dash; opacity: 1;} +{color: @railway_dash; opacity: 0.7;} line|z13-[railway=rail][usage=utility], line|z15-[railway=rail][service=spur], line|z16-[railway=rail][service=service], -{color: @railway_light; opacity: 1;} +{color: @railway_light; opacity: 0.5;} line|z17-[railway=rail][usage=utility]::dash, line|z17-[railway=rail][service=spur]::dash, line|z17-[railway=rail][service=service]::dash, -{color: @industrial; opacity: 1;} +{color: @industrial; opacity: 0.7;} line|z12-[railway=funicular], @@ -780,20 +741,20 @@ line|z16-[railway=construction], line|z16-[railway=disused], line|z16-[railway=preserved], line|z16-[railway=abandoned], -{color: @railway;opacity:1;} +{color: @railway; opacity: 0.6;} line|z13-[railway=light_rail][!tunnel], line|z13-[railway=subway][!tunnel], -{color: @railway_light; opacity: 1;} +{color: @railway_light; opacity: 0.5;} line|z16-[railway=tram]::centerline, -{color: @tram;opacity:1;} +{color: @tram; opacity: 0.6;} line|z16-[railway=tram] -{color: @tram;opacity:1;} +{color: @tram; opacity: 0.6; linecap: butt;} line|z16-[railway=subway][!tunnel]::dash, line|z16-[railway=light_rail][!tunnel]::dash, -{color: @railway_dash;opacity:1;} +{color: @railway_dash; opacity: 0.7;} line|z14-[railway=rail][bridge?]::bridgewhite, line|z14-[railway=subway][bridge?]::bridgewhite, @@ -801,14 +762,14 @@ line|z14-[railway=light_rail][bridge?]::bridgewhite, line|z16-[railway=preserved][bridge?]::bridgewhite, line|z16-[railway=abandoned][bridge?]::bridgewhite, line|z16-[railway=tram][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} +{casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;} line|z16-[railway=rail][bridge?]::bridgeblack, line|z16-[railway=subway][bridge?]::bridgeblack, line|z16-[railway=light_rail][bridge?]::bridgeblack, line|z16-[railway=preserved][bridge?]::bridgeblack, line|z16-[railway=abandoned][bridge?]::bridgeblack, line|z16-[railway=tram][bridge?]::bridgeblack, -{casing-linecap: butt;casing-color:@bridge_casing;} +{casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;} /* 9.1 RAIL 11-22 ZOOM */ @@ -822,8 +783,8 @@ line|z15[railway=rail], {width: 1.8;} line|z16[railway=rail], {width: 2.8;} -line|z17[railway=rail], -{width: 3.2;} +line|z17-[railway=rail], +{width: 3.2; opacity: 0.7;} line|z18[railway=rail], {width: 4.2;} line|z19-[railway=rail], @@ -885,10 +846,10 @@ line|z14[railway=rail][highspeed?], {width: 2;} line|z15[railway=rail][highspeed?], {width: 2.2;} -line|z16[railway=rail][highspeed?], -line|z16[railway=rail][usage=main], -line|z16[railway=rail][usage=tourism], -line|z16[railway=rail][usage=branch], +line|z16-[railway=rail][highspeed?], +line|z16-[railway=rail][usage=main], +line|z16-[railway=rail][usage=tourism], +line|z16-[railway=rail][usage=branch], {width: 2.8;} line|z17[railway=rail][highspeed?], line|z17[railway=rail][usage=main], @@ -897,7 +858,7 @@ line|z17[railway=rail][usage=branch], line|z17[railway=rail][usage=utility], line|z17[railway=rail][service=spur], line|z17[railway=rail][service=service], -{width: 3.2;} +{width: 3.2; opacity: 0.7;} line|z18-[railway=rail][highspeed?], line|z18-[railway=rail][usage=main], line|z18-[railway=rail][usage=tourism], @@ -905,7 +866,7 @@ line|z18-[railway=rail][usage=branch], line|z18-[railway=rail][usage=utility], line|z18-[railway=rail][service=spur], line|z18-[railway=rail][service=service], -{width: 4.2;} +{width: 4; opacity: 0.7;} line|z16[railway=rail][highspeed?]::dash, @@ -950,12 +911,9 @@ line|z16[railway=light_rail][!tunnel], line|z17[railway=subway][!tunnel], line|z17[railway=light_rail][!tunnel], {width: 3.2;} -line|z18[railway=subway][!tunnel], -line|z18[railway=light_rail][!tunnel], -{width: 4.2;} -line|z19-[railway=subway][!tunnel], -line|z19-[railway=light_rail][!tunnel], -{width: 5.8;} +line|z18-[railway=subway][!tunnel], +line|z18-[railway=light_rail][!tunnel], +{width: 4; opacity: 0.7;} line|z16[railway=subway][!tunnel]::dash, line|z16[railway=light_rail][!tunnel]::dash, @@ -982,7 +940,7 @@ line|z16-[railway=disused] /* 9.2 Rail tunnel 14-22 ZOOM */ line|z14-[railway=rail][tunnel?], -{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;} +{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5; casing-opacity: 0.5; opacity: 0.5;} /* 9.3 Rail bridge 14-22 ZOOM */ @@ -1044,7 +1002,7 @@ line|z18-[railway=abandoned][bridge?]::bridgeblack, /* 9.4 Monorail 14-22 ZOOM */ line|z14[railway=monorail] -{color: @railway_light;width: 1;} +{color: @railway_light; width: 1; opacity: 0.7;} line|z15-16[railway=monorail], line|z15-16[railway=narrow_gauge] {width: 1.2;} @@ -1064,157 +1022,22 @@ line|z19-[railway=tram]::centerline {width: 2;} line|z16-[railway=tram] -{width: 1.5;opacity:1;dashes:0.8,12; linecap:butt;} +{width: 1.5; dashes:0.8,12;} line|z17-[railway=tram] -{width: 3; opacity:1;dashes:1.15,14; linecap:butt;} +{width: 3; dashes:1.15,14;} line|z18-[railway=tram] -{width: 4.3; opacity:1;dashes:1.25,16; linecap:butt;} +{width: 4.1; dashes:1.25,16;} line|z19-[railway=tram] -{width: 7; opacity:1; dashes:1.5,19; linecap:butt;} +{width: 6.4; dashes:1.5,19;} /* 9.6 Funicular 12-22 ZOOM */ -/*line|z12[railway=funicular], -{width: 1.4;} -line|z13-14[railway=funicular], -{width: 2;} -line|z15-[railway=funicular], -{width: 3;}*/ - /* 10.PISTE 12-22 ZOOM */ -/* -line|z12-[aerialway=cable_car], -line|z12-[aerialway=chair_lift], -line|z12-[aerialway=gondola], -line|z12-[aerialway=mixed_lift], -line|z12-[aerialway=drag_lift], -line|z12-[aerialway=j-bar], -line|z12-[aerialway=t-bar], -line|z12-[aerialway=magic_carpet], -line|z12-[aerialway=platter], -line|z12-[aerialway=rope_tow], -line|z12-[aerialway=cable_car]::dash, -line|z12-[aerialway=chair_lift]::dash, -line|z12-[aerialway=gondola]::dash, -line|z12-[aerialway=mixed_lift]::dash, -line|z12-[aerialway=drag_lift] ::dash, -line|z12-[aerialway=j-bar]::dash, -line|z12-[aerialway=t-bar]::dash, -line|z12-[aerialway=magic_carpet]::dash, -line|z12-[aerialway=platter]::dash, -line|z12-[aerialway=rope_tow]::dash, -line|z18-[power=line], -{color: @aerialway;opacity: 1;} -*/ - /* 10.2 Aerialway 12-22 ZOOM */ -/*line|z12-15[aerialway=cable_car], -line|z12-15[aerialway=chair_lift], -line|z12-15[aerialway=gondola], -line|z12-15[aerialway=mixed_lift], -line|z12-15[aerialway=drag_lift], -line|z12-15[aerialway=j-bar], -line|z12-15[aerialway=t-bar], -line|z12-15[aerialway=magic_carpet], -line|z12-15[aerialway=platter], -line|z12-15[aerialway=rope_tow], -{width: 0.5;} -line|z16-[aerialway=cable_car], -line|z16-[aerialway=chair_lift], -line|z16-[aerialway=gondola], -line|z16-[aerialway=mixed_lift], -line|z16-[aerialway=drag_lift], -line|z16-[aerialway=j-bar], -line|z16-[aerialway=t-bar], -line|z16-[aerialway=magic_carpet], -line|z16-[aerialway=platter], -line|z16-[aerialway=rope_tow], -{width: 1;} -line|z12-13[aerialway=cable_car]::dash, -line|z12-13[aerialway=chair_lift]::dash, -line|z12-13[aerialway=gondola]::dash, -line|z12-13[aerialway=mixed_lift]::dash, -line|z12-13[aerialway=drag_lift] ::dash, -line|z12-13[aerialway=j-bar]::dash, -line|z12-13[aerialway=t-bar]::dash, -line|z12-13[aerialway=magic_carpet]::dash, -line|z12-13[aerialway=platter]::dash, -line|z12-13[aerialway=rope_tow]::dash, -{width: 2;opacity: 0.6;dashes: 0.9,18;} -line|z14-[aerialway=cable_car]::dash, -line|z14-[aerialway=chair_lift]::dash, -line|z14-[aerialway=gondola]::dash, -line|z14-[aerialway=mixed_lift]::dash, -line|z14-[aerialway=drag_lift] ::dash, -line|z14-[aerialway=j-bar]::dash, -line|z14-[aerialway=t-bar]::dash, -line|z14-[aerialway=magic_carpet]::dash, -line|z14-[aerialway=platter]::dash, -line|z14-[aerialway=rope_tow]::dash, -{width: 2.5;opacity: 0.6;dashes: 0.9,18;}*/ - /* 10.3 Piste & Route 14-22 ZOOM */ -/*line|z14-[piste:type=downhill][piste:difficulty=novice] -{color: @piste_novice;opacity: 1;} -line|z14-[piste:type=downhill][piste:difficulty=easy] -{color: @piste_easy;opacity: 1;} -line|z14-[piste:type=downhill][piste:difficulty=intermediate] -{color: @piste_intermadiate;opacity: 1;} -line|z14-[piste:type=downhill][piste:difficulty=advanced] -{color: @piste_advanced;opacity: 1;} -line|z14-[piste:type=downhill][piste:difficulty=expert], -line|z14-[piste:type=downhill][piste:difficulty=freeride] -{color: @piste_expert;opacity: 1;} - -line|z14-[piste:type=downhill], -line|z14-[piste:type=nordic], -line|z14-[piste:type=sled] -{color: @piste;opacity: 1;} - -line|z14[piste:type=downhill], -line|z14[piste:type=nordic], -line|z14[piste:type=sled], -{width: 0.8;} -line|z14[route=ski], -line|z14[leisure=skiing] -{width: 0.8;} -line|z14-[piste:type=downhill][piste:difficulty=novice], -line|z14-[piste:type=downhill][piste:difficulty=easy], -line|z14-[piste:type=downhill][piste:difficulty=intermediate], -line|z14-[piste:type=downhill][piste:difficulty=advanced], -line|z14-[piste:type=downhill][piste:difficulty=expert], -line|z14-[piste:type=downhill][piste:difficulty=freeride], -{width: 1;} -line|z15-[piste:type=downhill][piste:difficulty=novice], -line|z15-[piste:type=downhill][piste:difficulty=easy], -line|z15-[piste:type=downhill][piste:difficulty=intermediate], -line|z15-[piste:type=downhill][piste:difficulty=advanced], -line|z15-[piste:type=downhill][piste:difficulty=expert], -line|z15-[piste:type=downhill][piste:difficulty=freeride], -{width: 1.6;} -line|z15-[piste:type=downhill], -line|z15-[piste:type=sled], -line|z15-[piste:type=nordic], -line|z15-[route=ski], -line|z15-[leisure=skiing] -{width: 1.1;} -line|z17-[piste:type=downhill][piste:difficulty=novice], -line|z17-[piste:type=downhill][piste:difficulty=easy], -line|z17-[piste:type=downhill][piste:difficulty=intermediate], -line|z17-[piste:type=downhill][piste:difficulty=advanced], -line|z17-[piste:type=downhill][piste:difficulty=expert], -line|z17-[piste:type=downhill][piste:difficulty=freeride], -{width: 1.8;} -line|z17-[piste:type=downhill], -line|z17-[piste:type=sled], -line|z17-[piste:type=nordic], -line|z17-[route=ski], -line|z17-[leisure=skiing] -{width: 1.5;}*/ - /* 11. FERRY */ /*line|z10-[route=ferry], line|z10-[route=ferry_motorcar]