Update water area presets to use natural=water + water=*

(closes #5591)

data/presets.yaml

@@ -4197,7 +4197,6 @@ en:
       landuse/basin:
         # landuse=basin
         name: Basin
-        terms: '<translate with synonyms or related terms for ''Basin'', separated by commas>'
       landuse/brownfield:
         # landuse=brownfield
         name: Brownfield
@@ -4350,6 +4349,9 @@ en:
         name: Plant Nursery
         # 'terms: flower,garden,grow,vivero'
         terms: '<translate with synonyms or related terms for ''Plant Nursery'', separated by commas>'
+      landuse/pond:
+        # landuse=pond
+        name: Pond
       landuse/quarry:
         # landuse=quarry
         name: Quarry
@@ -4368,6 +4370,9 @@ en:
         # landuse=religious
         name: Religious Area
         terms: '<translate with synonyms or related terms for ''Religious Area'', separated by commas>'
+      landuse/reservoir:
+        # landuse=reservoir
+        name: Reservoir
       landuse/residential:
         # landuse=residential
         name: Residential Area
@@ -5040,6 +5045,10 @@ en:
         # natural=water
         name: Water
         terms: '<translate with synonyms or related terms for ''Water'', separated by commas>'
+      natural/water/canal:
+        # 'natural=water, water=canal'
+        name: Canal
+        terms: '<translate with synonyms or related terms for ''Canal'', separated by commas>'
       natural/water/lake:
         # 'natural=water, water=lake'
         name: Lake
@@ -5054,6 +5063,16 @@ en:
         # 'natural=water, water=reservoir'
         name: Reservoir
         terms: '<translate with synonyms or related terms for ''Reservoir'', separated by commas>'
+      natural/water/river:
+        # 'natural=water, water=river'
+        name: River
+        # 'terms: beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse'
+        terms: '<translate with synonyms or related terms for ''River'', separated by commas>'
+      natural/water/stream:
+        # 'natural=water, water=stream'
+        name: 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'
+        terms: '<translate with synonyms or related terms for ''Stream'', separated by commas>'
       natural/wetland:
         # natural=wetland
         name: Wetland
@@ -6854,7 +6873,6 @@ en:
       waterway/riverbank:
         # waterway=riverbank
         name: Riverbank
-        terms: '<translate with synonyms or related terms for ''Riverbank'', separated by commas>'
       waterway/sanitary_dump_station:
         # waterway=sanitary_dump_station
         name: Marine Toilet Disposal

data/presets/presets.json

@@ -473,10 +473,12 @@
     "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"},
     "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"},
     "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "name": "Land Use"},
-    "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "terms": [], "name": "Farmland", "searchable": false},
+    "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "name": "Basin", "searchable": false},
+    "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false},
+    "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false},
+    "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false},
     "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
     "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"},
-    "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "terms": [], "name": "Basin"},
     "landuse/brownfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"},
     "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
     "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
@@ -657,9 +659,12 @@
     "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": ["water"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
-    "natural/water/lake": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "natural", "value": "water"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"},
-    "natural/water/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "natural", "value": "water"}, "terms": ["lakelet", "millpond", "tarn", "pool", "mere"], "name": "Pond"},
-    "natural/water/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "natural", "value": "water"}, "name": "Reservoir"},
+    "natural/water/canal": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"},
+    "natural/water/lake": {"icon": "maki-water", "fields": ["name", "intermittent"], "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": ["name", "intermittent"], "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", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"},
+    "natural/water/river": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River"},
+    "natural/water/stream": {"icon": "maki-water", "fields": ["name", "intermittent"], "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"},
@@ -1047,6 +1052,7 @@
     "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
     "type/waterway": {"icon": "iD-route-water", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "vertex": {"fields": ["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"], "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/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name"], "tags": {"waterway": "dam"}, "name": "Dam"},
@@ -1056,7 +1062,6 @@
     "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
     "waterway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_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/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank"},
     "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "water_point"], "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"},

data/presets/presets/landuse/basin.json → data/presets/presets/landuse/_basin.json

@@ -11,6 +11,6 @@
     "tags": {
         "landuse": "basin"
     },
-    "terms": [],
-    "name": "Basin"
+    "name": "Basin",
+    "searchable": false
 }

data/presets/presets/landuse/_farm.json

@@ -12,7 +12,6 @@
     "tags": {
         "landuse": "farm"
     },
-    "terms": [],
     "name": "Farmland",
     "searchable": false
 }

data/presets/presets/landuse/_pond.json

@@ -0,0 +1,15 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "intermittent"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "landuse": "pond"
+    },
+    "name": "Pond",
+    "searchable": false
+}

data/presets/presets/landuse/_reservoir.json

@@ -0,0 +1,15 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "intermittent"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "landuse": "reservoir"
+    },
+    "name": "Reservoir",
+    "searchable": false
+}

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

@@ -0,0 +1,19 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "intermittent"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "water",
+        "water": "canal"
+    },
+    "reference": {
+        "key": "water",
+        "value": "canal"
+    },
+    "name": "Canal"
+}

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

@@ -12,8 +12,8 @@
         "water": "lake"
     },
     "reference": {
-        "key": "natural",
-        "value": "water"
+        "key": "water",
+        "value": "lake"
     },
     "terms": [
         "lakelet",

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

@@ -12,8 +12,8 @@
         "water": "pond"
     },
     "reference": {
-        "key": "natural",
-        "value": "water"
+        "key": "water",
+        "value": "pond"
     },
     "terms": [
         "lakelet",

data/presets/presets/natural/water/reservoir.json

@@ -12,8 +12,8 @@
         "water": "reservoir"
     },
     "reference": {
-        "key": "natural",
-        "value": "water"
+        "key": "water",
+        "value": "reservoir"
     },
     "name": "Reservoir"
 }

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

@@ -0,0 +1,34 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "intermittent"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "water",
+        "water": "river"
+    },
+    "reference": {
+        "key": "water",
+        "value": "river"
+    },
+    "terms": [
+        "beck",
+        "branch",
+        "brook",
+        "course",
+        "creek",
+        "estuary",
+        "rill",
+        "rivulet",
+        "run",
+        "runnel",
+        "stream",
+        "tributary",
+        "watercourse"
+    ],
+    "name": "River"
+}

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

@@ -0,0 +1,46 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "intermittent"
+    ],
+    "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"
+}

data/presets/presets/waterway/riverbank.json → data/presets/presets/waterway/_riverbank.json

@@ -6,5 +6,6 @@
     "tags": {
         "waterway": "riverbank"
     },
-    "name": "Riverbank"
+    "name": "Riverbank",
+    "searchable": false
 }