Merge master

This commit is contained in:
Pieter Vander Vennet 2023-03-09 15:25:09 +01:00
commit df13901f18
16 changed files with 98 additions and 184 deletions

View file

@ -259,8 +259,8 @@ id | question | osmTags
available_sports.0 | All sports (default) |
available_sports.1 | Basketball fields | sport=basketball
available_sports.2 | Soccer fields | sport=soccer
available_sports.3 | Ping-pong table | sport=table_tennis
available_sports.4 | Tennis field | sport=tennis
available_sports.3 | Ping-pong tables | sport=table_tennis
available_sports.4 | Tennis fields | sport=tennis

View file

@ -2,7 +2,6 @@ import { VariableUiElement } from "./VariableUIElement"
import Locale from "../i18n/Locale"
import Link from "./Link"
import Svg from "../../Svg"
import show = Mocha.reporters.Base.cursor.show
/**
* The little 'translate'-icon next to every icon + some static helper functions

View file

@ -41,7 +41,6 @@ export class ActionButtons extends Combine {
readonly currentBounds: Store<BBox>
readonly locationControl: Store<Loc>
readonly osmConnection: OsmConnection
readonly isTranslator: Store<boolean>
readonly featureSwitchMoreQuests: Store<boolean>
}) {
const imgSize = "h-6 w-6"

View file

@ -118,7 +118,6 @@ export default class CopyrightPanel extends Combine {
currentBounds: Store<BBox>
locationControl: UIEventSource<Loc>
osmConnection: OsmConnection
isTranslator: Store<boolean>
}) {
const t = Translations.t.general.attribution
const layoutToUse = state.layoutToUse

View file

@ -24,7 +24,6 @@ export default class ThemeIntroductionPanel extends Combine {
osmConnection: OsmConnection
currentBounds: Store<BBox>
locationControl: UIEventSource<Loc>
isTranslator: Store<boolean>
},
guistate?: { userInfoIsOpened: UIEventSource<boolean> }
) {

View file

@ -74,7 +74,7 @@ class SingleUserSettingsPanel extends EditableTagRendering {
if (kv.k.startsWith("_")) {
continue
}
osmConnection.GetPreference(kv.k, "", {prefix: ""}).setData(kv.v)
osmConnection.GetPreference(kv.k, "", { prefix: "" }).setData(kv.v)
}
editMode.setData(false)

View file

@ -1,7 +1,7 @@
{
"contributors": [
{
"commits": 5071,
"commits": 5097,
"contributor": "Pieter Vander Vennet"
},
{
@ -145,12 +145,12 @@
"contributor": "pelderson"
},
{
"commits": 4,
"contributor": "Nadhem"
"commits": 5,
"contributor": "Codain"
},
{
"commits": 4,
"contributor": "Codain"
"contributor": "Nadhem"
},
{
"commits": 4,

View file

@ -611,7 +611,8 @@
{
"question": {
"en": "Publicly accessible",
"nl": "Publiek toegankelijk"
"nl": "Publiek toegankelijk",
"de": "Öffentlich zugänglich"
},
"osmTags": {
"or": [
@ -629,35 +630,40 @@
{
"question": {
"en": "All sports",
"nl": "Alle sporten"
"nl": "Alle sporten",
"de": "Alle Sportarten"
}
},
{
"osmTags": "sport=basketball",
"question": {
"nl": "Basketbalvelden",
"en": "Basketball fields"
"en": "Basketball fields",
"de": "Basketballplätze"
}
},
{
"osmTags": "sport=soccer",
"question": {
"nl": "Voetbalvelden",
"en": "Soccer fields"
"en": "Soccer fields",
"de": "Fußballplätze"
}
},
{
"osmTags": "sport=table_tennis",
"question": {
"nl": "Pingpong-tafel",
"en": "Ping-pong table"
"en": "Ping-pong tables",
"de": "Tischtennisplatten"
}
},
{
"osmTags": "sport=tennis",
"question": {
"nl": "Tennisveld",
"en": "Tennis field"
"en": "Tennis fields",
"de": "Tennisplätze"
}
}
]

View file

@ -70,19 +70,22 @@
{
"id": "all-questions-at-once",
"question": {
"en": "Should questions for unknown data fields appear one-by-one or together?"
"en": "Should questions for unknown data fields appear one-by-one or together?",
"de": "Sollen Fragen für unbekannte Datenfelder einzeln oder zusammen angezeigt werden?"
},
"mappings": [
{
"if": "mapcomplete-show-all-questions=true",
"then": {
"en": "Show all questions in the infobox together"
"en": "Show all questions in the infobox together",
"de": "Alle Fragen in der Infobox zusammen anzeigen"
}
},
{
"if": "mapcomplete-show-all-questions=false",
"then": {
"en": "Show questions one-by-one"
"en": "Show questions one-by-one",
"de": "Fragen der Reihe nach anzeigen"
}
}
]

View file

@ -1,30 +1,13 @@
{
"id": "mapcomplete-changes",
"title": {
"en": "Changes made with MapComplete",
"cs": "Změny provedené pomocí MapComplete",
"de": "Mit MapComplete vorgenommene Änderungen",
"es": "Cambios realizados por MapComplete",
"fr": "Changements faits avec MapComplete",
"nb_NO": "Endringer laget med MapComplete",
"nl": "Wijzigingen gemaakt met MapComplete"
"en": "Changes made with MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete",
"cs": "Zobrazuje změny provedené pomocí MapComplete",
"de": "Zeigt Änderungen, die von MapComplete vorgenommen wurden",
"es": "Muestra los cambios realizados por MapComplete",
"nb_NO": "Vis endringer laget med MapComplete",
"nl": "Toont wijzigingen gemaakt met MapComplete"
"en": "Shows changes made by MapComplete"
},
"description": {
"en": "This map shows all the changes made with MapComplete",
"ca": "Aquest mapa mostra tots els canvis fets amb MapComplete",
"cs": "Tato mapa zobrazuje všechny změny provedené pomocí MapComplete",
"de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
"es": "Este mapa muestra todos los cambios realizados con MapComplete",
"fr": "Cette carte montre tous les changements faits avec MapComplete",
"nl": "Deze kaart toont alle wijzigingen gemaakt met MapComplete"
"en": "This maps shows all the changes made with MapComplete"
},
"icon": "./assets/svg/logo.svg",
"hideFromOverview": true,
@ -37,12 +20,7 @@
{
"id": "mapcomplete-changes",
"name": {
"en": "Changeset centers",
"ca": "Centres del conjunt de canvis",
"de": "Zentrum der Änderungssätze",
"es": "Centros de cambios",
"fr": "Centres de modifications de paramètres",
"nl": "Middelpunt van de wijzigingenset"
"en": "Changeset centers"
},
"minzoom": 0,
"source": {
@ -53,78 +31,41 @@
},
"title": {
"render": {
"en": "Changeset for {theme}",
"de": "Änderungssatz für {theme}",
"es": "Conjunto de cambios para {theme}",
"fr": "Groupe de modifications pour {theme}",
"nb_NO": "Endringssett for {theme}",
"nl": "Changeset voor {theme}"
"en": "Changeset for {theme}"
}
},
"description": {
"en": "Shows all MapComplete changes",
"cs": "Zobrazuje všechny změny MapComplete",
"de": "Zeigt alle MapComplete-Änderungen",
"es": "Muestra todos los cambios de MapComplete",
"fr": "Montre tous les changements de MapComplete",
"nb_NO": "Viser alle MapComplete-endringer",
"nl": "Toon alle MapComplete wijzigingen"
"en": "Shows all MapComplete changes"
},
"tagRenderings": [
{
"id": "show_changeset_id",
"render": {
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"es": "Conjunto de cambios <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"fr": "Groupe de modifications <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"nb_NO": "Endringssett <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"nl": "Wijzigingenset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
}
},
{
"id": "contributor",
"question": {
"en": "What contributor did make this change?",
"cs": "Jaký přispěvatel provedl tuto změnu?",
"de": "Welcher Mitwirkende hat diese Änderung vorgenommen?",
"es": "¿Qué colaborador realizó este cambio?",
"fr": "Quel contributeur a fait ce changement ?",
"nl": "Welke bijdrager maakte deze wijziging?"
"en": "What contributor did make this change?"
},
"freeform": {
"key": "user"
},
"render": {
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"cs": "Změna byla provedena uživatelem <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"de": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"es": "Cambio realizado por <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"fr": "Modification faite par <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"nb_NO": "Endring gjort av <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"nl": "Wijziging gemaakt door <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
}
},
{
"id": "theme-id",
"question": {
"en": "What theme was used to make this change?",
"de": "Welches Thema wurde für diese Änderung verwendet?",
"es": "¿Qué tema se utilizó para realizar este cambio?",
"fr": "Quel thème a été utilisé pour faire cette modification ?",
"nb_NO": "Hvilket tema ble brukt for å utføre denne denne endringen?",
"nl": "Welk thema is gebruikt voor deze wijziging?"
"en": "What theme was used to make this change?"
},
"freeform": {
"key": "theme"
},
"render": {
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"es": "Cambio con tema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"fr": "Modifié avec le thème <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"nb_NO": "Endre med temaet <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"nl": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
}
},
{
@ -133,39 +74,19 @@
"key": "locale"
},
"question": {
"en": "What locale (language) was this change made in?",
"cs": "V jakém prostředí (jazyce) byla tato změna provedena?",
"de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?",
"es": "¿En qué configuración regional (idioma) se realizó este cambio?",
"fr": "En quelle langue est-ce que ce changement a été fait ?",
"nl": "In welke taal (en cultuur) werd deze wijziging gemaakt?"
"en": "What locale (language) was this change made in?"
},
"render": {
"en": "User locale is {locale}",
"cs": "Uživatelské prostředí je {locale}",
"de": "Benutzergebietsschema ist {locale}",
"es": "La configuración regional del usuario es {locale}",
"fr": "La langue de l'utilisateur est {locale}",
"nl": "De locale van de bijdrager is {locale}"
"en": "User locale is {locale}"
}
},
{
"id": "host",
"render": {
"en": "Change with <a href='{host}'>{host}</a>",
"ca": "Canvi amb <a href='{host}'>{host}</a>",
"cs": "Změnit s <a href='{host}'>{host}</a>",
"de": "Geändert über <a href='{host}'>{host}</a>",
"es": "Cambio con <a href='{host}'>{host}</a>",
"fr": "Changement avec <a href='{host}'>{host}</a>",
"nl": "Wijziging met <a href='{host}'>{host}</a>"
"en": "Change with with <a href='{host}'>{host}</a>"
},
"question": {
"en": "What host (website) was this change made with?",
"de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?",
"es": "¿En qué host (sitio web) se realizó este cambio?",
"fr": "Depuis quel serveur (site web) ce changement a-t-il été fait ?",
"nl": "Op welk webadres werd deze wijziging gemaakt?"
"en": "What host (website) was this change made with?"
},
"freeform": {
"key": "host"
@ -510,13 +431,7 @@
}
],
"question": {
"en": "Themename contains {search}",
"ca": "Nom del tema conté {search}",
"de": "Themename enthält {search}",
"es": "El nombre contiene {search}",
"fr": "Nom de thème contenant {search}",
"nb_NO": "Temanavn inneholder {search}",
"nl": "Themanaam bevat {search}"
"en": "Themename contains {search}"
}
}
]
@ -532,13 +447,7 @@
}
],
"question": {
"en": "Made by contributor {search}",
"cs": "Vytvořil přispěvatel {search}",
"de": "Erstellt vom Mitwirkenden {search}",
"es": "Hecho por colaborador {search}",
"fr": "Fait par le contributeur {search}",
"nb_NO": "Laget av bidragsyter {search}",
"nl": "Gemaakt door {search}"
"en": "Made by contributor {search}"
}
}
]
@ -554,13 +463,7 @@
}
],
"question": {
"en": "<b>Not</b> made by contributor {search}",
"cs": "<b>Nevytvořil</b> přispěvatel {search}",
"de": "<b>Nicht</b> von Mitwirkendem {search}",
"es": "<b>No</b> hecho por colaborador {search}",
"fr": "<b>Non</b> réalisé par le contributeur{search}",
"nb_NO": "<b>Ikke</b> laget av bidragsyter {search}",
"nl": "<b>Niet</b> gemaakt door {search}"
"en": "<b>Not</b> made by contributor {search}"
}
}
]
@ -577,13 +480,7 @@
}
],
"question": {
"en": "Made before {search}",
"cs": "Vytvořeno před {search}",
"de": "Erstellt vor {search}",
"es": "Hecho antes de {search}",
"fr": "Fait avant {search}",
"nb_NO": "Laget før {search}",
"nl": "Gemaakt voor {search}"
"en": "Made before {search}"
}
}
]
@ -600,13 +497,7 @@
}
],
"question": {
"en": "Made after {search}",
"cs": "Vytvořeno po {search}",
"de": "Erstellt nach {search}",
"es": "Hecho después de {search}",
"fr": "Fait après {search}",
"nb_NO": "Laget etter {search}",
"nl": "Gemaakt na {search}"
"en": "Made after {search}"
}
}
]
@ -622,13 +513,7 @@
}
],
"question": {
"en": "User language (ISO-code) {search}",
"ca": "Idioma de l'usuari (ISO-code) {search}",
"de": "Benutzersprache (ISO-Code) {search}",
"es": "Use lenguaje (ISO-code) {search}",
"fr": "Langage utilisateur (code-ISO) {search}",
"nb_NO": "Brukerspråk (ISO-kode) {search}",
"nl": "Gebruikerstaal (ISO-code) {search}"
"en": "User language (iso-code) {search}"
}
}
]
@ -644,12 +529,7 @@
}
],
"question": {
"en": "Made with host {search}",
"de": "Erstellt mit host {search}",
"es": "Hecho con host {search}",
"fr": "Fait par le serveur {search}",
"nb_NO": "Laget med vert {search}",
"nl": "Gemaakt met host {search}"
"en": "Made with host {search}"
}
}
]
@ -660,12 +540,7 @@
{
"osmTags": "add-image>0",
"question": {
"en": "Changeset added at least one image",
"de": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt",
"es": "Conjunto de cambios ha añadido al menos una imagen",
"fr": "Le groupe de modifications a ajouté au moins une image",
"nb_NO": "Endringssett la til minst ett bilde",
"nl": "Changeset die een of meerdere afbeeldingen toevoegt"
"en": "Changeset added at least one image"
}
}
]
@ -680,13 +555,7 @@
{
"id": "link_to_more",
"render": {
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
"cs": "Další statistiky najdete na <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>.</a>",
"de": "Weitere Statistiken <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>",
"es": "Más estadísticas en <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>aquí</a>",
"fr": "Dautres statistiques sont disponibles <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>ici</a>",
"nb_NO": "Mer statistikk å finne <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>her</a>",
"nl": "Meer statistieken zijn <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a> te vinden"
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
}
},
{

View file

@ -695,4 +695,4 @@
"enableShareScreen": false,
"enableMoreQuests": false,
"credits": "Pieter Vander Vennet, Rob Nickerson, Russ Garrett"
}
}

View file

@ -103,4 +103,4 @@
],
"hideFromOverview": true,
"credits": "Robin van der Linde"
}
}

View file

@ -1,12 +1,12 @@
{
"contributors": [
{
"commits": 249,
"contributor": "Pieter Vander Vennet"
"commits": 250,
"contributor": "kjon"
},
{
"commits": 248,
"contributor": "kjon"
"commits": 249,
"contributor": "Pieter Vander Vennet"
},
{
"commits": 94,
@ -17,7 +17,7 @@
"contributor": "paunofu"
},
{
"commits": 66,
"commits": 67,
"contributor": "Robin van der Linde"
},
{

View file

@ -7229,6 +7229,34 @@
},
"sport_pitch": {
"description": "Ein Sportplatz",
"filter": {
"0": {
"options": {
"0": {
"question": "Öffentlich zugänglich"
}
}
},
"1": {
"options": {
"0": {
"question": "Alle Sportarten"
},
"1": {
"question": "Basketballplätze"
},
"2": {
"question": "Fußballplätze"
},
"3": {
"question": "Tischtennisplatten"
},
"4": {
"question": "Tennisplätze"
}
}
}
},
"name": "Sportplätze",
"presets": {
"0": {
@ -8432,6 +8460,17 @@
"usersettings": {
"description": "Eine spezielle Ebene, die nicht für die Darstellung auf einer Karte gedacht ist, sondern für die Festlegung von Benutzereinstellungen verwendet wird",
"tagRenderings": {
"all-questions-at-once": {
"mappings": {
"0": {
"then": "Alle Fragen in der Infobox zusammen anzeigen"
},
"1": {
"then": "Fragen der Reihe nach anzeigen"
}
},
"question": "Sollen Fragen für unbekannte Datenfelder einzeln oder zusammen angezeigt werden?"
},
"contributor-thanks": {
"mappings": {
"0": {

View file

@ -7249,10 +7249,10 @@
"question": "Soccer fields"
},
"3": {
"question": "Ping-pong table"
"question": "Ping-pong tables"
},
"4": {
"question": "Tennis field"
"question": "Tennis fields"
}
}
}

View file

@ -139,6 +139,7 @@
"josmOpened": "JOSM is geopend",
"mapContributionsBy": "De huidige data is bijgedragen door {contributors}",
"mapContributionsByAndHidden": "De zichtbare data heeft bijdragen van {contributors} en {hiddenCount} andere bijdragers",
"mapDataByOsm": "Kaartgegevens: OpenStreetMap",
"mapillaryHelp": "<b>Mapillary</b> is een online dienst waar straatbeelden onder een vrije licentie gedeeld worden. Deze beelden mogen gebruikt worden om OpenStreetMap te verbeteren.",
"openIssueTracker": "Geef een fout in de software door",
"openMapillary": "Open Mapillary op deze locatie",