From 388871fdf2330c4f0a2c7d1d50750c821b6ed571 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Fri, 5 May 2023 16:47:38 +0200
Subject: [PATCH] add field for `bicycle_road` tag, analoguous to `cyclestreet`
 (see #888)

---
 data/fields/bicycle_road.json           | 26 +++++++++++++++++++++++++
 data/fields/cyclestreet-BE-NL.json      | 18 ++---------------
 data/presets/highway/living_street.json |  1 +
 data/presets/highway/residential.json   |  1 +
 data/presets/highway/tertiary.json      |  1 +
 interim/source_strings.yaml             | 18 +++++++++--------
 6 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 data/fields/bicycle_road.json

diff --git a/data/fields/bicycle_road.json b/data/fields/bicycle_road.json
new file mode 100644
index 00000000..da52b8f8
--- /dev/null
+++ b/data/fields/bicycle_road.json
@@ -0,0 +1,26 @@
+{
+    "key": "bicycle_road",
+    "type": "defaultCheck",
+    "label": "Cycle Street",
+    "terms": [
+        "bicycle boulevard",
+        "bicycle road",
+        "cyclestreet",
+        "neighborhood bikeway",
+        "neighborhood byway",
+        "neighborhood greenway",
+        "neighborway"
+    ],
+    "locationSet": {
+        "exclude": [
+            "BE",
+            "NL"
+        ]
+    },
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "yes": "Yes"
+        }
+    }
+}
diff --git a/data/fields/cyclestreet-BE-NL.json b/data/fields/cyclestreet-BE-NL.json
index 0fd6998b..01e8ee9d 100644
--- a/data/fields/cyclestreet-BE-NL.json
+++ b/data/fields/cyclestreet-BE-NL.json
@@ -1,26 +1,12 @@
 {
     "key": "cyclestreet",
     "type": "defaultCheck",
-    "label": "Cycle Street",
-    "terms": [
-        "bicycle boulevard",
-        "bicycle road",
-        "cyclestreet",
-        "neighborhood bikeway",
-        "neighborhood byway",
-        "neighborhood greenway",
-        "neighborway"
-    ],
+    "label": "{bicycle_road}",
     "locationSet": {
         "include": [
             "BE",
             "NL"
         ]
     },
-    "strings": {
-        "options": {
-            "undefined": "No",
-            "yes": "Yes"
-        }
-    }
+    "stringsCrossReference": "{bicycle_road}"
 }
diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json
index 1666522e..b14544ce 100644
--- a/data/presets/highway/living_street.json
+++ b/data/presets/highway/living_street.json
@@ -11,6 +11,7 @@
     ],
     "moreFields": [
         "covered_no",
+        "bicycle_road",
         "cyclestreet-BE-NL",
         "cycleway",
         "flood_prone",
diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json
index 82ec0bf6..236483be 100644
--- a/data/presets/highway/residential.json
+++ b/data/presets/highway/residential.json
@@ -12,6 +12,7 @@
     "moreFields": [
         "covered_no",
         "cycleway",
+        "bicycle_road",
         "cyclestreet-BE-NL",
         "flood_prone",
         "incline",
diff --git a/data/presets/highway/tertiary.json b/data/presets/highway/tertiary.json
index 3e0e8283..144874c6 100644
--- a/data/presets/highway/tertiary.json
+++ b/data/presets/highway/tertiary.json
@@ -5,6 +5,7 @@
     ],
     "moreFields": [
         "{highway/primary}",
+        "bicycle_road",
         "cyclestreet-BE-NL"
     ],
     "geometry": [
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 60a1350a..7dff4fd6 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -568,6 +568,16 @@ en:
           stands: Stand (supports bicycle frame)
           # bicycle_parking=wall_loops
           wall_loops: Wheelbender (supports wheel only)
+      bicycle_road:
+        # bicycle_road=*
+        label: Cycle Street
+        options:
+          # bicycle_road=undefined
+          undefined: 'No'
+          # bicycle_road=yes
+          'yes': 'Yes'
+        # 'terms: bicycle boulevard,bicycle road,cyclestreet,neighborhood bikeway,neighborhood byway,neighborhood greenway,neighborway'
+        terms: '[translate with synonyms or related terms for ''Cycle Street'', separated by commas]'
       bike_ride:
         # bike_ride=*
         label: Bike and Ride
@@ -1504,14 +1514,6 @@ en:
         label: Network
       cyclestreet-BE-NL:
         # cyclestreet=* | Local preset for countries "BE", "NL"
-        label: Cycle Street
-        options:
-          # cyclestreet=undefined
-          undefined: 'No'
-          # cyclestreet=yes
-          'yes': 'Yes'
-        # 'terms: bicycle boulevard,bicycle road,cyclestreet,neighborhood bikeway,neighborhood byway,neighborhood greenway,neighborway'
-        terms: '[translate with synonyms or related terms for ''Cycle Street'', separated by commas]'
       cycleway:
         # cycleway:left=*, cycleway:right=*
         label: Bike Lanes