From d4bb911fe2ca712abf944506aa469a3744d37f0b Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Tue, 10 Jun 2025 00:59:26 +0200 Subject: [PATCH] Incorporated feedback about improved light map style --- data/styles/default/include/Basemap.mapcss | 9 ++++---- data/styles/default/include/Roads.mapcss | 25 +++++++++++----------- data/styles/default/light/colors.mapcss | 24 ++++++++++----------- data/styles/outdoors/light/colors.mapcss | 3 +++ 4 files changed, 33 insertions(+), 28 deletions(-) diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 1af4d191b..a24261015 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -141,10 +141,11 @@ area|z14-[landuse=recreation_ground], area|z14-[landuse=village_green], area|z14-[landuse=field], {fill-color: @green1;} +area|z11[landuse=forest], area|z16-[natural=grassland], area|z16-[landuse=meadow], {fill-color: @green1b;} -area|z11-12[landuse=forest], +area|z12[landuse=forest], area|z12[leisure=garden], {fill-color: @green2;} area|z13[landuse=forest], @@ -605,13 +606,13 @@ line|z19-[barrier=hedge], line|z14-[barrier=city_wall], line|z14-[historic=citywalls], -{color: @building1; width: 2; opacity: 0.7;} +{color: @building_border1; width: 2; opacity: 0.9;} line|z15[barrier=city_wall], line|z15[historic=citywalls], {width: 2.8;} line|z16-[barrier=city_wall], line|z16-[historic=citywalls], -{color: @building0; width: 4.5; dashes: 3,3,1.5,3;} +{cwidth: 4.5; dashes: 3,3,1.5,3;} line|z17[barrier=city_wall], line|z17[historic=citywalls], {width: 5.9; dashes: 4,4,1.9,4;} @@ -656,7 +657,7 @@ line|z18-[barrier=retaining_wall], line|z16-[man_made=embankment], -{color: @building1; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.7;} +{color: @building_border0; 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], diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 83b5fa470..f5daee60c 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -76,7 +76,7 @@ line|z9[highway=world_level] line|z6[highway=motorway], {color: @motorway0; opacity: 1;} line|z6[highway=trunk], -{color: @trunk0; opacity: 0.6;} +{color: @trunk1; opacity: 0.6;} line|z7-9[highway=motorway], {color: @motorway0; opacity: 1;} line|z7-9[highway=trunk], @@ -84,11 +84,12 @@ line|z7-9[highway=trunk], line|z10-[highway=motorway], {color: @motorway1; opacity: 0.7;} line|z10-[highway=trunk], -{color: @trunk1; opacity: 0.7;} +{color: @trunk1; opacity: 0.8;} line|z10-[highway=motorway_link], line|z10-[highway=trunk_link], {color: @primary0; opacity: 0.7;} line|z13-14[highway=trunk], +{color: @trunk1; opacity: 0.9;} line|z13-14[highway=motorway], line|z14-15[highway=motorway_link], line|z14-15[highway=trunk_link], @@ -275,10 +276,10 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack /* 4.PRIMARY 8-22 ZOOM */ line|z8-10[highway=primary], -{color: @primary1; opacity: 1;} +{color: @primary0; opacity: 0.8;} line|z11-13[highway=primary], line|z11-13[highway=primary_link] -{color: @primary0; opacity: 0.9;} +{color: @primary1; opacity: 1;} line|z14-[highway=primary], line|z14-[highway=primary_link], {color: @primary2; opacity: 1;} @@ -377,7 +378,7 @@ line|z10-12[highway=secondary], {color: @secondary0; opacity: 1;} line|z13-14[highway=secondary], line|z13-14[highway=secondary_link], -{color: @secondary1; opacity: 0.9;} +{color: @secondary1; opacity: 1;} line|z15-[highway=secondary], line|z15-[highway=secondary_link], {color: @secondary1; opacity: 1;} @@ -562,11 +563,11 @@ line|z18-[highway=unclassified][bridge?]::bridgeblack, line|z12-[highway=residential], line|z12-[highway=road], line|z12-[highway=living_street], -{color: @residential; opacity: 0.7;} +{color: @residential; opacity: 1;} line|z14-16[highway=residential], line|z14-16[highway=road], line|z14-16[highway=living_street], -{opacity: 0.85;} +{opacity: 0.9;} line|z17-[highway=residential], line|z17-[highway=road], line|z17-[highway=living_street], @@ -725,7 +726,7 @@ line|z15-[leisure=track][!area], line|z14-[highway=bridleway] {color: @bridleway;opacity: 0.6;} line|z15-[highway=footway], -{color: @footway;opacity: 0.8;} +{color: @footway;opacity: 0.87;} line|z15-[highway=steps], {color: @footway;opacity: 0.9;} line|z14-[highway=path], @@ -803,16 +804,16 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack, /* 8.4 Cycleway 13-22 ZOOM */ line|z13[highway=cycleway], -{opacity: 0.5;} +{opacity: 0.6;} line|z14[highway=cycleway], line|z14[highway=path][bicycle=designated]::cycleline, -{opacity: 0.6;} +{opacity: 0.7;} line|z15[highway=cycleway], line|z15[highway=path][bicycle=designated]::cycleline, -{opacity: 0.7;} +{opacity: 0.8;} line|z16-17[highway=cycleway], line|z16-17[highway=path][bicycle=designated]::cycleline, -{opacity: 0.8;} +{opacity: 0.9;} line|z18-[highway=cycleway], line|z18-[highway=path][bicycle=designated]::cycleline, {opacity: 1;} diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index f0c223672..f6c482b9d 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -41,7 +41,7 @@ @water: #8AD8E7; @water_bad: #95C5B8; @river: #5FB4C5; -@wetland: #A8DCDC; +@wetland: #C3E0D1; @beach: #FFE7B7; @barerock: #D9D2BF; @scree: #CCC7BA; @@ -63,8 +63,8 @@ /* 4.LANDUSE */ /*4.1 Main landuse*/ -@pedestrian_area: #F7EAD8; -@pedestrian_area_light: #F7EBD9; +@pedestrian_area: #F6EBDC; +@pedestrian_area_light: #F7EDDF; @university: #F8E3C2; @hospital: #FFDAD6; @industrial: #E8E6E1; @@ -101,20 +101,20 @@ /* 5.ROADS */ /* 5.1 All roads */ -@motorway0: #F07800; +@motorway0: #F57A00; @motorway1: #F08800; -@trunk0: #F2A62B; -@trunk1: #F5A72C; -@primary0: #F5B64C; -@primary1: #F5BE62; -@primary2: #F5BD5F; -@secondary0: #F9C469; +@trunk0: #F09D18; +@trunk1: #F2A327; +@primary0: #F5B74E; +@primary1: #F2BA52; +@primary2: #F2BD5C; +@secondary0: #FFCB70; @secondary1: #F9CA7A; @tertiary: #FFFFFF; @residential: #FFFFFF; @pedestrian: #FFFAF5; @footway: #FFFAF5; -@cycleway: #FFB88B; +@cycleway: #605EFE; @construction: #C1A06B; @track: #635730; @path: #8E4E1D; @@ -173,7 +173,7 @@ /* 6.2 Natural labels */ -@water_label: #1D8EA4; +@water_label: #278FA2; @park_label: #3A7921; @halo_park_label: #FFFFFF; diff --git a/data/styles/outdoors/light/colors.mapcss b/data/styles/outdoors/light/colors.mapcss index 454031ba3..dc5edc8e2 100644 --- a/data/styles/outdoors/light/colors.mapcss +++ b/data/styles/outdoors/light/colors.mapcss @@ -34,6 +34,9 @@ @cycleway: #534DEB; /* slightly darker than in main */ +@pedestrian: #FFFFFF; /* slightly lighter than in main */ +@footway: #FFFFFF; /* slightly lighter than in main */ + @construction: #ABAB9A; /* 5.5 Transport */