From 0f6bcd821f07804227029f7f180450fd90ff85b3 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Wed, 5 Jan 2022 12:08:01 +0100
Subject: [PATCH 1/3] change default highway value for golf cart paths to
 "path"

and show the access field (as for all highway based presets), so users can set respective further access details
---
 data/presets/golf/cartpath.json | 4 ++--
 data/presets/golf/path.json     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/presets/golf/cartpath.json b/data/presets/golf/cartpath.json
index acf329fb..9b2b3e7a 100644
--- a/data/presets/golf/cartpath.json
+++ b/data/presets/golf/cartpath.json
@@ -12,8 +12,8 @@
     },
     "addTags": {
         "golf": "cartpath",
-        "golf_cart": "designated",
-        "highway": "service"
+        "highway": "path",
+        "golf_cart": "designated"
     },
     "name": "Golf Cartpath"
 }
diff --git a/data/presets/golf/path.json b/data/presets/golf/path.json
index 3627d3de..166db64d 100644
--- a/data/presets/golf/path.json
+++ b/data/presets/golf/path.json
@@ -5,6 +5,7 @@
         "surface",
         "width",
         "structure",
+        "access",
         "incline"
     ],
     "geometry": [

From cee203bcf7cf8072c1ca4bddbca17ec73c48a8a7 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Fri, 13 May 2022 18:38:23 +0200
Subject: [PATCH 2/3] golf cartpaths: add field to choose hw tag

and use highway=footway for walking paths
---
 data/fields/highway_cartpath.json | 12 ++++++++++++
 data/presets/golf/cartpath.json   |  7 ++++++-
 data/presets/golf/path.json       |  6 ++++--
 interim/source_strings.yaml       | 10 ++++++++++
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 data/fields/highway_cartpath.json

diff --git a/data/fields/highway_cartpath.json b/data/fields/highway_cartpath.json
new file mode 100644
index 00000000..e86e413b
--- /dev/null
+++ b/data/fields/highway_cartpath.json
@@ -0,0 +1,12 @@
+{
+    "key": "highway",
+    "type": "typeCombo",
+    "label": "Type of Path",
+    "strings": {
+        "options": {
+            "path": "Cartpath",
+            "service": "Service Road"
+        }
+    },
+    "autoSuggestions": false
+}
diff --git a/data/presets/golf/cartpath.json b/data/presets/golf/cartpath.json
index 9b2b3e7a..20b1b971 100644
--- a/data/presets/golf/cartpath.json
+++ b/data/presets/golf/cartpath.json
@@ -1,6 +1,8 @@
 {
     "icon": "temaki-golf_cart",
     "fields": [
+        "name",
+        "highway_cartpath",
         "{golf/path}",
         "maxspeed"
     ],
@@ -13,7 +15,10 @@
     "addTags": {
         "golf": "cartpath",
         "highway": "path",
-        "golf_cart": "designated"
+        "golf_cart": "customers"
     },
+    "terms": [
+        "cartpath"
+    ],
     "name": "Golf Cartpath"
 }
diff --git a/data/presets/golf/path.json b/data/presets/golf/path.json
index 166db64d..a7361d2e 100644
--- a/data/presets/golf/path.json
+++ b/data/presets/golf/path.json
@@ -16,8 +16,10 @@
     },
     "addTags": {
         "golf": "path",
-        "highway": "path",
-        "foot": "designated"
+        "highway": "footway"
     },
+    "terms": [
+        "golf path"
+    ],
     "name": "Golf Walking Path"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index a4ab5282..ee0da8e6 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -1351,6 +1351,14 @@ en:
       highway:
         # highway=*
         label: Type
+      highway_cartpath:
+        # highway=*
+        label: Type of Path
+        options:
+          # highway=path
+          path: Cartpath
+          # highway=service
+          service: Service Road
       historic:
         # historic=*
         label: Type
@@ -5759,6 +5767,7 @@ en:
       golf/cartpath:
         # golf=cartpath | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Golf Cartpath
+        # 'terms: cartpath'
         terms: <translate with synonyms or related terms for 'Golf Cartpath', separated by commas>
       golf/clubhouse:
         # golf=clubhouse | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -5789,6 +5798,7 @@ en:
       golf/path:
         # golf=path | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Golf Walking Path
+        # 'terms: golf path'
         terms: <translate with synonyms or related terms for 'Golf Walking Path', separated by commas>
       golf/rough:
         # golf=rough | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).

From b41923c2ccdad057e4a5c7550471c466550044ab Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Fri, 20 May 2022 12:07:42 +0200
Subject: [PATCH 3/3] use less opinionated "yes" as default access value

---
 data/presets/golf/cartpath.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/golf/cartpath.json b/data/presets/golf/cartpath.json
index 20b1b971..7d8fe07e 100644
--- a/data/presets/golf/cartpath.json
+++ b/data/presets/golf/cartpath.json
@@ -15,7 +15,7 @@
     "addTags": {
         "golf": "cartpath",
         "highway": "path",
-        "golf_cart": "customers"
+        "golf_cart": "yes"
     },
     "terms": [
         "cartpath"