From 8d181c183a9fcf4eb6ba8d48bb8005dcd3e97e9d Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Mon, 28 Oct 2024 00:25:21 +0100
Subject: [PATCH] Add self_service and automated to bike wash (#2203)

---
 .../layers/bike_cleaning/bike_cleaning.json   | 61 ++++++++++++++++---
 1 file changed, 52 insertions(+), 9 deletions(-)

diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json
index fedd79d62..7297efcde 100644
--- a/assets/layers/bike_cleaning/bike_cleaning.json
+++ b/assets/layers/bike_cleaning/bike_cleaning.json
@@ -34,8 +34,7 @@
       "or": [
         "service:bicycle:cleaning=yes",
         "service:bicycle:cleaning=diy",
-        "amenity=bicycle_wash",
-        "amenity=bike_wash"
+        "amenity=bicycle_wash"
       ]
     }
   },
@@ -83,7 +82,6 @@
           "if": {
             "and": [
               "service:bicycle:cleaning~*",
-              "amenity!=bike_wash",
               "amenity!=bicycle_wash"
             ]
           },
@@ -106,7 +104,6 @@
       ]
     }
   ],
-  "lineRendering": [],
   "presets": [
     {
       "title": {
@@ -158,7 +155,6 @@
       },
       "condition": {
         "and": [
-          "amenity!=bike_wash",
           "amenity!=bicycle_wash",
           "service:bicycle:cleaning!=no",
           "service:bicycle:cleaning!="
@@ -169,7 +165,7 @@
         "addExtraTags": [
           "service:bicycle:cleaning:fee=yes"
         ],
-        "inline": true
+        "inline": false
       },
       "mappings": [
         {
@@ -212,7 +208,7 @@
           "hideInAnswer": true
         }
       ],
-      "id": "bike_cleaning-service_bicycle_cleaning_charge"
+      "id": "bike_cleaning-service:bicycle:cleaning:charge"
     },
     {
       "question": {
@@ -241,7 +237,6 @@
       },
       "condition": {
         "or": [
-          "amenity=bike_wash",
           "amenity=bicycle_wash"
         ]
       },
@@ -285,6 +280,54 @@
         }
       ],
       "id": "bike_cleaning-charge"
+    },
+    {
+      "question": {
+        "en": "Is this bicycle cleaning service automated?",
+        "nl": "Is dit fietsschoonmaakpunt geautomatiseerd?"
+      },
+      "id": "automated",
+      "mappings": [
+        {
+          "if": "automated=no",
+          "then": {
+            "en": "This is a manual bike washing station",
+            "nl": "Dit is een handmatig fietsschoonmaakpunt"
+          }
+        },
+        {
+          "if": "automated=yes",
+          "then": {
+            "en": "This is an automated bike wash",
+            "nl": "Dit is een automatisch fietsschoonmaakpunt"
+          }
+        }
+      ],
+      "condition": "amenity=bicycle_wash"
+    },
+    {
+      "question": {
+        "nl": "Is dit fietsschoonmaakpunt zelfbediening?",
+        "en": "Is this cleaning service self-service?"
+      },
+      "id": "self_service",
+      "mappings": [
+        {
+          "if": "self_service=yes",
+          "then": {
+            "nl": "Dit fietsschoonmaakpunt is zelfbediening",
+            "en": "This cleaning service is self-service"
+          }
+        },
+        {
+          "if": "self_service=no",
+          "then": {
+            "nl": "Dit fietsschoonmaakpunt wordt bediend door aanwezig personeel",
+            "en": "This cleaning service is operated by an employee"
+          }
+        }
+      ],
+      "condition": "amenity=bicycle_wash"
     }
   ],
   "deletion": {
@@ -300,4 +343,4 @@
     "enableRelocation": false,
     "enableImproveAccuracy": true
   }
-}
+}
\ No newline at end of file