From ff077366fe8c0ae43af07abdd9eb2ddd000f3834 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Wed, 13 Mar 2024 16:12:27 +0100
Subject: [PATCH] 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         | 3 ++-
 .../tree/broadleaved/{_evergreen.json => evergreen.json}     | 5 +++--
 .../tree/needleleaved/{_deciduous.json => deciduous.json}    | 5 +++--
 data/presets/natural/tree/needleleaved/evergreen.json        | 3 ++-
 interim/source_strings.yaml                                  | 4 ++++
 5 files changed, 14 insertions(+), 6 deletions(-)
 rename data/presets/natural/tree/broadleaved/{_evergreen.json => evergreen.json} (88%)
 rename data/presets/natural/tree/needleleaved/{_deciduous.json => deciduous.json} (89%)

diff --git a/data/presets/natural/tree/broadleaved/deciduous.json b/data/presets/natural/tree/broadleaved/deciduous.json
index 9626ac9a..9c58434b 100644
--- a/data/presets/natural/tree/broadleaved/deciduous.json
+++ b/data/presets/natural/tree/broadleaved/deciduous.json
@@ -18,7 +18,8 @@
         "broadleaf",
         "broadleaved",
         "deciduous",
-        "hardwood"
+        "hardwood",
+        "tree"
     ],
     "name": "Broadleaved Tree (deciduous)"
 }
diff --git a/data/presets/natural/tree/broadleaved/_evergreen.json b/data/presets/natural/tree/broadleaved/evergreen.json
similarity index 88%
rename from data/presets/natural/tree/broadleaved/_evergreen.json
rename to data/presets/natural/tree/broadleaved/evergreen.json
index 5818f2ae..f0736c3e 100644
--- a/data/presets/natural/tree/broadleaved/_evergreen.json
+++ b/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
 }
diff --git a/data/presets/natural/tree/needleleaved/_deciduous.json b/data/presets/natural/tree/needleleaved/deciduous.json
similarity index 89%
rename from data/presets/natural/tree/needleleaved/_deciduous.json
rename to data/presets/natural/tree/needleleaved/deciduous.json
index d8b86a5b..57b1ee34 100644
--- a/data/presets/natural/tree/needleleaved/_deciduous.json
+++ b/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
 }
diff --git a/data/presets/natural/tree/needleleaved/evergreen.json b/data/presets/natural/tree/needleleaved/evergreen.json
index bd4b0222..c26a2a7e 100644
--- a/data/presets/natural/tree/needleleaved/evergreen.json
+++ b/data/presets/natural/tree/needleleaved/evergreen.json
@@ -18,7 +18,8 @@
         "conifer",
         "evergreen",
         "needleleaved",
-        "softwood"
+        "softwood",
+        "tree"
     ],
     "name": "Needleleaved Tree (evergreen)"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index b4a4f8b6..6bd5204b 100644
--- a/interim/source_strings.yaml
+++ b/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)