From 37bc3025b6beeb38c1a510fbeb2c90157a42d9a4 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Fri, 4 Feb 2022 19:16:18 +0100
Subject: [PATCH] render (some) golf features like grass areas (closes #8927)

---
 CHANGELOG.md               |  2 ++
 css/25_areas.css           | 12 ++++++++++--
 modules/svg/tag_pattern.js | 11 +++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8676cd318..71e4a8c45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,11 +48,13 @@ _Breaking developer changes, which may affect downstream projects or sites that
 #### :rocket: Presets
 * Optimize order of values in dropdowns of `access` fields ([#8945])
 * Use value of `vehicle` tag as placeholder value of `access` fields for `motor_vehicle` and `bicycle`
+* Render `golf` features `tee`, `fairway`, `rough` and `green` in green color and using a grass pattern ([#8927])
 #### :hammer: Development
 * Switch build system to [esbuild](https://esbuild.github.io/) for much faster builds ([#8774], thanks [@ mbrzakovic] and [@bhousel])
 
 [#8774]: https://github.com/openstreetmap/iD/pull/8774
 [#8811]: https://github.com/openstreetmap/iD/issues/8811
+[#8927]: https://github.com/openstreetmap/iD/issues/8927
 [#8944]: https://github.com/openstreetmap/iD/issues/8944
 [#8945]: https://github.com/openstreetmap/iD/issues/8945
 
diff --git a/css/25_areas.css b/css/25_areas.css
index 6c0f0d3d0..b3c0a0433 100644
--- a/css/25_areas.css
+++ b/css/25_areas.css
@@ -36,7 +36,11 @@ path.stroke.tag-leisure-park,
 path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-track,
 path.stroke.tag-natural,
-path.stroke.tag-natural-wood {
+path.stroke.tag-natural-wood,
+path.stroke.tag-golf-tee,
+path.stroke.tag-golf-fairway,
+path.stroke.tag-golf-rough,
+path.stroke.tag-golf-green {
     stroke: rgb(140, 208, 95);
 }
 path.fill.tag-barrier-hedge,
@@ -52,7 +56,11 @@ path.fill.tag-leisure-park,
 path.fill.tag-leisure-pitch,
 path.fill.tag-leisure-track,
 path.fill.tag-natural,
-path.fill.tag-natural-wood {
+path.fill.tag-natural-wood,
+path.fill.tag-golf-tee,
+path.fill.tag-golf-fairway,
+path.fill.tag-golf-rough,
+path.fill.tag-golf-green {
     stroke: rgba(140, 208, 95, 0.3);
     fill: rgba(140, 208, 95, 0.3);
 }
diff --git a/modules/svg/tag_pattern.js b/modules/svg/tag_pattern.js
index f315f2f80..a6ff5763c 100644
--- a/modules/svg/tag_pattern.js
+++ b/modules/svg/tag_pattern.js
@@ -30,10 +30,7 @@ var patterns = {
             { pattern: 'forest' } // same as 'leaf_type:mixed'
         ],
         grave_yard: 'cemetery',
-        grass: [
-            { golf: 'green', pattern: 'golf_green' },
-            { pattern: 'grass' },
-        ],
+        grass: 'grass',
         landfill: 'landfill',
         meadow: 'meadow',
         military: 'construction',
@@ -65,6 +62,12 @@ var patterns = {
             { pattern: 'forest' } // same as 'leaf_type:mixed'
         ]
     },
+    golf: {
+        green: 'golf_green',
+        tee: 'grass',
+        fairway: 'grass',
+        rough: 'grass'
+    },
     traffic_calming: {
         island: [
             { surface: 'grass', pattern: 'grass' },