From 748eccba5903c55c17e5995b747065a3d6835036 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 9 Mar 2025 23:51:56 +0100 Subject: [PATCH] Themes: winter_service theme, split off all_streets from street_lighting --- assets/layers/all_streets/all_streets.json | 86 ++++++ assets/svg/license_info.json | 17 +- assets/svg/snowflake.svg | 41 +++ assets/svg/snowflake.svg.license | 2 + .../mapcomplete-changes.json | 4 + .../street_lighting/street_lighting.json | 265 +++++++----------- .../themes/winter_service/winter_service.json | 112 ++++++++ langs/themes/ca.json | 38 ++- langs/themes/cs.json | 38 ++- langs/themes/da.json | 38 ++- langs/themes/de.json | 38 ++- langs/themes/en.json | 69 +++-- langs/themes/es.json | 38 ++- langs/themes/eu.json | 9 - langs/themes/fr.json | 38 ++- langs/themes/hu.json | 38 ++- langs/themes/it.json | 38 ++- langs/themes/ko.json | 38 ++- langs/themes/nb_NO.json | 38 ++- langs/themes/nl.json | 38 ++- langs/themes/pa_PK.json | 6 - langs/themes/pl.json | 38 ++- langs/themes/ru.json | 8 - langs/themes/zh_Hant.json | 38 ++- src/Models/Constants.ts | 1 + src/assets/svg/Snowflake.svelte | 4 + 26 files changed, 639 insertions(+), 479 deletions(-) create mode 100644 assets/layers/all_streets/all_streets.json create mode 100644 assets/svg/snowflake.svg create mode 100644 assets/svg/snowflake.svg.license create mode 100644 assets/themes/winter_service/winter_service.json create mode 100644 src/assets/svg/Snowflake.svelte diff --git a/assets/layers/all_streets/all_streets.json b/assets/layers/all_streets/all_streets.json new file mode 100644 index 000000000..9d1d18443 --- /dev/null +++ b/assets/layers/all_streets/all_streets.json @@ -0,0 +1,86 @@ +{ + "id": "all_streets", + "isCounted": false, + "name": { + "en": "All streets", + "nl": "Alle straten", + "ru": "Все улицы", + "zh_Hant": "所有道路", + "hu": "Minden utca", + "de": "Alle Straßen", + "ca": "Tots els carrers", + "es": "Todas las calles", + "fr": "Toutes les rues", + "nb_NO": "Alle gater", + "da": "Alle gader", + "pa_PK": "ساریاں سڑکاں", + "cs": "Všechny ulice", + "it": "Tutte le strade", + "pl": "Wszystkie ulice", + "ko": "모든 거리" + }, + "description": { + "en": "Layer with (almost) all streets", + "nl": "Laag met (bijna) alle straten" + }, + "source": { + "osmTags": { + "and": [ + "highway!=", + "service!=driveway", + "highway!=platform" + ] + } + }, + "minzoom": 18, + "title": { + "render": { + "en": "Street", + "nl": "Straat", + "ru": "Улица", + "zh_Hant": "照明", + "hu": "Utca", + "de": "Straße", + "ca": "Carrer", + "nb_NO": "Gate", + "fr": "Rue", + "da": "Gade", + "pa_PK": "سڑک", + "es": "Calle", + "cs": "Ulice", + "eu": "Kalea", + "it": "Strada", + "pl": "Ulica", + "ko": "거리" + }, + "mappings": [ + { + "if": "name~*", + "then": "{name}" + } + ] + }, + "tagRenderings": [ + "images" + ], + "allowSplit": true, + "pointRendering": null, + "lineRendering": [ + { + "color": { + "render": "#a9a9a9", + "mappings": [ + { + "if": "lit=no", + "then": "#303030" + }, + { + "if": "lit=yes", + "then": "#ff0" + } + ] + } + } + ], + "allowMove": false +} \ No newline at end of file diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 06bc3869d..e94c29d51 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -451,12 +451,6 @@ "authors": [], "sources": [] }, - { - "path": "gear.svg", - "license": "TRIVIAL", - "authors": [], - "sources": [] - }, { "path": "gender_bi.svg", "license": "CC0-1.0", @@ -1103,6 +1097,17 @@ ], "sources": [] }, + { + "path": "snowflake.svg", + "license": "CC0-1.0", + "authors": [ + "Schnouf25", + "Razorbliss" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Snow_flake.svg" + ] + }, { "path": "speech_bubble.svg", "license": "CC-BY-4.0", diff --git a/assets/svg/snowflake.svg b/assets/svg/snowflake.svg new file mode 100644 index 000000000..f90eb6ca1 --- /dev/null +++ b/assets/svg/snowflake.svg @@ -0,0 +1,41 @@ + + + + + + diff --git a/assets/svg/snowflake.svg.license b/assets/svg/snowflake.svg.license new file mode 100644 index 000000000..9d7689318 --- /dev/null +++ b/assets/svg/snowflake.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Schnouf25; Razorbliss +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 8bc4511d3..5090a5fc8 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -605,6 +605,10 @@ { "if": "theme=width", "then": "./assets/themes/width/icon.svg" + }, + { + "if": "theme=winter_service", + "then": "./assets/svg/snowflake.svg" } ] } diff --git a/assets/themes/street_lighting/street_lighting.json b/assets/themes/street_lighting/street_lighting.json index a181a6e1c..133d3536f 100644 --- a/assets/themes/street_lighting/street_lighting.json +++ b/assets/themes/street_lighting/street_lighting.json @@ -211,184 +211,109 @@ "allowMove": false }, { - "id": "all_streets", - "isCounted": false, - "name": { - "en": "All streets", - "nl": "Alle straten", - "ru": "Все улицы", - "zh_Hant": "所有道路", - "hu": "Minden utca", - "de": "Alle Straßen", - "ca": "Tots els carrers", - "es": "Todas las calles", - "fr": "Toutes les rues", - "nb_NO": "Alle gater", - "da": "Alle gader", - "pa_PK": "ساریاں سڑکاں", - "cs": "Všechny ulice", - "it": "Tutte le strade", - "pl": "Wszystkie ulice", - "ko": "모든 거리" - }, - "source": { - "osmTags": { - "and": [ - "highway!=", - "service!=driveway", - "highway!=platform" - ] - } - }, - "minzoom": 18, - "title": { - "render": { - "en": "Street", - "nl": "Straat", - "ru": "Улица", - "zh_Hant": "照明", - "hu": "Utca", - "de": "Straße", - "ca": "Carrer", - "nb_NO": "Gate", - "fr": "Rue", - "da": "Gade", - "pa_PK": "سڑک", - "es": "Calle", - "cs": "Ulice", - "eu": "Kalea", - "it": "Strada", - "pl": "Ulica", - "ko": "거리" - }, - "mappings": [ + "builtin": "all_streets", + "override": { + "tagRenderings+": [ { - "if": "name~*", - "then": "{name}" - } - ] - }, - "tagRenderings": [ - "images", - { - "id": "lit", - "question": { - "en": "Is this street lit?", - "nl": "Is deze straat verlicht?", - "zh_Hant": "這道路有照明嗎？", - "hu": "Ki van-e világítva ez az utca?", - "de": "Ist diese Straße beleuchtet?", - "nb_NO": "Er denne gaten belyst?", - "fr": "Cette rue est-elle éclairée ?", - "da": "Er denne gade oplyst?", - "ca": "Aquest carrer està il·luminat?", - "es": "¿Está iluminada esta calle?", - "cs": "Je tato ulice osvětlená?", - "it": "Questa strada è illuminata?", - "pl": "Czy ta ulica jest oświetlona?", - "ko": "이 거리는 밝나요?" - }, - "mappings": [ - { - "if": "lit=yes", - "then": { - "en": "This street is lit", - "nl": "Deze straat is verlicht", - "zh_Hant": "這道路有照明", - "hu": "Ez az utca ki van világítva", - "de": "Diese Straße ist beleuchtet", - "es": "Esta calle está iluminada", - "nb_NO": "Denne gaten er belyst", - "fr": "Cette rue est éclairée", - "da": "Denne gade er oplyst", - "ca": "Aquest carrer està il·luminat", - "cs": "Tato ulice je osvětlená", - "it": "Questa strada è illuminata", - "pl": "Ta ulica jest oświetlona", - "ko": "이 거리는 밝습니다" - } + "id": "lit", + "question": { + "en": "Is this street lit?", + "nl": "Is deze straat verlicht?", + "zh_Hant": "這道路有照明嗎？", + "hu": "Ki van-e világítva ez az utca?", + "de": "Ist diese Straße beleuchtet?", + "nb_NO": "Er denne gaten belyst?", + "fr": "Cette rue est-elle éclairée ?", + "da": "Er denne gade oplyst?", + "ca": "Aquest carrer està il·luminat?", + "es": "¿Está iluminada esta calle?", + "cs": "Je tato ulice osvětlená?", + "it": "Questa strada è illuminata?", + "pl": "Czy ta ulica jest oświetlona?", + "ko": "이 거리는 밝나요?" }, - { - "if": "lit=no", - "then": { - "en": "This street is not lit", - "nl": "Deze straat is niet verlicht", - "zh_Hant": "這道路沒有照明", - "hu": "Ez az utca nincs kivilágítva", - "de": "Diese Straße ist nicht beleuchtet", - "es": "Esta calle no está iluminada", - "nb_NO": "Denne gaten er ikke belyst", - "fr": "Cette rue n’est pas éclairée", - "da": "Denne gade er ikke oplyst", - "ca": "Aquest carrer no està il·luminat", - "cs": "Tato ulice není osvětlená", - "it": "Questa strada non è illuminata", - "pl": "Ta ulica nie jest oświetlona", - "ko": "이 거리는 밝지 않습니다" - } - }, - { - "if": "lit=sunset-sunrise", - "then": { - "en": "This street is lit at night", - "nl": "Deze straat is 's nachts verlicht", - "zh_Hant": "這道路晚上有照明", - "hu": "Ez az utca éjjel ki van világítva", - "de": "Diese Straße ist nachts beleuchtet", - "nb_NO": "Denne gaten er belyst nattestid", - "fr": "Cette rue est éclairée la nuit", - "da": "Denne gade er oplyst om natten", - "ca": "Aquest carrer està il·luminat per la nit", - "es": "Esta calle está iluminada por la noche", - "cs": "Tato ulice je v noci osvětlená", - "it": "Questa strada è illuminata di sera", - "pl": "Ta ulica jest oświetlona w nocy", - "ko": "이 거리는 밤에 밝습니다" - }, - "hideInAnswer": true - }, - { - "if": "lit=24/7", - "then": { - "en": "This street is lit 24/7", - "nl": "Deze straat is 24/7 verlicht", - "zh_Hant": "這道路 24/7 有照明", - "hu": "Ez az utca éjjel-nappal ki van világítva", - "de": "Diese Straße ist durchgehend beleuchtet", - "nb_NO": "Denne gaten er belyst døgnet rundt", - "fr": "Cette rue est éclairée en permanence", - "da": "Denne gade er oplyst 24/7", - "ca": "Aquest carrer està il·luminat 24/7", - "es": "Esta calle está iluminada 24/7", - "cs": "Tato ulice je osvětlena 24/7", - "it": "Questa strada è illuminata 24 ore su 24", - "pl": "Ta ulica jest oświetlona 24/7", - "ko": "이 거리는 24시간 밝습니다" - } - } - ] - } - ], - "allowSplit": true, - "pointRendering": null, - "lineRendering": [ - { - "color": { - "render": "#a9a9a9", "mappings": [ { - "if": "lit=no", - "then": "#303030" + "if": "lit=yes", + "then": { + "en": "This street is lit", + "nl": "Deze straat is verlicht", + "zh_Hant": "這道路有照明", + "hu": "Ez az utca ki van világítva", + "de": "Diese Straße ist beleuchtet", + "es": "Esta calle está iluminada", + "nb_NO": "Denne gaten er belyst", + "fr": "Cette rue est éclairée", + "da": "Denne gade er oplyst", + "ca": "Aquest carrer està il·luminat", + "cs": "Tato ulice je osvětlená", + "it": "Questa strada è illuminata", + "pl": "Ta ulica jest oświetlona", + "ko": "이 거리는 밝습니다" + } }, { - "if": "lit=yes", - "then": "#ff0" + "if": "lit=no", + "then": { + "en": "This street is not lit", + "nl": "Deze straat is niet verlicht", + "zh_Hant": "這道路沒有照明", + "hu": "Ez az utca nincs kivilágítva", + "de": "Diese Straße ist nicht beleuchtet", + "es": "Esta calle no está iluminada", + "nb_NO": "Denne gaten er ikke belyst", + "fr": "Cette rue n’est pas éclairée", + "da": "Denne gade er ikke oplyst", + "ca": "Aquest carrer no està il·luminat", + "cs": "Tato ulice není osvětlená", + "it": "Questa strada non è illuminata", + "pl": "Ta ulica nie jest oświetlona", + "ko": "이 거리는 밝지 않습니다" + } + }, + { + "if": "lit=sunset-sunrise", + "then": { + "en": "This street is lit at night", + "nl": "Deze straat is 's nachts verlicht", + "zh_Hant": "這道路晚上有照明", + "hu": "Ez az utca éjjel ki van világítva", + "de": "Diese Straße ist nachts beleuchtet", + "nb_NO": "Denne gaten er belyst nattestid", + "fr": "Cette rue est éclairée la nuit", + "da": "Denne gade er oplyst om natten", + "ca": "Aquest carrer està il·luminat per la nit", + "es": "Esta calle está iluminada por la noche", + "cs": "Tato ulice je v noci osvětlená", + "it": "Questa strada è illuminata di sera", + "pl": "Ta ulica jest oświetlona w nocy", + "ko": "이 거리는 밤에 밝습니다" + }, + "hideInAnswer": true + }, + { + "if": "lit=24/7", + "then": { + "en": "This street is lit 24/7", + "nl": "Deze straat is 24/7 verlicht", + "zh_Hant": "這道路 24/7 有照明", + "hu": "Ez az utca éjjel-nappal ki van világítva", + "de": "Diese Straße ist durchgehend beleuchtet", + "nb_NO": "Denne gaten er belyst døgnet rundt", + "fr": "Cette rue est éclairée en permanence", + "da": "Denne gade er oplyst 24/7", + "ca": "Aquest carrer està il·luminat 24/7", + "es": "Esta calle está iluminada 24/7", + "cs": "Tato ulice je osvětlena 24/7", + "it": "Questa strada è illuminata 24 ore su 24", + "pl": "Ta ulica jest oświetlona 24/7", + "ko": "이 거리는 24시간 밝습니다" + } } ] } - } - ], - "allowMove": false + ] + } } ] -} +} \ No newline at end of file diff --git a/assets/themes/winter_service/winter_service.json b/assets/themes/winter_service/winter_service.json new file mode 100644 index 000000000..cda079ef8 --- /dev/null +++ b/assets/themes/winter_service/winter_service.json @@ -0,0 +1,112 @@ +{ + "credits": "Robin van der Linde", + "credits:uid": 5093765, + "id": "winter_service", + "title": { + "en": "Winter Service" + }, + "icon": "./assets/svg/snowflake.svg", + "layers": [ + { + "id": "serviced_streets", + "name": { + "en": "Serviced streets" + }, + "description": { + "en": "Streets that have some form of winter service" + }, + "source": { + "osmTags": { + "and": [ + "highway!=", + "service!=driveway", + "highway!=platform", + "winter_service=yes" + ] + } + }, + "minzoom": 16, + "title": { + "render": { + "en": "Serviced street" + }, + "mappings": [ + { + "if": "name~*", + "then": "{name}" + } + ] + }, + "lineRendering": [ + { + "color": "#00ff00" + } + ], + "pointRendering": null, + "allowMove": false, + "tagRenderings": [] + }, + { + "builtin": "all_streets", + "override": { + "lineRendering": [ + { + "color": { + "mappings": [ + { + "if": "winter_service=yes", + "then": "#00ff00" + }, + { + "if": "winter_service=limited", + "then": "#ffff00" + }, + { + "if": "winter_service=no", + "then": "#ff0000" + } + ] + } + } + ] + } + } + ], + "description": { + "en": "A map showing roads and whether they're cleared in winter" + }, + "overrideAll": { + "tagRenderings+": [ + { + "id": "winter_service", + "question": { + "en": "Is this road serviced (e.g. cleared of snow) in winter?" + }, + "mappings": [ + { + "if": "winter_service=yes", + "then": { + "en": "This road is serviced in winter" + }, + "icon": "snowflake:green" + }, + { + "if": "winter_service=limited", + "then": { + "en": "This road is serviced in winter, but only to a limited extent. This is often signposted as well." + }, + "icon": "snowflake:yellow" + }, + { + "if": "winter_service=no", + "then": { + "en": "This road is not serviced in winter" + }, + "icon": "snowflake:red" + } + ] + } + ] + }, + "hideFromOverview": true +} \ No newline at end of file diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 89f271919..07c9ec19f 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -876,28 +876,26 @@ } }, "2": { - "name": "Tots els carrers", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Aquest carrer està il·luminat" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Aquest carrer està il·luminat" + }, + "1": { + "then": "Aquest carrer no està il·luminat" + }, + "2": { + "then": "Aquest carrer està il·luminat per la nit" + }, + "3": { + "then": "Aquest carrer està il·luminat 24/7" + } }, - "1": { - "then": "Aquest carrer no està il·luminat" - }, - "2": { - "then": "Aquest carrer està il·luminat per la nit" - }, - "3": { - "then": "Aquest carrer està il·luminat 24/7" - } - }, - "question": "Aquest carrer està il·luminat?" + "question": "Aquest carrer està il·luminat?" + } } - }, - "title": { - "render": "Carrer" } } }, diff --git a/langs/themes/cs.json b/langs/themes/cs.json index 0ab985cb7..c0224d033 100644 --- a/langs/themes/cs.json +++ b/langs/themes/cs.json @@ -1168,28 +1168,26 @@ } }, "2": { - "name": "Všechny ulice", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Tato ulice je osvětlená" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Tato ulice je osvětlená" + }, + "1": { + "then": "Tato ulice není osvětlená" + }, + "2": { + "then": "Tato ulice je v noci osvětlená" + }, + "3": { + "then": "Tato ulice je osvětlena 24/7" + } }, - "1": { - "then": "Tato ulice není osvětlená" - }, - "2": { - "then": "Tato ulice je v noci osvětlená" - }, - "3": { - "then": "Tato ulice je osvětlena 24/7" - } - }, - "question": "Je tato ulice osvětlená?" + "question": "Je tato ulice osvětlená?" + } } - }, - "title": { - "render": "Ulice" } } }, diff --git a/langs/themes/da.json b/langs/themes/da.json index 0552ecf66..80ba8b292 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -687,28 +687,26 @@ } }, "2": { - "name": "Alle gader", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Denne gade er oplyst" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Denne gade er oplyst" + }, + "1": { + "then": "Denne gade er ikke oplyst" + }, + "2": { + "then": "Denne gade er oplyst om natten" + }, + "3": { + "then": "Denne gade er oplyst 24/7" + } }, - "1": { - "then": "Denne gade er ikke oplyst" - }, - "2": { - "then": "Denne gade er oplyst om natten" - }, - "3": { - "then": "Denne gade er oplyst 24/7" - } - }, - "question": "Er denne gade oplyst?" + "question": "Er denne gade oplyst?" + } } - }, - "title": { - "render": "Gade" } } }, diff --git a/langs/themes/de.json b/langs/themes/de.json index e82d5d44a..f43f16d7f 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -1202,28 +1202,26 @@ } }, "2": { - "name": "Alle Straßen", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Diese Straße ist beleuchtet" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Diese Straße ist beleuchtet" + }, + "1": { + "then": "Diese Straße ist nicht beleuchtet" + }, + "2": { + "then": "Diese Straße ist nachts beleuchtet" + }, + "3": { + "then": "Diese Straße ist durchgehend beleuchtet" + } }, - "1": { - "then": "Diese Straße ist nicht beleuchtet" - }, - "2": { - "then": "Diese Straße ist nachts beleuchtet" - }, - "3": { - "then": "Diese Straße ist durchgehend beleuchtet" - } - }, - "question": "Ist diese Straße beleuchtet?" + "question": "Ist diese Straße beleuchtet?" + } } - }, - "title": { - "render": "Straße" } } }, diff --git a/langs/themes/en.json b/langs/themes/en.json index 729c671b4..0fa5aeda9 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1234,28 +1234,26 @@ } }, "2": { - "name": "All streets", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "This street is lit" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "This street is lit" + }, + "1": { + "then": "This street is not lit" + }, + "2": { + "then": "This street is lit at night" + }, + "3": { + "then": "This street is lit 24/7" + } }, - "1": { - "then": "This street is not lit" - }, - "2": { - "then": "This street is lit at night" - }, - "3": { - "then": "This street is lit 24/7" - } - }, - "question": "Is this street lit?" + "question": "Is this street lit?" + } } - }, - "title": { - "render": "Street" } } }, @@ -1378,5 +1376,36 @@ "description": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself.", "shortDescription": "A map with waste baskets", "title": "Waste Baskets" + }, + "winter_service": { + "description": "A map showing roads and whether they're cleared in winter", + "layers": { + "0": { + "description": "Streets that have some form of winter service", + "name": "Serviced streets", + "title": { + "render": "Serviced street" + } + } + }, + "overrideAll": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "This road is serviced in winter" + }, + "1": { + "then": "This road is serviced in winter, but only to a limited extent. This is often signposted as well." + }, + "2": { + "then": "This road is not serviced in winter" + } + }, + "question": "Is this road serviced (e.g. cleared of snow) in winter?" + } + } + }, + "title": "Winter Service" } } \ No newline at end of file diff --git a/langs/themes/es.json b/langs/themes/es.json index 3ca061dae..9b673c1f6 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -1159,28 +1159,26 @@ } }, "2": { - "name": "Todas las calles", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Esta calle está iluminada" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Esta calle está iluminada" + }, + "1": { + "then": "Esta calle no está iluminada" + }, + "2": { + "then": "Esta calle está iluminada por la noche" + }, + "3": { + "then": "Esta calle está iluminada 24/7" + } }, - "1": { - "then": "Esta calle no está iluminada" - }, - "2": { - "then": "Esta calle está iluminada por la noche" - }, - "3": { - "then": "Esta calle está iluminada 24/7" - } - }, - "question": "¿Está iluminada esta calle?" + "question": "¿Está iluminada esta calle?" + } } - }, - "title": { - "render": "Calle" } } }, diff --git a/langs/themes/eu.json b/langs/themes/eu.json index c35244843..a940a77a8 100644 --- a/langs/themes/eu.json +++ b/langs/themes/eu.json @@ -178,15 +178,6 @@ "sports": { "title": "Kirolak" }, - "street_lighting": { - "layers": { - "2": { - "title": { - "render": "Kalea" - } - } - } - }, "trees": { "title": "Zuhaitzak" }, diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 7d88aba22..0686170e0 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -982,28 +982,26 @@ } }, "2": { - "name": "Toutes les rues", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Cette rue est éclairée" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Cette rue est éclairée" + }, + "1": { + "then": "Cette rue n’est pas éclairée" + }, + "2": { + "then": "Cette rue est éclairée la nuit" + }, + "3": { + "then": "Cette rue est éclairée en permanence" + } }, - "1": { - "then": "Cette rue n’est pas éclairée" - }, - "2": { - "then": "Cette rue est éclairée la nuit" - }, - "3": { - "then": "Cette rue est éclairée en permanence" - } - }, - "question": "Cette rue est-elle éclairée ?" + "question": "Cette rue est-elle éclairée ?" + } } - }, - "title": { - "render": "Rue" } } }, diff --git a/langs/themes/hu.json b/langs/themes/hu.json index 5f4ae6bc2..c4e89bb5c 100644 --- a/langs/themes/hu.json +++ b/langs/themes/hu.json @@ -431,28 +431,26 @@ } }, "2": { - "name": "Minden utca", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Ez az utca ki van világítva" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Ez az utca ki van világítva" + }, + "1": { + "then": "Ez az utca nincs kivilágítva" + }, + "2": { + "then": "Ez az utca éjjel ki van világítva" + }, + "3": { + "then": "Ez az utca éjjel-nappal ki van világítva" + } }, - "1": { - "then": "Ez az utca nincs kivilágítva" - }, - "2": { - "then": "Ez az utca éjjel ki van világítva" - }, - "3": { - "then": "Ez az utca éjjel-nappal ki van világítva" - } - }, - "question": "Ki van-e világítva ez az utca?" + "question": "Ki van-e világítva ez az utca?" + } } - }, - "title": { - "render": "Utca" } } }, diff --git a/langs/themes/it.json b/langs/themes/it.json index 7e549ebb3..fc77a0106 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -566,28 +566,26 @@ } }, "2": { - "name": "Tutte le strade", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Questa strada è illuminata" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Questa strada è illuminata" + }, + "1": { + "then": "Questa strada non è illuminata" + }, + "2": { + "then": "Questa strada è illuminata di sera" + }, + "3": { + "then": "Questa strada è illuminata 24 ore su 24" + } }, - "1": { - "then": "Questa strada non è illuminata" - }, - "2": { - "then": "Questa strada è illuminata di sera" - }, - "3": { - "then": "Questa strada è illuminata 24 ore su 24" - } - }, - "question": "Questa strada è illuminata?" + "question": "Questa strada è illuminata?" + } } - }, - "title": { - "render": "Strada" } } }, diff --git a/langs/themes/ko.json b/langs/themes/ko.json index 076fff142..1e1e49476 100644 --- a/langs/themes/ko.json +++ b/langs/themes/ko.json @@ -1168,28 +1168,26 @@ } }, "2": { - "name": "모든 거리", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "이 거리는 밝습니다" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "이 거리는 밝습니다" + }, + "1": { + "then": "이 거리는 밝지 않습니다" + }, + "2": { + "then": "이 거리는 밤에 밝습니다" + }, + "3": { + "then": "이 거리는 24시간 밝습니다" + } }, - "1": { - "then": "이 거리는 밝지 않습니다" - }, - "2": { - "then": "이 거리는 밤에 밝습니다" - }, - "3": { - "then": "이 거리는 24시간 밝습니다" - } - }, - "question": "이 거리는 밝나요?" + "question": "이 거리는 밝나요?" + } } - }, - "title": { - "render": "거리" } } }, diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index e602bac9e..46055c0f6 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -440,28 +440,26 @@ } }, "2": { - "name": "Alle gater", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Denne gaten er belyst" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Denne gaten er belyst" + }, + "1": { + "then": "Denne gaten er ikke belyst" + }, + "2": { + "then": "Denne gaten er belyst nattestid" + }, + "3": { + "then": "Denne gaten er belyst døgnet rundt" + } }, - "1": { - "then": "Denne gaten er ikke belyst" - }, - "2": { - "then": "Denne gaten er belyst nattestid" - }, - "3": { - "then": "Denne gaten er belyst døgnet rundt" - } - }, - "question": "Er denne gaten belyst?" + "question": "Er denne gaten belyst?" + } } - }, - "title": { - "render": "Gate" } } }, diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 61dea1ffa..c512a1de1 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1270,28 +1270,26 @@ } }, "2": { - "name": "Alle straten", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Deze straat is verlicht" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Deze straat is verlicht" + }, + "1": { + "then": "Deze straat is niet verlicht" + }, + "2": { + "then": "Deze straat is 's nachts verlicht" + }, + "3": { + "then": "Deze straat is 24/7 verlicht" + } }, - "1": { - "then": "Deze straat is niet verlicht" - }, - "2": { - "then": "Deze straat is 's nachts verlicht" - }, - "3": { - "then": "Deze straat is 24/7 verlicht" - } - }, - "question": "Is deze straat verlicht?" + "question": "Is deze straat verlicht?" + } } - }, - "title": { - "render": "Straat" } } }, diff --git a/langs/themes/pa_PK.json b/langs/themes/pa_PK.json index aefe3545f..c5879317a 100644 --- a/langs/themes/pa_PK.json +++ b/langs/themes/pa_PK.json @@ -158,12 +158,6 @@ "title": { "render": "روشنی والی سڑک" } - }, - "2": { - "name": "ساریاں سڑکاں", - "title": { - "render": "سڑک" - } } }, "title": "سڑک دیاں روشنیاں" diff --git a/langs/themes/pl.json b/langs/themes/pl.json index 56809ae40..adc045a15 100644 --- a/langs/themes/pl.json +++ b/langs/themes/pl.json @@ -855,28 +855,26 @@ } }, "2": { - "name": "Wszystkie ulice", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "Ta ulica jest oświetlona" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Ta ulica jest oświetlona" + }, + "1": { + "then": "Ta ulica nie jest oświetlona" + }, + "2": { + "then": "Ta ulica jest oświetlona w nocy" + }, + "3": { + "then": "Ta ulica jest oświetlona 24/7" + } }, - "1": { - "then": "Ta ulica nie jest oświetlona" - }, - "2": { - "then": "Ta ulica jest oświetlona w nocy" - }, - "3": { - "then": "Ta ulica jest oświetlona 24/7" - } - }, - "question": "Czy ta ulica jest oświetlona?" + "question": "Czy ta ulica jest oświetlona?" + } } - }, - "title": { - "render": "Ulica" } } }, diff --git a/langs/themes/ru.json b/langs/themes/ru.json index d865e05a0..5292a9bd3 100644 --- a/langs/themes/ru.json +++ b/langs/themes/ru.json @@ -236,14 +236,6 @@ "title": "Спортивные объекты" }, "street_lighting": { - "layers": { - "2": { - "name": "Все улицы", - "title": { - "render": "Улица" - } - } - }, "title": "Уличное освещение" }, "surveillance": { diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json index adcb07626..3278776d8 100644 --- a/langs/themes/zh_Hant.json +++ b/langs/themes/zh_Hant.json @@ -807,28 +807,26 @@ } }, "2": { - "name": "所有道路", - "tagRenderings": { - "lit": { - "mappings": { - "0": { - "then": "這道路有照明" + "override": { + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "這道路有照明" + }, + "1": { + "then": "這道路沒有照明" + }, + "2": { + "then": "這道路晚上有照明" + }, + "3": { + "then": "這道路 24/7 有照明" + } }, - "1": { - "then": "這道路沒有照明" - }, - "2": { - "then": "這道路晚上有照明" - }, - "3": { - "then": "這道路 24/7 有照明" - } - }, - "question": "這道路有照明嗎？" + "question": "這道路有照明嗎？" + } } - }, - "title": { - "render": "照明" } } }, diff --git a/src/Models/Constants.ts b/src/Models/Constants.ts index 8eb298467..cad980136 100644 --- a/src/Models/Constants.ts +++ b/src/Models/Constants.ts @@ -191,6 +191,7 @@ export default class Constants { "resolved", "ring", "scissors", + "snowflake", "square", "square_rounded", "teardrop", diff --git a/src/assets/svg/Snowflake.svelte b/src/assets/svg/Snowflake.svelte new file mode 100644 index 000000000..cce4078a2 --- /dev/null +++ b/src/assets/svg/Snowflake.svelte @@ -0,0 +1,4 @@ + + \ No newline at end of file