Add "trees" as a search term for Natural Wood and Managed Forest

(closes #7097)

data/presets.yaml

@@ -5323,7 +5323,7 @@ en:
       landuse/forest:
         # landuse=forest
         name: Managed Forest
-        # 'terms: cut,forest,forestry,lumber,silviculture,tree'
+        # 'terms: cut,forest,forestry,lumber,silviculture,tree,trees'
         terms: '<translate with synonyms or related terms for ''Managed Forest'', separated by commas>'
       landuse/garages:
         # landuse=garages
@@ -6418,9 +6418,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Wetland'', separated by commas>'
       natural/wood:
         # natural=wood
-        name: Wood
-        # 'terms: tree'
-        terms: '<translate with synonyms or related terms for ''Wood'', separated by commas>'
+        name: Natural Wood
+        # 'terms: tree,trees'
+        terms: '<translate with synonyms or related terms for ''Natural Wood'', separated by commas>'
       network/type/node_network:
         # 'network:type=node_network'
         name: Recreational Network Node

data/presets/presets.json

@@ -599,7 +599,7 @@
     "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
     "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
     "landuse/flowerbed": {"icon": "maki-garden", "fields": ["operator"], "moreFields": ["address", "name"], "geometry": ["area"], "tags": {"landuse": "flowerbed"}, "terms": ["floral garden", "flower garden"], "name": "Flowerbed"},
-    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree"], "name": "Managed Forest"},
+    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree", "trees"], "name": "Managed Forest"},
     "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
     "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": [], "name": "Grass"},
     "landuse/greenfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "greenfield"}, "terms": [], "matchScore": 0.9, "name": "Greenfield"},
@@ -826,7 +826,7 @@
     "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 Area"},
     "natural/water/wastewater": {"icon": "temaki-waste", "geometry": ["area"], "tags": {"natural": "water", "water": "wastewater"}, "reference": {"key": "water", "value": "wastewater"}, "terms": ["excrement", "shit", "sewage", "wastewater", "Settling Basin", "Clarifier Basin"], "name": "Wastewater Basin"},
     "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"},
+    "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree", "trees"], "name": "Natural Wood"},
     "network/type/node_network": {"fields": ["name", "rwn_ref", "rcn_ref"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"},
     "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", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},

data/presets/presets/landuse/forest.json

@@ -25,7 +25,8 @@
         "forestry",
         "lumber",
         "silviculture",
-        "tree"
+        "tree",
+        "trees"
     ],
     "name": "Managed Forest"
 }

data/presets/presets/natural/wood.json

@@ -13,7 +13,8 @@
         "natural": "wood"
     },
     "terms": [
-        "tree"
+        "tree",
+        "trees"
     ],
-    "name": "Wood"
+    "name": "Natural Wood"
 }

data/taginfo.json

@@ -801,7 +801,7 @@
     {"key": "water", "value": "stream", "description": "🄿 Stream Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
     {"key": "water", "value": "wastewater", "description": "🄿 Wastewater Basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/waste.svg"},
     {"key": "natural", "value": "wetland", "description": "🄿 Wetland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wetland-15.svg"},
-    {"key": "natural", "value": "wood", "description": "🄿 Wood", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
+    {"key": "natural", "value": "wood", "description": "🄿 Natural Wood", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
     {"key": "network:type", "value": "node_network", "description": "🄿 Recreational Network Node", "object_types": ["node"]},
     {"key": "noexit", "value": "yes", "description": "🄿 No Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
     {"key": "office", "description": "🄿 Office, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},

dist/locales/en.json

@@ -7093,7 +7093,7 @@
                 },
                 "landuse/forest": {
                     "name": "Managed Forest",
-                    "terms": "cut,forest,forestry,lumber,silviculture,tree"
+                    "terms": "cut,forest,forestry,lumber,silviculture,tree,trees"
                 },
                 "landuse/garages": {
                     "name": "Garage Landuse",
@@ -8000,8 +8000,8 @@
                     "terms": "bog,fen,marsh,mire,moor,muskeg,peatland,quagmire,reedbed,saltmarsh,swamp,tidalflat,wet meadow"
                 },
                 "natural/wood": {
-                    "name": "Wood",
-                    "terms": "tree"
+                    "name": "Natural Wood",
+                    "terms": "tree,trees"
                 },
                 "network/type/node_network": {
                     "name": "Recreational Network Node",