diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json index ce46418d5..3bb2ab11b 100644 --- a/assets/layers/ghost_bike/ghost_bike.json +++ b/assets/layers/ghost_bike/ghost_bike.json @@ -184,14 +184,20 @@ "ca": "En quina pàgina web es pot trobar més informació sobre la bicicleta blanca o l'accident?" }, "render": { - "en": "More info available", - "nl": "Meer informatie", - "de": "Mehr Informationen", - "it": "Sono disponibili ulteriori informazioni", - "ru": "Доступна более подробная информация", - "fr": "Plus d'informations sont disponibles", - "id": "Informasi lanjut tersedia", - "ca": "Més informació disponible" + "special": { + "type": "link", + "href": "{source}", + "text": { + "en": "More info available", + "nl": "Meer informatie", + "de": "Mehr Informationen", + "it": "Sono disponibili ulteriori informazioni", + "ru": "Доступна более подробная информация", + "fr": "Plus d'informations sont disponibles", + "id": "Informasi lanjut tersedia", + "ca": "Més informació disponible" + } + } }, "freeform": { "type": "url", diff --git a/assets/layers/icons/icons.json b/assets/layers/icons/icons.json index c5633b74a..f3b781152 100644 --- a/assets/layers/icons/icons.json +++ b/assets/layers/icons/icons.json @@ -12,7 +12,7 @@ "labels": [ "defaults" ], - "render": "Wikipedia", + "render": "Wikipedia", "condition": { "or": [ "wikipedia~*", @@ -23,7 +23,7 @@ { "#": "ignore-image-in-then", "if": "wikipedia=", - "then": "WD" + "then": "WD" } ] }, @@ -106,7 +106,7 @@ "labels": [ "defaults" ], - "render": "website", + "render": "website", "condition": "website~*" }, { @@ -140,7 +140,7 @@ "labels": [ "defaults" ], - "render": "on osm", + "render": "on osm", "mappings": [ { "if": "id~.*/-.*", @@ -149,7 +149,7 @@ { "#": "ignore-image-in-then", "if": "_backend~*", - "then": "" + "then": "" } ], "condition": "id~(node|way|relation)/[0-9]*" diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json index 4ee12d8e0..c8a0df017 100644 --- a/assets/layers/public_bookcase/public_bookcase.json +++ b/assets/layers/public_bookcase/public_bookcase.json @@ -438,13 +438,19 @@ }, { "render": { - "en": "More info on the website", - "nl": "Meer info op de website", - "de": "Weitere Informationen auf der Webseite", - "fr": "Plus d'infos sur le site web", - "ru": "Более подробная информация на сайте", - "it": "Maggiori informazioni sul sito web", - "hu": "További információ ezen a weboldalon" + "special": { + "type": "link", + "href": "{website}", + "text": { + "en": "More info on the website", + "nl": "Meer info op de website", + "de": "Weitere Informationen auf der Webseite", + "fr": "Plus d'infos sur le site web", + "ru": "Более подробная информация на сайте", + "it": "Maggiori informazioni sul sito web", + "hu": "További információ ezen a weboldalon" + } + } }, "question": { "en": "Is there a website with more information about this public bookcase?", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index dabbec8e1..3bd0b3b29 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,13 +1,21 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete" + "en": "Changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen", + "fr": "Changements faits avec MapComplete", + "nl": "Wijzigingen gemaakt met MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete" + "en": "Show changes made with MapComplete", + "de": "Mit MapComplete erstellte Änderungen anzeigen", + "nl": "Toon wijzigingen gemaakt met MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete" + "en": "This maps shows all the changes made with MapComplete", + "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "fr": "Cette carte montre tous les changements faits avec MapComplete", + "nl": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -20,7 +28,9 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers" + "en": "Changeset centers", + "de": "Zentrum der Änderungssätze", + "nl": "Centerpunt van changeset" }, "minzoom": 0, "source": { @@ -31,41 +41,57 @@ }, "title": { "render": { - "en": "Changeset for {theme}" + "en": "Changeset for {theme}", + "de": "Änderungssatz für {theme}", + "fr": "Groupe de modifications pour {theme}" } }, "description": { - "en": "Shows all MapComplete changes" + "en": "Show all MapComplete changes", + "de": "Alle MapComplete-Änderungen anzeigen", + "nl": "Toon alle MapComplete wijzigingen" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}" + "en": "Changeset {id}", + "de": "Änderungssatz {id}", + "fr": "Groupe de modifications {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?" + "en": "Which contributor made this change?", + "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "fr": "Quel contributeur a fait cette modification ?", + "nl": "Welke bijdrager maakte deze wijziging?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}" + "en": "Change made by {user}", + "de": "Änderung gemacht von {user}", + "fr": "Modification faite par {user}", + "nl": "Wijziging gemaakt door {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?" + "en": "What theme was used to make this change?", + "de": "Welches Thema wurde für diese Änderung verwendet?", + "fr": "Quel thème a été utilisé pour faire cette modification ?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}" + "en": "Change with theme {theme}", + "de": "Geändert mit Thema {theme}", + "fr": "Modifié avec le thème {theme}" } }, { @@ -74,19 +100,29 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?" + "en": "What locale (language) was this change made in?", + "de": "In welcher Sprache wurde diese Änderung vorgenommen?", + "fr": "En quelle langue est-ce que ce changement a été fait ?", + "nl": "In welke locale (taal) werd deze wijziging gemaakt?" }, "render": { - "en": "User locale is {locale}" + "en": "User locale is {locale}", + "de": "Usersprache ist {locale}", + "nl": "De gebruikerstaal is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}" + "en": "Change made with {host}", + "de": "Änderung vorgenommen mit {host}", + "fr": "Modification faite avec {host}", + "nl": "Wijziging gemaakt met {host}" }, "question": { - "en": "What host (website) was this change made with?" + "en": "What host (website) was this change made with?", + "de": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "nl": "Met welke host (website) werd deze wijziging gemaakt?" }, "freeform": { "key": "host" @@ -107,10 +143,14 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?" + "en": "What version of MapComplete was used to make this change?", + "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", + "fr": "Quelle version de MapComplete a été utilisée pour faire cette modification ?" }, "render": { - "en": "Made with {editor}" + "en": "Made with {editor}", + "de": "Erstellt mit {editor}", + "fr": "Fait avec {editor}" }, "freeform": { "key": "editor" @@ -452,7 +492,9 @@ } ], "question": { - "en": "Themename contains {search}" + "en": "Theme name contains {search}", + "de": "Themenname enthält {search}", + "nl": "Themenaam bevat {search}" } } ] @@ -468,7 +510,9 @@ } ], "question": { - "en": "Made by contributor {search}" + "en": "Made by contributor {search}", + "de": "Erstellt von {search}", + "nl": "Gemaakt door bijdrager {search}" } } ] @@ -484,7 +528,9 @@ } ], "question": { - "en": "Not made by contributor {search}" + "en": "Not made by contributor {search}", + "de": "Nicht erstellt von {search}", + "nl": "Niet gemaakt door bijdrager {search}" } } ] @@ -501,7 +547,9 @@ } ], "question": { - "en": "Made before {search}" + "en": "Made before {search}", + "de": "Erstellt vor {search}", + "nl": "Gemaakt voor {search}" } } ] @@ -518,7 +566,9 @@ } ], "question": { - "en": "Made after {search}" + "en": "Made after {search}", + "de": "Erstellt nach {search}", + "nl": "Gemaakt na {search}" } } ] @@ -534,7 +584,10 @@ } ], "question": { - "en": "User language (iso-code) {search}" + "en": "User language (iso-code) {search}", + "de": "Benutzersprache (ISO-Code) {search}", + "fr": "Langage utilisateur (code-ISO) {search}", + "nl": "De taal van de bijdrager is {search}" } } ] @@ -550,7 +603,9 @@ } ], "question": { - "en": "Made with host {search}" + "en": "Made with host {search}", + "de": "Erstellt mit Host {search}", + "nl": "Gemaakt met host {search}" } } ] @@ -561,7 +616,10 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image" + "en": "Changeset added at least one image", + "de": "Changeset fügte mindestens ein Bild hinzu", + "fr": "Le groupe de modifications a ajouté au moins une image", + "nl": "Changeset bevat minstens één afbeelding" } } ] @@ -576,7 +634,9 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here" + "en": "More statistics can be found here", + "de": "Mehr Statistiken gibt es hier", + "fr": "D'autres statistiques sont disponibles ici" } }, { @@ -606,4 +666,4 @@ } } ] -} \ No newline at end of file +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 2173159a3..de8bc86b5 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -3160,7 +3160,11 @@ }, "ghost_bike-source": { "question": "En quina pàgina web es pot trobar més informació sobre la bicicleta blanca o l'accident?", - "render": "Més informació disponible" + "render": { + "special": { + "text": "Més informació disponible" + } + } } }, "title": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 8f844fa1b..894e1a797 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5151,7 +5151,11 @@ }, "ghost_bike-source": { "question": "Auf welcher Webseite kann man mehr Informationen über das Geisterrad oder den Unfall finden?", - "render": "Mehr Informationen" + "render": { + "special": { + "text": "Mehr Informationen" + } + } }, "ghost_bike-start_date": { "question": "Wann wurde dieses Geisterrad aufgestellt?", @@ -7101,7 +7105,11 @@ }, "public_bookcase-website": { "question": "Auf welcher Webseite findet man Informationen zu diesem Bücherschrank?", - "render": "Weitere Informationen auf der Webseite" + "render": { + "special": { + "text": "Weitere Informationen auf der Webseite" + } + } } }, "title": { diff --git a/langs/layers/en.json b/langs/layers/en.json index a290fad1b..e3acffc5d 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5171,7 +5171,11 @@ }, "ghost_bike-source": { "question": "On what webpage can one find more info about the ghost bike or the accident?", - "render": "More info available" + "render": { + "special": { + "text": "More info available" + } + } }, "ghost_bike-start_date": { "question": "When was this Ghost bike installed?", @@ -7135,7 +7139,11 @@ }, "public_bookcase-website": { "question": "Is there a website with more information about this public bookcase?", - "render": "More info on the website" + "render": { + "special": { + "text": "More info on the website" + } + } } }, "title": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 4dcce7098..fa04bb6b7 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -3584,7 +3584,11 @@ }, "ghost_bike-source": { "question": "Sur quelle page web peut-on trouver plus d'informations sur le Vélo fantôme ou l'accident ?", - "render": "Plus d'informations sont disponibles" + "render": { + "special": { + "text": "Plus d'informations sont disponibles" + } + } }, "ghost_bike-start_date": { "question": "Quand ce vélo fantôme a-t-il été installée ?", @@ -4265,7 +4269,11 @@ }, "public_bookcase-website": { "question": "Y a-t-il un site web avec plus d'informations sur cette microbibliothèque ?", - "render": "Plus d'infos sur le site web" + "render": { + "special": { + "text": "Plus d'infos sur le site web" + } + } } }, "title": { diff --git a/langs/layers/hu.json b/langs/layers/hu.json index 033b17ec5..1b2e6ef41 100644 --- a/langs/layers/hu.json +++ b/langs/layers/hu.json @@ -752,7 +752,11 @@ }, "public_bookcase-website": { "question": "Van-e olyan weboldal, ahol további információ található erről a nyilvános könyvespolcról?", - "render": "További információ ezen a weboldalon" + "render": { + "special": { + "text": "További információ ezen a weboldalon" + } + } } }, "title": { diff --git a/langs/layers/id.json b/langs/layers/id.json index 950dc3170..fc28c3edf 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -341,7 +341,11 @@ "render": "{inscription}" }, "ghost_bike-source": { - "render": "Informasi lanjut tersedia" + "render": { + "special": { + "text": "Informasi lanjut tersedia" + } + } } } }, diff --git a/langs/layers/it.json b/langs/layers/it.json index ea7d06fcc..d3066d329 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -1344,7 +1344,11 @@ }, "ghost_bike-source": { "question": "In quale pagina web si possono trovare informazioni sulla bici fantasma o l’incidente?", - "render": "Sono disponibili ulteriori informazioni" + "render": { + "special": { + "text": "Sono disponibili ulteriori informazioni" + } + } }, "ghost_bike-start_date": { "question": "Quando è stata installata questa bici fantasma?", @@ -1759,7 +1763,11 @@ }, "public_bookcase-website": { "question": "C'è un sito web con maggiori informazioni su questa microbiblioteca?", - "render": "Maggiori informazioni sul sito web" + "render": { + "special": { + "text": "Maggiori informazioni sul sito web" + } + } } }, "title": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 87d066050..6a602b03f 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4851,7 +4851,11 @@ }, "ghost_bike-source": { "question": "Op welke website kan men meer informatie vinden over de Witte fiets of over het ongeval?", - "render": "Meer informatie" + "render": { + "special": { + "text": "Meer informatie" + } + } }, "ghost_bike-start_date": { "question": "Wanneer werd deze witte fiets geplaatst?", @@ -6667,7 +6671,11 @@ }, "public_bookcase-website": { "question": "Is er een website over dit boekenruilkastje?", - "render": "Meer info op de website" + "render": { + "special": { + "text": "Meer info op de website" + } + } } }, "title": { diff --git a/langs/layers/ru.json b/langs/layers/ru.json index a320c85f5..e2b6cbb1b 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -996,7 +996,11 @@ "render": "В знак памяти о {subject}" }, "ghost_bike-source": { - "render": "Доступна более подробная информация" + "render": { + "special": { + "text": "Доступна более подробная информация" + } + } }, "ghost_bike-start_date": { "render": "Установлен {start_date}" @@ -1515,7 +1519,11 @@ }, "public_bookcase-website": { "question": "Есть ли веб-сайт с более подробной информацией об этом общественном книжном шкафе?", - "render": "Более подробная информация на сайте" + "render": { + "special": { + "text": "Более подробная информация на сайте" + } + } } }, "title": { diff --git a/langs/themes/de.json b/langs/themes/de.json index 6052fc55f..e64d44abe 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -854,6 +854,112 @@ }, "title": "Bordsteine und Überwege" }, + "mapcomplete-changes": { + "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", + "layers": { + "0": { + "description": "Alle MapComplete-Änderungen anzeigen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenname enthält {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Erstellt von {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Nicht erstellt von {search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "Erstellt vor {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Erstellt nach {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "Benutzersprache (ISO-Code) {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Erstellt mit Host {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Changeset fügte mindestens ein Bild hinzu" + } + } + } + }, + "name": "Zentrum der Änderungssätze", + "tagRenderings": { + "contributor": { + "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?", + "render": "Änderung gemacht von {user}" + }, + "host": { + "question": "Mit welchem Host / welcher Website wurde diese Änderung gemacht?", + "render": "Änderung vorgenommen mit {host}" + }, + "locale": { + "question": "In welcher Sprache wurde diese Änderung vorgenommen?", + "render": "Usersprache ist {locale}" + }, + "show_changeset_id": { + "render": "Änderungssatz {id}" + }, + "theme-id": { + "question": "Welches Thema wurde für diese Änderung verwendet?", + "render": "Geändert mit Thema {theme}" + }, + "version": { + "question": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", + "render": "Erstellt mit {editor}" + } + }, + "title": { + "render": "Änderungssatz für {theme}" + } + }, + "1": { + "override": { + "tagRenderings+": { + "0": { + "render": "Mehr Statistiken gibt es hier" + } + } + } + } + }, + "shortDescription": "Mit MapComplete erstellte Änderungen anzeigen", + "title": "Mit MapComplete erstellte Änderungen" + }, "maproulette": { "description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.", "title": "MapRoulette-Aufgaben" diff --git a/langs/themes/en.json b/langs/themes/en.json index ca9c5a4f9..d07b53164 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -858,12 +858,12 @@ "description": "This maps shows all the changes made with MapComplete", "layers": { "0": { - "description": "Shows all MapComplete changes", + "description": "Show all MapComplete changes", "filter": { "0": { "options": { "0": { - "question": "Themename contains {search}" + "question": "Theme name contains {search}" } } }, @@ -920,12 +920,12 @@ "name": "Changeset centers", "tagRenderings": { "contributor": { - "question": "What contributor did make this change?", + "question": "Which contributor made this change?", "render": "Change made by {user}" }, "host": { "question": "What host (website) was this change made with?", - "render": "Change with with {host}" + "render": "Change made with {host}" }, "locale": { "question": "What locale (language) was this change made in?", @@ -936,7 +936,7 @@ }, "theme-id": { "question": "What theme was used to make this change?", - "render": "Change with theme {theme}" + "render": "Change with theme {theme}" }, "version": { "question": "What version of MapComplete was used to make this change?", @@ -957,7 +957,7 @@ } } }, - "shortDescription": "Shows changes made by MapComplete", + "shortDescription": "Show changes made with MapComplete", "title": "Changes made with MapComplete" }, "maproulette": { diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 1154031d0..21da83331 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -844,6 +844,65 @@ }, "title": "Ressauts et traversées" }, + "mapcomplete-changes": { + "description": "Cette carte montre tous les changements faits avec MapComplete", + "layers": { + "0": { + "filter": { + "5": { + "options": { + "0": { + "question": "Langage utilisateur (code-ISO) {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Le groupe de modifications a ajouté au moins une image" + } + } + } + }, + "tagRenderings": { + "contributor": { + "question": "Quel contributeur a fait cette modification ?", + "render": "Modification faite par {user}" + }, + "host": { + "render": "Modification faite avec {host}" + }, + "locale": { + "question": "En quelle langue est-ce que ce changement a été fait ?" + }, + "show_changeset_id": { + "render": "Groupe de modifications {id}" + }, + "theme-id": { + "question": "Quel thème a été utilisé pour faire cette modification ?", + "render": "Modifié avec le thème {theme}" + }, + "version": { + "question": "Quelle version de MapComplete a été utilisée pour faire cette modification ?", + "render": "Fait avec {editor}" + } + }, + "title": { + "render": "Groupe de modifications pour {theme}" + } + }, + "1": { + "override": { + "tagRenderings+": { + "0": { + "render": "D'autres statistiques sont disponibles ici" + } + } + } + } + }, + "title": "Changements faits avec MapComplete" + }, "maproulette": { "description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.", "title": "Tâches MapRoulette" diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 8344d4fba..2affa3f47 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -936,6 +936,89 @@ }, "title": "Stoepranden en oversteekplaatsen" }, + "mapcomplete-changes": { + "description": "Deze kaart toont alle wijzigingen die met MapComplete gemaakt werden", + "layers": { + "0": { + "description": "Toon alle MapComplete wijzigingen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenaam bevat {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Gemaakt door bijdrager {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Niet gemaakt door bijdrager {search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "Gemaakt voor {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Gemaakt na {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "De taal van de bijdrager is {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Gemaakt met host {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Changeset bevat minstens één afbeelding" + } + } + } + }, + "name": "Centerpunt van changeset", + "tagRenderings": { + "contributor": { + "question": "Welke bijdrager maakte deze wijziging?", + "render": "Wijziging gemaakt door {user}" + }, + "host": { + "question": "Met welke host (website) werd deze wijziging gemaakt?", + "render": "Wijziging gemaakt met {host}" + }, + "locale": { + "question": "In welke locale (taal) werd deze wijziging gemaakt?", + "render": "De gebruikerstaal is {locale}" + } + } + } + }, + "shortDescription": "Toon wijzigingen gemaakt met MapComplete", + "title": "Wijzigingen gemaakt met MapComplete" + }, "maproulette": { "description": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen.", "title": "MapRoulette taken" diff --git a/scripts/GenerateSeries.ts b/scripts/GenerateSeries.ts index 6ed84955f..3017e8180 100644 --- a/scripts/GenerateSeries.ts +++ b/scripts/GenerateSeries.ts @@ -1,10 +1,10 @@ import { existsSync, readdirSync, readFileSync, unlinkSync, writeFileSync } from "fs" import ScriptUtils from "./ScriptUtils" -import { Utils } from "../Utils" +import { Utils } from "../src/Utils" import Script from "./Script" -import { GeoOperations } from "../Logic/GeoOperations" +import { GeoOperations } from "../src/Logic/GeoOperations" import { Feature, Polygon } from "geojson" -import { Tiles } from "../Models/TileRange" +import { Tiles } from "../src/Models/TileRange" class StatsDownloader { private readonly urlTemplate = diff --git a/src/Models/Constants.ts b/src/Models/Constants.ts index 0ab2ea2e6..e883af575 100644 --- a/src/Models/Constants.ts +++ b/src/Models/Constants.ts @@ -1,13 +1,16 @@ -import { Utils } from "../Utils" import * as meta from "../../package.json" +import { Utils } from "../Utils" export type PriviligedLayerType = (typeof Constants.priviliged_layers)[number] export default class Constants { + static { + console.log("Meta (package:json)", meta) + } public static vNumber = meta.version public static ImgurApiKey = meta.config.api_keys.imgur - public static readonly mapillary_client_token_v4 =meta.config.api_keys.mapillary_v4 + public static readonly mapillary_client_token_v4 = meta.config.api_keys.mapillary_v4 /** * API key for Maproulette diff --git a/src/Models/ThemeConfig/TagRenderingConfig.ts b/src/Models/ThemeConfig/TagRenderingConfig.ts index 940056a99..a29afdcc4 100644 --- a/src/Models/ThemeConfig/TagRenderingConfig.ts +++ b/src/Models/ThemeConfig/TagRenderingConfig.ts @@ -242,7 +242,7 @@ export default class TagRenderingConfig { if (txt === "") { throw context + " Rendering for language " + ln + " is empty" } - if (txt.indexOf("{" + this.freeform.key + "}") >= 0) { + if (txt.indexOf("{" + this.freeform.key + "}") >= 0 || txt.indexOf("&LBRACE" + this.freeform.key + "&RBRACE") ) { continue } if (txt.indexOf("{" + this.freeform.key + ":") >= 0) { diff --git a/src/UI/Base/SubtleLink.svelte b/src/UI/Base/SubtleLink.svelte index 401c34a24..5a3d9f505 100644 --- a/src/UI/Base/SubtleLink.svelte +++ b/src/UI/Base/SubtleLink.svelte @@ -34,6 +34,7 @@ class={twMerge(options.extraClasses, "button text-ellipsis")} {href} target={newTab ? "_blank" : undefined} + rel={newTab ? "noopener" : undefined} > {#if imageUrl !== undefined} diff --git a/src/UI/BigComponents/ContactLink.svelte b/src/UI/BigComponents/ContactLink.svelte index f3ccac9e2..7cebd2c0d 100644 --- a/src/UI/BigComponents/ContactLink.svelte +++ b/src/UI/BigComponents/ContactLink.svelte @@ -35,7 +35,7 @@ src={`https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/${resource.type}.svg`} />
- + {resource.resolved.name ?? resource.resolved.url} {resource.resolved?.description} diff --git a/src/UI/BigComponents/CopyrightPanel.ts b/src/UI/BigComponents/CopyrightPanel.ts index 988a802ca..d066a4d00 100644 --- a/src/UI/BigComponents/CopyrightPanel.ts +++ b/src/UI/BigComponents/CopyrightPanel.ts @@ -102,7 +102,7 @@ export default class CopyrightPanel extends Combine { let bgAttr: BaseUIElement | string = undefined if (attrText && attrUrl) { bgAttr = - "" + attrText + "" + "" + attrText + "" } else if (attrUrl) { bgAttr = attrUrl } else { diff --git a/src/UI/BigComponents/UserProfile.svelte b/src/UI/BigComponents/UserProfile.svelte index 5ade85a15..5cb514a4d 100644 --- a/src/UI/BigComponents/UserProfile.svelte +++ b/src/UI/BigComponents/UserProfile.svelte @@ -37,6 +37,7 @@ diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts index 25a5c2e36..bf3dce5ab 100644 --- a/src/UI/SpecialVisualizations.ts +++ b/src/UI/SpecialVisualizations.ts @@ -1250,7 +1250,7 @@ export default class SpecialVisualizations { }, { funcName: "link", - docs: "Construct a link. By using the 'special' visualisation notation, translation should be easier", + docs: "Construct a link. By using the 'special' visualisation notation, translations should be easier", args: [ { name: "text",