From 830ff475cdfc82d69312d5bf567031c9409612f8 Mon Sep 17 00:00:00 2001
From: guylamar2006 <guychronister@outlook.com>
Date: Sat, 7 Dec 2024 10:10:59 -0600
Subject: [PATCH 1/2] Update golf bunker from natural=sand to surface=sand
 since golf bunker is manmade.

---
 resources/data/defaultpresets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index 0013d6f425..aacf656619 100644
--- a/resources/data/defaultpresets.xml
+++ b/resources/data/defaultpresets.xml
@@ -5536,7 +5536,7 @@
                 <link wiki="Tag:golf=bunker" />
                 <space />
                 <key key="golf" value="bunker" />
-                <combo key="natural" text="Natural" text_context="golf" values="sand" default="sand" />
+                <combo key="surface" text="Surface" text_context="golf" values="sand" default="sand" />
             </item> <!-- Bunker -->
              <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
                 <link wiki="Tag:leisure=golf_course" />

From f519ae6d3fddb9f05141fc1d4f91ce77b6ebb702 Mon Sep 17 00:00:00 2001
From: guylamar2006 <guychronister@outlook.com>
Date: Sat, 7 Dec 2024 10:24:58 -0600
Subject: [PATCH 2/2] Include sand surface by default since it's manmade.

---
 resources/data/defaultpresets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index aacf656619..719e3a92b5 100644
--- a/resources/data/defaultpresets.xml
+++ b/resources/data/defaultpresets.xml
@@ -5536,7 +5536,7 @@
                 <link wiki="Tag:golf=bunker" />
                 <space />
                 <key key="golf" value="bunker" />
-                <combo key="surface" text="Surface" text_context="golf" values="sand" default="sand" />
+                <key key="surface" value="sand" match="keyvalue" />
             </item> <!-- Bunker -->
              <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
                 <link wiki="Tag:leisure=golf_course" />