Merge branch 'develop'

assets/layers/climbing_gym/climbing_gym.json

@@ -77,6 +77,46 @@
       "builtin": "climbing.fee"
     },
     "opening_hours",
+    {
+      "id": "shoe_rental",
+      "question": {
+        "en": "Can one rent climbing shoes here?"
+      },
+      "mappings": [
+        {
+          "if": "service:rental:climbing_shoes=yes",
+          "then": {
+            "en": "Climbing shoes can be rented here"
+          }
+        },
+        {
+          "if": "service:rental:climbing_shoes=no",
+          "then": {
+            "en": "Climbing shoes can <b>not</b> be rented here"
+          }
+        }
+      ]
+    },
+    {
+      "id": "harness_rental",
+      "question": {
+        "en": "Can one rent a climbing harness here?"
+      },
+      "mappings": [
+        {
+          "if": "service:rental:climbing_harness=yes",
+          "then": {
+            "en": "A climbing harness can be rented here"
+          }
+        },
+        {
+          "if": "service:rental:climbing_harness=no",
+          "then": {
+            "en": "A climbing harness can <b>not</b> be rented here"
+          }
+        }
+      ]
+    },
     "climbing.toprope",
     {
       "builtin": "climbing.average_length",
@@ -171,4 +211,4 @@
       }
     }
   ]
-}
+}

assets/layers/parking_spaces/parking_spaces.json

@@ -171,7 +171,16 @@
       "en": "Parking Space",
       "de": "Stellplatz",
       "nl": "Parkeerplek"
-    }
+    },
+    "mappings": [
+      {
+        "if": "parking_space=disabled",
+        "then": {
+          "en": "Disabled Parking Space",
+          "nl": "Parkeerplek voor gehandicapten"
+        }
+      }
+    ]
   },
   "mapRendering": [
     {

assets/themes/onwheels/onwheels.json

@@ -181,7 +181,20 @@
         "mapRendering": [
           {
             "icon": "./assets/themes/onwheels/parking.svg",
-            "iconSize": "40,40,bottom"
+            "iconSize": {
+              "render": "20,20,bottom",
+              "mappings": [
+                {
+                  "if": {
+                    "or": [
+                      "capacity:disabled>0",
+                      "capacity:disabled=yes"
+                    ]
+                  },
+                  "then": "40,40,bottom"
+                }
+              ]
+            }
           },
           {
             "color": "#225f92"
@@ -199,9 +212,19 @@
           {
             "icon": {
               "mappings": null
-            }
+            },
+            "iconSize": "30,30,center",
+            "iconBadges": [
+              {
+                "if": "parking_space=disabled",
+                "then": "./assets/layers/toilet/wheelchair.svg"
+              }
+            ]
           }
-        ]
+        ],
+        "name": {
+          "en": "Disabled parking spaces"
+        }
       },
       "hideTagRenderingsWithLabels": [
         "type",