Merge branch 'develop'

assets/layers/cycleways_and_roads/cycleways_and_roads.json

@@ -273,6 +273,9 @@
       "width": "8"
     }
   ],
+  "calculatedTags": [
+    "width:= ! ! (feat.properties['width:carriageway']) ? feat.properties['width:carriageway'] : feat.properties['width'] "
+  ],
   "tagRenderings": [
     "images",
     {
@@ -1289,16 +1292,16 @@
         ]
       },
       "render": {
-        "en": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
-        "nl": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>",
-        "de": "Die Fahrbahnbreite dieser Straße beträgt <strong>{width:carriageway}m</strong>",
-        "fr": "La largeur de cette chaussée est de <strong>{width:carriageway}m</strong>",
-        "ca": "L'amplada dels carrils d'aquesta carretera és <strong>{width:carriageway}m</strong>",
-        "cs": "Šířka vozovky této silnice je <strong>{width:carriageway}m</strong>",
-        "es": "El ancho de la calzada de esta carretera es de <strong>{width:carriageway}m</strong>"
+        "en": "The carriage width of this road is <strong>{width}m</strong>",
+        "nl": "De breedte van deze rijbaan in deze straat is <strong>{width}m</strong>",
+        "de": "Die Fahrbahnbreite dieser Straße beträgt <strong>{width}m</strong>",
+        "fr": "La largeur de cette chaussée est de <strong>{width}m</strong>",
+        "ca": "L'amplada dels carrils d'aquesta carretera és <strong>{width}m</strong>",
+        "cs": "Šířka vozovky této silnice je <strong>{width}m</strong>",
+        "es": "El ancho de la calzada de esta carretera es de <strong>{width}m</strong>"
       },
       "freeform": {
-        "key": "width:carriageway",
+        "key": "width",
         "type": "distance",
         "helperArgs": [
           "20",
@@ -1314,7 +1317,7 @@
         "cs": "Jaká je šířka vozovky této silnice (v metrech)?",
         "es": "¿Cuál es el ancho de la calzada de esta carretera (en metros)?"
       },
-      "id": "width:carriageway",
+      "id": "width",
       "questionHint": {
         "en": "This is measured curb to curb and thus includes the width of parallell parking lanes",
         "nl": "Dit is gemeten van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook",

assets/layers/shops/shops.json

@@ -523,6 +523,43 @@
         }
       ]
     },
+    {
+      "id": "optometrist_service",
+      "#": "Quite often, opticians also sell hearing aids and vice versa. They often also have a certified optometrist or audiologist",
+      "condition": {
+        "or": [
+          "shop=optician",
+          "shop=hearing_aid",
+          "shop=medical_supply"
+        ]
+      },
+      "question": {
+        "en": "Are medical services available here?",
+        "nl": "Zijn hier medische services beschikbaar?"
+      },
+      "multiAnswer": true,
+      "mappings": [
+        {
+          "if": "healthcare=optometrist",
+          "ifnot": "not:healtcare=optometrist",
+          "addExtraTags": [
+            "not:healthcare=optometrist"
+          ],
+          "then": {
+            "en": "This shop offers eye exams by certified optometrists",
+            "nl": "Hier kan men een oogtest door een erkende optometrist laten uitvoeren"
+          }
+        },
+        {
+          "if": "healthcare=audiologist",
+          "ifnot": "not:healthcare=audiologist",
+          "then": {
+            "en": "This shop offers hearing tests by a certified audiologist",
+            "nl": "HIer kan men een hoortest laten uitvoeren door een erkende audioloog"
+          }
+        }
+      ]
+    },
     {
       "id": "key_cutter",
       "question": {

assets/layers/waste_basket/waste_basket.json

@@ -27,11 +27,7 @@
     "cs": "Jedná se o veřejný odpadkový koš, odpadkový koš, kam můžete vyhodit odpadky."
   },
   "source": {
-    "osmTags": {
-      "and": [
-        "amenity=waste_basket"
-      ]
-    }
+    "osmTags": "amenity=waste_basket"
   },
   "minzoom": 17,
   "title": {
@@ -489,4 +485,4 @@
     "enableRelocation": false,
     "enableImproveAccuracy": true
   }
-}
+}

assets/layers/waste_disposal/waste_disposal.json

@@ -27,7 +27,6 @@
     "osmTags": "amenity=waste_disposal"
   },
   "minzoom": 12,
-  "minzoomVisible": 12,
   "title": {
     "render": {
       "en": "Waste Disposal",
@@ -324,4 +323,4 @@
     "enableImproveAccuracy": true,
     "enableRelocation": true
   }
-}
+}