make "drivable" slipways a special case of regular ones

closes #2

data/presets/leisure/slipway.json

@@ -6,8 +6,7 @@
         "access_simple",
         "fee",
         "payment_multi_fee",
-        "charge_fee",
-        "lanes"
+        "charge_fee"
     ],
     "moreFields": [
         "lit",
@@ -17,6 +16,8 @@
         "width"
     ],
     "geometry": [
+        "point",
+        "vertex",
         "line"
     ],
     "terms": [
@@ -27,11 +28,5 @@
     "tags": {
         "leisure": "slipway"
     },
-    "addTags": {
-        "leisure": "slipway",
-        "highway": "service",
-        "service": "slipway"
-    },
-    "matchScore": 1.1,
     "name": "Slipway"
 }

data/presets/leisure/slipway_drivable.json

@@ -0,0 +1,29 @@
+{
+    "icon": "maki-slipway",
+    "fields": [
+        "{leisure/slipway}",
+        "lanes"
+    ],
+    "moreFields": [
+        "{leisure/slipway}"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "terms": [
+        "boat launch",
+        "boat ramp",
+        "boat landing"
+    ],
+    "tags": {
+        "leisure": "slipway",
+        "highway": "service"
+    },
+    "addTags": {
+        "leisure": "slipway",
+        "highway": "service",
+        "service": "slipway"
+    },
+    "matchScore": 1.1,
+    "name": "Slipway (Drivable)"
+}

data/presets/leisure/slipway_point.json

@@ -1,22 +0,0 @@
-{
-    "icon": "maki-slipway",
-    "fields": [
-        "{leisure/slipway}"
-    ],
-    "moreFields": [
-        "{leisure/slipway}"
-    ],
-    "geometry": [
-        "point",
-        "vertex"
-    ],
-    "terms": [
-        "boat launch",
-        "boat ramp",
-        "boat landing"
-    ],
-    "tags": {
-        "leisure": "slipway"
-    },
-    "name": "Slipway"
-}