From fcf980615de6cc9246f092702a071f794fb8f0ee Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Fri, 8 Dec 2023 11:59:37 +0300
Subject: [PATCH] Update landcover features visible on z5

---
 app/assets/images/key/mapnik/common.png    | Bin 117 -> 0 bytes
 app/assets/images/key/mapnik/forest.png    | Bin 112 -> 0 bytes
 app/assets/images/key/mapnik/heathland.png | Bin 99 -> 0 bytes
 app/assets/images/key/mapnik/wood.png      | Bin 119 -> 0 bytes
 config/key.yml                             |  23 ++++++++++++++++-----
 config/locales/en.yml                      |  16 ++++++++++++--
 6 files changed, 32 insertions(+), 7 deletions(-)
 delete mode 100644 app/assets/images/key/mapnik/common.png
 delete mode 100644 app/assets/images/key/mapnik/forest.png
 delete mode 100644 app/assets/images/key/mapnik/heathland.png
 delete mode 100644 app/assets/images/key/mapnik/wood.png

diff --git a/app/assets/images/key/mapnik/common.png b/app/assets/images/key/mapnik/common.png
deleted file mode 100644
index c1422e7be23162dc9a76fd0a682e0ffed4399da3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQZ}A0jv*C{$rk_1Tu=Qp*RH!D
zG{1UtlF{Lv*R_os=KSAs<oUgIGYseGN^Q-!vMBU_xZ(T#_Vb&U{rF!e#=xWKne}$Q
RPC3vV22WQ%mvv4FO#mujDjom;

diff --git a/app/assets/images/key/mapnik/forest.png b/app/assets/images/key/mapnik/forest.png
deleted file mode 100644
index 5b341c61dbe32c9bf785b2163770720190530d52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQs$m6jv*C{$uBG?&An7@@|@lG
z<Hk8Bd1~E@j2h<rH#zFQDV-<1+f7$$YsS@80ngh0a>{Hu%B#b`P`t=py&xzZXas|&
LtDnm{r-UW|$k8Ky

diff --git a/app/assets/images/key/mapnik/heathland.png b/app/assets/images/key/mapnik/heathland.png
deleted file mode 100644
index d48f9690f3732f2fd7efa613d579292e3d934975..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 99
zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQd*uajv*C{$v^)8ci<BEzrb)F
y&n6A#j{lb>&PzNK>y0wW5;PVlz96xgfnm?Pl__Euz8wVWV(@hJb6Mw<&;$V8@*YY6

diff --git a/app/assets/images/key/mapnik/wood.png b/app/assets/images/key/mapnik/wood.png
deleted file mode 100644
index 2413cda6cd2f35e3d07fc38bcee97608a3d6619c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQg)s$jv*C{$q~hw`>y}${#<@R
zX#HLT`{{{yTYpNv*3<jpA6%39ujgUT#TBlL#d3Gp_?O*1`crPp5$SVhFEcT$`OUuT
U()zAvK$93eUHx3vIVCg!0K_;gR{#J2

diff --git a/config/key.yml b/config/key.yml
index daf0a9a3f..f9ce0a3ee 100644
--- a/config/key.yml
+++ b/config/key.yml
@@ -18,18 +18,31 @@ mapnik:
   # administrative boundaries: admin.mss
   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
   # landcover: landcover.mss, water.mss
-  - { min_zoom: 0, max_zoom: 19, name: lake, width: 26, height: 10, fill: "#aad3df" }
+  - { name: lake, width: 26, height: 10, fill: "#aad3df" }
+  - { name: glacier, width: 26, height: 10, fill: "#ddecec" }
+  - { min_zoom: 5, max_zoom: 11, name: forest, width: 26, height: 10, fill: "#bddab1" }
+  - { min_zoom: 12, name: forest, width: 26, height: 10, fill: "#add19e" }
+  - { min_zoom: 5, max_zoom: 11, name: orchard, width: 26, height: 10, fill: "#bee5b5" }
+  - { min_zoom: 12, name: orchard, width: 26, height: 10, fill: "#aedfa3" }
+  - { min_zoom: 5, max_zoom: 11, name: grass, width: 26, height: 10, fill: "#d7efc0" }
+  - { min_zoom: 12, name: grass, width: 26, height: 10, fill: "#cdebb0" }
+  - { min_zoom: 5, max_zoom: 11, name: farmland, width: 26, height: 10, fill: "#f1f3dd" }
+  - { min_zoom: 12, name: farmland, width: 26, height: 10, fill: "#eef0d5" }
+  - { min_zoom: 5, max_zoom: 11, name: heathland, width: 26, height: 10, fill: "#dee1b2" }
+  - { min_zoom: 12, name: heathland, width: 26, height: 10, fill: "#d6d99f" }
+  - { min_zoom: 5, max_zoom: 11, name: scrubland, width: 26, height: 10, fill: "#d3dfbc" }
+  - { min_zoom: 12, name: scrubland, width: 26, height: 10, fill: "#c8d7ab" }
+  - { min_zoom: 5, max_zoom: 11, name: bare_rock, width: 26, height: 10, fill: "#f1eae3" }
+  - { min_zoom: 12, name: bare_rock, width: 26, height: 10, fill: "#eee5dc" }
+  - { min_zoom: 5, max_zoom: 11, name: sand, width: 26, height: 10, fill: "#f7edd1" }
+  - { min_zoom: 12, name: sand, width: 26, height: 10, fill: "#f5e9c6" }
   # other
-  - { min_zoom: 5, max_zoom: 19, name: forest, image: forest.png }
-  - { min_zoom: 5, max_zoom: 19, name: wood, image: wood.png }
   - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png }
   - { min_zoom: 10, max_zoom: 19, name: park, image: park.png }
   - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png }
-  - { min_zoom: 5, max_zoom: 19, name: common, image: common.png }
   - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png }
   - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }
   - { min_zoom: 10, max_zoom: 19, name: commercial, image: commercial.png }
-  - { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.png }
   - { min_zoom: 10, max_zoom: 19, name: farm, image: farm.png }
   - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png }
   - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4b4f6b301..b51f047d7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2310,8 +2310,18 @@ en:
             - Airport apron
             - terminal
           admin: "Administrative boundary"
-          forest: "Forest"
-          wood: "Wood"
+          orchard:
+            - Orchard
+            - vineyard
+          forest:
+            - Forest
+            - wood
+          farmland: "Farmland"
+          grass:
+            - Grass
+            - meadow
+          bare_rock: "Bare rock"
+          sand: "Sand"
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"
@@ -2323,9 +2333,11 @@ en:
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"
+          scrubland: "Scrubland"
           lake:
             - Lake
             - reservoir
+          glacier: "Glacier"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
-- 
2.39.5