diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index d11f1749f..8ffa89e11 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -726,6 +726,7 @@ line|z15-[highway=footway], {color: @footway;opacity: 0.9;} line|z16-[highway=footway], {opacity: 0.95;} +line|z15-[highway=ladder], line|z15-[highway=steps], {color: @residential;opacity: 1;} line|z15-[highway=path], @@ -1032,15 +1033,20 @@ line|z17-[highway=footway][bridge?]::bridgeblack /* 8.8 Steps 15-22 ZOOM */ -line|z15[highway=steps] +line|z15[highway=ladder], +line|z15[highway=steps], {width: 2.4; dashes: 1.5,1.3;} -line|z16[highway=steps] +line|z16[highway=ladder], +line|z16[highway=steps], {width: 4; dashes: 1.8,1.6;} -line|z17-[highway=steps] +line|z17-[highway=ladder], +line|z17-[highway=steps], {width: 6; dashes: 2.5,2.2; opacity: 1;} -line|z18[highway=steps] +line|z18[highway=ladder], +line|z18[highway=steps], {width: 8; dashes: 3.2,2.8;} -line|z19-[highway=steps] +line|z19-[highway=ladder], +line|z19-[highway=steps], {width: 10; dashes: 4,3.5;} line|z17-[highway=steps][tunnel?]::tunnelBackground diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index 25584f1e5..4884b9040 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -45,6 +45,7 @@ power-line # line z19- (also has line:: power-line::dash # line::dash z19- (also has line z19-) === 340 +highway-ladder # line z15- (also has icon z17-, pathtext z17-) highway-steps # line z15- (also has pathtext z16-) highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index b73a64279..c3f474d6a 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1096,7 +1096,7 @@ amenity-nursing_home # icon z17- (also has captio amenity-prison # icon z17- (also has caption(optional) z17-, area z12-) amenity-social_facility # icon z17- (also has caption(optional) z17-, area z15-) amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) -highway-ladder # icon z17- (also has caption(optional) z17-) +highway-ladder # icon z17- and pathtext z17- (also has line z15-) historic-ruins # icon z17- (also has caption(optional) z17-) landuse-farmland # caption z15- (also has area z10-) landuse-garages # caption z15- (also has area z13-) @@ -2046,7 +2046,6 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) # amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) # amenity-waste_transfer_station # caption(optional) z19- (also has icon z17-, area z13-) -# highway-ladder # caption(optional) z17- (also has icon z17-) # historic-ruins # caption(optional) z17- (also has icon z17-) # leisure-ice_rink # caption(optional) z17- (also has icon z17-) # leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index ab16d9794..f08f1305d 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -87,6 +87,7 @@ line|z11-[highway=track], /* Its not unusual for trails to be tagged as footways, e.g. in UK */ line|z11-[highway=footway], +line|z12-[highway=ladder], line|z12-[highway=steps], {color: @footway; opacity: 1;} @@ -130,6 +131,7 @@ line|z11[highway=path], {width: 1; dashes: 3.5,2; opacity: 0.6;} line|z12[highway=footway], /* Make steps on z12-14 look same as footways, z15- follows main style */ +line|z12[highway=ladder], line|z12[highway=steps], {width: 1.1; dashes: 3.5,2;} line|z12[highway=path], @@ -138,13 +140,18 @@ line|z12[piste:type=hike], line|z13[highway=path], line|z13[piste:type=hike], line|z13[highway=footway], +line|z13[highway=ladder], line|z13[highway=steps], {width: 1.3; dashes: 4,2.5;} line|z14[highway=path], line|z14[piste:type=hike], line|z14[highway=footway], +line|z14[highway=ladder], line|z14[highway=steps], {width: 1.6; dashes: 4,2.5;} + +/* steps and ladder from z15 are set in default style */ + line|z15[highway=path], line|z15[piste:type=hike], line|z15[highway=footway], diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 7cce6bdb9..e2b56fcbc 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -47,6 +47,7 @@ power-line::dash # line::dash z13- (also has power-minor_line::dash # line::dash z15- (also has line z15-) === 340 +highway-ladder # line z12- (also has icon z16-, pathtext z17-) highway-steps # line z12- (also has pathtext z13-) highway-steps-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-steps-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 1af9d05fc..2477a717d 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1097,7 +1097,7 @@ amenity-nursing_home # icon z17- (also has captio amenity-prison # icon z17- (also has caption(optional) z17-, area z12-) amenity-social_facility # icon z17- (also has caption(optional) z17-, area z15-) amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) -highway-ladder # icon z16- (also has caption(optional) z17-) +highway-ladder # icon z16- and pathtext z17- (also has line z12-) historic-ruins # icon z17- (also has caption(optional) z17-) landuse-farmland # caption z15- (also has area z10-) landuse-garages # caption z15- (also has area z13-) @@ -2049,7 +2049,6 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) # amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) # amenity-waste_transfer_station # caption(optional) z19- (also has icon z17-, area z13-) -# highway-ladder # caption(optional) z17- (also has icon z16-) # historic-ruins # caption(optional) z17- (also has icon z17-) # leisure-ice_rink # caption(optional) z17- (also has icon z17-) # leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index 2abb8253e..93aa63548 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -640,6 +640,7 @@ line|z19-[highway=construction], /* 8.7 Footway & Steps 18-22 ZOOM */ line|z18-[highway=footway], +line|z18-[highway=ladder], line|z18-[highway=steps], {color: @footway; opacity: 0.7; width: 1.5; dashes: 5,2;} diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 72af66213..f04f8c2e3 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -15,6 +15,7 @@ historic-citywalls # line z15- === 280 +highway-ladder # line z18- highway-steps # line z18- highway-steps-bridge # line z18- hwtag-oneway::arrows # line::arrows z15-