From 879536c823b4f2ee5d8be44675197c64414524a9 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 17 Feb 2022 14:34:43 +0100 Subject: [PATCH] Changed zoom levels, other details --- assets/layers/recycling/recycling.json | 58 ++++++++++++------- .../layers/waste_disposal/waste_disposal.json | 3 +- assets/themes/waste/waste.json | 3 +- langs/layers/en.json | 6 ++ langs/layers/nl.json | 3 + 5 files changed, 49 insertions(+), 24 deletions(-) diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index 13fedf0d9d..0e8a1e86b4 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -75,7 +75,12 @@ "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" }, { @@ -259,85 +264,94 @@ } }, { - "if": "recycling:glass_bottles=yes", - "ifnot": "recycling:glass_bottles=", + "if": "recycling:organic=yes", + "ifnot": "recycling:organic=", "then": { "en": "
Glass bottles can be recycled here
", "nl": "
Glazen flessen kunnen hier gerecycled worden
" - } + }, + "hideInAnswer": true }, { - "if": "recycling:glass=yes", - "ifnot": "recycling:glass=", + "if": "recycling:glass_bottles=yes", + "ifnot": "recycling:glass_bottles=", "then": { "en": "
Glass can be recycled here
", "nl": "
Glas kan hier gerecycled worden
" } }, { - "if": "recycling:newspaper=yes", - "ifnot": "recycling:newspaper=", + "if": "recycling:glass=yes", + "ifnot": "recycling:glass=", "then": { "en": "
Newspapers can be recycled here
", "nl": "
Kranten kunnen hier gerecycled worden
" } }, { - "if": "recycling:paper=yes", - "ifnot": "recycling:paper=", + "if": "recycling:newspaper=yes", + "ifnot": "recycling:newspaper=", "then": { "en": "
Paper can be recycled here
", "nl": "
Papier kan hier gerecycled worden
" } }, { - "if": "recycling:plastic_bottles=yes", - "ifnot": "recycling:plastic_bottles=", + "if": "recycling:paper=yes", + "ifnot": "recycling:paper=", "then": { "en": "
Plastic bottles can be recycled here
", "nl": "
Plastic flessen kunnen hier gerecycled worden
" } }, { - "if": "recycling:plastic_packaging=yes", - "ifnot": "recycling:plastic_packaging=", + "if": "recycling:plastic_bottles=yes", + "ifnot": "recycling:plastic_bottles=", "then": { "en": "
Plastic packaging can be recycled here
", "nl": "
Plastic verpakking kan hier gerecycled worden
" } }, { - "if": "recycling:plastic=yes", - "ifnot": "recycling:plastic=", + "if": "recycling:plastic_packaging=yes", + "ifnot": "recycling:plastic_packaging=", "then": { "en": "
Plastic can be recycled here
", "nl": "
Plastic kan hier gerecycled worden
" } }, { - "if": "recycling:scrap_metal=yes", - "ifnot": "recycling:scrap_metal=", + "if": "recycling:plastic=yes", + "ifnot": "recycling:plastic=", "then": { "en": "
Scrap metal can be recycled here
", "nl": "
Oud metaal kan hier gerecycled worden
" } }, { - "if": "recycling:shoes=yes", - "ifnot": "recycling:shoes=", + "if": "recycling:scrap_metal=yes", + "ifnot": "recycling:scrap_metal=", "then": { "en": "
Shoes can be recycled here
", "nl": "
Schoenen kunnen hier gerecycled worden
" } }, { - "if": "recycling:small_electrical_appliances=yes", - "ifnot": "recycling:small_electrical_appliances=", + "if": "recycling:shoes=yes", + "ifnot": "recycling:shoes=", "then": { "en": "
Small electrical appliances can be recycled here
", "nl": "
Kleine elektronische apparaten kunnen hier gerecycled worden
" } }, + { + "if": "recycling:small_electrical_appliances=yes", + "ifnot": "recycling:small_electrical_appliances=", + "then": { + "en": "
Residual waste can be recycled here
", + "nl": "
Restafval kan hier gerecycled worden
" + } + }, { "if": "recycling:waste=yes", "ifnot": "recycling:waste=", diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json index b744796724..dc5c2e3349 100644 --- a/assets/layers/waste_disposal/waste_disposal.json +++ b/assets/layers/waste_disposal/waste_disposal.json @@ -9,7 +9,8 @@ "source": { "osmTags": "amenity=waste_disposal" }, - "minZoom": 12, + "minzoom": 18, + "minzoomVisible": 18, "title": { "render": { "en": "Waste Disposal" diff --git a/assets/themes/waste/waste.json b/assets/themes/waste/waste.json index 6ca4ccbc3c..1998b893a8 100644 --- a/assets/themes/waste/waste.json +++ b/assets/themes/waste/waste.json @@ -22,7 +22,8 @@ { "builtin": "waste_basket", "override": { - "minzoom": 12 + "minzoom": 18, + "minzoomVisible": 18 } }, "recycling", diff --git a/langs/layers/en.json b/langs/layers/en.json index d32c623af7..fdb214cf16 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4313,6 +4313,9 @@ }, "17": { "then": "
Residual waste can be recycled here
" + }, + "18": { + "then": "
Residual waste can be recycled here
" } }, "question": "What can be recycled here?" @@ -4336,6 +4339,9 @@ }, "1": { "then": "Recycling container" + }, + "2": { + "then": "Waste disposal bin" } }, "render": "Recycling facility" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index d9673fce05..0b313e6483 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4046,6 +4046,9 @@ }, "17": { "then": "
Restafval kan hier gerecycled worden
" + }, + "18": { + "then": "
Restafval kan hier gerecycled worden
" } }, "question": "Wat kan hier gerecycled worden?"