From b7a616cd3f40ed7b79e78891a51117986f9fd7aa Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Mon, 31 Jan 2022 14:04:39 +0300
Subject: [PATCH] [styles] Make national park & military fills less obtrusive

Closes #1222

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/styles/clear/include/Basemap.mapcss      | 21 ++++++++++---------
 data/styles/clear/style-clear/colors.mapcss   |  4 ++--
 data/styles/clear/style-night/colors.mapcss   |  4 ++--
 data/styles/vehicle/style-clear/colors.mapcss |  2 +-
 data/styles/vehicle/style-night/colors.mapcss |  4 ++--
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index f20cdd28f7..3efa83fdd8 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -12,9 +12,9 @@
   6.2 Line water(river,canal etc.)
 7.LANDUSE
   7.1 Industrial
-  7.2 Hostital
+  7.2 Hospital
   7.3 University & Sport
-  7.4 Cemetry
+  7.4 Cemetery
   7.5 Pedestrian areas
   7.6 Airports
   7.7 Religion
@@ -23,6 +23,7 @@
   8.1 Pier
   8.2 Building
   8.3 Barrier
+9.ISOLINES
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -298,12 +299,12 @@ area|z12-13[landuse=village_green],
 area|z12-13[landuse=field],
 {fill-color: @green0;}
 
-area|z14-[leisure=nature_reserve],
-area|z14-[boundary=national_park],
-{fill-position: background; fill-opacity: 1; fill-color: @green6;}
-
-area|z14-[landuse=military]
-{fill-position: background; fill-opacity: 1; fill-color: @military;}
+/* These 3 types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */
+area|z10-[leisure=nature_reserve],
+area|z10-[boundary=national_park],
+{fill-position: background; fill-opacity: 0.2; fill-color: @green6;}
+area|z12-[landuse=military]
+{fill-position: background; fill-opacity: 0.5; fill-color: @military;}
 
 area|z14[landuse=forest],
 area|z14[leisure=park],
@@ -476,7 +477,7 @@ area|z15-[landuse=railway],
 area|z15-[landuse=quarry]
 {fill-color: @industrial;}
 
-/* 7.2 Hostital */
+/* 7.2 Hospital */
 
 area|z14-[amenity=hospital],
 area|z14-[amenity=doctors]
@@ -494,7 +495,7 @@ area|z17-[sport=multi],
 area|z16-[sport=soccer],
 {fill-color: @sport;}
 
-/* 7.4 Cemetry */
+/* 7.4 Cemetery */
 
 area|z14[landuse=cemetery],
 area|z14[amenity=grave_yard]
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 00bbabed52..725df73f28 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -44,7 +44,7 @@
 @beach: #FCEC7E;
 @barerock: #EDE5DC;
 
-/*3.2 Vegeration*/
+/*3.2 Vegetation*/
 
 @forest: #AABF65;
 @green0: #CFD5A8;
@@ -53,7 +53,7 @@
 @green3: #B3C471;
 @green4: #AEC26B;
 @green5: #B0C270;
-@green6: #9EB360;
+@green6: #888C38;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index 9e2493187c..ea2fe8dd4f 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -44,7 +44,7 @@
 @beach: #28281A;
 @barerock: #302A2A;
 
-/*3.2 Vegeration*/
+/*3.2 Vegetation*/
 
 @forest: #141C00;
 @green0: #0F1400;
@@ -53,7 +53,7 @@
 @green3: #141C00;
 @green4: #141C00;
 @green5: #141C00;
-@green6: #1C2600;
+@green6: #2F4000;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss
index 9b5a0cc111..5a2e58cfc2 100644
--- a/data/styles/vehicle/style-clear/colors.mapcss
+++ b/data/styles/vehicle/style-clear/colors.mapcss
@@ -107,7 +107,7 @@
 @green3: #C6D9AB;
 @green4: #C6D9AB;
 @green5: #C6D9AB;
-@green6: #9EB360;
+@green6: #888C38;
 
 /* BUILDINGS */
 @housename: #65655E;
diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss
index 7c0d18b5d3..33b1d8e1d4 100644
--- a/data/styles/vehicle/style-night/colors.mapcss
+++ b/data/styles/vehicle/style-night/colors.mapcss
@@ -44,7 +44,7 @@
 @beach: #28281A;
 @barerock: #302A2A;
 
-/*3.2 Vegeration*/
+/*3.2 Vegetation*/
 
 @forest: #090F0A;
 @green0: #090F0A;
@@ -53,7 +53,7 @@
 @green3: #090F0A;
 @green4: #090F0A;
 @green5: #090F0A;
-@green6: #1C2600;
+@green6: #2F4000;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/