From e108a13843f997a004db586978fb3014165e123c Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Fri, 8 Dec 2023 23:52:04 +0300
Subject: [PATCH] Update bounded landuses

---
 app/assets/images/key/mapnik/military.png | Bin 112 -> 0 bytes
 app/assets/images/key/mapnik/military.svg |   9 +++++++++
 app/assets/images/key/mapnik/reserve.png  | Bin 116 -> 0 bytes
 app/assets/images/key/mapnik/reserve.svg  |   4 ++++
 config/key.yml                            |   4 ++--
 5 files changed, 15 insertions(+), 2 deletions(-)
 delete mode 100644 app/assets/images/key/mapnik/military.png
 create mode 100644 app/assets/images/key/mapnik/military.svg
 delete mode 100644 app/assets/images/key/mapnik/reserve.png
 create mode 100644 app/assets/images/key/mapnik/reserve.svg

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

literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQs$m6jv*C{$rTsw&;PVx|9^Jf
zkBj&1JIUjq#C+nXf3i)oMYKuQ#TBmq!`CM5yMN(;qxYZv3maJ(KJ+|Ud|GKQE6@lA
MPgg&ebxsLQ0B&<AcK`qY

diff --git a/app/assets/images/key/mapnik/military.svg b/app/assets/images/key/mapnik/military.svg
new file mode 100644
index 000000000..7a6872df8
--- /dev/null
+++ b/app/assets/images/key/mapnik/military.svg
@@ -0,0 +1,9 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='26' height='10'>
+<defs>
+<pattern id='hatch' width='8' height='8' patternUnits='userSpaceOnUse'>
+<rect width='8' height='8' fill='#ff555514' />
+<line x1='8' y2='8' stroke='#ff555544' />
+</pattern>
+</defs>
+<rect x='.5' y='.5' width='25' height='9' fill='url(#hatch)' stroke='#ff555544' />
+</svg>
diff --git a/app/assets/images/key/mapnik/reserve.png b/app/assets/images/key/mapnik/reserve.png
deleted file mode 100644
index 5e3a79f0d0acb07a8b80d33a76e01d86fcb1e9a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eb!3HE(&G8EbQr4a>jv*C{$q}{rQKw%0zFc=f
zXnmzYsnOwCzb_j#%=y3NXmC1DdbgXd)Ygov|3lAwet-V?0@Zu__cyXK$ercbdV2A!
Rmq23}JYD@<);T3K0RTA`E5iT)

diff --git a/app/assets/images/key/mapnik/reserve.svg b/app/assets/images/key/mapnik/reserve.svg
new file mode 100644
index 000000000..5a53f0a77
--- /dev/null
+++ b/app/assets/images/key/mapnik/reserve.svg
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='26' height='10'>
+<rect x='1' y='1' width='24' height='8' fill='none' stroke='#008000' stroke-width='2' opacity='.15' />
+<rect x='2' y='2' width='22' height='6' fill='none' stroke='#008000' stroke-width='4' opacity='.15' />
+</svg>
diff --git a/config/key.yml b/config/key.yml
index 1caf3a0d9..831453337 100644
--- a/config/key.yml
+++ b/config/key.yml
@@ -56,9 +56,9 @@ mapnik:
   - { min_zoom: 12, name: allotments, width: 26, height: 10, fill: "#c9e1bf" }
   - { min_zoom: 11, name: pitch, width: 26, height: 10, fill: "#88e0be" }
   - { min_zoom: 11, name: centre, width: 26, height: 10, fill: "#dffce2" }
+  - { min_zoom: 10, name: reserve, image: reserve.svg } # admin.mss
+  - { min_zoom: 8, name: military, image: military.svg }
   # other
-  - { min_zoom: 11, max_zoom: 19, name: reserve, image: reserve.png }
-  - { min_zoom: 11, max_zoom: 19, name: military, image: military.png }
   - { min_zoom: 12, max_zoom: 19, name: school, image: school.png }
   - { min_zoom: 12, max_zoom: 19, name: building, image: building.png }
   - { min_zoom: 12, max_zoom: 19, name: station, image: station.png }
-- 
2.45.1