From 18ab84ae6e07a274a6a5a32a78ae7b762beaff48 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Thu, 18 Apr 2019 09:03:45 -0700
Subject: [PATCH] Add terms and field to Wetland preset

---
 data/presets.yaml                         |  2 +-
 data/presets/presets.json                 |  2 +-
 data/presets/presets/natural/wetland.json | 14 ++++++++++++--
 dist/locales/en.json                      |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 13fabfdf3..6c7604190 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5512,7 +5512,7 @@ en:
       natural/wetland:
         # natural=wetland
         name: Wetland
-        # 'terms: bog,marsh,reedbed,swamp,tidalflat'
+        # '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/wood:
         # natural=wood
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c76f4670b..2b56d0076 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -722,7 +722,7 @@
     "natural/water/reservoir": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"},
     "natural/water/river": {"icon": "iD-waterway-river", "fields": ["{natural/water}", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "riverbank", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River"},
     "natural/water/stream": {"icon": "iD-waterway-stream", "fields": ["{natural/water}"], "geometry": ["area"], "tags": {"natural": "water", "water": "stream"}, "reference": {"key": "water", "value": "stream"}, "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "name": "Stream"},
-    "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "marsh", "reedbed", "swamp", "tidalflat"], "name": "Wetland"},
+    "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"},
     "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"},
     "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
     "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "operator", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
diff --git a/data/presets/presets/natural/wetland.json b/data/presets/presets/natural/wetland.json
index f52829c19..2de1fadc0 100644
--- a/data/presets/presets/natural/wetland.json
+++ b/data/presets/presets/natural/wetland.json
@@ -1,7 +1,9 @@
 {
     "icon": "maki-wetland",
     "fields": [
-        "wetland"
+        "wetland",
+        "salt",
+        "tidal"
     ],
     "geometry": [
         "point",
@@ -12,10 +14,18 @@
     },
     "terms": [
         "bog",
+        "fen",
         "marsh",
+        "mire",
+        "moor",
+        "muskeg",
+        "peatland",
+        "quagmire",
         "reedbed",
+        "saltmarsh",
         "swamp",
-        "tidalflat"
+        "tidalflat",
+        "wet meadow"
     ],
     "name": "Wetland"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f1d0005e2..02a733ea1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6973,7 +6973,7 @@
                 },
                 "natural/wetland": {
                     "name": "Wetland",
-                    "terms": "bog,marsh,reedbed,swamp,tidalflat"
+                    "terms": "bog,fen,marsh,mire,moor,muskeg,peatland,quagmire,reedbed,saltmarsh,swamp,tidalflat,wet meadow"
                 },
                 "natural/wood": {
                     "name": "Wood",