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

Changed zoom levels, other details

Browse source
This commit is contained in:
Robin van der Linde 2022-02-17 14:34:43 +01:00
parent 41009abe5d
commit 879536c823
5 changed files with 49 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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"
}, },
{ {
@ -259,85 +264,94 @@
} }
}, },
{ {
"if": "recycling:glass_bottles=yes", "if": "recycling:organic=yes",
"ifnot": "recycling:glass_bottles=", "ifnot": "recycling:organic=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glass bottles can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glass bottles can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glazen flessen kunnen hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass_bottles.svg'/> Glazen flessen kunnen hier gerecycled worden</div>"
} },
"hideInAnswer": true
}, },
{ {
"if": "recycling:glass=yes", "if": "recycling:glass_bottles=yes",
"ifnot": "recycling:glass=", "ifnot": "recycling:glass_bottles=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glass can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glass can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glas kan hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/glass.svg'/> Glas kan hier gerecycled worden</div>"
} }
}, },
{ {
"if": "recycling:newspaper=yes", "if": "recycling:glass=yes",
"ifnot": "recycling:newspaper=", "ifnot": "recycling:glass=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Newspapers can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Newspapers can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Kranten kunnen hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/newspaper.svg'/> Kranten kunnen hier gerecycled worden</div>"
} }
}, },
{ {
"if": "recycling:paper=yes", "if": "recycling:newspaper=yes",
"ifnot": "recycling:paper=", "ifnot": "recycling:newspaper=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Paper can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Paper can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Papier kan hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/paper.svg'/> Papier kan hier gerecycled worden</div>"
} }
}, },
{ {
"if": "recycling:plastic_bottles=yes", "if": "recycling:paper=yes",
"ifnot": "recycling:plastic_bottles=", "ifnot": "recycling:paper=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic bottles can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic bottles can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic flessen kunnen hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_bottles.svg'/> Plastic flessen kunnen hier gerecycled worden</div>"
} }
}, },
{ {
"if": "recycling:plastic_packaging=yes", "if": "recycling:plastic_bottles=yes",
"ifnot": "recycling:plastic_packaging=", "ifnot": "recycling:plastic_bottles=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic packaging can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic packaging can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic verpakking kan hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic_packaging.svg'/> Plastic verpakking kan hier gerecycled worden</div>"
} }
}, },
{ {
"if": "recycling:plastic=yes", "if": "recycling:plastic_packaging=yes",
"ifnot": "recycling:plastic=", "ifnot": "recycling:plastic_packaging=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic kan hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/plastic.svg'/> Plastic kan hier gerecycled worden</div>"
} }
}, },
{ {
"if": "recycling:scrap_metal=yes", "if": "recycling:plastic=yes",
"ifnot": "recycling:scrap_metal=", "ifnot": "recycling:plastic=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Scrap metal can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Scrap metal can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Oud metaal kan hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/scrap_metal.svg'/> Oud metaal kan hier gerecycled worden</div>"
} }
}, },
{ {
"if": "recycling:shoes=yes", "if": "recycling:scrap_metal=yes",
"ifnot": "recycling:shoes=", "ifnot": "recycling:scrap_metal=",
"then": { "then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Shoes can be recycled here</div>", "en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Shoes can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Schoenen kunnen hier gerecycled worden</div>" "nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/recycling/shoes.svg'/> Schoenen kunnen hier gerecycled worden</div>"
} }
}, },
{ {
"if": "recycling:small_electrical_appliances=yes", "if": "recycling:shoes=yes",
"ifnot": "recycling:small_electrical_appliances=", "ifnot": "recycling:shoes=",
"then": { "then": {
"en": "<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>", "en": "<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>",
"nl": "<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>" "nl": "<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>"
} }
}, },
{
"if": "recycling:small_electrical_appliances=yes",
"ifnot": "recycling:small_electrical_appliances=",
"then": {
"en": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/waste_disposal/waste_disposal.svg'/> Residual waste can be recycled here</div>",
"nl": "<div class='flex'><img class='w-12 mx-4' src='./assets/layers/waste_disposal/waste_disposal.svg'/> Restafval kan hier gerecycled worden</div>"
}
},
{ {
"if": "recycling:waste=yes", "if": "recycling:waste=yes",
"ifnot": "recycling:waste=", "ifnot": "recycling:waste=",

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",

6
langs/layers/en.json
View file

@ -4313,6 +4313,9 @@
}, },
"17": { "17": {
"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>"
},
"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>"
} }
}, },
"question": "What can be recycled here?" "question": "What can be recycled here?"
@ -4336,6 +4339,9 @@
}, },
"1": { "1": {
"then": "Recycling container" "then": "Recycling container"
},
"2": {
"then": "Waste disposal bin"
} }
}, },
"render": "Recycling facility" "render": "Recycling facility"

3
langs/layers/nl.json
View file

@ -4046,6 +4046,9 @@
}, },
"17": { "17": {
"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>"
},
"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>"
} }
}, },
"question": "Wat kan hier gerecycled worden?" "question": "Wat kan hier gerecycled worden?"