From abb1e39612cc154df067f0e8d0620573ac1cd60e Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Sun, 2 Jan 2022 20:54:00 +0100
Subject: [PATCH] Added names and iconBadges

---
 assets/layers/recycling/recycling.json | 92 +++++++++++++++++++++++++-
 langs/layers/en.json                   |  8 +++
 langs/layers/nl.json                   |  8 +++
 3 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index 1bebe85be9..58e1d28fdb 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -16,7 +16,23 @@
     "render": {
       "en": "Recycling facility",
       "nl": "Recyclingfaciliteit"
-    }
+    },
+    "mappings": [
+      {
+        "if": "recycling_type=centre",
+        "then": {
+          "en": "Recycling centre",
+          "nl": "Recyclingcentrum"
+        }
+      },
+      {
+        "if": "recycling_type=container",
+        "then": {
+          "en": "Recycling container",
+          "nl": "Recyclingcontainer"
+        }
+      }
+    ]
   },
   "mapRendering": [
     {
@@ -24,7 +40,77 @@
         "point",
         "centroid"
       ],
-      "icon": "./assets/layers/recycling/recycling-14.svg"
+      "icon": "./assets/layers/recycling/recycling-14.svg",
+      "iconBadges": [
+        {
+          "if": "recycling:batteries=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/batteries.svg"
+        },
+        {
+          "if": "recycling:beverage_cartons=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/beverage_cartons.svg"
+        },
+        {
+          "if": "recycling:cans=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/cans.svg"
+        },
+        {
+          "if": "recycling:clothes=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/clothes.svg"
+        },
+        {
+          "if": "recycling:cooking_oil=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/cooking_oil.svg"
+        },
+        {
+          "if": "recycling:engine_oil=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/engine_oil.svg"
+        },
+        {
+          "if": "recycling:glass=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/glass.svg"
+        },
+        {
+          "if": "recycling:glass_bottles=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/glass_bottles.svg"
+        },
+        {
+          "if": "recycling:green_waste=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/garden_waste.svg"
+        },
+        {
+          "if": "recycling:newspaper=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/newspaper.svg"
+        },
+        {
+          "if": "recycling:paper=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/paper.svg"
+        },
+        {
+          "if": "recycling:plastic_bottles=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/plastic_bottles.svg"
+        },
+        {
+          "if": "recycling:plastic_packaging=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/plastic_packaging.svg"
+        },
+        {
+          "if": "recycling:plastic=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/plastic.svg"
+        },
+        {
+          "if": "recycling:scrap_metal=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/scrap_metal.svg"
+        },
+        {
+          "if": "recyling:shoes=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/shoes.svg"
+        },
+        {
+          "if": "recycling:small_electrical_appliances=yes",
+          "then": "circle:#FFFFFF;./assets/layers/recycling/small_electrical_appliances.svg"
+        }
+      ]
     }
   ],
   "presets": [
@@ -217,7 +303,7 @@
           }
         },
         {
-          "if": "recylcing:plastic=yes",
+          "if": "recycling:plastic=yes",
           "ifnot": "recycling:plastic=",
           "then": {
             "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic can be recycled here</div>",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index c9a347aa7e..dec19cc040 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3791,6 +3791,14 @@
             }
         },
         "title": {
+            "mappings": {
+                "0": {
+                    "then": "Recycling centre"
+                },
+                "1": {
+                    "then": "Recycling container"
+                }
+            },
             "render": "Recycling facility"
         }
     },
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 9138f969a3..eded2ac50e 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3777,6 +3777,14 @@
             }
         },
         "title": {
+            "mappings": {
+                "0": {
+                    "then": "Recyclingcentrum"
+                },
+                "1": {
+                    "then": "Recyclingcontainer"
+                }
+            },
             "render": "Recyclingfaciliteit"
         }
     },