Merge branch 'waste-theme' of github.com:pietervdvn/MapComplete into waste-theme

assets/layers/recycling/recycling.json

@@ -40,7 +40,7 @@
         "point",
         "centroid"
       ],
-      "icon": "./assets/layers/recycling/recycling-14.svg",
+      "icon": "circle:white;./assets/layers/recycling/recycling-14.svg",
       "iconBadges": [
         {
           "if": "recycling:batteries=yes",
@@ -75,7 +75,12 @@
           "then": "circle:#FFFFFF;./assets/layers/recycling/glass_bottles.svg"
         },
         {
-          "if": "recycling:green_waste=yes",
+          "if": {
+            "or": [
+              "recycling:green_waste=yes",
+              "recycling:organic=yes"
+            ]
+          },
           "then": "circle:#FFFFFF;./assets/layers/recycling/garden_waste.svg"
         },
         {
@@ -258,6 +263,15 @@
             "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Groen afval kan hier gerecycled worden</div>"
           }
         },
+        {
+          "if": "recycling:organic=yes",
+          "ifnot": "recycling:organic=",
+          "then": {
+            "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Organic waste can be recycled here</div>",
+            "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Organisch afval kan hier gerecycled worden</div>"
+          },
+          "hideInAnswer": true
+        },
         {
           "if": "recycling:glass_bottles=yes",
           "ifnot": "recycling:glass_bottles=",

assets/layers/waste_basket/waste_basket.json

@@ -145,7 +145,7 @@
             "nl": "Deze vuilnisbaak heeft waarschijnlijk geen verdeler voor hondenpoepzakjes",
             "de": "Dieser Abfalleimer <b>hat keinen</b> Spender für (Hunde-)Kotbeutel"
           },
-          "hideInAnwer": true
+          "hideInAnswer": true
         }
       ]
     }

assets/layers/waste_disposal/waste_disposal.json

@@ -9,7 +9,8 @@
   "source": {
     "osmTags": "amenity=waste_disposal"
   },
-  "minZoom": 12,
+  "minzoom": 18,
+  "minzoomVisible": 18,
   "title": {
     "render": {
       "en": "Waste Disposal"