From b565c7d96d51dc8bb0f5dc460c81ef17b2b5179f Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Mon, 13 Feb 2023 18:15:05 +0100
Subject: [PATCH] fix presets with dupliate ids

* merge duplicate barrier=ditch presets
* give unique ids to alternate "point geometry" presets for natural=wood and landuse=industrial
---
 data/presets/barrier/_ditch.json                      | 11 -----------
 data/presets/barrier/ditch.json                       |  9 +++++++--
 .../_industrial_point.json}                           |  0
 data/presets/natural/{_wood.json => _wood_point.json} |  1 +
 interim/source_strings.yaml                           |  7 ++++++-
 5 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 data/presets/barrier/_ditch.json
 rename data/presets/landuse/{_industrial.json => industrial/_industrial_point.json} (100%)
 rename data/presets/natural/{_wood.json => _wood_point.json} (92%)

diff --git a/data/presets/barrier/_ditch.json b/data/presets/barrier/_ditch.json
deleted file mode 100644
index 92ef22df..00000000
--- a/data/presets/barrier/_ditch.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "icon": "maki-roadblock",
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "barrier": "ditch"
-    },
-    "name": "Ditch",
-    "searchable": false
-}
diff --git a/data/presets/barrier/ditch.json b/data/presets/barrier/ditch.json
index 290ea9ac..e6c7ca26 100644
--- a/data/presets/barrier/ditch.json
+++ b/data/presets/barrier/ditch.json
@@ -1,12 +1,17 @@
 {
     "icon": "temaki-trench",
     "geometry": [
-        "line",
-        "area"
+        "line"
     ],
     "tags": {
         "barrier": "ditch"
     },
     "name": "Trench",
+    "aliases": [
+        "Ditch"
+    ],
+    "terms": [
+        "ha-ha"
+    ],
     "matchScore": 0.25
 }
diff --git a/data/presets/landuse/_industrial.json b/data/presets/landuse/industrial/_industrial_point.json
similarity index 100%
rename from data/presets/landuse/_industrial.json
rename to data/presets/landuse/industrial/_industrial_point.json
diff --git a/data/presets/natural/_wood.json b/data/presets/natural/_wood_point.json
similarity index 92%
rename from data/presets/natural/_wood.json
rename to data/presets/natural/_wood_point.json
index 4baa7b9c..14879a66 100644
--- a/data/presets/natural/_wood.json
+++ b/data/presets/natural/_wood_point.json
@@ -13,5 +13,6 @@
         "natural": "wood"
     },
     "searchable": false,
+    "matchScore": 1.1,
     "name": "{natural/wood}"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 5c291a8d..d995d657 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -6830,8 +6830,9 @@ en:
         # 'terms: bicycle barrier,bicycling barrier,bike gates,cycling barrier'
         terms: <translate with synonyms or related terms for 'Cycle Barrier', separated by commas>
       barrier/ditch:
-        # barrier=ditch | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        # barrier=ditch | Ditch | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Trench
+        # 'terms: ha-ha'
         terms: <translate with synonyms or related terms for 'Trench', separated by commas>
       barrier/entrance:
         # barrier=entrance | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -8509,6 +8510,8 @@ en:
         terms: <translate with synonyms or related terms for 'Industrial Area', separated by commas>
       landuse/industrial/brewery:
         # industrial=brewery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+      landuse/industrial/industrial_point:
+        # landuse=industrial | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
       landuse/industrial/scrap_yard:
         # industrial=scrap_yard | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Scrap Yard
@@ -9869,6 +9872,8 @@ en:
         name: Natural Wood
         # 'terms: boreal,forest,forrest,taiga,tree,trees,woodlands,woods'
         terms: <translate with synonyms or related terms for 'Natural Wood', separated by commas>
+      natural/wood_point:
+        # natural=wood | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
       network/type/node_network-DE-NL-BE-LU:
         # network:type=node_network | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Recreational Network Node