From f82bafa56742058fad086381568839e79bcc8a3c Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Fri, 7 Jan 2022 16:13:26 +0100
Subject: [PATCH] update golf presets to match wiki recommendations

see https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dgolf_course#Details_within_a_golf_course

closes #203
---
 data/presets/golf/bunker.json  |  7 ++++++-
 data/presets/golf/fairway.json |  7 ++-----
 data/presets/golf/green.json   | 10 +++++-----
 data/presets/golf/rough.json   |  7 ++-----
 data/presets/golf/tee.json     |  7 ++-----
 interim/source_strings.yaml    |  5 +++--
 6 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/data/presets/golf/bunker.json b/data/presets/golf/bunker.json
index 6528c5f6..6000c03f 100644
--- a/data/presets/golf/bunker.json
+++ b/data/presets/golf/bunker.json
@@ -3,6 +3,9 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "surface"
+    ],
     "geometry": [
         "area"
     ],
@@ -14,7 +17,9 @@
         "natural": "sand"
     },
     "terms": [
-        "hazard",
+        "hazard"
+    ],
+    "aliases": [
         "bunker"
     ],
     "name": "Sand Trap"
diff --git a/data/presets/golf/fairway.json b/data/presets/golf/fairway.json
index 65d0de85..b9c80a3c 100644
--- a/data/presets/golf/fairway.json
+++ b/data/presets/golf/fairway.json
@@ -1,7 +1,8 @@
 {
     "icon": "maki-golf",
     "fields": [
-        "name"
+        "name",
+        "surface"
     ],
     "geometry": [
         "area"
@@ -9,9 +10,5 @@
     "tags": {
         "golf": "fairway"
     },
-    "addTags": {
-        "golf": "fairway",
-        "landuse": "grass"
-    },
     "name": "Fairway"
 }
diff --git a/data/presets/golf/green.json b/data/presets/golf/green.json
index 6f824971..d315d77b 100644
--- a/data/presets/golf/green.json
+++ b/data/presets/golf/green.json
@@ -1,7 +1,8 @@
 {
     "icon": "temaki-golf_green",
     "fields": [
-        "name"
+        "name",
+        "surface"
     ],
     "geometry": [
         "area"
@@ -9,9 +10,8 @@
     "tags": {
         "golf": "green"
     },
-    "addTags": {
-        "golf": "green",
-        "landuse": "grass"
-    },
+    "terms": [
+        "Green"
+    ],
     "name": "Putting Green"
 }
diff --git a/data/presets/golf/rough.json b/data/presets/golf/rough.json
index d65942c5..67a520c1 100644
--- a/data/presets/golf/rough.json
+++ b/data/presets/golf/rough.json
@@ -1,7 +1,8 @@
 {
     "icon": "maki-golf",
     "fields": [
-        "name"
+        "name",
+        "surface"
     ],
     "geometry": [
         "area"
@@ -9,9 +10,5 @@
     "tags": {
         "golf": "rough"
     },
-    "addTags": {
-        "golf": "rough",
-        "landuse": "grass"
-    },
     "name": "Rough"
 }
diff --git a/data/presets/golf/tee.json b/data/presets/golf/tee.json
index 0c048a78..9dc1a6e0 100644
--- a/data/presets/golf/tee.json
+++ b/data/presets/golf/tee.json
@@ -1,7 +1,8 @@
 {
     "icon": "maki-golf",
     "fields": [
-        "name"
+        "name",
+        "surface"
     ],
     "geometry": [
         "vertex",
@@ -10,10 +11,6 @@
     "tags": {
         "golf": "tee"
     },
-    "addTags": {
-        "golf": "tee",
-        "landuse": "grass"
-    },
     "terms": [
         "teeing ground"
     ],
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 74ab045a..0e5dc68e 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -5505,9 +5505,9 @@ en:
         # 'ford=*\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Ford
       golf/bunker:
-        # 'golf=bunker\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        # 'golf=bunker\n\nbunker\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Sand Trap
-        # 'terms: hazard,bunker'
+        # 'terms: hazard'
         terms: '<translate with synonyms or related terms for ''Sand Trap'', separated by commas>'
       golf/cartpath:
         # 'golf=cartpath\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
@@ -5529,6 +5529,7 @@ en:
       golf/green:
         # 'golf=green\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Putting Green
+        # 'terms: green'
         terms: '<translate with synonyms or related terms for ''Putting Green'', separated by commas>'
       golf/hole:
         # 'golf=hole\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'