make all tree type presets searchable, fixes #1156

also adding "tree" as search term to all of these presets and use matchscore to nudge sorting to slightly prefer the (in OSM) more common cases

data/presets/natural/tree/broadleaved/deciduous.json

@@ -18,7 +18,8 @@
         "broadleaf",
         "broadleaved",
         "deciduous",
-        "hardwood"
+        "hardwood",
+        "tree"
     ],
     "name": "Broadleaved Tree (deciduous)"
 }

data/presets/natural/tree/broadleaved/evergreen.json

@@ -18,8 +18,9 @@
         "broadleaf",
         "broadleaved",
         "evergreen",
-        "hardwood"
+        "hardwood",
+        "tree"
     ],
     "name": "Broadleaved Tree (evergreen)",
-    "searchable": false
+    "matchScore": 0.99
 }

data/presets/natural/tree/needleleaved/deciduous.json

@@ -18,8 +18,9 @@
         "conifer",
         "deciduous",
         "needleleaved",
-        "softwood"
+        "softwood",
+        "tree"
     ],
     "name": "Needleleaved Tree (deciduous)",
-    "searchable": false
+    "matchScore": 0.99
 }

data/presets/natural/tree/needleleaved/evergreen.json

@@ -18,7 +18,8 @@
         "conifer",
         "evergreen",
         "needleleaved",
-        "softwood"
+        "softwood",
+        "tree"
     ],
     "name": "Needleleaved Tree (evergreen)"
 }

interim/source_strings.yaml

@@ -11038,12 +11038,16 @@ en:
       natural/tree/broadleaved/evergreen:
         # natural=tree + leaf_type=broadleaved + leaf_cycle=evergreen | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Broadleaved Tree (evergreen)
+        # 'terms: broadleaf,broadleaved,evergreen,hardwood'
+        terms: <translate with synonyms or related terms for 'Broadleaved Tree (evergreen)', separated by commas>
       natural/tree/needleleaved:
         # natural=tree + leaf_type=needleleaved | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Needleleaved Tree
       natural/tree/needleleaved/deciduous:
         # natural=tree + leaf_type=needleleaved + leaf_cycle=deciduous | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Needleleaved Tree (deciduous)
+        # 'terms: conifer,deciduous,needleleaved,softwood'
+        terms: <translate with synonyms or related terms for 'Needleleaved Tree (deciduous)', separated by commas>
       natural/tree/needleleaved/evergreen:
         # natural=tree + leaf_type=needleleaved + leaf_cycle=evergreen | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Needleleaved Tree (evergreen)