From dd4d3a3e9edf1393a9c99ef406c095af97e97291 Mon Sep 17 00:00:00 2001
From: Onni Hakala <onni@flaky.build>
Date: Sun, 10 Aug 2025 12:04:51 +0300
Subject: [PATCH 1/2] Add recommended sauna related fields from 'leisure=sauna'
 Wikipage to sauna type

---
 data/fields/gender_segregated.json |  5 +++++
 data/fields/sauna.json             | 16 ++++++++++++++++
 data/fields/sauna_fuel.json        | 13 +++++++++++++
 data/fields/sauna_heating.json     | 11 +++++++++++
 data/fields/sauna_water.json       |  5 +++++
 data/presets/leisure/sauna.json    |  9 ++++++++-
 6 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 data/fields/gender_segregated.json
 create mode 100644 data/fields/sauna.json
 create mode 100644 data/fields/sauna_fuel.json
 create mode 100644 data/fields/sauna_heating.json
 create mode 100644 data/fields/sauna_water.json

diff --git a/data/fields/gender_segregated.json b/data/fields/gender_segregated.json
new file mode 100644
index 00000000..2ae6efff
--- /dev/null
+++ b/data/fields/gender_segregated.json
@@ -0,0 +1,5 @@
+{
+    "key": "gender_segregated",
+    "type": "check",
+    "label": "Gender separated areas or timeslots"
+}
diff --git a/data/fields/sauna.json b/data/fields/sauna.json
new file mode 100644
index 00000000..6eb19921
--- /dev/null
+++ b/data/fields/sauna.json
@@ -0,0 +1,16 @@
+{
+    "key": "sauna",
+    "type": "combo",
+    "label": "Sauna type",
+    "strings": {
+        "options": {
+            "hot": "Finnish Sauna over > 60°C",
+            "steam": "Steam Sauna",
+            "smoke": "Smoke Sauna",
+            "dry": "Sauna without throwing water",
+            "infrared": "Infrared Sauna",
+            "aroma": "Aroma Sauna",
+            "hanjeungmak": "Hanjeungmak (Korean Dry Sauna)"
+        }
+    }
+}
diff --git a/data/fields/sauna_fuel.json b/data/fields/sauna_fuel.json
new file mode 100644
index 00000000..1f0e990e
--- /dev/null
+++ b/data/fields/sauna_fuel.json
@@ -0,0 +1,13 @@
+{
+    "key": "sauna:fuel",
+    "type": "combo",
+    "label": "Sauna fuel",
+    "strings": {
+        "options": {
+            "electricity": "Electricity",
+            "gas": "Natural Gas",
+            "wood": "Wood",
+            "oil": "Fuel Oil"
+        }
+    }
+}
diff --git a/data/fields/sauna_heating.json b/data/fields/sauna_heating.json
new file mode 100644
index 00000000..3d2c271e
--- /dev/null
+++ b/data/fields/sauna_heating.json
@@ -0,0 +1,11 @@
+{
+    "key": "sauna:heating",
+    "type": "combo",
+    "label": "Sauna heating method",
+    "strings": {
+        "options": {
+            "once": "Heated once before using",
+            "continuous": "Heating is continued during usage"
+        }
+    }
+}
diff --git a/data/fields/sauna_water.json b/data/fields/sauna_water.json
new file mode 100644
index 00000000..eea91a04
--- /dev/null
+++ b/data/fields/sauna_water.json
@@ -0,0 +1,5 @@
+{
+    "key": "sauna:water",
+    "type": "check",
+    "label": "Throwing water on the sauna stove"
+}
diff --git a/data/presets/leisure/sauna.json b/data/presets/leisure/sauna.json
index 3dbc1e55..673ee670 100644
--- a/data/presets/leisure/sauna.json
+++ b/data/presets/leisure/sauna.json
@@ -8,7 +8,14 @@
         "access_simple",
         "fee",
         "payment_multi_fee",
-        "charge_fee"
+        "charge_fee",
+        "reservation",
+        "gender",
+        "gender_segregated",
+        "sauna",
+        "sauna_fuel",
+        "sauna_heating",
+        "sauna_water"
     ],
     "moreFields": [
         "{@templates/contact}",

From 089e50772db44585454f029906bb23a116ce8ba7 Mon Sep 17 00:00:00 2001
From: Onni Hakala <onni@flaky.build>
Date: Sun, 10 Aug 2025 14:36:17 +0300
Subject: [PATCH 2/2] Fix too many values in "fields" of "leisure/sauna"

---
 data/presets/leisure/sauna.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/presets/leisure/sauna.json b/data/presets/leisure/sauna.json
index 673ee670..72466bb2 100644
--- a/data/presets/leisure/sauna.json
+++ b/data/presets/leisure/sauna.json
@@ -10,17 +10,17 @@
         "payment_multi_fee",
         "charge_fee",
         "reservation",
-        "gender",
-        "gender_segregated",
         "sauna",
-        "sauna_fuel",
-        "sauna_heating",
-        "sauna_water"
+        "gender"
     ],
     "moreFields": [
         "{@templates/contact}",
         "gnis/feature_id-US",
-        "level"
+        "level",
+        "gender_segregated",
+        "sauna_fuel",
+        "sauna_heating",
+        "sauna_water"
     ],
     "geometry": [
         "point",