Merge pull request #5489 from RudyTheDev/new-stylings

Pattern stylings for forest and grass

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,

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',

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', 'grass'],
+                ['grass', 'grass'],
+                ['forest', 'forest'],
+                ['wood', 'forest']
             ])
             .enter()
             .append('pattern')