From 01bcaff093c4e3a7587b5e4bf15977222a1b7292 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 28 Jan 2025 23:37:42 +0100 Subject: [PATCH] Refactoring: remove unused maproulette layer, move SpecialVisualizations into subfiles --- .../maproulette_challenge.json | 4 - assets/themes/maproulette/maproulette.json | 36 ---- src/UI/BigComponents/MenuDrawer.svelte | 1 - src/UI/InputElement/LanguagePicker.svelte | 16 +- src/UI/QueryParameterDocumentation.ts | 5 - .../MapRouletteSpecialVisualisations.ts | 92 +++++++++ .../SettingsVisualisations.ts | 44 ++++- .../UISpecialVisualisations.ts | 17 +- src/UI/SpecialVisualizations.ts | 186 +----------------- 9 files changed, 161 insertions(+), 240 deletions(-) delete mode 100644 assets/themes/maproulette/maproulette.json create mode 100644 src/UI/SpecialVisualisations/MapRouletteSpecialVisualisations.ts diff --git a/assets/layers/maproulette_challenge/maproulette_challenge.json b/assets/layers/maproulette_challenge/maproulette_challenge.json index 638b49c541..8d04f289f6 100644 --- a/assets/layers/maproulette_challenge/maproulette_challenge.json +++ b/assets/layers/maproulette_challenge/maproulette_challenge.json @@ -102,10 +102,6 @@ ], "lineRendering": [], "tagRenderings": [ - { - "id": "details", - "render": "{maproulette_task()}" - }, { "id": "status", "mappings": [ diff --git a/assets/themes/maproulette/maproulette.json b/assets/themes/maproulette/maproulette.json deleted file mode 100644 index 49d30d241f..0000000000 --- a/assets/themes/maproulette/maproulette.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "id": "maproulette", - "title": { - "en": "MapRoulette Tasks", - "de": "MapRoulette-Aufgaben", - "fr": "Tâches MapRoulette", - "da": "KortRoulette-opgaver", - "ca": "Tasques de MapRoulette", - "pa_PK": "میپ‌رولیٹ دے کم", - "nl": "MapRoulette taken", - "es": "Tareas de MapRoulette", - "cs": "Úkoly MapRoulette", - "zh_Hant": "MapRoulette 任務", - "pl": "Zadania MapRoulette", - "hu": "MapRoulette-feladatok", - "ko": "MapRoulette 작업" - }, - "description": { - "en": "Theme showing MapRoulette tasks, allowing you to search, filter and fix them.", - "de": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.", - "fr": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.", - "da": "Tema, der viser MapRoulette-opgaver, så du kan søge, filtrere og rette dem.", - "nl": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en oplossen.", - "es": "Tema que muestra las tareas de MapRoulette, permitiéndote buscarlas, filtrarlas y solucionarlas.", - "cs": "Téma zobrazující úkoly MapRoulette, které umožňuje vyhledávat, filtrovat a opravovat je.", - "ca": "Tema que mostra les tasques de MapRoulette, que us permet cercar-les, filtrar-les i solucionar-les.", - "pl": "Temat pokazujący zadania MapRoulette, umożliwiający ich wyszukiwanie, filtrowanie i naprawianie.", - "ko": "MapRoulette 작업을 표시하는 테마로, 작업을 검색, 필터링 허용될 수 있습니다." - }, - "icon": "./assets/layers/maproulette/logomark.svg", - "startZoom": 4, - "hideFromOverview": true, - "layers": [ - "maproulette" - ] -} \ No newline at end of file diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte index 47a0fc4178..48ee620415 100644 --- a/src/UI/BigComponents/MenuDrawer.svelte +++ b/src/UI/BigComponents/MenuDrawer.svelte @@ -21,7 +21,6 @@ import OpenIdEditor from "./OpenIdEditor.svelte" import OpenJosm from "../Base/OpenJosm.svelte" import MapillaryLink from "./MapillaryLink.svelte" - import Github from "../../assets/svg/Github.svelte" import Bug from "../../assets/svg/Bug.svelte" import CopyrightPanel from "./CopyrightPanel.svelte" import CopyrightAllIcons from "./CopyrightAllIcons.svelte" diff --git a/src/UI/InputElement/LanguagePicker.svelte b/src/UI/InputElement/LanguagePicker.svelte index 8db0836ed9..f7fdc4f3e1 100644 --- a/src/UI/InputElement/LanguagePicker.svelte +++ b/src/UI/InputElement/LanguagePicker.svelte @@ -4,7 +4,7 @@ // Translated languages import language_translations from "../../assets/language_translations.json" - import { Store, UIEventSource } from "../../Logic/UIEventSource" + import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource" import Locale from "../i18n/Locale" import { LanguageIcon } from "@babeard/svelte-heroicons/solid" import Dropdown from "../Base/Dropdown.svelte" @@ -16,7 +16,13 @@ * Languages one can choose from * Defaults to _all_ languages known by MapComplete */ - export let availableLanguages: string[] = Object.keys(native) + export let availableLanguages: string[] | Store = Object.keys(native) + let languages: Store + if (Array.isArray(availableLanguages)) { + languages = new ImmutableStore(availableLanguages) + } else { + languages = availableLanguages + } /** * EventStore to assign to, defaults to 'Locale.langauge' */ @@ -29,14 +35,14 @@ if (preferredLanguages?.indexOf(lng) < 0) { preferredLanguages?.push(lng) } - preferredFiltered = preferredLanguages?.filter((l) => availableLanguages.indexOf(l) >= 0) + preferredFiltered = preferredLanguages?.filter((l) => $languages.indexOf(l) >= 0) }) export let clss: string = undefined let current = Locale.language -{#if availableLanguages?.length > 1} +{#if $languages?.length > 1}