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

@@ -3,6 +3,9 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "surface"
+    ],
     "geometry": [
         "area"
     ],
@@ -14,7 +17,9 @@
         "natural": "sand"
     },
     "terms": [
-        "hazard",
+        "hazard"
+    ],
+    "aliases": [
         "bunker"
     ],
     "name": "Sand Trap"

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"
 }

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"
 }

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"
 }

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"
     ],

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).'