From 83414d189c720085b760af0cab8b309a3fdb28d6 Mon Sep 17 00:00:00 2001
From: Tobias <tobias@fixmycity.de>
Date: Mon, 29 Apr 2024 21:47:52 +0200
Subject: [PATCH] Test out full modified copy of access fields for
 bicycle_road|s

This requires to remove the "copy fields from parent" in order to remove the original `access` field
---
 data/fields/access/access_vehicle.json        | 66 +++++++++++++++++++
 data/fields/access_vehicle.json               | 23 -------
 data/presets/highway/bicycle_road/_path.json  |  8 ++-
 .../highway/bicycle_road/_service.json        |  9 ++-
 .../highway/bicycle_road/cycleway.json        | 10 ++-
 .../highway/bicycle_road/residential.json     |  9 ++-
 6 files changed, 94 insertions(+), 31 deletions(-)
 create mode 100644 data/fields/access/access_vehicle.json
 delete mode 100644 data/fields/access_vehicle.json

diff --git a/data/fields/access/access_vehicle.json b/data/fields/access/access_vehicle.json
new file mode 100644
index 00000000..a3f4f30a
--- /dev/null
+++ b/data/fields/access/access_vehicle.json
@@ -0,0 +1,66 @@
+{
+    "keys": [
+        "access",
+        "foot",
+        "vehicle",
+        "motor_vehicle",
+        "bicycle"
+    ],
+    "reference": {
+        "key": "access"
+    },
+    "type": "access",
+    "label": "Allowed Access",
+    "placeholder": "Not Specified",
+    "strings": {
+        "types": {
+            "access": "All",
+            "foot": "Foot",
+            "vehicle": "All Vehicles",
+            "motor_vehicle": "Motor Vehicles",
+            "bicycle": "Bicycles"
+        },
+        "options": {
+            "yes": {
+                "title": "Allowed",
+                "description": "Access allowed by law; a right of way"
+            },
+            "no": {
+                "title": "Prohibited",
+                "description": "Access not allowed to the general public"
+            },
+            "permissive": {
+                "title": "Permissive",
+                "description": "Access allowed until such time as the owner revokes the permission"
+            },
+            "private": {
+                "title": "Private",
+                "description": "Access allowed only with permission of the owner on an individual basis"
+            },
+            "designated": {
+                "title": "Designated",
+                "description": "Access allowed according to signs or specific local laws"
+            },
+            "destination": {
+                "title": "Destination",
+                "description": "Access allowed only to reach a destination"
+            },
+            "customers": {
+                "title": "Customers",
+                "description": "Restricted to customers at the destination"
+            },
+            "dismount": {
+                "title": "Dismount",
+                "description": "Access allowed but rider must dismount"
+            },
+            "permit": {
+                "title": "Permit",
+                "description": "Access allowed only with a valid permit or license"
+            },
+            "unknown": {
+                "title": "Unknown",
+                "description": "Access conditions are unknown or unclear"
+            }
+        }
+    }
+}
diff --git a/data/fields/access_vehicle.json b/data/fields/access_vehicle.json
deleted file mode 100644
index f1abe6e7..00000000
--- a/data/fields/access_vehicle.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "key": "vehicle",
-    "type": "defaultCheck",
-    "label": "General vehicle access",
-    "geometry": [
-        "line"
-    ],
-    "reference": {
-        "key": "access"
-    },
-    "strings": {
-        "options": {
-            "no": {
-                "title": "No vehicle allowed",
-                "description": "Access is prohibited for all vehicles"
-            },
-            "undefined": {
-                "title": "Other access restrictions",
-                "description": "Other access restrictions apply"
-            }
-        }
-    }
-}
diff --git a/data/presets/highway/bicycle_road/_path.json b/data/presets/highway/bicycle_road/_path.json
index 4bb5b3f1..1b81d097 100644
--- a/data/presets/highway/bicycle_road/_path.json
+++ b/data/presets/highway/bicycle_road/_path.json
@@ -1,8 +1,12 @@
 {
     "icon": "fas-biking",
     "fields": [
-        "{highway/path}",
-        "access_vehicle"
+        "name",
+        "surface",
+        "width",
+        "structure",
+        "access/access_vehicle",
+        "incline"
     ],
     "moreFields": [
         "{highway/path}"
diff --git a/data/presets/highway/bicycle_road/_service.json b/data/presets/highway/bicycle_road/_service.json
index a2363aad..77e00aa8 100644
--- a/data/presets/highway/bicycle_road/_service.json
+++ b/data/presets/highway/bicycle_road/_service.json
@@ -1,8 +1,13 @@
 {
     "icon": "iD-highway-service",
     "fields": [
-        "{highway/service}",
-        "access_vehicle"
+        "name",
+        "service",
+        "oneway",
+        "maxspeed",
+        "surface",
+        "structure",
+        "access/access_vehicle"
     ],
     "moreFields": [
         "{highway/service}"
diff --git a/data/presets/highway/bicycle_road/cycleway.json b/data/presets/highway/bicycle_road/cycleway.json
index 20ce591b..1e5925d6 100644
--- a/data/presets/highway/bicycle_road/cycleway.json
+++ b/data/presets/highway/bicycle_road/cycleway.json
@@ -1,8 +1,14 @@
 {
     "icon": "fas-biking",
     "fields": [
-        "{highway/cycleway}",
-        "access_vehicle"
+        "name",
+        "oneway",
+        "surface",
+        "smoothness",
+        "width",
+        "structure",
+        "access/access_vehicle",
+        "incline"
     ],
     "moreFields": [
         "{highway/cycleway}"
diff --git a/data/presets/highway/bicycle_road/residential.json b/data/presets/highway/bicycle_road/residential.json
index 443d288c..f2570e87 100644
--- a/data/presets/highway/bicycle_road/residential.json
+++ b/data/presets/highway/bicycle_road/residential.json
@@ -1,8 +1,13 @@
 {
     "icon": "iD-highway-residential",
     "fields": [
-        "{highway/residential}",
-        "access_vehicle"
+        "name",
+        "oneway",
+        "maxspeed",
+        "lanes",
+        "surface",
+        "structure",
+        "access/access_vehicle"
     ],
     "moreFields": [
         "{highway/residential}"