From 3948e353abdb21243b7101fe6b607858bbf9759f Mon Sep 17 00:00:00 2001
From: Tobias <tobias@fixmycity.de>
Date: Mon, 29 Apr 2024 22:09:15 +0200
Subject: [PATCH] Test cycleway_lane tagging with separate fields

We might want to use a directionalCombo for this. However, that would suggest to tag data for cycleway:left:lane=* when in fact there is no cycleway:left=lane. This tries to work around this by adding separate fields with re-conditions.
---
 data/fields/cycleway/both_lane.json    | 26 ++++++++++++++++++++++++++
 data/fields/cycleway/left_lane.json    | 26 ++++++++++++++++++++++++++
 data/fields/cycleway/right_lane.json   | 26 ++++++++++++++++++++++++++
 data/presets/highway/primary.json      |  3 +++
 data/presets/highway/primary_link.json |  3 +++
 data/presets/highway/residential.json  |  3 +++
 6 files changed, 87 insertions(+)
 create mode 100644 data/fields/cycleway/both_lane.json
 create mode 100644 data/fields/cycleway/left_lane.json
 create mode 100644 data/fields/cycleway/right_lane.json

diff --git a/data/fields/cycleway/both_lane.json b/data/fields/cycleway/both_lane.json
new file mode 100644
index 000000000..9be9d34f1
--- /dev/null
+++ b/data/fields/cycleway/both_lane.json
@@ -0,0 +1,26 @@
+{
+    "key": "cycleway:both:lane",
+    "prerequisiteTag": {
+        "key": "cycleway:both",
+        "value": "lane"
+    },
+    "type": "combo",
+    "label": "Cycle Lane Type (Both)",
+    "strings": {
+        "options": {
+            "exclusive": {
+                "title": "Exclusive cycle lane",
+                "description": "A cycle lane strictly reserved exclusively for cyclists, segregated from the car lanes, usually through a continuous line."
+            },
+            "advisory": {
+                "title": "Advisory cycle lane",
+                "description": "A cycle lane which is not reserved exclusively for cyclists."
+            }
+        }
+    },
+    "autoSuggestions": false,
+    "reference": {
+        "key": "cycleway:lane"
+    },
+    "terms": []
+}
diff --git a/data/fields/cycleway/left_lane.json b/data/fields/cycleway/left_lane.json
new file mode 100644
index 000000000..5f22c8a92
--- /dev/null
+++ b/data/fields/cycleway/left_lane.json
@@ -0,0 +1,26 @@
+{
+    "key": "cycleway:left:lane",
+    "prerequisiteTag": {
+        "key": "cycleway:left",
+        "value": "lane"
+    },
+    "type": "combo",
+    "label": "Cycle Lane Type (Left)",
+    "strings": {
+        "options": {
+            "exclusive": {
+                "title": "Exclusive cycle lane",
+                "description": "A cycle lane strictly reserved exclusively for cyclists, segregated from the car lanes, usually through a continuous line."
+            },
+            "advisory": {
+                "title": "Advisory cycle lane",
+                "description": "A cycle lane which is not reserved exclusively for cyclists."
+            }
+        }
+    },
+    "autoSuggestions": false,
+    "reference": {
+        "key": "cycleway:lane"
+    },
+    "terms": []
+}
diff --git a/data/fields/cycleway/right_lane.json b/data/fields/cycleway/right_lane.json
new file mode 100644
index 000000000..baacb03be
--- /dev/null
+++ b/data/fields/cycleway/right_lane.json
@@ -0,0 +1,26 @@
+{
+    "key": "cycleway:right:lane",
+    "prerequisiteTag": {
+        "key": "cycleway:right",
+        "value": "lane"
+    },
+    "type": "combo",
+    "label": "Cycle Lane Type (Right)",
+    "strings": {
+        "options": {
+            "exclusive": {
+                "title": "Exclusive cycle lane",
+                "description": "A cycle lane strictly reserved exclusively for cyclists, segregated from the car lanes, usually through a continuous line."
+            },
+            "advisory": {
+                "title": "Advisory cycle lane",
+                "description": "A cycle lane which is not reserved exclusively for cyclists."
+            }
+        }
+    },
+    "autoSuggestions": false,
+    "reference": {
+        "key": "cycleway:lane"
+    },
+    "terms": []
+}
diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json
index 8e3daa6a5..c896872f3 100644
--- a/data/presets/highway/primary.json
+++ b/data/presets/highway/primary.json
@@ -15,6 +15,9 @@
         "charge_toll",
         "covered_no",
         "cycleway",
+        "cycleway/both_lane",
+        "cycleway/left_lane",
+        "cycleway/right_lane",
         "expressway-US",
         "flood_prone",
         "incline",
diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json
index 82fbb450f..daf65b138 100644
--- a/data/presets/highway/primary_link.json
+++ b/data/presets/highway/primary_link.json
@@ -16,6 +16,9 @@
         "charge_toll",
         "covered_no",
         "cycleway",
+        "cycleway/both_lane",
+        "cycleway/left_lane",
+        "cycleway/right_lane",
         "destination/symbol_oneway",
         "flood_prone",
         "incline",
diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json
index 0a9746fae..ead45e53a 100644
--- a/data/presets/highway/residential.json
+++ b/data/presets/highway/residential.json
@@ -14,6 +14,9 @@
         "covered_no",
         "cycleway",
         "bicycle_road",
+        "cycleway/both_lane",
+        "cycleway/left_lane",
+        "cycleway/right_lane",
         "cyclestreet-BE-NL",
         "flood_prone",
         "incline",