diff --git a/assets/layers/recycling/license_info.json b/assets/layers/recycling/license_info.json index c4d0f589e..1d9f7fd52 100644 --- a/assets/layers/recycling/license_info.json +++ b/assets/layers/recycling/license_info.json @@ -180,6 +180,17 @@ "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/plastic_packaging.svg" ] }, + { + "path": "pmd.svg", + "license": "CC-BY-SA-4.0", + "authors": [ + "Modified from Tobias Zwick" + ], + "sources": [ + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/cans.svg", + "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/plastic_packaging.svg" + ] + }, { "path": "printer_cartridges.svg", "license": "CC-BY-4.0", diff --git a/assets/layers/recycling/pmd.svg b/assets/layers/recycling/pmd.svg new file mode 100644 index 000000000..86df370db --- /dev/null +++ b/assets/layers/recycling/pmd.svg @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/recycling/pmd.svg.license b/assets/layers/recycling/pmd.svg.license new file mode 100644 index 000000000..964ccb3a1 --- /dev/null +++ b/assets/layers/recycling/pmd.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Modified from Tobias Zwick +SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index 2d359d3a6..81e21b463 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -238,6 +238,15 @@ }, "then": "./assets/layers/recycling/plastic.svg" }, + { + "if": { + "and": [ + "_waste_amount>1", + "recycling:pmd=yes" + ] + }, + "then": "./assets/layers/recycling/pmd.svg" + }, { "if": { "and": [ @@ -465,6 +474,15 @@ }, "then": "./assets/layers/recycling/plastic.svg" }, + { + "if": { + "and": [ + "_waste_amount=1", + "recycling:pmd=yes" + ] + }, + "then": "./assets/layers/recycling/pmd.svg" + }, { "if": { "and": [ @@ -640,6 +658,7 @@ "recycling:plastic_bottles=", "recycling:plastic_packaging=", "recycling:plastic=", + "recycling:pmd=", "recycling:printer_cartridges=", "recycling:scrap_metal=", "recycling:shoes=", @@ -1093,6 +1112,18 @@ "class": "medium" } }, + { + "if": "recycling:pmd=yes", + "ifnot": "recycling:pmd=", + "then": { + "en": "Plastic packaging, metal packaging and drink cartons (PMD) can be recycled here", + "nl": "Plastic verkpakkingen, metalen verkpakkingen en drankpakken kunnen hier gerecycled worden" + }, + "icon": { + "path": "./assets/layers/recycling/pmd.svg", + "class": "medium" + } + }, { "if": "recycling:printer_cartridges=yes", "ifnot": "recycling:printer_cartridges=", @@ -1571,6 +1602,13 @@ }, "osmTags": "recycling:plastic=yes" }, + { + "question": { + "en": "Recycling of plastic packaging, metal packaging and drink cartons (PMD)", + "nl": "Recycling van plastic verkpakkingen, metalen verkpakkingen en drankpakken (PMD)" + }, + "osmTags": "recycling:pmd=yes" + }, { "question": { "en": "Recycling of scrap metal", @@ -1672,4 +1710,4 @@ "enableRelocation": true, "enableImproveAccuracy": true } -} +} \ No newline at end of file diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index 2c572b62e..d5d359797 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -206,6 +206,13 @@ "cs": "Odpadkový koš na plasty" } }, + { + "if": "waste=pmd", + "then": { + "en": "A waste basket for plastic packaging, metal packaging and drink cartons (PMD)", + "nl": "Een vuilnisbak voor plastic verpakkingen, metalen verpakkingen en drankpakken (PMD)" + } + }, { "if": "waste=paper", "then": { @@ -237,8 +244,8 @@ }, "condition": { "or": [ - "waste=dog_excrement", - "waste=trash", + "waste~i~.*dog_excrement.*", + "waste~i~.*trash.*", "waste=" ] }, @@ -397,6 +404,20 @@ "cs": "Odpadkový koš na plast" }, "osmTags": "waste~i~.*plastic.*" + }, + { + "question": { + "en": "Waste basket for plastic packaging, metal packaging and drink cartons (PMD)", + "nl": "Vuilnisbak voor plastic verpakkingen, metalen verpakkingen en drankpakken (PMD)" + }, + "osmTags": "waste~i~.*pmd.*" + }, + { + "question": { + "en": "Waste basket for paper", + "nl": "Vuilnisbak voor papier" + }, + "osmTags": "waste~i~.*paper.*" } ] }, @@ -432,16 +453,5 @@ "allowMove": { "enableRelocation": false, "enableImproveAccuracy": true - }, - "cs": { - "0": { - "iconSize": { - "mappings": { - "0": { - "then": "Odpadkový koš" - } - } - } - } } -} +} \ No newline at end of file