From 082403f506086d5b6557a08e447d3b15955174dc Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Fri, 13 Jun 2025 16:41:52 +0200 Subject: [PATCH] Incorporated feedback --- data/styles/default/dark/colors.mapcss | 2 + data/styles/default/include/Basemap.mapcss | 11 +++- data/styles/default/include/Roads.mapcss | 55 +++++++++---------- .../include/priorities_1_BG-by-size.prio.txt | 2 +- .../default/include/priorities_3_FG.prio.txt | 6 +- .../include/priorities_4_overlays.prio.txt | 6 +- data/styles/default/light/colors.mapcss | 12 ++-- data/styles/outdoors/include/Roads.mapcss | 27 ++++++--- .../include/priorities_1_BG-by-size.prio.txt | 2 +- .../outdoors/include/priorities_3_FG.prio.txt | 6 +- .../include/priorities_4_overlays.prio.txt | 6 +- 11 files changed, 72 insertions(+), 63 deletions(-) diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 1c0ffc915..44ac839d7 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -72,6 +72,7 @@ @sport0: #21211B; @sport1: #262620; @sport2: #2A2A24; +@playground: #2A2A24; @parking: #1F1B1B; @military: #B71C1C; @prison: #7f7f7f; @@ -98,6 +99,7 @@ @building1: #424242; @building_border0: #616161; @building_border1: #696969; +@historic_wall: #696969; /* 5.ROADS */ /* 5.1 All roads */ diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 9563f0e7d..177920e05 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -361,9 +361,12 @@ area|z15-[landuse=education], area|z16-[public_transport=platform], area|z16-[amenity=place_of_worship], area|z16-[railway=platform], -area|z16-[leisure=playground], +area|z15-[leisure=playground], {fill-opacity: 1;} +area|z15-[amenity=university], +{fill-opacity: 0.9;} + /* 7.1 Industrial */ area|z15-[landuse=industrial], @@ -391,9 +394,11 @@ area|z15-[landuse=education], area|z15-[leisure=pitch], area|z15-[leisure=track][area?], -area|z16-[leisure=playground], {fill-color: @sport2;} +area|z15-[leisure=playground], +{fill-color: @playground;} + area|z15-[leisure=stadium] {fill-color: @sport1;} @@ -606,7 +611,7 @@ line|z19-[barrier=hedge], line|z14-[barrier=city_wall], line|z14-[historic=citywalls], -{color: @building_border1; width: 2; opacity: 0.9;} +{color: @historic_wall; width: 2; opacity: 0.9;} line|z15[barrier=city_wall], line|z15[historic=citywalls], {width: 2.8;} diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 0f50f26bd..839efd85d 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -658,7 +658,12 @@ line|z18-[highway=residential][bridge?]::bridgeblack, line|z15-[highway=service], line|z15-[highway=service][service=busway], line|z15-[highway=busway], -{color: @residential; opacity: 0.9;} +{color: @residential; opacity: 0.95;} + +line|z13-[highway=service], +line|z13-[highway=service][service=busway], +line|z13-[highway=busway], +{opacity: 0.9;} line|z15[highway=service], line|z15[highway=service][service=busway], @@ -694,20 +699,8 @@ line|z14-[highway=path][bicycle=designated]::cycleline, line|z15-[highway=footway][bicycle=designated]::cycleline, {color: @cycleway;} -line|z14-[highway=path][bicycle=designated]::cycleline, -{dashes: 7,9.6;} -line|z16[highway=path][bicycle=designated]::cycleline, -{dashes: 7.5,9.5;} -line|z17[highway=path][bicycle=designated]::cycleline, -{dashes: 8,9.4;} -line|z18[highway=path][bicycle=designated]::cycleline, -{dashes: 8.5,9.3;} -line|z19-[highway=path][bicycle=designated]::cycleline, -{dashes: 9,9.2;} - - line|z13-[highway=construction], -{color: @construction;opacity: 0.7;} +{color: @construction;opacity: 0.8;} line|z13-[highway=pedestrian][bridge?]::bridgewhite, line|z15-[highway=footway][bridge?]::bridgewhite, line|z15-[highway=cycleway][bridge?]::bridgewhite, @@ -815,44 +808,46 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack, /* 8.4 Cycleway 13-22 ZOOM */ line|z13[highway=cycleway], -{opacity: 0.5;} -line|z14[highway=cycleway], -line|z14[highway=path][bicycle=designated]::cycleline, -{opacity: 0.6;} -line|z15[highway=cycleway], -line|z15[highway=path][bicycle=designated]::cycleline, +{opacity: 0.7;} +line|z14-16[highway=cycleway], {opacity: 0.8;} -line|z16-17[highway=cycleway], -line|z16-17[highway=path][bicycle=designated]::cycleline, +line|z17-18[highway=cycleway], {opacity: 0.9;} -line|z18-[highway=cycleway], -line|z18-[highway=path][bicycle=designated]::cycleline, +line|z19-[highway=cycleway], {opacity: 1;} +line|z14-[highway=path][bicycle=designated]::cycleline, line|z15-[highway=footway][bicycle=designated]::cycleline, {opacity: 1;} line|z13[highway=cycleway] {width: 1.0;} line|z14[highway=cycleway], -line|z14[highway=path][bicycle=designated]::cycleline, {width: 1.2;} line|z15[highway=cycleway], -line|z15[highway=path][bicycle=designated]::cycleline, {width: 1.5;} line|z16[highway=cycleway], -line|z16[highway=path][bicycle=designated]::cycleline, {width: 2;} line|z17[highway=cycleway], -line|z17[highway=path][bicycle=designated]::cycleline, {width: 2.4;} line|z18[highway=cycleway], -line|z18[highway=path][bicycle=designated]::cycleline, {width: 3.2;} line|z19-[highway=cycleway], -line|z19-[highway=path][bicycle=designated]::cycleline, {width: 4.2;} +line|z14[highway=path][bicycle=designated]::cycleline, +{width: 0.5;} +line|z15[highway=path][bicycle=designated]::cycleline, +{width: 0.6;} +line|z16[highway=path][bicycle=designated]::cycleline, +{width: 1.2;} +line|z17[highway=path][bicycle=designated]::cycleline, +{width: 1;} +line|z18[highway=path][bicycle=designated]::cycleline, +{width: 1.4;} +line|z19-[highway=path][bicycle=designated]::cycleline, +{width: 1.8;} + line|z15[highway=footway][bicycle=designated]::cycleline, {width: 0.7;} line|z16[highway=footway][bicycle=designated]::cycleline, diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 62cb1e323..05a8fe629 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -37,7 +37,7 @@ leisure-swimming_pool-private # area z13- (also has icon z landuse-landfill # area z15- (also has icon z15-, caption(optional) z15-) === 220 -leisure-playground # area z16- (also has icon z17-, caption(optional) z17-) +leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) === 200 amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index 45dec6650..8acf9e7a7 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -224,9 +224,11 @@ railway-subway-bridge::dash # line::dash z16- (also has === 221 highway-footway-bicycle # line z15- (also has line::cycleline z15-, pathtext z15-) +highway-path-bicycle # line z14- (also has line::cycleline z14-, pathtext z15-) === 220 highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, pathtext z15-) +highway-path-bicycle::cycleline # line::cycleline z14- (also has line z14-, pathtext z15-) === 219 highway-cycleway # line z13- (also has pathtext z15-) @@ -268,9 +270,6 @@ highway-pedestrian-tunnel # line z13- (also has line(c # highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, pathtext z14-) # === 199 -highway-path-bicycle::cycleline # line::cycleline z14- (also has line z14-, pathtext z15-) -=== 190 - highway-bridleway # line z14- (also has pathtext z15-) highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) @@ -278,7 +277,6 @@ highway-footway # line z15- (also has pathte highway-footway-area # line z15- and area z14- (also has pathtext z15-) highway-footway-crossing # line z16- highway-path # line z14- (also has pathtext z15-) -highway-path-bicycle # line z14- (also has line::cycleline z14-, pathtext z15-) highway-path-difficult # line z14- (also has pathtext z15-) highway-path-expert # line z14- (also has pathtext z15-) highway-raceway # line z14- (also has 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 cdf1c3a82..ddeb72fd2 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -669,6 +669,7 @@ highway-residential-tunnel::shield # shield::shield z15- (also === 2955 highway-footway-bicycle # pathtext z15- (also has line z15-, line::cycleline z15-) +highway-path-bicycle # pathtext z15- (also has line z14-, line::cycleline z14-) === 2954 highway-cycleway # pathtext z15- (also has line z13-) @@ -708,7 +709,6 @@ highway-bridleway # pathtext z15- (also has li highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) highway-path # pathtext z15- (also has line z14-) -highway-path-bicycle # pathtext z15- (also has line z14-, line::cycleline z14-) highway-path-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) highway-path-difficult # pathtext z15- (also has line z14-) highway-path-expert # pathtext z15- (also has line z14-) @@ -1007,7 +1007,7 @@ amenity-shelter # icon z17- (also has captio amenity-shelter-public_transport # icon z17- (also has caption(optional) z17-) emergency-lifeguard # icon z17- (also has caption(optional) z18-) leisure-fitness_station # icon z17- (also has caption(optional) z17-) -leisure-playground # icon z17- (also has caption(optional) z17-, area z16-) +leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) natural-cliff # pathtext z16- (also has line z14-) === 1500 @@ -1960,7 +1960,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-shelter-public_transport # caption(optional) z17- (also has icon z17-) # emergency-lifeguard # caption(optional) z18- (also has icon z17-) # leisure-fitness_station # caption(optional) z17- (also has icon z17-) -# leisure-playground # caption(optional) z17- (also has icon z17-, area z16-) +# leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) # === -8500 # sport-american_football # caption(optional) z17- (also has icon z17-) diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index 9b29e2b0c..71ea550cd 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -66,14 +66,15 @@ @pedestrian_area: #F6EBDC; @pedestrian_area_light: #F7EDDF; -@university: #F8E3C2; +@university: #F5DFBC; @hospital: #FFDAD6; -@industrial: #E8E6E1; +@industrial: #E5E5E4; @sport0: #F5EED3; @sport1: #E8E8C3; @sport2: #D4E796; +@playground: #E4E7A2; @parking: #F6F0E9; -@military: #E53935; +@military: #DE2D28; @prison: #727272; @farmland: #E4E0AD; @farmyard: #E6D6AF; @@ -98,6 +99,7 @@ @building1: #D0D1CC; @building_border0: #A1A096; @building_border1: #9B9A8F; +@historic_wall: #AEAD9E; /* 5.ROADS */ /* 5.1 All roads */ @@ -115,8 +117,8 @@ @residential: #FFFEFE; @pedestrian: #FFFAF5; @footway: #FFFAF5; -@cycleway: #6F6DFF; -@construction: #C1A06B; +@cycleway: #8B8AFF; +@construction: #B2B8C8; @track: #635730; @path: #8E4E1D; @path_expert: #3D2617; diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index 37bbc2d42..7fe83aa2c 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -173,11 +173,11 @@ line|z13[highway=path][bicycle=designated], line|z14[highway=path][bicycle=designated], {width: 1.6; dashes: 4,3;} line|z15[highway=path][bicycle=designated], -{width: 2; dashes: 6,4.5;} +{width: 2; dashes: 6,4.5; opacity: 0.8} line|z16[highway=path][bicycle=designated], -{width: 2.6; dashes: 6,4.5;} +{width: 2.6; dashes: 6,4.5; opacity: 0.9;} line|z17[highway=path][bicycle=designated], -{width: 3.3; dashes: 8,6;} +{width: 3.3; dashes: 8,6; opacity: 1;} line|z18-[highway=path][bicycle=designated], {width: 4; dashes: 8,6; opacity: 1;} @@ -258,24 +258,33 @@ line|z11[highway=cycleway], line|z12[highway=cycleway], {width: 1.1; opacity: 0.7;} line|z13[highway=cycleway], -line|z13[highway=path][bicycle=designated]::cycleline, {width: 1.3; opacity: 0.8;} line|z14[highway=cycleway], -line|z14[highway=path][bicycle=designated]::cycleline, {width: 1.6;} line|z15[highway=cycleway], -line|z15[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=path][bicycle=designated]::cycleline, {width: 4;} +line|z13-[highway=path][bicycle=designated]::cycleline, +{opacity: 1;} +line|z13[highway=path][bicycle=designated]::cycleline, +{width: 0.6;} +line|z14[highway=path][bicycle=designated]::cycleline, +{width: 0.8;} +line|z15[highway=path][bicycle=designated]::cycleline, +{width: 1;} +line|z16[highway=path][bicycle=designated]::cycleline, +{width: 1.3;} +line|z17[highway=path][bicycle=designated]::cycleline, +{width: 1.6;} +line|z18-[highway=path][bicycle=designated]::cycleline, +{width: 2;} + line|z13-[highway=footway][bicycle=designated]::cycleline, {opacity: 1;} line|z13[highway=footway][bicycle=designated]::cycleline, diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index ec3d8e101..e301146fd 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -37,7 +37,7 @@ leisure-swimming_pool-private # area z13- (also has icon z landuse-landfill # area z15- (also has icon z15-, caption(optional) z15-) === 220 -leisure-playground # area z16- (also has icon z17-, caption(optional) z17-) +leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) === 200 amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 91272a6ab..b55203f85 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -48,9 +48,11 @@ power-minor_line::dash # line::dash z15- (also has === 340 highway-footway-bicycle # line z11- (also has line::cycleline z13-, pathtext z13-) +highway-path-bicycle # line z11- (also has line::cycleline z13-, pathtext z13-) === 332 highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-) +highway-path-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-) === 331 highway-cycleway # line z11- (also has pathtext z13-) @@ -279,7 +281,6 @@ highway-bridleway-tunnel # line z11- (also has line:: highway-footway # line z11- (also has pathtext z13-) highway-footway-area # line z11- and area z14- (also has pathtext z13-) highway-path # line z11- (also has 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-) @@ -290,9 +291,6 @@ 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-path-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-) -=== 170 - highway-construction # line z11- (also has pathtext z15-) leisure-track # line z15- (also has caption z16-) railway-abandoned # line z13- diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 652c05608..1245cd9d3 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -669,6 +669,7 @@ highway-residential-tunnel::shield # shield::shield z15- (also === 2955 highway-footway-bicycle # pathtext z13- (also has line z11-, line::cycleline z13-) +highway-path-bicycle # pathtext z13- (also has line z11-, line::cycleline z13-) === 2954 highway-cycleway # pathtext z13- (also has line z11-) @@ -708,7 +709,6 @@ 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 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-) @@ -1007,7 +1007,7 @@ amenity-shelter # icon z12- (also has captio amenity-shelter-public_transport # icon z14- (also has caption(optional) z14-) emergency-lifeguard # icon z14- (also has caption(optional) z18-) leisure-fitness_station # icon z17- (also has caption(optional) z17-) -leisure-playground # icon z17- (also has caption(optional) z17-, area z16-) +leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) natural-cliff # pathtext z14- (also has line z12-) === 1500 @@ -1963,7 +1963,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-shelter-public_transport # caption(optional) z14- (also has icon z14-) # emergency-lifeguard # caption(optional) z18- (also has icon z14-) # leisure-fitness_station # caption(optional) z17- (also has icon z17-) -# leisure-playground # caption(optional) z17- (also has icon z17-, area z16-) +# leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) # === -8500 # sport-american_football # caption(optional) z17- (also has icon z17-)