contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

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

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-02-18 00:06:35 +01:00
commit 0e83d5be79
6 changed files with 47 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
assets/layers/recycling/recycling.json
View file

@ -40,7 +40,7 @@
"point", "point",
"centroid" "centroid"
], ],
"icon": "./assets/layers/recycling/recycling-14.svg", "icon": "circle:white;./assets/layers/recycling/recycling-14.svg",
"iconBadges": [ "iconBadges": [
{ {
"if": "recycling:batteries=yes", "if": "recycling:batteries=yes",
@ -75,7 +75,12 @@
"then": "circle:#FFFFFF;./assets/layers/recycling/glass_bottles.svg" "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" "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>" "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", "if": "recycling:glass_bottles=yes",
"ifnot": "recycling:glass_bottles=", "ifnot": "recycling:glass_bottles=",

2
assets/layers/waste_basket/waste_basket.json
View file

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

3
assets/layers/waste_disposal/waste_disposal.json
View file

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

3
assets/themes/waste/waste.json
View file

@ -22,7 +22,8 @@
{ {
"builtin": "waste_basket", "builtin": "waste_basket",
"override": { "override": {
"minzoom": 12 "minzoom": 18,
"minzoomVisible": 18
} }
}, },
"recycling", "recycling",

23
langs/layers/en.json
View file

@ -4282,36 +4282,39 @@
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Green waste can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Green waste can be recycled here</div>"
}, },
"7": { "7": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glass bottles can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Organic waste can be recycled here</div>"
}, },
"8": { "8": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glass can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glass bottles can be recycled here</div>"
}, },
"9": { "9": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Newspapers can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glass can be recycled here</div>"
}, },
"10": { "10": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Paper can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Newspapers can be recycled here</div>"
}, },
"11": { "11": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic bottles can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Paper can be recycled here</div>"
}, },
"12": { "12": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic packaging can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic bottles can be recycled here</div>"
}, },
"13": { "13": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic packaging can be recycled here</div>"
}, },
"14": { "14": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Scrap metal can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic can be recycled here</div>"
}, },
"15": { "15": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Shoes can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Scrap metal can be recycled here</div>"
}, },
"16": { "16": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/small_electrical_appliances.svg'/> Small electrical appliances can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Shoes can be recycled here</div>"
}, },
"17": { "17": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/small_electrical_appliances.svg'/> Small electrical appliances can be recycled here</div>"
},
"18": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/waste_disposal/waste_disposal.svg'/> Residual waste can be recycled here</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/waste_disposal/waste_disposal.svg'/> Residual waste can be recycled here</div>"
} }
}, },

23
langs/layers/nl.json
View file

@ -4015,36 +4015,39 @@
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Groen afval kan hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Groen afval kan hier gerecycled worden</div>"
}, },
"7": { "7": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glazen flessen kunnen hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/garden_waste.svg'/> Organisch afval kan hier gerecycled worden</div>"
}, },
"8": { "8": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glas kan hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glazen flessen kunnen hier gerecycled worden</div>"
}, },
"9": { "9": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Kranten kunnen hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glas kan hier gerecycled worden</div>"
}, },
"10": { "10": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Papier kan hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Kranten kunnen hier gerecycled worden</div>"
}, },
"11": { "11": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic flessen kunnen hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Papier kan hier gerecycled worden</div>"
}, },
"12": { "12": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic verpakking kan hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic flessen kunnen hier gerecycled worden</div>"
}, },
"13": { "13": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic kan hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic verpakking kan hier gerecycled worden</div>"
}, },
"14": { "14": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Oud metaal kan hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic kan hier gerecycled worden</div>"
}, },
"15": { "15": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Schoenen kunnen hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Oud metaal kan hier gerecycled worden</div>"
}, },
"16": { "16": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/small_electrical_appliances.svg'/> Kleine elektronische apparaten kunnen hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Schoenen kunnen hier gerecycled worden</div>"
}, },
"17": { "17": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/small_electrical_appliances.svg'/> Kleine elektronische apparaten kunnen hier gerecycled worden</div>"
},
"18": {
"then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/waste_disposal/waste_disposal.svg'/> Restafval kan hier gerecycled worden</div>" "then": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/waste_disposal/waste_disposal.svg'/> Restafval kan hier gerecycled worden</div>"
} }
}, },