From f47186efba8f9b3103f031e7410bf4d0117449cc Mon Sep 17 00:00:00 2001
From: Bert <bert.marcelis@outlook.com>
Date: Wed, 15 Dec 2021 12:35:47 +0100
Subject: [PATCH] Squashed commit of the following:

commit 0258ae7ca6fb9af1dad1c5c4fb765e4a5fa75a31
Author: Bert <bert.marcelis@outlook.com>
Date:   Sat Jan 16 11:25:34 2021 +0100

    Add presets for marsh, swamp and reedbed

    https://wiki.openstreetmap.org/wiki/Tag:wetland%3Dmarsh
    https://wiki.openstreetmap.org/wiki/Tag:wetland%3Dswamp
    https://wiki.openstreetmap.org/wiki/Tag:wetland%3Dreedbed
---
 data/presets/natural/marsh.json   | 17 +++++++++++++++++
 data/presets/natural/reedbed.json | 21 +++++++++++++++++++++
 data/presets/natural/swamp.json   | 17 +++++++++++++++++
 interim/source_strings.yaml       | 13 +++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 data/presets/natural/marsh.json
 create mode 100644 data/presets/natural/reedbed.json
 create mode 100644 data/presets/natural/swamp.json

diff --git a/data/presets/natural/marsh.json b/data/presets/natural/marsh.json
new file mode 100644
index 00000000..af478a37
--- /dev/null
+++ b/data/presets/natural/marsh.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-wetland",
+    "fields": [
+        "wetland",
+        "salt",
+        "tidal"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "marsh"
+    },
+    "terms": [],
+    "name": "Marsh"
+}
diff --git a/data/presets/natural/reedbed.json b/data/presets/natural/reedbed.json
new file mode 100644
index 00000000..a5932c4f
--- /dev/null
+++ b/data/presets/natural/reedbed.json
@@ -0,0 +1,21 @@
+{
+    "icon": "maki-wetland",
+    "fields": [
+        "wetland",
+        "salt",
+        "tidal"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "reedbed"
+    },
+    "terms": [
+        "reeds",
+        "bulrushes",
+        "cattail"
+    ],
+    "name": "Reed bed"
+}
diff --git a/data/presets/natural/swamp.json b/data/presets/natural/swamp.json
new file mode 100644
index 00000000..1f993a56
--- /dev/null
+++ b/data/presets/natural/swamp.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-wetland",
+    "fields": [
+        "wetland",
+        "salt",
+        "tidal"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "swamp"
+    },
+    "terms": [],
+    "name": "Swamp"
+}
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index ae01cac3..25a7cd5e 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -7172,6 +7172,10 @@ en:
         name: Hot Spring
         # 'terms: geothermal spring,thermal pool'
         terms: '<translate with synonyms or related terms for ''Hot Spring'', separated by commas>'
+      natural/marsh:
+        # 'natural=wetland + wetland=marsh\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Marsh
+        terms: '<translate with synonyms or related terms for ''Marsh'', separated by commas>'
       natural/mud:
         # 'natural=mud\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Mud
@@ -7182,6 +7186,11 @@ en:
         name: Peak
         # 'terms: acme,aiguille,alp,climax,crest,crown,hill,mount,mountain,pinnacle,summit,tip,top'
         terms: '<translate with synonyms or related terms for ''Peak'', separated by commas>'
+      natural/reedbed:
+        # 'natural=wetland + wetland=reedbed\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Reed bed
+        # 'terms: reeds,bulrushes,cattail'
+        terms: '<translate with synonyms or related terms for ''Reed bed'', separated by commas>'
       natural/reef:
         # 'natural=reef\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Reef
@@ -7237,6 +7246,10 @@ en:
         name: Unattached Stone / Boulder
         # 'terms: boulder,stone,rock'
         terms: '<translate with synonyms or related terms for ''Unattached Stone / Boulder'', separated by commas>'
+      natural/swamp:
+        # 'natural=wetland + wetland=swamp\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Swamp
+        terms: '<translate with synonyms or related terms for ''Swamp'', separated by commas>'
       natural/tree:
         # 'natural=tree\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Tree