From 473cd60986c33b4a7927fc4001cfeb10f7186028 Mon Sep 17 00:00:00 2001
From: RudyTheDev <RudyTheDev@gmail.com>
Date: Thu, 15 Nov 2018 16:40:40 +0200
Subject: [PATCH] Add a new pattern "forest" for forest/wood; use dots for
 grass; use bushes (wetlands) for scrub

---
 css/25_areas.css            |  20 +++++++++++++++++---
 dist/img/pattern/forest.png | Bin 0 -> 18019 bytes
 modules/svg/areas.js        |   3 +++
 modules/svg/defs.js         |   6 +++++-
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 dist/img/pattern/forest.png

diff --git a/css/25_areas.css b/css/25_areas.css
index f5fd3cd90..53b8c384d 100644
--- a/css/25_areas.css
+++ b/css/25_areas.css
@@ -27,14 +27,20 @@ path.stroke.tag-natural,
 path.stroke.tag-leisure-nature_reserve,
 path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-park,
-path.stroke.tag-barrier-hedge {
+path.stroke.tag-barrier-hedge,
+path.stroke.tag-landuse-forest,
+path.stroke.tag-landuse-wood,
+path.stroke.tag-landuse-grass {
     stroke: rgb(140, 208, 95);
 }
 path.fill.tag-landuse,
 path.fill.tag-natural,
 path.fill.tag-leisure-nature_reserve,
 path.fill.tag-leisure-pitch,
-path.fill.tag-leisure-park {
+path.fill.tag-leisure-park,
+path.fill.tag-landuse-forest,
+path.fill.tag-natural-wood,
+path.fill.tag-landuse-grass {
     stroke: rgba(140, 208, 95, 0.3);
     fill: rgba(140, 208, 95, 0.3);
 }
@@ -42,10 +48,18 @@ path.fill.tag-leisure-park {
 .preset-icon-fill-area.tag-natural,
 .preset-icon-fill-area.tag-leisure-nature_reserve,
 .preset-icon-fill-area.tag-leisure-pitch,
-.preset-icon-fill-area.tag-leisure-park {
+.preset-icon-fill-area.tag-leisure-park,
+.preset-icon-fill-area.tag-landuse-forest,
+.preset-icon-fill-area.tag-natural-wood,
+.preset-icon-fill-area.tag-landuse-grass {
     border-color: rgb(140, 208, 95);
     background-color: rgba(140, 208, 95, 0.3);
 }
+.pattern-color-forest,
+.pattern-color-wood,
+.pattern-color-grass {
+    fill: rgba(140, 208, 95, 0.3);
+}
 
 /* Blue things */
 path.stroke.tag-amenity-swimming_pool,
diff --git a/dist/img/pattern/forest.png b/dist/img/pattern/forest.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7b2d2943dd564a6c4afa9b6398d9b3ac5626576
GIT binary patch
literal 18019
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
WX!`PZHifT&8Q!|R{OFePd;S9r(aYul

literal 0
HcmV?d00001

diff --git a/modules/svg/areas.js b/modules/svg/areas.js
index a334ca602..78149c19a 100644
--- a/modules/svg/areas.js
+++ b/modules/svg/areas.js
@@ -16,7 +16,10 @@ export function svgAreas(projection, context) {
         construction: 'construction',
         farm: 'farmland',
         farmland: 'farmland',
+        forest: 'forest',
+        wood: 'forest',
         grave_yard: 'cemetery',
+        grass: 'grass',
         meadow: 'meadow',
         military: 'construction',
         orchard: 'orchard',
diff --git a/modules/svg/defs.js b/modules/svg/defs.js
index 4de82e4ad..8f16edf9d 100644
--- a/modules/svg/defs.js
+++ b/modules/svg/defs.js
@@ -73,13 +73,17 @@ export function svgDefs(context) {
             .data([
                 // pattern name, pattern image name
                 ['wetland', 'wetland'],
+                ['scrub', 'wetland'],
                 ['construction', 'construction'],
                 ['cemetery', 'cemetery'],
                 ['orchard', 'orchard'],
                 ['farmland', 'farmland'],
                 ['beach', 'dots'],
                 ['scrub', 'dots'],
-                ['meadow', 'dots']
+                ['meadow', 'dots'],
+                ['grass', 'dots'],
+                ['forest', 'forest'],
+                ['wood', 'forest']
             ])
             .enter()
             .append('pattern')