diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index 026dd144e..37bbc2d42 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -103,10 +103,9 @@ line|z11-[highway=bridleway], {color: @path; opacity: 1;} line|z11-[highway=cycleway], +line|z13-[highway=footway][bicycle=designated]::cycleline, line|z12-[highway=path][bicycle=designated]::cycleline, {color: @cycleway; opacity: 1;} -line|z13-[highway=footway][bicycle=designated]::cycleline, -{color: @cycleway; opacity: 0.8;} line|z11[highway=track], {width: 1.1; dashes: 6,2.5; opacity: 0.6;} @@ -168,27 +167,37 @@ line|z13-[highway=footway][bicycle=designated], {opacity: 0.8;} line|z12[highway=path][bicycle=designated], -line|z12[highway=footway][bicycle=designated], {width: 1.1; dashes: 3.5,2.5; opacity: 0.7;} line|z13[highway=path][bicycle=designated], -line|z13[highway=footway][bicycle=designated], {width: 1.3; dashes: 4,3;} line|z14[highway=path][bicycle=designated], -line|z14[highway=footway][bicycle=designated], {width: 1.6; dashes: 4,3;} line|z15[highway=path][bicycle=designated], -line|z15[highway=footway][bicycle=designated], {width: 2; dashes: 6,4.5;} line|z16[highway=path][bicycle=designated], -line|z16[highway=footway][bicycle=designated], {width: 2.6; dashes: 6,4.5;} line|z17[highway=path][bicycle=designated], -line|z17[highway=footway][bicycle=designated], {width: 3.3; dashes: 8,6;} line|z18-[highway=path][bicycle=designated], -line|z18-[highway=footway][bicycle=designated], {width: 4; dashes: 8,6; opacity: 1;} +line|z12[highway=footway][bicycle=designated], +{width: 1.1; dashes: 2,6; opacity: 0.7;} +line|z13[highway=footway][bicycle=designated], +{width: 1.3; dashes: 3,7;} +line|z14[highway=footway][bicycle=designated], +{width: 1.6; dashes: 4,8;} +line|z15[highway=footway][bicycle=designated], +{width: 2; dashes: 6,9; opacity: 0.8;} +line|z16[highway=footway][bicycle=designated], +{width: 2.6; dashes: 8,10; opacity: 0.9;} +line|z17[highway=footway][bicycle=designated], +{width: 3.3; dashes: 10,11; opacity: 1;} +line|z18[highway=footway][bicycle=designated], +{width: 4; dashes: 15,15; opacity: 1;} +line|z19-[highway=footway][bicycle=designated], +{width: 4; dashes: 20,20; opacity: 1;} + line|z11[highway=path][_path_grade=difficult], line|z11[highway=path][_path_grade=expert], {width: 1; dashes: 1,2; opacity: 0.7;} @@ -247,32 +256,42 @@ line|z18-[highway=bridleway], line|z11[highway=cycleway], {width: 0.9; opacity: 0.7;} line|z12[highway=cycleway], -line|z12[highway=path][bicycle=designated]::cycleline, -{width: 1; opacity: 0.7;} +{width: 1.1; opacity: 0.7;} line|z13[highway=cycleway], -line|z13[highway=footway][bicycle=designated]::cycleline, line|z13[highway=path][bicycle=designated]::cycleline, -{width: 1.1; opacity: 0.8;} +{width: 1.3; opacity: 0.8;} line|z14[highway=cycleway], -line|z14[highway=footway][bicycle=designated]::cycleline, line|z14[highway=path][bicycle=designated]::cycleline, -{width: 1.3;} +{width: 1.6;} line|z15[highway=cycleway], -line|z15[highway=footway][bicycle=designated]::cycleline, line|z15[highway=path][bicycle=designated]::cycleline, -{width: 1.5;} -line|z16[highway=cycleway], -line|z16[highway=footway][bicycle=designated]::cycleline, -line|z16[highway=path][bicycle=designated]::cycleline, -{width: 1.7;} -line|z17[highway=cycleway], -line|z17[highway=footway][bicycle=designated]::cycleline, -line|z17[highway=path][bicycle=designated]::cycleline, {width: 2;} +line|z16[highway=cycleway], +line|z16[highway=path][bicycle=designated]::cycleline, +{width: 2.6;} +line|z17[highway=cycleway], +line|z17[highway=path][bicycle=designated]::cycleline, +{width: 3.3;} line|z18-[highway=cycleway], -line|z18-[highway=footway][bicycle=designated]::cycleline, line|z18-[highway=path][bicycle=designated]::cycleline, -{width: 2.4;} +{width: 4;} + +line|z13-[highway=footway][bicycle=designated]::cycleline, +{opacity: 1;} +line|z13[highway=footway][bicycle=designated]::cycleline, +{width: 0.5;} +line|z14[highway=footway][bicycle=designated]::cycleline, +{width: 0.6;} +line|z15[highway=footway][bicycle=designated]::cycleline, +{width: 0.7;} +line|z16[highway=footway][bicycle=designated]::cycleline, +{width: 0.8;} +line|z17[highway=footway][bicycle=designated]::cycleline, +{width: 1.1;} +line|z18[highway=footway][bicycle=designated]::cycleline, +{width: 1.4;} +line|z19-[highway=footway][bicycle=designated]::cycleline, +{width: 2.0;} /* Ski pistes */ diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index c88956085..91272a6ab 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -47,6 +47,12 @@ power-line::dash # line::dash z13- (also has power-minor_line::dash # line::dash z15- (also has line z15-) === 340 +highway-footway-bicycle # line z11- (also has line::cycleline z13-, pathtext z13-) +=== 332 + +highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-) +=== 331 + highway-cycleway # line z11- (also has pathtext z13-) highway-cycleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-cycleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) @@ -272,9 +278,8 @@ highway-bridleway-bridge # line z11- (also has line:: highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-footway # line z11- (also has pathtext z13-) highway-footway-area # line z11- and area z14- (also has pathtext z13-) -highway-footway-bicycle # line z11- (also has line::cycleline z13-, pathtext z13-) highway-path # line z11- (also has pathtext z13-) -highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z13-) +highway-path-bicycle # line z11- (also has line::cycleline z13-, pathtext z13-) highway-path-difficult # line z11- (also has pathtext z13-) highway-path-expert # line z11- (also has pathtext z13-) highway-raceway # line z14- (also has pathtext z16-) @@ -285,8 +290,7 @@ highway-track-no-access # line z11- (also has pathte highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) === 180 -highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-) -highway-path-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z13-) +highway-path-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-) === 170 highway-construction # line z11- (also has pathtext z15-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 5afcd21fd..652c05608 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -668,6 +668,9 @@ highway-residential-bridge::shield # shield::shield z15- (also highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-) === 2955 +highway-footway-bicycle # pathtext z13- (also has line z11-, line::cycleline z13-) +=== 2954 + highway-cycleway # pathtext z13- (also has line z11-) highway-cycleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) highway-cycleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) @@ -676,7 +679,6 @@ highway-cycleway-tunnel # pathtext z13- (also has li area:highway-footway # caption z15- (also has area z14-) highway-footway # pathtext z13- (also has line z11-) highway-footway-area # pathtext z13- (also has line z11-, area z14-) -highway-footway-bicycle # pathtext z13- (also has line z11-, line::cycleline z13-) highway-footway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) highway-footway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) highway-tertiary_link # pathtext z18- (also has line z14-) @@ -706,7 +708,7 @@ highway-bridleway # pathtext z13- (also has li highway-bridleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) highway-bridleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) highway-path # pathtext z13- (also has line z11-) -highway-path-bicycle # pathtext z13- (also has line z11-, line::cycleline z12-) +highway-path-bicycle # pathtext z13- (also has line z11-, line::cycleline z13-) highway-path-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) highway-path-difficult # pathtext z13- (also has line z11-) highway-path-expert # pathtext z13- (also has line z11-)