diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 6d4fa2317..d8c78b1ec 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -174,16 +174,45 @@ "type": "pfloat" } }, + { + "id": "elevator-shape", + "question": { + "en": "What shape does this elevator have?" + }, + "mappings": [ + { + "if": "shape=rectangular", + "alsoShowIf": "shape=", + "then": { + "en": "This elevator has a rectangular shape" + }, + "icon": "./assets/svg/square.svg" + }, + { + "if": "shape=circular", + "then": { + "en": "This elevator has a circular shape" + }, + "icon": "./assets/svg/circle.svg" + } + ] + }, { "id": "elevator-width", + "condition": { + "or": [ + "shape=", + "shape=rectangular" + ] + }, "render": { - "en": "This elevator has a width of {canonical(elevator:width)}", - "fr": "Cet ascenseur a une largeur de {canonical(elevator:width)}", - "de": "Die Aufzugskabine hat eine Breite von {canonical(elevator:width)}", - "nl": "Deze lift heeft een breedte van {canonical(elevator:width)}", - "pl": "Szerokość tej windy to {canonical(elevator:width)}", - "ca": "L'ascensor té una amplada de {canonical(elevator:width)}", - "cs": "Tento výtah má šířku {canonical(elevator:width)}" + "en": "This elevator has a width of {canonical(width)}", + "fr": "Cet ascenseur a une largeur de {canonical(width)}", + "de": "Die Aufzugskabine hat eine Breite von {canonical(width)}", + "nl": "Deze lift heeft een breedte van {canonical(width)}", + "pl": "Szerokość tej windy to {canonical(width)}", + "ca": "L'ascensor té una amplada de {canonical(width)}", + "cs": "Tento výtah má šířku {canonical(width)}" }, "question": { "en": "What is the width of this elevator?", @@ -195,19 +224,25 @@ "cs": "Jaká je šířka tohoto výtahu?" }, "freeform": { - "key": "elevator:width", + "key": "width", "type": "pfloat" } }, { "id": "elevator-depth", + "condition": { + "or": [ + "shape=", + "shape=rectangular" + ] + }, "render": { - "en": "This elevator has a depth of {canonical(elevator:depth)}", - "fr": "Cet ascenseur a une profondeur de {canonical(elevator:depth)}", - "de": "Dieser Aufzug hat eine Kabinentiefe von {canonical(elevator:depth)}", - "nl": "Deze lift heeft een diepte van {canonical(elevator:depth)}", - "ca": "L'ascensor té un profunditat de {canonical(elevator:depth)}", - "cs": "Tento výtah má hloubku {canonical(elevator:depth)}" + "en": "This elevator has a depth of {canonical(length)}", + "fr": "Cet ascenseur a une profondeur de {canonical(length)}", + "de": "Dieser Aufzug hat eine Kabinentiefe von {canonical(length)}", + "nl": "Deze lift heeft een diepte van {canonical(length)}", + "ca": "L'ascensor té un profunditat de {canonical(length)}", + "cs": "Tento výtah má hloubku {canonical(length)}" }, "question": { "en": "What is the depth of this elevator?", @@ -218,7 +253,25 @@ "cs": "Jaká je hloubka tohoto výtahu?" }, "freeform": { - "key": "elevator:depth", + "key": "length", + "type": "pfloat" + } + }, + { + "id": "elevator-diameger", + "condition": { + "or": [ + "shape=circular" + ] + }, + "render": { + "en": "This elevator has a diameger of {canonical(diameter)}" + }, + "question": { + "en": "What is the diameter of this elevator?" + }, + "freeform": { + "key": "diameter", "type": "pfloat" } }, @@ -356,14 +409,14 @@ "cm" ] }, - "elevator:width": { + "width": { "quantity": "distance", "canonical": "m", "denominations": [ "cm" ] }, - "elevator:depth": { + "length": { "quantity": "distance", "canonical": "m", "denominations": [ diff --git a/assets/themes/blind_osm/blind_osm.json b/assets/themes/blind_osm/blind_osm.json index a2e25824d..4a90a4afb 100644 --- a/assets/themes/blind_osm/blind_osm.json +++ b/assets/themes/blind_osm/blind_osm.json @@ -31,7 +31,7 @@ "startZoom": 20, "startLat": 52.99238, "startLon": 6.570614, - "defaultBackgroundId": "maptiler.backdrop", + "defaultBackgroundId": "protomaps.gray", "layers": [ { "builtin": "cycleways_and_roads", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index b5c21b217..9e119e077 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Änderungen mit MapComplete", - "es": "Cambios hechos con MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "de": "Änderungen von MapComplete anzeigen", - "es": "Muestra los cambios hechos por MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "es": "Este mapa muestra todos los cambios hechos con MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -24,9 +18,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze", - "es": "Centro del conjunto de cambios" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -36,55 +28,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}", - "es": "Conjunto de cambios para {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "de": "Alle MapComplete-Änderungen anzeigen", - "es": "Muestra todos los cambios de MapComplete" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}", - "es": "Conjunto de cambios {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?", - "de": "Wer hat diese Änderung vorgenommen?", - "es": "¿Quién realizó este cambio?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "de": "Änderung von {user}", - "es": "Cambio hecho por {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Thema wurde für die Änderung verwendet?", - "es": "¿Qué tema se utilizó para realizar este cambio?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}", - "es": "Cambio con el tema {theme}" + "en": "Change with theme {theme}" } }, { @@ -93,27 +71,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "de": "In welcher Benutzersprache wurde die Änderung vorgenommen?", - "es": "¿En qué configuración regional (idioma) se realizó este cambio?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "de": "Benutzersprache {locale}", - "es": "La configuración regional del usuario es {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}", - "de": "Änderung über {host}", - "es": "Cambio con {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?", - "es": "¿Con qué host (página web) se realizó este cambio?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -134,14 +104,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "de": "Mit welcher MapComplete Version wurde die Änderung vorgenommen?", - "es": "¿Qué versión de MapComplete se usó para realizar este cambio?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "de": "Erstellt mit {editor}", - "es": "Hecho con {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -523,9 +489,7 @@ } ], "question": { - "en": "Themename contains {search}", - "de": "Themename enthält {search}", - "es": "El nombre del tema contiene {search}" + "en": "Themename contains {search}" } } ] @@ -541,9 +505,7 @@ } ], "question": { - "en": "Themename does not contain {search}", - "de": "Der Name enthält nicht {search}", - "es": "El nombre del tema no contiene {search}" + "en": "Themename does not contain {search}" } } ] @@ -559,9 +521,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt vom Mitwirkenden {search}", - "es": "Hecho por el colaborador {search}" + "en": "Made by contributor {search}" } } ] @@ -577,9 +537,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von Mitwirkendem {search}", - "es": "No hecho por el colaborador {search}" + "en": "Not made by contributor {search}" } } ] @@ -596,9 +554,7 @@ } ], "question": { - "en": "Made before {search}", - "de": "Erstellt vor {search}", - "es": "Hecho antes de {search}" + "en": "Made before {search}" } } ] @@ -615,9 +571,7 @@ } ], "question": { - "en": "Made after {search}", - "de": "Erstellt nach {search}", - "es": "Hecho después de {search}" + "en": "Made after {search}" } } ] @@ -633,9 +587,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "es": "Idioma del usuario (código ISO) {search}" + "en": "User language (iso-code) {search}" } } ] @@ -651,9 +603,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit host {search}", - "es": "Hecho con el host {search}" + "en": "Made with host {search}" } } ] @@ -664,9 +614,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt", - "es": "El conjunto de cambios ha añadido al menos una imagen" + "en": "Changeset added at least one image" } } ] @@ -677,9 +625,7 @@ { "osmTags": "theme!=grb", "question": { - "en": "Exclude GRB theme", - "de": "GRB-Thema ausschließen", - "es": "Excluir el tema del GRB" + "en": "Exclude GRB theme" } } ] @@ -690,9 +636,7 @@ { "osmTags": "theme!=etymology", "question": { - "en": "Exclude etymology theme", - "de": "Etymologie-Thema ausschließen", - "es": "Excluir el tema de la etimología" + "en": "Exclude etymology theme" } } ] @@ -707,9 +651,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Weitere Statistiken gibt es hier", - "es": "Puede encontrar más estadísticas aquí" + "en": "More statistics can be found here" } }, { diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 93561172f..5032805d7 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -3219,11 +3219,11 @@ }, "elevator-depth": { "question": "Quina és la profunditat de l'ascensor?", - "render": "L'ascensor té un profunditat de {canonical(elevator:depth)}" + "render": "L'ascensor té un profunditat de {canonical(length)}" }, "elevator-width": { "question": "Quina és l'amplada d'aquest ascensor?", - "render": "L'ascensor té una amplada de {canonical(elevator:width)}" + "render": "L'ascensor té una amplada de {canonical(width)}" }, "operational_status": { "mappings": { diff --git a/langs/layers/cs.json b/langs/layers/cs.json index f6b4e1f3a..f893ed726 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -3242,11 +3242,11 @@ }, "elevator-depth": { "question": "Jaká je hloubka tohoto výtahu?", - "render": "Tento výtah má hloubku {canonical(elevator:depth)}" + "render": "Tento výtah má hloubku {canonical(length)}" }, "elevator-width": { "question": "Jaká je šířka tohoto výtahu?", - "render": "Tento výtah má šířku {canonical(elevator:width)}" + "render": "Tento výtah má šířku {canonical(width)}" }, "operational_status": { "mappings": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 6ed4641af..d35f2bf48 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -4020,11 +4020,11 @@ }, "elevator-depth": { "question": "Wie tief ist die Kabine dieses Aufzugs?", - "render": "Dieser Aufzug hat eine Kabinentiefe von {canonical(elevator:depth)}" + "render": "Dieser Aufzug hat eine Kabinentiefe von {canonical(length)}" }, "elevator-width": { "question": "Wie breit ist die Kabine dieses Aufzugs?", - "render": "Die Aufzugskabine hat eine Breite von {canonical(elevator:width)}" + "render": "Die Aufzugskabine hat eine Breite von {canonical(width)}" }, "operational_status": { "mappings": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 9489dc7b7..1b5bb704c 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4020,11 +4020,26 @@ }, "elevator-depth": { "question": "What is the depth of this elevator?", - "render": "This elevator has a depth of {canonical(elevator:depth)}" + "render": "This elevator has a depth of {canonical(length)}" + }, + "elevator-diameger": { + "question": "What is the diameter of this elevator?", + "render": "This elevator has a diameger of {canonical(diameter)}" + }, + "elevator-shape": { + "mappings": { + "0": { + "then": "This elevator has a rectangular shape" + }, + "1": { + "then": "This elevator has a circular shape" + } + }, + "question": "What shape does this elevator have?" }, "elevator-width": { "question": "What is the width of this elevator?", - "render": "This elevator has a width of {canonical(elevator:width)}" + "render": "This elevator has a width of {canonical(width)}" }, "operational_status": { "mappings": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 7970b50e0..f56c7b8d9 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2948,11 +2948,11 @@ }, "elevator-depth": { "question": "Quelle est la profondeur de cet ascenseur ?", - "render": "Cet ascenseur a une profondeur de {canonical(elevator:depth)}" + "render": "Cet ascenseur a une profondeur de {canonical(length)}" }, "elevator-width": { "question": "Quelle est la largeur de cet ascenseur ?", - "render": "Cet ascenseur a une largeur de {canonical(elevator:width)}" + "render": "Cet ascenseur a une largeur de {canonical(width)}" }, "operational_status": { "mappings": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index f302c8580..59c840682 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3673,11 +3673,11 @@ }, "elevator-depth": { "question": "Wat is de diepte van deze lift?", - "render": "Deze lift heeft een diepte van {canonical(elevator:depth)}" + "render": "Deze lift heeft een diepte van {canonical(length)}" }, "elevator-width": { "question": "Wat is de breedte van deze lift?", - "render": "Deze lift heeft een breedte van {canonical(elevator:width)}" + "render": "Deze lift heeft een breedte van {canonical(width)}" }, "operational_status": { "mappings": { diff --git a/langs/layers/pl.json b/langs/layers/pl.json index 685d02975..c3864591c 100644 --- a/langs/layers/pl.json +++ b/langs/layers/pl.json @@ -1214,7 +1214,7 @@ }, "elevator-width": { "question": "Jaka jest szerokość tej windy?", - "render": "Szerokość tej windy to {canonical(elevator:width)}" + "render": "Szerokość tej windy to {canonical(width)}" }, "operational_status": { "mappings": { diff --git a/langs/themes/de.json b/langs/themes/de.json index 1ef97a808..58c0f816d 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -975,133 +975,6 @@ }, "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": "Themename enthält {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Der Name enthält nicht {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Erstellt vom Mitwirkenden {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "Nicht erstellt von Mitwirkendem {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Erstellt vor {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "Erstellt nach {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Benutzersprache (ISO-Code) {search}" - } - } - }, - "7": { - "options": { - "0": { - "question": "Erstellt mit host {search}" - } - } - }, - "8": { - "options": { - "0": { - "question": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt" - } - } - }, - "9": { - "options": { - "0": { - "question": "GRB-Thema ausschließen" - } - } - }, - "10": { - "options": { - "0": { - "question": "Etymologie-Thema ausschließen" - } - } - } - }, - "name": "Zentrum der Änderungssätze", - "tagRenderings": { - "contributor": { - "question": "Wer hat diese Änderung vorgenommen?", - "render": "Änderung von {user}" - }, - "host": { - "question": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?", - "render": "Änderung über {host}" - }, - "locale": { - "question": "In welcher Benutzersprache wurde die Änderung vorgenommen?", - "render": "Benutzersprache {locale}" - }, - "show_changeset_id": { - "render": "Änderungssatz {id}" - }, - "theme-id": { - "question": "Welches Thema wurde für die Änderung verwendet?", - "render": "Geändert mit Thema {theme}" - }, - "version": { - "question": "Mit welcher MapComplete Version wurde die Änderung vorgenommen?", - "render": "Erstellt mit {editor}" - } - }, - "title": { - "render": "Änderungssatz für {theme}" - } - }, - "1": { - "override": { - "tagRenderings+": { - "0": { - "render": "Weitere Statistiken gibt es hier" - } - } - } - } - }, - "shortDescription": "Änderungen von MapComplete anzeigen", - "title": "Änderungen mit MapComplete" - }, "maproulette": { "description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.", "title": "MapRoulette-Aufgaben" diff --git a/langs/themes/es.json b/langs/themes/es.json index 9717f492b..9110808f3 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -925,133 +925,6 @@ }, "title": "Bordillos y cruces" }, - "mapcomplete-changes": { - "description": "Este mapa muestra todos los cambios hechos con MapComplete", - "layers": { - "0": { - "description": "Muestra todos los cambios de MapComplete", - "filter": { - "0": { - "options": { - "0": { - "question": "El nombre del tema contiene {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "El nombre del tema no contiene {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Hecho por el colaborador {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "No hecho por el colaborador {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Hecho antes de {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "Hecho después de {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Idioma del usuario (código ISO) {search}" - } - } - }, - "7": { - "options": { - "0": { - "question": "Hecho con el host {search}" - } - } - }, - "8": { - "options": { - "0": { - "question": "El conjunto de cambios ha añadido al menos una imagen" - } - } - }, - "9": { - "options": { - "0": { - "question": "Excluir el tema del GRB" - } - } - }, - "10": { - "options": { - "0": { - "question": "Excluir el tema de la etimología" - } - } - } - }, - "name": "Centro del conjunto de cambios", - "tagRenderings": { - "contributor": { - "question": "¿Quién realizó este cambio?", - "render": "Cambio hecho por {user}" - }, - "host": { - "question": "¿Con qué host (página web) se realizó este cambio?", - "render": "Cambio con {host}" - }, - "locale": { - "question": "¿En qué configuración regional (idioma) se realizó este cambio?", - "render": "La configuración regional del usuario es {locale}" - }, - "show_changeset_id": { - "render": "Conjunto de cambios {id}" - }, - "theme-id": { - "question": "¿Qué tema se utilizó para realizar este cambio?", - "render": "Cambio con el tema {theme}" - }, - "version": { - "question": "¿Qué versión de MapComplete se usó para realizar este cambio?", - "render": "Hecho con {editor}" - } - }, - "title": { - "render": "Conjunto de cambios para {theme}" - } - }, - "1": { - "override": { - "tagRenderings+": { - "0": { - "render": "Puede encontrar más estadísticas aquí" - } - } - } - } - }, - "shortDescription": "Muestra los cambios hechos por MapComplete", - "title": "Cambios hechos con MapComplete" - }, "maproulette": { "description": "Tema que muestra las tareas de MapRoulette, permitiendo buscarlas, filtrarlas y arreglarlas.", "title": "Tareas de MapRoulette" diff --git a/src/assets/global-raster-layers.json b/src/assets/global-raster-layers.json index 66f391499..8bf13eb97 100644 --- a/src/assets/global-raster-layers.json +++ b/src/assets/global-raster-layers.json @@ -23,17 +23,6 @@ "url": "https://github.com/ZeLonewolf/openstreetmap-americana/" } }, - { - "name": "MapTiler Backdrop", - "url": "https://api.maptiler.com/maps/backdrop/style.json?key=GvoVAJgu46I5rZapJuAy", - "category": "osmbasedmap", - "id": "maptiler.backdrop", - "type": "vector", - "attribution": { - "text": "Maptiler", - "url": "https://www.maptiler.com/copyright/" - } - }, { "name": "MapTiler Carto", "url": "https://api.maptiler.com/maps/openstreetmap/style.json?key=GvoVAJgu46I5rZapJuAy",