From a6b21a2fc8533110c24a986453fbd2b15f6c32ba Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Wed, 15 Dec 2021 14:56:54 +0100
Subject: [PATCH] make "drivable" slipways a special case of regular ones

closes #2
---
 data/presets/leisure/slipway.json          | 11 +++-----
 data/presets/leisure/slipway_drivable.json | 29 ++++++++++++++++++++++
 data/presets/leisure/slipway_point.json    | 22 ----------------
 interim/source_strings.yaml                |  6 ++---
 4 files changed, 35 insertions(+), 33 deletions(-)
 create mode 100644 data/presets/leisure/slipway_drivable.json
 delete mode 100644 data/presets/leisure/slipway_point.json

diff --git a/data/presets/leisure/slipway.json b/data/presets/leisure/slipway.json
index 5dc189e2..497e14fc 100644
--- a/data/presets/leisure/slipway.json
+++ b/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"
 }
diff --git a/data/presets/leisure/slipway_drivable.json b/data/presets/leisure/slipway_drivable.json
new file mode 100644
index 00000000..d0b27cbd
--- /dev/null
+++ b/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)"
+}
diff --git a/data/presets/leisure/slipway_point.json b/data/presets/leisure/slipway_point.json
deleted file mode 100644
index 80b119e9..00000000
--- a/data/presets/leisure/slipway_point.json
+++ /dev/null
@@ -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"
-}
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 354461c1..7820faac 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -6662,11 +6662,11 @@ en:
         name: Slipway
         # 'terms: boat launch,boat ramp,boat landing'
         terms: '<translate with synonyms or related terms for ''Slipway'', separated by commas>'
-      leisure/slipway_point:
+      leisure/slipway_drivable:
         # 'leisure=slipway\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Slipway
+        name: Slipway (Drivable)
         # 'terms: boat launch,boat ramp,boat landing'
-        terms: '<translate with synonyms or related terms for ''Slipway'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Slipway (Drivable)'', separated by commas>'
       leisure/sports_centre:
         # 'leisure=sports_centre\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Sports Center / Complex