Update bounded landuses

diff --git a/app/assets/images/key/mapnik/military.png b/app/assets/images/key/mapnik/military.png
deleted file mode 100644 (file)
index 73c82d4..0000000
Binary files a/app/assets/images/key/mapnik/military.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/military.svg b/app/assets/images/key/mapnik/military.svg
new file mode 100644 (file)
index 0000000..7a6872d
--- /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 (file)
index 5e3a79f..0000000
Binary files a/app/assets/images/key/mapnik/reserve.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/reserve.svg b/app/assets/images/key/mapnik/reserve.svg
new file mode 100644 (file)
index 0000000..5a53f0a
--- /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 1caf3a0d9b6946126ee7aec50e2a276c0412f997..8314533377663004d616869945c04dcbe61fe16c 100644 (file)
--- 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: 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
   # 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 }
   - { 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 }