From 28d66373680dda160b4b899621c5c89aa1c52143 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Sun, 12 Mar 2023 19:09:59 +0100
Subject: [PATCH] feat: Add printer cartridges to recycling

---
 assets/layers/recycling/license_info.json     | 13 +++++-
 .../layers/recycling/printer_cartridges.svg   |  8 ++++
 assets/layers/recycling/recycling.json        | 40 ++++++++++++++++++-
 .../layers/waste_disposal/waste_disposal.json |  7 +++-
 4 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 assets/layers/recycling/printer_cartridges.svg

diff --git a/assets/layers/recycling/license_info.json b/assets/layers/recycling/license_info.json
index 6698ec44c..957f2d98f 100644
--- a/assets/layers/recycling/license_info.json
+++ b/assets/layers/recycling/license_info.json
@@ -164,6 +164,17 @@
       "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/plastic_packaging.svg"
     ]
   },
+  {
+    "path": "printer_cartridges.svg",
+    "license": "CC-BY",
+    "authors": [
+      "Noun Project",
+      "Zach Bogart"
+    ],
+    "sources": [
+      "https://thenounproject.com/icon/ink-4963274/"
+    ]
+  },
   {
     "path": "recycling-14.svg",
     "license": "CC0",
@@ -205,4 +216,4 @@
       "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/small_electrical_appliances.svg"
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/assets/layers/recycling/printer_cartridges.svg b/assets/layers/recycling/printer_cartridges.svg
new file mode 100644
index 000000000..860f6ad4d
--- /dev/null
+++ b/assets/layers/recycling/printer_cartridges.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="700pt" height="700pt" version="1.1" viewBox="0 0 700 700" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g>
+  <path d="m258.99 52.527c0.35938-5.1562-2.0781-10.141-6.4102-13.031-4.543-3.0312-10.398-3.2422-15.148-0.55469-15.547 8.7969-34.496 9.0898-50.309 0.77344-1.25-0.65625-2.5039-1.3164-3.7539-1.9727-24.516-12.891-53.91-12.441-78.02 1.1992-4.8711 2.7539-7.6992 8.0586-7.3125 13.602v464.05c0 3.9805 1.5859 7.8047 4.4023 10.625 2.8164 2.8164 6.6367 4.3945 10.625 4.3945h130.91c3.9883 0 7.8047-1.5781 10.625-4.3945 2.8164-2.8164 4.4023-6.6406 4.4023-10.625v-464.07zm-80.477 320.7c-11.406 0-20.668 9.2578-20.668 20.664s9.2617 20.668 20.668 20.668 20.668-9.2617 20.668-20.668-9.2617-20.664-20.668-20.664zm0 10.266c5.7383 0 10.398 4.6602 10.398 10.398 0 5.7461-4.6602 10.406-10.398 10.406s-10.398-4.6602-10.398-10.406c0-5.7383 4.6602-10.398 10.398-10.398zm13.02-206.28c-2.3477-5.0664-7.4258-8.3164-13.02-8.3164s-10.672 3.2461-13.02 8.3164c-7.4297 15.707-20.859 47.234-20.859 63.129 0 18.699 15.18 33.879 33.879 33.879s33.879-15.18 33.879-33.879c0-15.895-13.43-47.422-20.859-63.129zm-8.7422 4.082c-0.76172-1.6797-2.4375-2.7539-4.2773-2.7539-1.8438 0-3.5156 1.0742-4.2773 2.7539-6.957 14.695-19.957 44.145-19.957 59.047 0 13.371 10.859 24.238 24.238 24.238s24.238-10.863 24.238-24.238c0-14.902-13.004-44.352-19.957-59.047z" fill-rule="evenodd"/>
+  <path d="m430.48 52.527c0.35938-5.1562-2.0781-10.141-6.4102-13.031-4.543-3.0312-10.398-3.2422-15.148-0.55469-15.547 8.7969-34.496 9.0898-50.309 0.77344-1.25-0.65625-2.5039-1.3164-3.7539-1.9727-24.516-12.891-53.91-12.441-78.02 1.1992-4.8711 2.7539-7.6992 8.0586-7.3125 13.602v464.05c0 3.9805 1.5859 7.8047 4.4023 10.625 2.8164 2.8164 6.6367 4.3945 10.625 4.3945h130.91c3.9883 0 7.8047-1.5781 10.625-4.3945 2.8164-2.8164 4.4023-6.6406 4.4023-10.625v-464.07zm-105.32 340.89c-11.02 2.9531-17.566 14.293-14.617 25.312 2.9531 11.016 14.297 17.566 25.312 14.617 11.02-2.957 17.566-14.297 14.617-25.316-2.9531-11.016-14.297-17.566-25.312-14.609zm2.6562 9.9102c5.543-1.4844 11.258 1.8125 12.738 7.3594 1.4844 5.543-1.8086 11.25-7.3516 12.738-5.5508 1.4844-11.258-1.8086-12.738-7.3594-1.4883-5.543 1.8086-11.25 7.3516-12.738zm61.645-23.594c2.9531-11.016-3.5938-22.359-14.617-25.312-11.016-2.9531-22.359 3.5938-25.312 14.617-2.9531 11.02 3.5938 22.359 14.617 25.312 11.016 2.9531 22.359-3.5938 25.312-14.617zm-9.918-2.6562c-1.4844 5.543-7.1914 8.8438-12.738 7.3516-5.543-1.4844-8.8359-7.1914-7.3516-12.738 1.4844-5.543 7.1953-8.8359 12.738-7.3516s8.8438 7.1953 7.3516 12.738zm-16.52-199.88c-2.3477-5.0664-7.4258-8.3164-13.02-8.3164s-10.672 3.2461-13.02 8.3164c-7.4297 15.707-20.859 47.234-20.859 63.129 0 18.699 15.18 33.879 33.879 33.879s33.879-15.18 33.879-33.879c0-15.895-13.43-47.422-20.859-63.129zm-8.7422 4.082c-0.76172-1.6797-2.4375-2.7539-4.2773-2.7539-1.8438 0-3.5156 1.0742-4.2773 2.7539-6.957 14.695-19.957 44.145-19.957 59.047 0 13.371 10.859 24.238 24.238 24.238s24.238-10.863 24.238-24.238c0-14.902-13.004-44.352-19.957-59.047z" fill-rule="evenodd"/>
+  <path d="m601.96 52.527c0.35938-5.1562-2.0781-10.141-6.4102-13.031-4.543-3.0312-10.398-3.2422-15.148-0.55469-15.547 8.7969-34.496 9.0898-50.309 0.77344-1.25-0.65625-2.5039-1.3164-3.7539-1.9727-24.516-12.891-53.91-12.441-78.02 1.1992-4.8711 2.7539-7.6992 8.0586-7.3125 13.602v464.05c0 3.9805 1.5859 7.8047 4.4023 10.625 2.8164 2.8164 6.6367 4.3945 10.625 4.3945h130.91c3.9883 0 7.8047-1.5781 10.625-4.3945 2.8164-2.8164 4.4023-6.6406 4.4023-10.625v-464.07zm-97.715 347.34c-9.8789-5.707-22.527-2.3203-28.23 7.5664-5.707 9.8789-2.3203 22.527 7.5586 28.23 9.8828 5.707 22.535 2.3125 28.234-7.5664 5.707-9.8789 2.3125-22.527-7.5664-28.23zm55.145 35.797c9.8789-5.6992 13.266-18.352 7.5586-28.234-5.6992-9.8789-18.352-13.266-28.23-7.5586-9.8789 5.6992-13.273 18.352-7.5664 28.23 5.6992 9.8789 18.352 13.273 28.234 7.5664zm-60.273-26.906c4.9688 2.8711 6.6758 9.2383 3.8086 14.211-2.8711 4.9688-9.2383 6.6758-14.211 3.8086-4.9727-2.8711-6.6758-9.2383-3.8086-14.211 2.8711-4.9727 9.2383-6.6758 14.211-3.8086zm55.137 18.016c-4.9727 2.8711-11.34 1.1641-14.211-3.8008-2.8672-4.9727-1.1602-11.34 3.8086-14.211 4.9727-2.8672 11.34-1.1641 14.211 3.8086 2.8672 4.9727 1.1641 11.34-3.8086 14.207zm-22.438-74.652c-9.8789-5.707-22.527-2.3203-28.23 7.5586-5.707 9.8828-2.3125 22.535 7.5664 28.234 9.8789 5.707 22.527 2.3125 28.23-7.5664 5.707-9.8789 2.3125-22.527-7.5664-28.23zm-5.1289 8.8867c4.9727 2.8711 6.6758 9.2383 3.8086 14.211-2.8711 4.9688-9.2383 6.6758-14.211 3.8008-4.9727-2.8672-6.6758-9.2344-3.8086-14.207 2.8711-4.9727 9.2383-6.6758 14.211-3.8086zm7.8164-183.8c-2.3477-5.0664-7.4258-8.3164-13.02-8.3164s-10.672 3.2461-13.02 8.3164c-7.4297 15.707-20.859 47.234-20.859 63.129 0 18.699 15.18 33.879 33.879 33.879s33.879-15.18 33.879-33.879c0-15.895-13.43-47.422-20.859-63.129zm-8.7422 4.082c-0.76172-1.6797-2.4375-2.7539-4.2773-2.7539-1.8438 0-3.5156 1.0742-4.2773 2.7539-6.957 14.695-19.957 44.145-19.957 59.047 0 13.371 10.859 24.238 24.238 24.238 13.379 0 24.238-10.863 24.238-24.238 0-14.902-13.004-44.352-19.957-59.047z" fill-rule="evenodd"/>
+ </g>
+</svg>
diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index 64194c210..d18055081 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -223,6 +223,15 @@
             },
             "then": "circle:white;./assets/layers/recycling/plastic.svg"
           },
+          {
+            "if": {
+              "and": [
+                "_waste_amount=1",
+                "recycling:printer_cartridges=yes"
+              ]
+            },
+            "then": "circle:white;./assets/layers/recycling/printer_cartridges.svg"
+          },
           {
             "if": {
               "and": [
@@ -416,6 +425,15 @@
           },
           "then": "circle:white;./assets/layers/recycling/plastic.svg"
         },
+        {
+          "if": {
+            "and": [
+              "_waste_amount>1",
+              "recycling:printer_cartridges=yes"
+            ]
+          },
+          "then": "circle:white;./assets/layers/recycling/printer_cartridges.svg"
+        },
         {
           "if": {
             "and": [
@@ -549,6 +567,7 @@
             "recycling:plastic_bottles=",
             "recycling:plastic_packaging=",
             "recycling:plastic=",
+            "recycling:printer_cartridges=",
             "recycling:scrap_metal=",
             "recycling:shoes=",
             "recycling:small_appliances=",
@@ -918,6 +937,18 @@
             "class": "medium"
           }
         },
+        {
+          "if": "recycling:printer_cartridges=yes",
+          "ifnot": "recycling:printer_cartridges=",
+          "then": {
+            "en": "Printer cartridges (inkjet/toner) can be recycled here",
+            "nl": "Printer cartridges (inkjet/toner) kunnen hier gerecycled worden"
+          },
+          "icon": {
+            "path": "./assets/layers/recycling/printer_cartridges.svg",
+            "class": "medium"
+          }
+        },
         {
           "if": "recycling:scrap_metal=yes",
           "ifnot": "recycling:scrap_metal=",
@@ -1271,6 +1302,13 @@
           },
           "osmTags": "recycling:plastic=yes"
         },
+        {
+          "question": {
+            "en": "Recycling of printer cartridges",
+            "nl": "Recycling van printer cartridges"
+          },
+          "osmTags": "recycling:printer_cartridges=yes"
+        },
         {
           "question": {
             "en": "Recycling of scrap metal",
@@ -1336,4 +1374,4 @@
     "enableRelocation": true,
     "enableImproveAccuracy": true
   }
-}
\ No newline at end of file
+}
diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json
index aca9b8cd2..216ec4a67 100644
--- a/assets/layers/waste_disposal/waste_disposal.json
+++ b/assets/layers/waste_disposal/waste_disposal.json
@@ -197,6 +197,11 @@
       ]
     }
   ],
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": true
+  },
+  "deletion": true,
   "filter": [
     {
       "#": "ignore-possible-duplicate",
@@ -216,4 +221,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}