diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 3796c1b16..bb05a0d23 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -23,6 +23,8 @@ 7.2 Residential, Road, Street tunnel 16-22 ZOOM 7.3 Residential, Road, Street bridge 14-22 ZOOM 7.4 Service 15-22 ZOOM + 7.5 Service tunnel 16-22 ZOOM + 7.6 Service bridge 15-22 ZOOM 8.OTHERS ROADS 13-22 ZOOM 8.1 Pedestrian & ford 13-22 ZOOM 8.2 Pedestrian & ford tunnel 16-22 ZOOM @@ -678,6 +680,41 @@ line|z19-[highway=service][service=busway], line|z19-[highway=busway], {width: 4;} +/* 7.5 Service tunnel 16-22 ZOOM */ + +line|z15-[highway=service][tunnel?], +line|z15-[highway=service][service=busway][tunnel?], +line|z15-[highway=busway][tunnel?], +{opacity: 0.7; casing-width: 1; casing-dashes: 5,5; color: @residential_tunnel; casing-linecap: butt; casing-color: @residential_tunnel_casing; casing-opacity: 0.7;} + +/* 7.6 Service bridge 15-22 ZOOM */ + +line|z15-[highway=service][bridge?]::bridgewhite, +line|z15-[highway=service][service=busway][bridge?]::bridgewhite, +line|z15-[highway=busway][bridge?]::bridgewhite, +{casing-width-add: 0;} +line|z15-[highway=service][bridge?]::bridgewhite, +line|z15-[highway=service][service=busway][bridge?]::bridgewhite, +line|z15-[highway=busway][bridge?]::bridgewhite, +{casing-width-add: 0.8;} +line|z15-[highway=service][bridge?]::bridgewhite, +line|z15-[highway=service][service=busway][bridge?]::bridgewhite, +line|z15-[highway=busway][bridge?]::bridgewhite, +{casing-width-add: 1;} + +line|z15-[highway=service][bridge?]::bridgeblack, +line|z15-[highway=service][service=busway][bridge?]::bridgeblack, +line|z15-[highway=busway][bridge?]::bridgeblack, +{casing-width-add: 0.4;} +line|z15-[highway=service][bridge?]::bridgeblack, +line|z15-[highway=service][service=busway][bridge?]::bridgeblack, +line|z15-[highway=busway][bridge?]::bridgeblack, +{casing-width-add: 1.6;} +line|z15-[highway=service][bridge?]::bridgeblack, +line|z15-[highway=service][service=busway][bridge?]::bridgeblack, +line|z15-[highway=busway][bridge?]::bridgeblack, +{casing-width-add: 2;} + /* 8.OTHERS ROADS 13-22 ZOOM */ line|z13-[highway=pedestrian], diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index c8c6d5ba3..c9b4bab0c 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -196,17 +196,19 @@ highway-tertiary_link-tunnel # line z14- (also has line(c === 223 highway-busway # line z15- (also has pathtext z16-) -highway-busway-bridge # line z15- (also has pathtext z16-) -highway-busway-tunnel # line z15- (also has pathtext z16-) +highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) highway-service # line z15- (also has pathtext z16-) highway-service-area # line z15- (also has pathtext z16-) -highway-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-) +highway-service-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) highway-service-driveway # line z16- (also has pathtext z16-) highway-service-parking_aisle # line z15- (also has pathtext z16-) -highway-service-tunnel # line z15- (also has pathtext z16-) +highway-service-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) # highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) === 222 +# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) railway-rail::dash # line::dash z16- (also has line z11-) @@ -327,6 +329,7 @@ highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (a === 153 highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) +highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) @@ -339,7 +342,7 @@ highway-residential-bridge::bridgewhite # line::bridgewhite z14- (al highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) -highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z15-, line::bridgeblack z16-, pathtext z16-) +highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) @@ -362,6 +365,7 @@ railway-subway-bridge::bridgewhite # line::bridgewhite z13- (al === 150 highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) +highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-) highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) @@ -374,7 +378,7 @@ highway-residential-bridge::bridgeblack # line::bridgeblack z14- (al highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) -highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z16-, pathtext z16-) +highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 24f658bfc..7d178e4ea 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -736,10 +736,10 @@ highway-track-tunnel # pathtext z15- (also has li highway-service # pathtext z16- (also has line z15-) highway-service-area # pathtext z16- (also has line z15-) -highway-service-bridge # pathtext z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z16-) +highway-service-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) highway-service-driveway # pathtext z16- (also has line z16-) highway-service-parking_aisle # pathtext z16- (also has line z15-) -highway-service-tunnel # pathtext z16- (also has line z15-) +highway-service-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) 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-) @@ -891,8 +891,8 @@ leisure-dog_park # icon z16- (also has captio === 2300 highway-busway # pathtext z16- (also has line z15-) -highway-busway-bridge # pathtext z16- (also has line z15-) -highway-busway-tunnel # pathtext z16- (also has line z15-) +highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) +highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) === 2250 amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 065a2bf92..60cdcb0bb 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -198,17 +198,19 @@ highway-tertiary_link-tunnel # line z14- (also has line(c === 223 highway-busway # line z15- (also has pathtext z16-) -highway-busway-bridge # line z15- (also has pathtext z16-) -highway-busway-tunnel # line z15- (also has pathtext z16-) +highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) highway-service # line z13- (also has pathtext z16-) highway-service-area # line z13- (also has pathtext z16-) -highway-service-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-) +highway-service-bridge # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) highway-service-driveway # line z16- (also has pathtext z16-) highway-service-parking_aisle # line z15- (also has pathtext z16-) -highway-service-tunnel # line z13- (also has pathtext z16-) +highway-service-tunnel # line z13- (also has line(casing) z15-, pathtext z16-) # highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) === 222 +# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z13-, pathtext z16-) railway-light_rail::dash # line::dash z16- (also has line z13-) railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) railway-rail::dash # line::dash z15- (also has line z10-) @@ -329,6 +331,7 @@ highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (a === 153 highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) +highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) @@ -341,7 +344,7 @@ highway-residential-bridge::bridgewhite # line::bridgewhite z14- (al highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) -highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-, pathtext z16-) +highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-) highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) @@ -364,6 +367,7 @@ railway-subway-bridge::bridgewhite # line::bridgewhite z13- (al === 150 highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) +highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) @@ -376,7 +380,7 @@ highway-residential-bridge::bridgeblack # line::bridgeblack z14- (al highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) -highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-, pathtext z16-) +highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-) highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 9884f5d9d..e2ca771f8 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -736,10 +736,10 @@ highway-track-tunnel # pathtext z13- (also has li highway-service # pathtext z16- (also has line z13-) highway-service-area # pathtext z16- (also has line z13-) -highway-service-bridge # pathtext z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z16-) +highway-service-bridge # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-) highway-service-driveway # pathtext z16- (also has line z16-) highway-service-parking_aisle # pathtext z16- (also has line z15-) -highway-service-tunnel # pathtext z16- (also has line z13-) +highway-service-tunnel # pathtext z16- (also has line z13-, line(casing) z15-) piste:type-downhill # pathtext z15- (also has line z12-) piste:type-downhill-advanced # pathtext z15- (also has line z12-) piste:type-downhill-easy # pathtext z15- (also has line z12-) @@ -891,8 +891,8 @@ leisure-dog_park # icon z16- (also has captio === 2300 highway-busway # pathtext z16- (also has line z15-) -highway-busway-bridge # pathtext z16- (also has line z15-) -highway-busway-tunnel # pathtext z16- (also has line z15-) +highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) +highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) === 2250 amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-)