From da2c88b7d2e8f2035ba39027f944f5f06627b7c4 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Mon, 10 Jan 2022 13:15:40 +0100
Subject: [PATCH] more detailed wetland presets (closes #281)

add presets for all categories currently documented at https://wiki.openstreetmap.org/wiki/Key:wetland

also drop the tidal/salt fields where they do not apply to the more specific wetland presets
---
 data/fields/wetland.json                      | 16 +++-
 data/presets/natural/wetland/bog.json         | 17 ++++
 data/presets/natural/wetland/fen.json         | 19 +++++
 .../{swamp.json => wetland/mangrove.json}     |  9 ++-
 data/presets/natural/{ => wetland}/marsh.json | 10 +--
 .../natural/{ => wetland}/reedbed.json        | 10 +--
 data/presets/natural/wetland/saltmarsh.json   | 23 ++++++
 data/presets/natural/wetland/string_bog.json  | 23 ++++++
 data/presets/natural/wetland/swamp.json       | 22 +++++
 data/presets/natural/wetland/tidalflat.json   | 25 ++++++
 data/presets/natural/wetland/wet_meadow.json  | 17 ++++
 interim/source_strings.yaml                   | 80 ++++++++++++++++---
 12 files changed, 244 insertions(+), 27 deletions(-)
 create mode 100644 data/presets/natural/wetland/bog.json
 create mode 100644 data/presets/natural/wetland/fen.json
 rename data/presets/natural/{swamp.json => wetland/mangrove.json} (59%)
 rename data/presets/natural/{ => wetland}/marsh.json (66%)
 rename data/presets/natural/{ => wetland}/reedbed.json (72%)
 create mode 100644 data/presets/natural/wetland/saltmarsh.json
 create mode 100644 data/presets/natural/wetland/string_bog.json
 create mode 100644 data/presets/natural/wetland/swamp.json
 create mode 100644 data/presets/natural/wetland/tidalflat.json
 create mode 100644 data/presets/natural/wetland/wet_meadow.json

diff --git a/data/fields/wetland.json b/data/fields/wetland.json
index bf103718..649fc4d0 100644
--- a/data/fields/wetland.json
+++ b/data/fields/wetland.json
@@ -1,5 +1,19 @@
 {
     "key": "wetland",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "marsh": "Marsh",
+            "reedbed": "Reed Bed",
+            "saltmarsh": "Coastal Salt Marsh",
+            "tidalflat": "Tidal Flat",
+            "wet_meadow": "Wet Meadow",
+            "swamp": "Swamp",
+            "mangrove": "Mangrove",
+            "bog": "Bog",
+            "fen": "Fen",
+            "string_bog": "String Bog"
+        }
+    }
 }
\ No newline at end of file
diff --git a/data/presets/natural/wetland/bog.json b/data/presets/natural/wetland/bog.json
new file mode 100644
index 00000000..88498756
--- /dev/null
+++ b/data/presets/natural/wetland/bog.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-wetland",
+    "fields": [],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "bog"
+    },
+    "reference": {
+        "key": "wetland",
+        "value": "bog"
+    },
+    "terms": [],
+    "name": "Bog"
+}
diff --git a/data/presets/natural/wetland/fen.json b/data/presets/natural/wetland/fen.json
new file mode 100644
index 00000000..9991641b
--- /dev/null
+++ b/data/presets/natural/wetland/fen.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-wetland",
+    "fields": [],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "fen"
+    },
+    "reference": {
+        "key": "wetland",
+        "value": "fen"
+    },
+    "terms": [
+        "groundwater"
+    ],
+    "name": "Fen"
+}
diff --git a/data/presets/natural/swamp.json b/data/presets/natural/wetland/mangrove.json
similarity index 59%
rename from data/presets/natural/swamp.json
rename to data/presets/natural/wetland/mangrove.json
index 1f993a56..cf1dfc25 100644
--- a/data/presets/natural/swamp.json
+++ b/data/presets/natural/wetland/mangrove.json
@@ -1,7 +1,6 @@
 {
     "icon": "maki-wetland",
     "fields": [
-        "wetland",
         "salt",
         "tidal"
     ],
@@ -10,8 +9,12 @@
     ],
     "tags": {
         "natural": "wetland",
-        "wetland": "swamp"
+        "wetland": "mangrove"
+    },
+    "reference": {
+        "key": "wetland",
+        "value": "mangrove"
     },
     "terms": [],
-    "name": "Swamp"
+    "name": "Mangrove"
 }
diff --git a/data/presets/natural/marsh.json b/data/presets/natural/wetland/marsh.json
similarity index 66%
rename from data/presets/natural/marsh.json
rename to data/presets/natural/wetland/marsh.json
index af478a37..a84a7744 100644
--- a/data/presets/natural/marsh.json
+++ b/data/presets/natural/wetland/marsh.json
@@ -1,10 +1,6 @@
 {
     "icon": "maki-wetland",
-    "fields": [
-        "wetland",
-        "salt",
-        "tidal"
-    ],
+    "fields": [],
     "geometry": [
         "area"
     ],
@@ -12,6 +8,10 @@
         "natural": "wetland",
         "wetland": "marsh"
     },
+    "reference": {
+        "key": "wetland",
+        "value": "marsh"
+    },
     "terms": [],
     "name": "Marsh"
 }
diff --git a/data/presets/natural/reedbed.json b/data/presets/natural/wetland/reedbed.json
similarity index 72%
rename from data/presets/natural/reedbed.json
rename to data/presets/natural/wetland/reedbed.json
index a5932c4f..696c3ca9 100644
--- a/data/presets/natural/reedbed.json
+++ b/data/presets/natural/wetland/reedbed.json
@@ -1,10 +1,6 @@
 {
     "icon": "maki-wetland",
-    "fields": [
-        "wetland",
-        "salt",
-        "tidal"
-    ],
+    "fields": [],
     "geometry": [
         "area"
     ],
@@ -12,6 +8,10 @@
         "natural": "wetland",
         "wetland": "reedbed"
     },
+    "reference": {
+        "key": "wetland",
+        "value": "reedbed"
+    },
     "terms": [
         "reeds",
         "bulrushes",
diff --git a/data/presets/natural/wetland/saltmarsh.json b/data/presets/natural/wetland/saltmarsh.json
new file mode 100644
index 00000000..cbf06fb0
--- /dev/null
+++ b/data/presets/natural/wetland/saltmarsh.json
@@ -0,0 +1,23 @@
+{
+    "icon": "maki-wetland",
+    "fields": [
+        "salt",
+        "tidal"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "saltmarsh"
+    },
+    "reference": {
+        "key": "wetland",
+        "value": "saltmarsh"
+    },
+    "terms": [
+        "saltmarsh",
+        "tidal"
+    ],
+    "name": "Coastal Salt Marsh"
+}
diff --git a/data/presets/natural/wetland/string_bog.json b/data/presets/natural/wetland/string_bog.json
new file mode 100644
index 00000000..e129ae55
--- /dev/null
+++ b/data/presets/natural/wetland/string_bog.json
@@ -0,0 +1,23 @@
+{
+    "icon": "maki-wetland",
+    "fields": [],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "string_bog"
+    },
+    "reference": {
+        "key": "wetland",
+        "value": "string_bog"
+    },
+    "terms": [
+        "aapa moore",
+        "strangemoore"
+    ],
+    "aliases": [
+        "Strong Mire"
+    ],
+    "name": "String Bog"
+}
diff --git a/data/presets/natural/wetland/swamp.json b/data/presets/natural/wetland/swamp.json
new file mode 100644
index 00000000..d07e0065
--- /dev/null
+++ b/data/presets/natural/wetland/swamp.json
@@ -0,0 +1,22 @@
+{
+    "icon": "maki-wetland",
+    "fields": [],
+    "moreFields": [
+        "tidal"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "swamp"
+    },
+    "reference": {
+        "key": "wetland",
+        "value": "swamp"
+    },
+    "terms": [
+        "waterlogged"
+    ],
+    "name": "Swamp"
+}
diff --git a/data/presets/natural/wetland/tidalflat.json b/data/presets/natural/wetland/tidalflat.json
new file mode 100644
index 00000000..0e0235af
--- /dev/null
+++ b/data/presets/natural/wetland/tidalflat.json
@@ -0,0 +1,25 @@
+{
+    "icon": "maki-wetland",
+    "fields": [
+        "salt",
+        "tidal"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "tidalflat"
+    },
+    "reference": {
+        "key": "wetland",
+        "value": "tidalflat"
+    },
+    "terms": [
+        "tidal"
+    ],
+    "aliases": [
+        "Mudflat"
+    ],
+    "name": "Tidal Flat"
+}
diff --git a/data/presets/natural/wetland/wet_meadow.json b/data/presets/natural/wetland/wet_meadow.json
new file mode 100644
index 00000000..08729748
--- /dev/null
+++ b/data/presets/natural/wetland/wet_meadow.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-wetland",
+    "fields": [],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "wetland",
+        "wetland": "wet_meadow"
+    },
+    "reference": {
+        "key": "wetland",
+        "value": "wet_meadow"
+    },
+    "terms": [],
+    "name": "Wet Meadow"
+}
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index e5cb8d51..a74635d3 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -3253,6 +3253,27 @@ en:
       wetland:
         # wetland=*
         label: Type
+        options:
+          # wetland=bog
+          bog: Bog
+          # wetland=fen
+          fen: Fen
+          # wetland=mangrove
+          mangrove: Mangrove
+          # wetland=marsh
+          marsh: Marsh
+          # wetland=reedbed
+          reedbed: Reed Bed
+          # wetland=saltmarsh
+          saltmarsh: Coastal Salt Marsh
+          # wetland=string_bog
+          string_bog: String Bog
+          # wetland=swamp
+          swamp: Swamp
+          # wetland=tidalflat
+          tidalflat: Tidal Flat
+          # wetland=wet_meadow
+          wet_meadow: Wet Meadow
       wheelchair:
         # wheelchair=*
         label: Wheelchair Access
@@ -7343,10 +7364,6 @@ 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
@@ -7357,11 +7374,6 @@ 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
@@ -7417,10 +7429,6 @@ 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
@@ -7492,6 +7500,52 @@ en:
         name: Wetland
         # 'terms: bog,fen,marsh,mire,moor,muskeg,peatland,quagmire,reedbed,saltmarsh,swamp,tidalflat,wet meadow'
         terms: '<translate with synonyms or related terms for ''Wetland'', separated by commas>'
+      natural/wetland/bog:
+        # 'natural=wetland + wetland=bog\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Bog
+        terms: '<translate with synonyms or related terms for ''Bog'', separated by commas>'
+      natural/wetland/fen:
+        # 'natural=wetland + wetland=fen\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Fen
+        # 'terms: groundwater'
+        terms: '<translate with synonyms or related terms for ''Fen'', separated by commas>'
+      natural/wetland/mangrove:
+        # 'natural=wetland + wetland=mangrove\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Mangrove
+        terms: '<translate with synonyms or related terms for ''Mangrove'', separated by commas>'
+      natural/wetland/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/wetland/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/wetland/saltmarsh:
+        # 'natural=wetland + wetland=saltmarsh\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Coastal Salt Marsh
+        # 'terms: saltmarsh,tidal'
+        terms: '<translate with synonyms or related terms for ''Coastal Salt Marsh'', separated by commas>'
+      natural/wetland/string_bog:
+        # 'natural=wetland + wetland=string_bog\n\nStrong Mire\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: String Bog
+        # 'terms: aapa moore,strangemoore'
+        terms: '<translate with synonyms or related terms for ''String Bog'', separated by commas>'
+      natural/wetland/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: waterlogged'
+        terms: '<translate with synonyms or related terms for ''Swamp'', separated by commas>'
+      natural/wetland/tidalflat:
+        # 'natural=wetland + wetland=tidalflat\n\nMudflat\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Tidal Flat
+        # 'terms: tidal'
+        terms: '<translate with synonyms or related terms for ''Tidal Flat'', separated by commas>'
+      natural/wetland/wet_meadow:
+        # 'natural=wetland + wetland=wet_meadow\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Wet Meadow
+        terms: '<translate with synonyms or related terms for ''Wet Meadow'', separated by commas>'
       natural/wood:
         # 'natural=wood\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Natural Wood