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

@@ -1,11 +0,0 @@
-{
-    "icon": "maki-roadblock",
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "barrier": "ditch"
-    },
-    "name": "Ditch",
-    "searchable": false
-}

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
 }

data/presets/natural/_wood_point.json

@@ -13,5 +13,6 @@
         "natural": "wood"
     },
     "searchable": false,
+    "matchScore": 1.1,
     "name": "{natural/wood}"
 }