Add Salt and Tidal fields to water presets (close #5822)

data/presets.yaml

@@ -1512,6 +1512,9 @@ en:
           mountain_hiking: 'T2: Mountain Hiking'
         # sac_scale field placeholder
         placeholder: 'Mountain Hiking, Alpine Hiking...'
+      salt:
+        # salt=*
+        label: Salt
       sanitary_dump_station:
         # sanitary_dump_station=*
         label: Toilet Disposal
@@ -1871,6 +1874,9 @@ en:
           'yes': 'Yes'
         # takeaway field placeholder
         placeholder: 'Yes, No, Takeaway Only...'
+      tidal:
+        # tidal=*
+        label: Tidal
       to:
         # to=*
         label: To

data/presets/fields.json

@@ -268,6 +268,7 @@
     "route_master": {"key": "route_master", "type": "combo", "label": "Type"},
     "route": {"key": "route", "type": "combo", "label": "Type"},
     "sac_scale": {"key": "sac_scale", "type": "combo", "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": {"options": {"hiking": "T1: Hiking", "mountain_hiking": "T2: Mountain Hiking", "demanding_mountain_hiking": "T3: Demanding Mountain Hiking", "alpine_hiking": "T4: Alpine Hiking", "demanding_alpine_hiking": "T5: Demanding Alpine Hiking", "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"}}},
+    "salt": {"key": "salt", "type": "check", "label": "Salt"},
     "sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"},
     "scuba_diving": {"key": "scuba_diving:", "type": "multiCombo", "label": "Services", "options": ["repair", "courses", "rental", "filling", "air_filling", "nitrox_filling", "trimix_filling", "oxygen_filling"]},
     "seamark/beacon_isolated_danger/shape": {"key": "seamark:beacon_isolated_danger:shape", "type": "combo", "label": "Shape"},
@@ -326,6 +327,7 @@
     "switch": {"key": "switch", "type": "combo", "label": "Type", "strings": {"options": {"mechanical": "Mechanical", "circuit_breaker": "Circuit Breaker", "disconnector": "Disconnector", "earthing": "Earthing"}}},
     "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"},
     "takeaway": {"key": "takeaway", "type": "combo", "label": "Takeaway", "placeholder": "Yes, No, Takeaway Only...", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Takeaway Only"}}},
+    "tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
     "to": {"key": "to", "type": "text", "label": "To"},
     "toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit/Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},
     "toll": {"key": "toll", "type": "check", "label": "Toll"},

data/presets/fields/salt.json

@@ -0,0 +1,5 @@
+{
+    "key": "salt",
+    "type": "check",
+    "label": "Salt"
+}

data/presets/fields/tidal.json

@@ -0,0 +1,5 @@
+{
+    "key": "tidal",
+    "type": "check",
+    "label": "Tidal"
+}

data/presets/presets.json

@@ -660,14 +660,14 @@
     "natural/tree_row": {"icon": "maki-park", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"},
     "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"},
     "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["mountain", "crater"], "name": "Volcano"},
-    "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
+    "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
     "natural/water/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"natural": "water", "water": "basin"}, "reference": {"key": "water", "value": "basin"}, "terms": ["detention", "drain", "overflow", "rain", "retention"], "name": "Basin"},
-    "natural/water/canal": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"},
-    "natural/water/lake": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"},
-    "natural/water/pond": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "water", "value": "pond"}, "terms": ["lakelet", "millpond", "tarn", "pool", "mere"], "name": "Pond"},
+    "natural/water/canal": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"},
+    "natural/water/lake": {"icon": "maki-water", "fields": ["{natural/water}", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"},
+    "natural/water/pond": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "water", "value": "pond"}, "terms": ["lakelet", "millpond", "tarn", "pool", "mere"], "name": "Pond"},
     "natural/water/reservoir": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"},
-    "natural/water/river": {"icon": "maki-water", "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": "maki-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/water/river": {"icon": "maki-water", "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": "maki-water", "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/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"},
@@ -1058,17 +1058,17 @@
     "vertex": {"moreFields": ["name"], "geometry": ["vertex"], "tags": {}, "name": "Other", "matchScore": 0.1},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
     "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
-    "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
+    "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent"], "moreFields": ["salt"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
     "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "moreFields": ["website"], "fields": ["name"], "tags": {"waterway": "dam"}, "name": "Dam"},
     "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"},
     "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"},
     "waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"},
     "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["payment_multi", "brand", "seamark/type", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
     "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"},
-    "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
+    "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
     "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "water_point"], "moreFields": ["opening_hours", "payment_multi", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
     "waterway/stream_intermittent": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "geometry": ["line"], "terms": ["arroyo", "beck", "branch", "brook", "burn", "course", "creek", "drift", "flood", "flow", "gully", "run", "runnel", "rush", "spate", "spritz", "tributary", "wadi", "wash", "watercourse"], "tags": {"waterway": "stream", "intermittent": "yes"}, "reference": {"key": "waterway", "value": "stream"}, "name": "Intermittent Stream"},
-    "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "geometry": ["line"], "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"], "tags": {"waterway": "stream"}, "name": "Stream"},
+    "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["salt", "tidal"], "geometry": ["line"], "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"], "tags": {"waterway": "stream"}, "name": "Stream"},
     "waterway/water_point": {"icon": "maki-drinking-water", "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "name": "Marine Drinking Water"},
     "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
     "waterway/weir": {"icon": "maki-dam", "geometry": ["vertex", "line"], "tags": {"waterway": "weir"}, "name": "Weir"},

data/presets/presets/natural/water.json

@@ -5,6 +5,10 @@
         "water",
         "intermittent"
     ],
+    "moreFields": [
+        "salt",
+        "tidal"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/natural/water/canal.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-water",
+    "fields": [
+        "{natural/water}",
+        "salt"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/natural/water/lake.json

@@ -1,5 +1,10 @@
 {
     "icon": "maki-water",
+    "fields": [
+        "{natural/water}",
+        "salt",
+        "tidal"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/natural/water/pond.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-water",
+    "fields": [
+        "{natural/water}",
+        "salt"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/natural/water/river.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-water",
+    "fields": [
+        "{natural/water}",
+        "tidal"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/natural/water/stream.json

@@ -1,5 +1,8 @@
 {
     "icon": "maki-water",
+    "fields": [
+        "{natural/water}"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/waterway/canal.json

@@ -5,6 +5,9 @@
         "width",
         "intermittent"
     ],
+    "moreFields": [
+        "salt"
+    ],
     "geometry": [
         "line"
     ],

data/presets/presets/waterway/river.json

@@ -4,7 +4,11 @@
         "name",
         "structure_waterway",
         "width",
-        "intermittent"
+        "intermittent",
+        "tidal"
+    ],
+    "moreFields": [
+        "salt"
     ],
     "geometry": [
         "line"

data/presets/presets/waterway/stream.json

@@ -6,6 +6,10 @@
         "width",
         "intermittent"
     ],
+    "moreFields": [
+        "salt",
+        "tidal"
+    ],
     "geometry": [
         "line"
     ],

data/taginfo.json

@@ -1427,6 +1427,7 @@
     {"key": "sac_scale", "value": "alpine_hiking", "description": "🄵 Hiking Difficulty"},
     {"key": "sac_scale", "value": "demanding_alpine_hiking", "description": "🄵 Hiking Difficulty"},
     {"key": "sac_scale", "value": "difficult_alpine_hiking", "description": "🄵 Hiking Difficulty"},
+    {"key": "salt", "description": "🄵 Salt"},
     {"key": "sanitary_dump_station", "description": "🄵 Toilet Disposal"},
     {"key": "scuba_diving:", "description": "🄵 Services"},
     {"key": "seamark:beacon_isolated_danger:shape", "description": "🄵 Shape"},
@@ -1532,6 +1533,7 @@
     {"key": "takeaway", "value": "yes", "description": "🄵 Takeaway"},
     {"key": "takeaway", "value": "no", "description": "🄵 Takeaway"},
     {"key": "takeaway", "value": "only", "description": "🄵 Takeaway"},
+    {"key": "tidal", "description": "🄵 Tidal"},
     {"key": "to", "description": "🄵 To"},
     {"key": "toilets:disposal", "value": "flush", "description": "🄵 Disposal"},
     {"key": "toilets:disposal", "value": "pitlatrine", "description": "🄵 Disposal"},

dist/locales/en.json

@@ -3102,6 +3102,9 @@
                         "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"
                     }
                 },
+                "salt": {
+                    "label": "Salt"
+                },
                 "sanitary_dump_station": {
                     "label": "Toilet Disposal"
                 },
@@ -3394,6 +3397,9 @@
                         "only": "Takeaway Only"
                     }
                 },
+                "tidal": {
+                    "label": "Tidal"
+                },
                 "to": {
                     "label": "To"
                 },