diff --git a/assets/layers/recycling/bicycles.svg b/assets/layers/recycling/bicycles.svg new file mode 100644 index 000000000..989d558de --- /dev/null +++ b/assets/layers/recycling/bicycles.svg @@ -0,0 +1,45 @@ + + + + + + + diff --git a/assets/layers/recycling/license_info.json b/assets/layers/recycling/license_info.json index 6da2ad258..863587120 100644 --- a/assets/layers/recycling/license_info.json +++ b/assets/layers/recycling/license_info.json @@ -19,6 +19,14 @@ "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/beverage_cartons.svg" ] }, + { + "path": "bicycles.svg", + "license": "CC0", + "authors": [ + "Antwerpenize Bike Font" + ], + "sources": [] + }, { "path": "cans.svg", "license": "CC-BY-SA", @@ -113,6 +121,14 @@ "https://openclipart.org/detail/175842/basic-light-bulb" ] }, + { + "path": "needles.svg", + "license": "CC0", + "authors": [], + "sources": [ + "https://svgsilh.com/image/1294131.html" + ] + }, { "path": "newspaper.svg", "license": "CC-BY-SA", diff --git a/assets/layers/recycling/needles.svg b/assets/layers/recycling/needles.svg new file mode 100644 index 000000000..7146cc54b --- /dev/null +++ b/assets/layers/recycling/needles.svg @@ -0,0 +1,41 @@ + + + + +Created by potrace 1.15, written by Peter Selinger 2001-2017 + + + + + diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index b1abe2663..1bf6cf054 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -273,6 +273,15 @@ ] }, "then": "circle:white;./assets/layers/waste_disposal/waste_disposal.svg" + }, + { + "if": { + "and": [ + "_waste_amount=1", + "recycling:needles=yes" + ] + }, + "then": "circle:white;./assets/layers/recycling/needles.svg" } ] }, @@ -475,6 +484,24 @@ ] }, "then": "circle:white;./assets/layers/waste_disposal/waste_disposal.svg" + }, + { + "if": { + "and": [ + "_waste_amount>1", + "recycling:needles=yes" + ] + }, + "then": "circle:white;./assets/layers/recycling/needles.svg" + }, + { + "if": { + "and": [ + "_waste_amount>1", + "recycling:bicycles=yes" + ] + }, + "then": "circle:white;./assets/layers/recycling/bicycles.svg" } ] } @@ -576,6 +603,20 @@ "recycling:small_electrical_appliances=", "recycling:waste=" ] + }, + { + "if": "recycling_type=pickup_point", + "then": { + "en": "This is a pickup point. The waste material is placed here without placing it in a dedicated container.", + "nl": "Dit is een verzamelplaats zonder container waar het afval later opgepikt wordt." + } + }, + { + "if": "recycling_type=dump", + "then": { + "en": "This is a dump where the waste material is stacked.", + "nl": "Dit is een afvalhoop waar het afvalmateriaal bovenop elkaar gestapeld wordt." + } } ] }, @@ -1024,6 +1065,10 @@ "de": "Nadeln können hier recycelt werden", "it": "Aghi e oggetti appuntiti", "ca": "Aquí es poden reciclar agulles" + }, + "icon": { + "path": "./assets/layers/recycling/needles.svg", + "class": "medium" } }, { @@ -1041,6 +1086,18 @@ "class": "medium" }, "hideInAnswer": "recycling_type=container" + }, + { + "if": "recycling:bicycles=yes", + "ifnot": "recycling:bicycles=", + "then": { + "en": "Bicycles can be recycled here", + "nl": "Fietsen (en fietswrakken) kunnen hier gerecycled worden" + }, + "icon": { + "path": "./assets/layers/recycling/bicycles.svg", + "class": "medium" + } } ] }, @@ -1338,7 +1395,7 @@ "it": "Riciclo di rottami metallici", "ca": "Reciclatge de ferralla" }, - "osmTags": "recycling:printer_cartridges=yes" + "osmTags": "recycling:scrap_metal=yes" }, { "question": { @@ -1349,16 +1406,6 @@ "it": "Riciclo di piccoli elettrodomestici", "ca": "Reciclatge de petits electrodomèstics" }, - "osmTags": "recycling:scrap_metal=yes" - }, - { - "question": { - "en": "Recycling of residual waste", - "nl": "Recycling van restafval", - "de": "Recycling von Restabfällen", - "it": "Riciclo di secco", - "ca": "Reciclatge del rebuig" - }, "osmTags": { "or": [ "recycling:small_appliances=yes", @@ -1375,6 +1422,20 @@ "ca": "Reciclatge del rebuig" }, "osmTags": "recycling:waste=yes" + }, + { + "question": { + "en": "Recycling of printer cartridges", + "nl": "Recycling van inktpatronen" + }, + "osmTags": "recycling:printer_cartridges=yes" + }, + { + "question": { + "en": "Recycling of bicycles", + "nl": "Recycling van fietsen" + }, + "osmTags": "recycling:bicycles=yes" } ] }, @@ -1409,4 +1470,4 @@ "enableRelocation": true, "enableImproveAccuracy": true } -} \ No newline at end of file +}