Merge branch 'develop'

assets/layers/bike_shop/bike_shop.json

@@ -139,6 +139,40 @@
       }
     ]
   },
+  "titleIcons": [
+    {
+      "mappings": [
+        {
+          "if": "service:bicycle:pump=yes",
+          "then": "<img src='./assets/layers/bike_shop/pump.svg'>"
+        }
+      ]
+    },
+    {
+      "mappings": [
+        {
+          "if": "service:bicycle:diy=yes",
+          "then": "<img src='./assets/layers/bike_shop/tools.svg'>"
+        }
+      ]
+    },
+    {
+      "mappings": [
+        {
+          "if": {
+            "or": [
+              "service:bicycle:cleaning=yes",
+              "service:bicycle:cleaning=diy"
+            ]
+          },
+          "then": "<img src='./assets/layers/bike_shop/bike_cleaning.svg'>"
+        }
+      ]
+    },
+    "wikipedialink",
+    "osmlink"
+   
+  ],
   "description": {
     "en": "A shop specifically selling bicycles or related items",
     "nl": "Een winkel die hoofdzakelijk fietsen en fietstoebehoren verkoopt"
@@ -438,6 +472,35 @@
           }
         }
       ]
+    },
+    {
+      "question": {
+        "en": "Are bicycles washed here?",
+        "nl": "Biedt deze winkel een fietsschoonmaak aan?"
+      },
+      "mappings": [
+        {
+          "if": "service:bicycle:cleaning=yes",
+          "then": {
+            "en": "This shop cleans bicycles",
+            "nl": "Deze winkel biedt fietsschoonmaak aan"
+          }
+        },
+        {
+          "if": "service:bicycle:cleaning=diy",
+          "then": {
+            "en": "This shop has an installation where one can clean bicycles themselves",
+            "nl": "Deze winkel biedt een installatie aan om zelf je fiets schoon te maken"
+          }
+        },
+        {
+          "if": "service:bicycle:cleaning=no",
+          "then": {
+            "en": "This shop doesn't offer bicycle cleaning",
+            "nl": "Deze winkel biedt geen fietsschoonmaak aan"
+          }
+        }
+      ]
     }
   ],
   "hideUnderlayingFeaturesMinPercentage": 1,

assets/layers/drinking_water/drinking_water.json

@@ -16,7 +16,16 @@
       "de": "Trinkwasser"
     }
   },
-  "icon": "./assets/layers/drinking_water/drinking_water.svg",
+  "icon": {
+    "render":     "./assets/layers/drinking_water/drinking_water.svg",
+    "mappings": [
+      {
+        "if": {"or": ["operational_status=broken", "operational_status=closed"]},
+        
+        "then":  "./assets/layers/drinking_water/drinking_water_broken.svg"
+      }
+    ]
+  },
   "iconSize": "40,40,bottom",
   "overpassTags": {
     "and": [
@@ -41,7 +50,7 @@
       ]
     }
   ],
-  "color": "#00bb00",
+  "color": "#6bc4f7",
   "tagRenderings": [
     "images",
     {
@@ -63,8 +72,7 @@
           "then": {
             "en": "This drinking water works",
             "nl": "Deze drinkwaterfonteint werkt"
-          },
-          "hideInAnswer": true
+          }
         },
         {
           "if": "operational_status=broken",

assets/themes/cyclofix/cyclofix.json

@@ -25,6 +25,6 @@
   "startZoom": 16,
   "widenFactor": 0.05,
   "socialImage": "./assets/themes/cyclofix/logo.svg",
-  "layers": ["bike_cafes", "bike_shops", "bike_repair_station", "drinking_water", "bike_themed_object","bike_parking"],
+  "layers": ["bike_cafes", "bike_shops", "bike_repair_station", "drinking_water", "bike_themed_object","bike_cleaning","bike_parking"],
   "roamingRenderings": []
 }