drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-26 15:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[styles] Changed how the greenery system works

Browse Source 
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2025-06-30 13:04:38 +02:00
parent 792f8332f5
commit 64975fc649
4 changed files with 193 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
data/styles/default/include/Basemap.mapcss
View File

@@ -111,85 +111,114 @@ area|z11-[landuse=meadow],
area|z12-[landuse=recreation_ground],
area|z12-[landuse=village_green],
area|z11-[natural=scrub],
area|z14-[leisure=miniature_golf],
area|z16-[landuse=flowerbed],
{fill-opacity: 1;}
area|z10-12[leisure=park],
{fill-color: @green0;}
area|z13-15[leisure=park],
{fill-color: @green1;}
area|z14-15[natural=scrub],
{fill-color: @green1;}
area|z16-[leisure=park],
{fill-color: @green2;}
area|z16-[natural=scrub],
{fill-color: @green3;}
area|z10[leisure=park],
{fill-color: @park_10;}
area|z11[leisure=park],
{fill-color: @park_11;}
area|z12[leisure=park],
{fill-color: @park_12;}
area|z13[leisure=park],
{fill-color: @park_13;}
area|z14-[leisure=park],
{fill-color: @park;}
area|z11[natural=heath],
{fill-color: @heath_11;}
area|z12[natural=heath],
{fill-color: @heath_12;}
area|z13[natural=heath],
{fill-color: @heath_13;}
area|z14-[natural=heath],
{fill-color: @heath;}
area|z11[landuse=grass],
area|z11[natural=grassland],
area|z11[landuse=meadow],
{fill-color: @grass_11;}
area|z12[landuse=grass],
area|z12[natural=grassland],
area|z12[landuse=meadow],
area|z12[landuse=recreation_ground],
area|z12[landuse=village_green],
{fill-color: @grass_12;}
area|z13[landuse=grass],
area|z13[natural=grassland],
area|z13[landuse=meadow],
area|z13[landuse=recreation_ground],
area|z13[landuse=village_green],
{fill-color: @grass_13;}
area|z14-[landuse=grass],
area|z14-[natural=grassland],
area|z14-[landuse=meadow],
area|z14-[landuse=recreation_ground],
area|z14-[landuse=village_green],
{fill-color: @grass;}
area|z16-[landuse=flowerbed],
{fill-color: @flowers;}
area|z14-15[landuse=grass],
{fill-color: @green0;}
area|z10[landuse=forest],
area|z16-[landuse=grass],
area|z14-15[natural=grassland],
area|z12[leisure=golf_course],
{fill-color: @golf_12;}
area|z13[leisure=golf_course],
{fill-color: @golf_13;}
area|z14-[leisure=golf_course],
area|z14-[leisure=miniature_golf],
{fill-color: @golf;}
area|z12[leisure=garden],
area|z12[landuse=allotments],
area|z12[landuse=orchard],
area|z12[landuse=plant_nursery],
area|z12[landuse=vineyard],
{fill-color: @allotments_12;}
area|z13[leisure=garden],
area|z13[landuse=allotments],
area|z13[landuse=orchard],
area|z13[landuse=plant_nursery],
area|z13[landuse=vineyard],
{fill-color: @allotments_13;}
area|z14-[leisure=garden],
area|z14-[landuse=allotments],
area|z14-[landuse=orchard],
area|z14-[landuse=plant_nursery],
area|z14-[landuse=vineyard],
area|z14-15[landuse=meadow],
area|z14-[landuse=recreation_ground],
area|z14-[landuse=village_green],
{fill-color: @green1;}
{fill-color: @allotments;}
area|z12[leisure=garden][garden:type=residential],
{fill-color: @residential_garden_12;}
area|z13[leisure=garden][garden:type=residential],
{fill-color: @residential_garden_13;}
area|z14-[leisure=garden][garden:type=residential],
{fill-color: @residential_garden;}
area|z11[natural=scrub],
{fill-color: @scrubs_11;}
area|z12[natural=scrub],
{fill-color: @scrubs_12;}
area|z13[natural=scrub],
{fill-color: @scrubs_13;}
area|z14-[natural=scrub],
{fill-color: @scrubs;}
area|z10[landuse=forest],
{fill-color: @woods_10;}
area|z11[landuse=forest],
area|z16-[natural=grassland],
area|z16-[landuse=meadow],
{fill-color: @green1b;}
{fill-color: @woods_11;}
area|z12[landuse=forest],
area|z12[leisure=garden],
{fill-color: @green2;}
{fill-color: @woods_12;}
area|z13[landuse=forest],
area|z13[leisure=garden],
{fill-color: @green3;}
area|z14[landuse=forest],
area|z14[leisure=garden],
{fill-color: @green4;}
area|z15[landuse=forest],
area|z15[leisure=garden],
{fill-color: @green5;}
area|z16-[landuse=forest],
area|z16-[leisure=garden],
{fill-color: @forest;}
{fill-color: @woods_13;}
area|z14-[landuse=forest],
{fill-color: @woods;}
area|z12-[leisure=garden][garden:type=residential],
{fill-color: @green0;}
area|z16-[leisure=garden][garden:type=residential],
{fill-color: @green1;}
area|z17-[leisure=garden][garden:type=residential],
{fill-color: @green2;}
area|z11-[natural=heath],
{fill-color: @heath;}
area|z11-13[landuse=grass],
area|z11-13[natural=grassland],
area|z12-13[leisure=golf_course],
area|z12-13[landuse=allotments],
area|z12-13[landuse=orchard],
area|z12-13[landuse=plant_nursery],
area|z12-13[landuse=vineyard],
area|z11-13[landuse=meadow],
area|z12-13[landuse=recreation_ground],
area|z12-13[landuse=village_green],
area|z11-13[natural=scrub],
{fill-color: @green0;}
/* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */
area|z10-17[leisure=nature_reserve],
area|z10-17[boundary=national_park],
area|z10-17[boundary=protected_area][protect_class=1],
{fill-opacity: 0.2; fill-color: @green6;}
{fill-opacity: 0.2; fill-color: @protected_nature;}
area|z10-16[boundary=aboriginal_lands],
{fill-opacity: 0.07; fill-color: @indigenous_lands;}
@@ -250,7 +279,7 @@ line|z13-[waterway=stream],
line|z13-[waterway=canal],
line|z13-[waterway=fish_pass],
line|z13-[natural=strait],
{opacity: 0.7; color: @river;}
{opacity: 0.95; color: @water;}
/* 6.1 Area water(lake,pond etc.) */
@@ -280,50 +309,56 @@ area|z11-[natural=wetland]
/* 6.2 Line water(river,canal etc.) */
line|z10[waterway=river],
{width: 1;}
{width: 1.4;}
line|z11-12[waterway=river],
{width: 1.2;}
{width: 2;}
line|z13[waterway=river],
{width: 1.6;}
line|z13[natural=strait],
{width: 2.7;}
line|z13[waterway=stream],
line|z13[waterway=canal],
line|z13[waterway=fish_pass],
line|z13[natural=strait],
{width: 0.7;}
{width: 1.3;}
line|z13[waterway=stream][intermittent=yes]
{width: 0.7;dashes: 2.7,2.7;}
{width: 1;dashes: 2.7,2.7;}
line|z14[waterway=river],
{width: 1.8;}
line|z14[natural=strait],
{width: 3.5;}
line|z14[waterway=stream],
line|z14[waterway=canal],
line|z14[waterway=fish_pass],
line|z14[natural=strait],
{width: 1;}
{width: 1.5;}
line|z14[waterway=stream][intermittent=yes]
{width: 1;dashes: 2.7,2.7;}
{width: 1.2;dashes: 2.7,2.7;}
line|z15-[waterway=river],
{width: 2.2;}
line|z15-[natural=strait],
{width: 4.6;}
line|z15-[waterway=stream],
line|z15-[waterway=canal],
line|z15-[waterway=fish_pass],
line|z15-[natural=strait],
{width: 1.6;}
{width: 1.8;}
line|z15-[waterway=stream][intermittent=yes]
{width: 1.4;dashes: 4.95,4.95;}
{width: 1.6;dashes: 4.95,4.95;}
node|z16-[waterway=lock_gate],
{icon-image: dot-m.svg;}
line|z13-[waterway=ditch],
line|z13-[waterway=drain],
{opacity: 0.7; color: @water_bad; width: 1.5; dashes: 2.7,2.7;}
{opacity: 0.8; color: @water_bad; width: 1.5; dashes: 5.4,2.7;}
line|z14[waterway=ditch],
line|z14[waterway=drain],
{opacity: 0.9;}
line|z15-[waterway=ditch],
line|z15-[waterway=drain],
{opacity: 0.95;}
line|z16-[waterway=ditch],
line|z16-[waterway=drain],
{width: 3;}
{width: 2;}
/* Do not draw tunnel waterways */
line[waterway][tunnel]
@@ -379,10 +414,10 @@ area|z13-[landuse=education],
area|z15-[amenity=university],
{fill-opacity: 0.9;}
area|z13-[landuse=retail],
{fill-color: @retail; fill-opacity: 1;}
area|z14-[leisure=miniature_golf],
area|z15-[leisure=pitch],
area|z15-[leisure=track][area?],
area|z15-[leisure=fitness_station],
@@ -402,17 +437,9 @@ area|z14-[piste:type=snow_park],
/* 7.4 Cemetery */
area|z14[landuse=cemetery],
area|z14[amenity=grave_yard]
{fill-color: @green2;fill-opacity: 0.85;}
area|z15-[amenity=grave_yard],
area|z15-[landuse=cemetery]
{fill-color: @green2;}
area|z16-[amenity=grave_yard],
area|z16-[landuse=cemetery]
{fill-color: @green3;}
area|z14-[landuse=cemetery],
area|z14-[amenity=grave_yard]
{fill-color: @flowers;}
/* 7.5 Pedestrian areas */
@@ -565,7 +592,7 @@ line|z19-[waterway=weir],
{width: 8;}
line|z14-[man_made=cutline],
{width: 1;color: @green0; opacity: 0.4;}
{width: 1;color: @grass;}
line|z15[man_made=cutline],
{width: 1.5;}
line|z16[man_made=cutline],