From a1e4a2e25fd664c8a6680e674534a821c21d7110 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 5 May 2022 11:54:30 +0200 Subject: [PATCH 01/13] Basic theme --- assets/layers/kerbs/KerbIcon.svg | 87 ++++++++++++++++++ assets/layers/kerbs/kerbs.json | 92 +++++++++++++++++++ assets/layers/kerbs/license_info.json | 12 +++ .../kerbs_and_crossings.json | 21 +++++ 4 files changed, 212 insertions(+) create mode 100644 assets/layers/kerbs/KerbIcon.svg create mode 100644 assets/layers/kerbs/kerbs.json create mode 100644 assets/layers/kerbs/license_info.json create mode 100644 assets/themes/kerbs_and_crossings/kerbs_and_crossings.json diff --git a/assets/layers/kerbs/KerbIcon.svg b/assets/layers/kerbs/KerbIcon.svg new file mode 100644 index 0000000000..001b5eac12 --- /dev/null +++ b/assets/layers/kerbs/KerbIcon.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json new file mode 100644 index 0000000000..2c73adeb79 --- /dev/null +++ b/assets/layers/kerbs/kerbs.json @@ -0,0 +1,92 @@ +{ + "id": "kerbs", + "name": { + "en": "Kerbs", + "nl": "Stoepranden" + }, + "description": { + "en": "A layer showing kerbs.", + "nl": "Een laag met stoepranden." + }, + "source": { + "osmTags": "barrier=kerb" + }, + "minzoom": 13, + "title": { + "render": { + "en": "Kerb", + "nl": "Stoeprand" + } + }, + "mapRendering": [ + { + "location": [ + "point", + "centroid" + ], + "icon": "./assets/layers/kerbs/KerbIcon.svg", + "iconBadges": [ + { + "if": "kerb=raised", + "then": "square:#f44e42" + }, + { + "if": "kerb=lowered", + "then": "triangle:#11ff00" + }, + { + "if": "kerb=flush", + "then": "circle:#11ff00" + } + ] + } + ], + "tagRenderings": [ + { + "id": "kerb-type", + "question": { + "en": "What is the height of this kerb?", + "nl": "Hoe hoog is deze stoeprand?" + }, + "mappings": [ + { + "if": "kerb=raised", + "then": { + "en": "Raised (>3 cm)", + "nl": "Hoog (>3 cm)" + } + }, + { + "if": "kerb=lowered", + "then": { + "en": "Lowered (~3 cm)", + "nl": "Verlaagd (~3 cm)" + } + }, + { + "if": "kerb=flush", + "then": { + "en": "Flush (0cm)", + "nl": "Vlak (0cm)" + } + }, + { + "if": "kerb=no", + "then": { + "en": "None", + "nl": "Geen" + }, + "hideInAnswer": true + }, + { + "if": "kerb=yes", + "then": { + "en": "Yes", + "nl": "Ja" + }, + "hideInAnswer": true + } + ] + } + ] +} \ No newline at end of file diff --git a/assets/layers/kerbs/license_info.json b/assets/layers/kerbs/license_info.json new file mode 100644 index 0000000000..8fc0aa4fe3 --- /dev/null +++ b/assets/layers/kerbs/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "KerbIcon.svg", + "license": "CC0", + "authors": [ + "Treeem" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:KerbIcon.svg" + ] + } +] \ No newline at end of file diff --git a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json new file mode 100644 index 0000000000..721a000ac4 --- /dev/null +++ b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json @@ -0,0 +1,21 @@ +{ + "id": "kerbs_and_crossings", + "maintainer": "Robin van der Linde", + "version": "20211215", + "title": { + "en": "Crossings and Kerbs", + "nl": "Oversteekplaatsen en stoepranden" + }, + "description": { + "en": "A map showing kerbs and crossings.", + "nl": "Een kaart met stoepranden en oversteekplaatsen." + }, + "icon": "./assets/layers/kerbs/KerbIcon.svg", + "startZoom": 19, + "startLat": 53.23776, + "startLon": 6.53812, + "layers": [ + "crossings", + "kerbs" + ] +} \ No newline at end of file From b5a21b7f5aa3923d0f1ee3343feb994109a1ec41 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 5 May 2022 11:55:03 +0200 Subject: [PATCH 02/13] Reset translations --- langs/layers/de.json | 8 +++- langs/layers/en.json | 43 +++++++++++++++++++- langs/layers/fr.json | 6 +++ langs/layers/it.json | 6 +++ langs/layers/nl.json | 41 +++++++++++++++++++ langs/shared-questions/ca.json | 2 +- langs/shared-questions/da.json | 2 +- langs/shared-questions/de.json | 2 +- langs/shared-questions/en.json | 2 +- langs/shared-questions/es.json | 2 +- langs/shared-questions/fil.json | 2 +- langs/shared-questions/fr.json | 2 +- langs/shared-questions/hu.json | 2 +- langs/shared-questions/it.json | 2 +- langs/shared-questions/ja.json | 2 +- langs/shared-questions/nb_NO.json | 2 +- langs/shared-questions/nl.json | 2 +- langs/shared-questions/pl.json | 2 +- langs/shared-questions/pt.json | 2 +- langs/shared-questions/ru.json | 2 +- langs/shared-questions/sv.json | 2 +- langs/shared-questions/zh_Hans.json | 2 +- langs/shared-questions/zh_Hant.json | 2 +- langs/themes/de.json | 62 ----------------------------- langs/themes/en.json | 4 ++ langs/themes/es.json | 47 ---------------------- langs/themes/nl.json | 4 ++ 27 files changed, 128 insertions(+), 129 deletions(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index fbc762d00c..9cc4aa9fb7 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -3183,7 +3183,7 @@ }, "10": { "options": { - "0": { + "1": { "question": "Importnotizen ausblenden" } } @@ -4246,6 +4246,12 @@ }, "2": { "then": "Diese Kamera ist an der Decke montiert" + }, + "3": { + "then": "Diese Kamera befindet sich an einer Straßenlaterne" + }, + "4": { + "then": "Diese Kamera ist an einem Baum angebracht" } }, "question": "Wie ist diese Kamera montiert?", diff --git a/langs/layers/en.json b/langs/layers/en.json index 6a17e854b7..3fa7dd8b90 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4000,6 +4000,35 @@ "render": "Information board" } }, + "kerbs": { + "description": "A layer showing kerbs.", + "name": "Kerbs", + "tagRenderings": { + "kerb-type": { + "mappings": { + "0": { + "then": "Raised (>3 cm)" + }, + "1": { + "then": "Lowered (~3 cm)" + }, + "2": { + "then": "Flush (0cm)" + }, + "3": { + "then": "None" + }, + "4": { + "then": "Yes" + } + }, + "question": "What is the height of this kerb?" + } + }, + "title": { + "render": "Kerb" + } + }, "map": { "description": "A map, meant for tourists which is permanently installed in the public space", "name": "Maps", @@ -4239,7 +4268,13 @@ "10": { "options": { "0": { + "question": "All Notes" + }, + "1": { "question": "Hide import notes" + }, + "2": { + "question": "Show only import Notes" } } } @@ -5312,10 +5347,16 @@ "then": "This camera is placed against a wall" }, "1": { - "then": "This camera is placed one a pole" + "then": "This camera is placed on a pole" }, "2": { "then": "This camera is placed on the ceiling" + }, + "3": { + "then": "This camera is placed on a street light" + }, + "4": { + "then": "This camera is placed on a tree" } }, "question": "How is this camera placed?", diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 90d813408e..59838c3b8a 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2361,6 +2361,12 @@ }, "2": { "then": "Cette caméra est placée au plafond" + }, + "3": { + "then": "Cette caméra est placée sur un lampadaire" + }, + "4": { + "then": "Cette caméra est placée sur un arbre" } }, "question": "Comment cette caméra est-elle placée ?", diff --git a/langs/layers/it.json b/langs/layers/it.json index 09f17d5937..80e977ed39 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -1986,6 +1986,12 @@ }, "2": { "then": "Questa telecamera è posizionata sul soffitto" + }, + "3": { + "then": "Questa telecamera è posizionata su un lampione" + }, + "4": { + "then": "Questa telecamera è posizionata su un albero" } }, "question": "Com'è posizionata questa telecamera?", diff --git a/langs/layers/nl.json b/langs/layers/nl.json index c3d2302774..833011fac6 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3848,6 +3848,35 @@ "render": "Informatiebord" } }, + "kerbs": { + "description": "Een laag met stoepranden.", + "name": "Stoepranden", + "tagRenderings": { + "kerb-type": { + "mappings": { + "0": { + "then": "Hoog (>3 cm)" + }, + "1": { + "then": "Verlaagd (~3 cm)" + }, + "2": { + "then": "Vlak (0cm)" + }, + "3": { + "then": "Geen" + }, + "4": { + "then": "Ja" + } + }, + "question": "Hoe hoog is deze stoeprand?" + } + }, + "title": { + "render": "Stoeprand" + } + }, "map": { "description": "Een permantent geinstalleerde kaart", "name": "Kaarten", @@ -4092,7 +4121,13 @@ "10": { "options": { "0": { + "question": "Alle Notes" + }, + "1": { "question": "Verberg import Notes" + }, + "2": { + "question": "Toon enkel import Notes" } } } @@ -5211,6 +5246,12 @@ }, "2": { "then": "Deze camera hangt aan het plafond" + }, + "3": { + "then": "Deze camera staat op een straatlantaarn" + }, + "4": { + "then": "Deze camera staat op een boom" } }, "question": "Hoe is deze camera geplaatst?", diff --git a/langs/shared-questions/ca.json b/langs/shared-questions/ca.json index 02641aabb2..b69f0decf5 100644 --- a/langs/shared-questions/ca.json +++ b/langs/shared-questions/ca.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "No hi ha cap enllaça a Viquipèdia encara" } }, diff --git a/langs/shared-questions/da.json b/langs/shared-questions/da.json index 17cbba8c5b..390bc0d818 100644 --- a/langs/shared-questions/da.json +++ b/langs/shared-questions/da.json @@ -94,7 +94,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Der er endnu ikke linket til nogen Wikipedia-side" } } diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index 12d4cab88a..b752664b92 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Es wurde noch keine Wikipedia-Seite verlinkt" } }, diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index 82241f876b..42858b62ae 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "No Wikipedia page has been linked yet" } }, diff --git a/langs/shared-questions/es.json b/langs/shared-questions/es.json index f6b0d6ad56..438ee688a7 100644 --- a/langs/shared-questions/es.json +++ b/langs/shared-questions/es.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Todavía no se ha enlazado una página de wikipedia" } }, diff --git a/langs/shared-questions/fil.json b/langs/shared-questions/fil.json index b309410c52..9b505b25d8 100644 --- a/langs/shared-questions/fil.json +++ b/langs/shared-questions/fil.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Wala pang kawing ng Wikipedia page" } }, diff --git a/langs/shared-questions/fr.json b/langs/shared-questions/fr.json index 9d4ffe24a5..b14771839f 100644 --- a/langs/shared-questions/fr.json +++ b/langs/shared-questions/fr.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Pas encore de lien vers une page Wikipedia" } }, diff --git a/langs/shared-questions/hu.json b/langs/shared-questions/hu.json index df4dd41e5a..5e2572c139 100644 --- a/langs/shared-questions/hu.json +++ b/langs/shared-questions/hu.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Még nincs Wikipédia-oldal belinkelve" } }, diff --git a/langs/shared-questions/it.json b/langs/shared-questions/it.json index 4846721baf..af3118fb33 100644 --- a/langs/shared-questions/it.json +++ b/langs/shared-questions/it.json @@ -81,7 +81,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Nessuna pagina Wikipedia è ancora stata collegata" } }, diff --git a/langs/shared-questions/ja.json b/langs/shared-questions/ja.json index 9a874275a5..b8f22df6a8 100644 --- a/langs/shared-questions/ja.json +++ b/langs/shared-questions/ja.json @@ -98,7 +98,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "ウィキペディアのページはまだリンクされていません" } }, diff --git a/langs/shared-questions/nb_NO.json b/langs/shared-questions/nb_NO.json index e768c96d88..ae143aef73 100644 --- a/langs/shared-questions/nb_NO.json +++ b/langs/shared-questions/nb_NO.json @@ -88,7 +88,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Ingen Wikipedia-side lenket enda" } }, diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index d876e305bb..4370fb3a21 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Er werd nog geen Wikipedia-pagina gekoppeld" } }, diff --git a/langs/shared-questions/pl.json b/langs/shared-questions/pl.json index 9e0b898f7b..da5e6d2fc7 100644 --- a/langs/shared-questions/pl.json +++ b/langs/shared-questions/pl.json @@ -98,7 +98,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Link do strony Wikipedii nie został jeszcze określony" } }, diff --git a/langs/shared-questions/pt.json b/langs/shared-questions/pt.json index f3ccf28f45..28d31dc05a 100644 --- a/langs/shared-questions/pt.json +++ b/langs/shared-questions/pt.json @@ -98,7 +98,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Ainda não foi vinculada nenhuma página da Wikipédia" } }, diff --git a/langs/shared-questions/ru.json b/langs/shared-questions/ru.json index 224cb218da..7dbe2be7c2 100644 --- a/langs/shared-questions/ru.json +++ b/langs/shared-questions/ru.json @@ -77,7 +77,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Никакой страницы на Википедии не было прикреплено" } } diff --git a/langs/shared-questions/sv.json b/langs/shared-questions/sv.json index 30c4c2b82d..54dd3fbe58 100644 --- a/langs/shared-questions/sv.json +++ b/langs/shared-questions/sv.json @@ -98,7 +98,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "Ingen Wikipedia-sida har länkats än" } }, diff --git a/langs/shared-questions/zh_Hans.json b/langs/shared-questions/zh_Hans.json index a6422ac1b4..083e7bc4be 100644 --- a/langs/shared-questions/zh_Hans.json +++ b/langs/shared-questions/zh_Hans.json @@ -55,7 +55,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "尚未有连接到的维基百科页面" } }, diff --git a/langs/shared-questions/zh_Hant.json b/langs/shared-questions/zh_Hant.json index e5ab9caf3a..7e6fa861c0 100644 --- a/langs/shared-questions/zh_Hant.json +++ b/langs/shared-questions/zh_Hant.json @@ -113,7 +113,7 @@ }, "wikipedia": { "mappings": { - "0": { + "1": { "then": "還沒有連結到維基百科頁面" } }, diff --git a/langs/themes/de.json b/langs/themes/de.json index 39ae6fe010..6b96fea87f 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -640,68 +640,6 @@ "shortDescription": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen.", "title": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen" }, - "mapcomplete-changes": { - "description": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", - "layers": { - "0": { - "description": "Zeigt alle MapComplete Änderungen", - "filter": { - "0": { - "options": { - "0": { - "question": "Themenname enthält {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Erstellt von {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Nicht erstellt von {search}" - } - } - } - }, - "name": "Schwerpunkte von Änderungssätzen", - "tagRenderings": { - "contributor": { - "render": "Änderung wurde von {_last_edit:contributor} gemacht" - }, - "render_id": { - "render": "Änderung {id}" - }, - "theme": { - "mappings": { - "0": { - "then": "Änderung mit inoffiziellem Thema {theme}" - } - }, - "render": "Änderung mit Thema {theme}" - } - }, - "title": { - "render": "Änderungen für {theme}" - } - }, - "1": { - "override": { - "tagRenderings": { - "link_to_more": { - "render": "Weitere Statistiken finden Sie hier" - } - } - } - } - }, - "shortDescription": "Zeigt Änderungen von MapComplete", - "title": "Änderungen mit MapComplete" - }, "maps": { "description": "Auf dieser Karte findest du alle Karten, die OpenStreetMap kennt - typischerweise eine große Karte auf einer Informationstafel, die das Gebiet, die Stadt oder die Region zeigt, z.B. eine touristische Karte auf der Rückseite einer Plakatwand, eine Karte eines Naturschutzgebietes, eine Karte der Radwegenetze in der Region, ...)

Wenn eine Karte fehlt, können Sie diese leicht auf OpenStreetMap kartieren.", "shortDescription": "Dieses Thema zeigt alle (touristischen) Karten, die OpenStreetMap kennt", diff --git a/langs/themes/en.json b/langs/themes/en.json index 225119a8ff..ba9b2c93d5 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -640,6 +640,10 @@ "shortDescription": "Map to show hydrants, extinguishers, fire stations, and ambulance stations.", "title": "Hydrants, Extinguishers, Fire stations, and Ambulance stations" }, + "kerbs_and_crossings": { + "description": "A map showing kerbs and crossings.", + "title": "Crossings and Kerbs" + }, "mapcomplete-changes": { "description": "This maps shows all the changes made with MapComplete", "layers": { diff --git a/langs/themes/es.json b/langs/themes/es.json index a5f1913799..f78451cfb7 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -317,53 +317,6 @@ "shortDescription": "Mapa para mostrar hidrantes, extintores, parques de bomberos y parques de ambulancias.", "title": "Hidrantes, Extintores, Parques de bomberos y Parques de ambulancias" }, - "mapcomplete-changes": { - "description": "Este mapa muestra todos los cambios hechos con MapComplete", - "layers": { - "0": { - "description": "Muestra todos los cambios de MapComplete", - "filter": { - "1": { - "options": { - "0": { - "question": "Hecho por contributor/a {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "No hecho por contributor/a {search}" - } - } - } - }, - "name": "Centros de conjuntos de cambios", - "tagRenderings": { - "contributor": { - "render": "Cambio hecho por {_last_edit:contributor}" - }, - "render_id": { - "render": "Conjunto de cambios {id}" - } - }, - "title": { - "render": "Conjunto de cambios para {theme}" - } - }, - "1": { - "override": { - "tagRenderings": { - "link_to_more": { - "render": "Se pueden encontrar más estadísticas aquí" - } - } - } - } - }, - "shortDescription": "Muestra los cambios hechos por MapComplete", - "title": "Cambios hechos con MapComplete" - }, "maps": { "description": "En este mapa puedes encontrar todos los mapas que OpenStreetMap conoce - típicamente un mapa grande con un tablero que muestra el área, la ciudad o la región, ej. un mapa turista detrás de una vaya publicitaria, un mapa de una reserva natura, un mapa de redes ciclistas en la región, ...)

Si falta un mapa, puedes mapear este mapa fácilmente en OpenStreetMap.", "shortDescription": "Este tema muestra todos los mapas (turísticos) que OpenStreetMap conoce", diff --git a/langs/themes/nl.json b/langs/themes/nl.json index f29c2d8a43..6acd6bf2e1 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -676,6 +676,10 @@ "hailhydrant": { "title": "Brandkranen, brandblussers, brandweerposten en ambulanceposten" }, + "kerbs_and_crossings": { + "description": "Een kaart met stoepranden en oversteekplaatsen.", + "title": "Oversteekplaatsen en stoepranden" + }, "maps": { "description": "Op deze kaart kan je alle kaarten zien die OpenStreetMap kent.

Ontbreekt er een kaart, dan kan je die kaart hier ook gemakelijk aan deze kaart toevoegen.", "shortDescription": "Een kaart met alle kaarten die OpenStreetMap kent", From 1f1786dc2476efbd3aaa506220e118ec518e5eb7 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 5 May 2022 13:07:24 +0200 Subject: [PATCH 03/13] Small fixes, square icon --- .../cycleways_and_roads.json | 18 +++-- assets/layers/kerbs/KerbIcon.svg | 67 ++++++++++--------- assets/layers/kerbs/kerbs.json | 28 +++++++- assets/svg/license_info.json | 8 +++ assets/svg/triangle.svg | 9 +++ .../mapcomplete-changes.json | 4 ++ 6 files changed, 97 insertions(+), 37 deletions(-) create mode 100644 assets/svg/triangle.svg diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 8c7131cd5d..d3060cf284 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -20,6 +20,12 @@ "highway=unclassified", "highway=primary", "highway=secondary", + "highway=tertiary_link", + "highway=primary_link", + "highway=secondary_link", + "highway=service", + "highway=footway", + "highway=pedestrian", { "and": [ "highway=path", @@ -109,7 +115,8 @@ "condition": { "and": [ "highway!=cycleway", - "highway!=path" + "highway!=path", + "highway!=footway" ] }, "mappings": [ @@ -226,7 +233,8 @@ "condition": { "and": [ "highway!=cycleway", - "highway!=path" + "highway!=path", + "highway!=footway" ] }, "mappings": [ @@ -280,7 +288,8 @@ "condition": { "and": [ "highway!=cycleway", - "highway!=path" + "highway!=path", + "highway!=footway" ] }, "mappings": [ @@ -776,7 +785,8 @@ "condition": { "and": [ "highway!=cycleway", - "highway!=path" + "highway!=path", + "highway!=footway" ] }, "render": { diff --git a/assets/layers/kerbs/KerbIcon.svg b/assets/layers/kerbs/KerbIcon.svg index 001b5eac12..d19fa5ad27 100644 --- a/assets/layers/kerbs/KerbIcon.svg +++ b/assets/layers/kerbs/KerbIcon.svg @@ -1,6 +1,4 @@ - - + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" + sodipodi:docname="KerbIcon.svg"> + inkscape:window-width="2160" + inkscape:window-height="1346" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" + inkscape:document-rotation="0"> + originx="-334.84375" + originy="-479.73718" + spacingx="1" + spacingy="1" /> @@ -66,22 +67,26 @@ inkscape:groupmode="layer" id="layer1" transform="translate(-334.84375,-558.61859)"> - - - + + + + + diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index 2c73adeb79..bd007dcc8f 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -21,10 +21,10 @@ "mapRendering": [ { "location": [ - "point", - "centroid" + "point" ], "icon": "./assets/layers/kerbs/KerbIcon.svg", + "iconSize": "25,23,center", "iconBadges": [ { "if": "kerb=raised", @@ -39,6 +39,10 @@ "then": "circle:#11ff00" } ] + }, + { + "color": "#f44e42", + "width": "8" } ], "tagRenderings": [ @@ -88,5 +92,25 @@ } ] } + ], + "presets": [ + { + "title": { + "en": "a kerb", + "nl": "een stoeprand" + }, + "tags": [ + "barrier=kerb" + ], + "description": { + "en": "Kerb in a footway", + "nl": "Stoeprand in een voetpad" + }, + "preciseInput": { + "maxSnapDistance": 10, + "preferredBackground": "photo", + "snapToLayer": ["cycleways_and_roads", "kerbs"] + } + } ] } \ No newline at end of file diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 530adea9ad..531a7d5bfd 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -1281,6 +1281,14 @@ "https://commons.wikimedia.org/wiki/File:OOjs_UI_icon_language-ltr.svg" ] }, + { + "path": "triangle.svg", + "license": "CC0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + }, { "path": "up.svg", "license": "CC0; trivial", diff --git a/assets/svg/triangle.svg b/assets/svg/triangle.svg new file mode 100644 index 0000000000..846a32f322 --- /dev/null +++ b/assets/svg/triangle.svg @@ -0,0 +1,9 @@ + + + + diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 0a04dea61c..924a272e9e 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -203,6 +203,10 @@ "if": "theme=hailhydrant", "then": "./assets/themes/hailhydrant/logo.svg" }, + { + "if": "theme=kerbs_and_crossings", + "then": "./assets/layers/kerbs/KerbIcon.svg" + }, { "if": "theme=mapcomplete-changes", "then": "./assets/svg/logo.svg" From 6eaf4a33e9def5b377968fbf1db2ee365e6d4f36 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 8 May 2022 14:31:00 +0200 Subject: [PATCH 04/13] Add extra icons, change size, add tactile paving --- assets/layers/artwork/artwork.json | 2 +- .../charging_station/charging_station.json | 124 +++++++++--------- assets/layers/kerbs/flush.svg | 7 + assets/layers/kerbs/kerbs.json | 69 +++++++--- assets/layers/kerbs/license_info.json | 40 ++++++ assets/layers/kerbs/lowered.svg | 5 + assets/layers/kerbs/no.svg | 7 + assets/layers/kerbs/raised.svg | 7 + assets/layers/note/note.json | 4 +- .../surveillance_camera.json | 2 +- assets/layers/tree_node/tree_node.json | 2 +- .../kerbs_and_crossings.json | 10 +- .../mapcomplete-changes.json | 53 ++------ langs/layers/en.json | 6 + langs/layers/nl.json | 6 + langs/shared-questions/ca.json | 3 + langs/shared-questions/da.json | 3 + langs/shared-questions/de.json | 3 + langs/shared-questions/en.json | 3 + langs/shared-questions/es.json | 3 + langs/shared-questions/fil.json | 3 + langs/shared-questions/fr.json | 3 + langs/shared-questions/hu.json | 3 + langs/shared-questions/it.json | 3 + langs/shared-questions/ja.json | 3 + langs/shared-questions/nb_NO.json | 3 + langs/shared-questions/nl.json | 3 + langs/shared-questions/pl.json | 3 + langs/shared-questions/pt.json | 3 + langs/shared-questions/ru.json | 3 + langs/shared-questions/sv.json | 3 + langs/shared-questions/zh_Hans.json | 3 + langs/shared-questions/zh_Hant.json | 3 + langs/themes/de.json | 62 +++++++++ langs/themes/es.json | 47 +++++++ 35 files changed, 383 insertions(+), 124 deletions(-) create mode 100644 assets/layers/kerbs/flush.svg create mode 100644 assets/layers/kerbs/lowered.svg create mode 100644 assets/layers/kerbs/no.svg create mode 100644 assets/layers/kerbs/raised.svg diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 32e08ad0af..f3f0e7277a 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -558,4 +558,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 665dc666c8..282330165c 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -3,8 +3,8 @@ "name": { "en": "Charging stations", "nl": "Oplaadpunten", - "de": "Ladestationen", - "ca": "Estacions de càrrega" + "ca": "Estacions de càrrega", + "de": "Ladestationen" }, "minzoom": 10, "source": { @@ -67,8 +67,8 @@ "description": { "en": "A charging station", "nl": "Oplaadpunten", - "de": "Eine Ladestation", - "da": "En ladestation" + "da": "En ladestation", + "de": "Eine Ladestation" }, "tagRenderings": [ "images", @@ -1504,7 +1504,7 @@ }, "mappings": [ { - "if": "socket:schuko:output=3.6 kw", + "if": "socket:schuko:output=3.6 kW", "then": { "en": "Schuko wall plug without ground pin (CEE7/4 type F) outputs at most 3.6 kw A", "nl": "Schuko stekker zonder aardingspin (CEE7/4 type F) levert een vermogen van maximaal 3.6 kw A" @@ -1609,7 +1609,7 @@ }, "mappings": [ { - "if": "socket:typee:output=3 kw", + "if": "socket:typee:output=3 kW", "then": { "en": "European wall plug with ground pin (CEE7/4 type E) outputs at most 3 kw A", "nl": "Europese stekker met aardingspin (CEE7/4 type E) levert een vermogen van maximaal 3 kw A" @@ -1620,7 +1620,7 @@ } }, { - "if": "socket:typee:output=22 kw", + "if": "socket:typee:output=22 kW", "then": { "en": "European wall plug with ground pin (CEE7/4 type E) outputs at most 22 kw A", "nl": "Europese stekker met aardingspin (CEE7/4 type E) levert een vermogen van maximaal 22 kw A" @@ -1725,7 +1725,7 @@ }, "mappings": [ { - "if": "socket:chademo:output=50 kw", + "if": "socket:chademo:output=50 kW", "then": { "en": "Chademo outputs at most 50 kw A", "nl": "Chademo levert een vermogen van maximaal 50 kw A" @@ -1841,7 +1841,7 @@ }, "mappings": [ { - "if": "socket:type1_cable:output=3.7 kw", + "if": "socket:type1_cable:output=3.7 kW", "then": { "en": "Type 1 with cable (J1772) outputs at most 3.7 kw A", "nl": "Type 1 met kabel (J1772) levert een vermogen van maximaal 3.7 kw A" @@ -1852,7 +1852,7 @@ } }, { - "if": "socket:type1_cable:output=7 kw", + "if": "socket:type1_cable:output=7 kW", "then": { "en": "Type 1 with cable (J1772) outputs at most 7 kw A", "nl": "Type 1 met kabel (J1772) levert een vermogen van maximaal 7 kw A" @@ -1968,7 +1968,7 @@ }, "mappings": [ { - "if": "socket:type1:output=3.7 kw", + "if": "socket:type1:output=3.7 kW", "then": { "en": "Type 1 without cable (J1772) outputs at most 3.7 kw A", "nl": "Type 1 zonder kabel (J1772) levert een vermogen van maximaal 3.7 kw A" @@ -1979,7 +1979,7 @@ } }, { - "if": "socket:type1:output=6.6 kw", + "if": "socket:type1:output=6.6 kW", "then": { "en": "Type 1 without cable (J1772) outputs at most 6.6 kw A", "nl": "Type 1 zonder kabel (J1772) levert een vermogen van maximaal 6.6 kw A" @@ -1990,7 +1990,7 @@ } }, { - "if": "socket:type1:output=7 kw", + "if": "socket:type1:output=7 kW", "then": { "en": "Type 1 without cable (J1772) outputs at most 7 kw A", "nl": "Type 1 zonder kabel (J1772) levert een vermogen van maximaal 7 kw A" @@ -2001,7 +2001,7 @@ } }, { - "if": "socket:type1:output=7.2 kw", + "if": "socket:type1:output=7.2 kW", "then": { "en": "Type 1 without cable (J1772) outputs at most 7.2 kw A", "nl": "Type 1 zonder kabel (J1772) levert een vermogen van maximaal 7.2 kw A" @@ -2128,7 +2128,7 @@ }, "mappings": [ { - "if": "socket:type1_combo:output=50 kw", + "if": "socket:type1_combo:output=50 kW", "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 50 kw A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een vermogen van maximaal 50 kw A" @@ -2139,7 +2139,7 @@ } }, { - "if": "socket:type1_combo:output=62.5 kw", + "if": "socket:type1_combo:output=62.5 kW", "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 62.5 kw A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een vermogen van maximaal 62.5 kw A" @@ -2150,7 +2150,7 @@ } }, { - "if": "socket:type1_combo:output=150 kw", + "if": "socket:type1_combo:output=150 kW", "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 150 kw A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een vermogen van maximaal 150 kw A" @@ -2161,7 +2161,7 @@ } }, { - "if": "socket:type1_combo:output=350 kw", + "if": "socket:type1_combo:output=350 kW", "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 350 kw A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een vermogen van maximaal 350 kw A" @@ -2277,7 +2277,7 @@ }, "mappings": [ { - "if": "socket:tesla_supercharger:output=120 kw", + "if": "socket:tesla_supercharger:output=120 kW", "then": { "en": "Tesla Supercharger outputs at most 120 kw A", "nl": "Tesla Supercharger levert een vermogen van maximaal 120 kw A" @@ -2288,7 +2288,7 @@ } }, { - "if": "socket:tesla_supercharger:output=150 kw", + "if": "socket:tesla_supercharger:output=150 kW", "then": { "en": "Tesla Supercharger outputs at most 150 kw A", "nl": "Tesla Supercharger levert een vermogen van maximaal 150 kw A" @@ -2299,7 +2299,7 @@ } }, { - "if": "socket:tesla_supercharger:output=250 kw", + "if": "socket:tesla_supercharger:output=250 kW", "then": { "en": "Tesla Supercharger outputs at most 250 kw A", "nl": "Tesla Supercharger levert een vermogen van maximaal 250 kw A" @@ -2426,7 +2426,7 @@ }, "mappings": [ { - "if": "socket:type2:output=11 kw", + "if": "socket:type2:output=11 kW", "then": { "en": "Type 2 (mennekes) outputs at most 11 kw A", "nl": "Type 2 (mennekes) levert een vermogen van maximaal 11 kw A" @@ -2437,7 +2437,7 @@ } }, { - "if": "socket:type2:output=22 kw", + "if": "socket:type2:output=22 kW", "then": { "en": "Type 2 (mennekes) outputs at most 22 kw A", "nl": "Type 2 (mennekes) levert een vermogen van maximaal 22 kw A" @@ -2564,7 +2564,7 @@ }, "mappings": [ { - "if": "socket:type2_combo:output=50 kw", + "if": "socket:type2_combo:output=50 kW", "then": { "en": "Type 2 CCS (mennekes) outputs at most 50 kw A", "nl": "Type 2 CCS (mennekes) levert een vermogen van maximaal 50 kw A" @@ -2691,7 +2691,7 @@ }, "mappings": [ { - "if": "socket:type2_cable:output=11 kw", + "if": "socket:type2_cable:output=11 kW", "then": { "en": "Type 2 with cable (mennekes) outputs at most 11 kw A", "nl": "Type 2 met kabel (J1772) levert een vermogen van maximaal 11 kw A" @@ -2702,7 +2702,7 @@ } }, { - "if": "socket:type2_cable:output=22 kw", + "if": "socket:type2_cable:output=22 kW", "then": { "en": "Type 2 with cable (mennekes) outputs at most 22 kw A", "nl": "Type 2 met kabel (J1772) levert een vermogen van maximaal 22 kw A" @@ -2829,7 +2829,7 @@ }, "mappings": [ { - "if": "socket:tesla_supercharger_ccs:output=50 kw", + "if": "socket:tesla_supercharger_ccs:output=50 kW", "then": { "en": "Tesla Supercharger CCS (a branded type2_css) outputs at most 50 kw A", "nl": "Tesla Supercharger CCS (een type2 CCS met Tesla-logo) levert een vermogen van maximaal 50 kw A" @@ -2945,7 +2945,7 @@ }, "mappings": [ { - "if": "socket:tesla_destination:output=120 kw", + "if": "socket:tesla_destination:output=120 kW", "then": { "en": "Tesla Supercharger (destination) outputs at most 120 kw A", "nl": "Tesla Supercharger (destination) levert een vermogen van maximaal 120 kw A" @@ -2956,7 +2956,7 @@ } }, { - "if": "socket:tesla_destination:output=150 kw", + "if": "socket:tesla_destination:output=150 kW", "then": { "en": "Tesla Supercharger (destination) outputs at most 150 kw A", "nl": "Tesla Supercharger (destination) levert een vermogen van maximaal 150 kw A" @@ -2967,7 +2967,7 @@ } }, { - "if": "socket:tesla_destination:output=250 kw", + "if": "socket:tesla_destination:output=250 kW", "then": { "en": "Tesla Supercharger (destination) outputs at most 250 kw A", "nl": "Tesla Supercharger (destination) levert een vermogen van maximaal 250 kw A" @@ -3095,7 +3095,7 @@ }, "mappings": [ { - "if": "socket:tesla_destination:output=11 kw", + "if": "socket:tesla_destination:output=11 kW", "then": { "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 11 kw A", "nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 11 kw A" @@ -3106,7 +3106,7 @@ } }, { - "if": "socket:tesla_destination:output=22 kw", + "if": "socket:tesla_destination:output=22 kW", "then": { "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 22 kw A", "nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 22 kw A" @@ -3225,7 +3225,7 @@ }, "mappings": [ { - "if": "socket:USB-A:output=5w", + "if": "socket:USB-A:output=5W", "then": { "en": "USB to charge phones and small electronics outputs at most 5w A", "nl": "USB om GSMs en kleine electronica op te laden levert een vermogen van maximaal 5w A" @@ -3236,7 +3236,7 @@ } }, { - "if": "socket:USB-A:output=10w", + "if": "socket:USB-A:output=10W", "then": { "en": "USB to charge phones and small electronics outputs at most 10w A", "nl": "USB om GSMs en kleine electronica op te laden levert een vermogen van maximaal 10w A" @@ -4104,18 +4104,18 @@ "question": { "en": "All vehicle types", "nl": "Alle voertuigen", + "da": "Alle køretøjstyper", "de": "Ladestationen für alle Fahrzeugtypen", - "fr": "Tout type de véhicule", - "da": "Alle køretøjstyper" + "fr": "Tout type de véhicule" } }, { "question": { "en": "Charging station for bicycles", "nl": "Oplaadpunten voor fietsen", + "da": "Ladestation til cykler", "de": "Ladestationen für Fahrräder", - "fr": "Station de charge pour vélos", - "da": "Ladestation til cykler" + "fr": "Station de charge pour vélos" }, "osmTags": "bicycle=yes" }, @@ -4123,9 +4123,9 @@ "question": { "en": "Charging station for cars", "nl": "Oplaadpunten voor auto's", + "da": "Ladestation til biler", "de": "Ladestationen für Autos", - "fr": "Station de charge pour automobiles", - "da": "Ladestation til biler" + "fr": "Station de charge pour automobiles" }, "osmTags": { "or": [ @@ -4143,8 +4143,8 @@ "question": { "en": "Only working charging stations", "nl": "Enkel werkende oplaadpunten", - "de": "Nur Ladestationen in Betrieb", - "da": "Kun fungerende ladestationer" + "da": "Kun fungerende ladestationer", + "de": "Nur Ladestationen in Betrieb" }, "osmTags": { "and": [ @@ -4162,8 +4162,8 @@ "question": { "en": "All connectors", "nl": "Alle types", - "de": "Alle Anschlüsse", - "ca": "Tots els connectors" + "ca": "Tots els connectors", + "de": "Alle Anschlüsse" } }, { @@ -4306,14 +4306,14 @@ "human": { "en": " minutes", "nl": " minuten", - "ru": " минут", - "ca": " minuts" + "ca": " minuts", + "ru": " минут" }, "humanSingular": { "en": " minute", "nl": " minuut", - "ru": " минута", - "ca": " minut" + "ca": " minut", + "ru": " минута" } }, { @@ -4330,14 +4330,14 @@ "human": { "en": " hours", "nl": " uren", - "ru": " часов", - "ca": " hores" + "ca": " hores", + "ru": " часов" }, "humanSingular": { "en": " hour", "nl": " uur", - "ru": " час", - "ca": " hora" + "ca": " hora", + "ru": " час" } }, { @@ -4351,14 +4351,14 @@ "human": { "en": " days", "nl": " day", - "ru": " дней", - "ca": " dies" + "ca": " dies", + "ru": " дней" }, "humanSingular": { "en": " day", "nl": " dag", - "ru": " день", - "ca": " dia" + "ca": " dia", + "ru": " день" } } ] @@ -4395,8 +4395,8 @@ "human": { "en": "Volts", "nl": "volt", - "ru": "Вольт", - "ca": "Volts" + "ca": "Volts", + "ru": "Вольт" } } ], @@ -4467,8 +4467,8 @@ "human": { "en": "kilowatt", "nl": "kilowatt", - "ru": "киловатт", - "ca": "quilovats" + "ca": "quilovats", + "ru": "киловатт" } }, { @@ -4479,8 +4479,8 @@ "human": { "en": "megawatt", "nl": "megawatt", - "ru": "мегаватт", - "ca": "megavats" + "ca": "megavats", + "ru": "мегаватт" } } ], diff --git a/assets/layers/kerbs/flush.svg b/assets/layers/kerbs/flush.svg new file mode 100644 index 0000000000..43068b3901 --- /dev/null +++ b/assets/layers/kerbs/flush.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index bd007dcc8f..ebf631c7f1 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -23,22 +23,27 @@ "location": [ "point" ], - "icon": "./assets/layers/kerbs/KerbIcon.svg", - "iconSize": "25,23,center", - "iconBadges": [ - { - "if": "kerb=raised", - "then": "square:#f44e42" - }, - { - "if": "kerb=lowered", - "then": "triangle:#11ff00" - }, - { - "if": "kerb=flush", - "then": "circle:#11ff00" - } - ] + "icon": { + "render": "./assets/layers/kerbs/KerbIcon.svg", + "mappings": [ + { + "if": "kerb=raised", + "then": "./assets/layers/kerbs/raised.svg" + }, + { + "if": "kerb=lowered", + "then": "./assets/layers/kerbs/lowered.svg" + }, + { + "if": "kerb=flush", + "then": "./assets/layers/kerbs/flush.svg" + }, + { + "if": "kerb=no", + "then": "./assets/layers/kerbs/no.svg" + } + ] + } }, { "color": "#f44e42", @@ -91,6 +96,33 @@ "hideInAnswer": true } ] + }, + { + "id": "tactile-paving", + "question": { + "en": "Is there tactile paving at this kerb?" + }, + "mappings": [ + { + "if": "tactile_paving=yes", + "then": { + "en": "This kerb has tactile paving." + } + }, + { + "if": "tactile_paving=no", + "then": { + "en": "This kerb does not have tactile paving." + } + }, + { + "if": "tactile_paving=incorrect", + "then": { + "en": "This kerb has tactile paving, but it is incorrect" + }, + "hideInAnswer": true + } + ] } ], "presets": [ @@ -109,7 +141,10 @@ "preciseInput": { "maxSnapDistance": 10, "preferredBackground": "photo", - "snapToLayer": ["cycleways_and_roads", "kerbs"] + "snapToLayer": [ + "cycleways_and_roads", + "kerbs" + ] } } ] diff --git a/assets/layers/kerbs/license_info.json b/assets/layers/kerbs/license_info.json index 8fc0aa4fe3..61687d8335 100644 --- a/assets/layers/kerbs/license_info.json +++ b/assets/layers/kerbs/license_info.json @@ -8,5 +8,45 @@ "sources": [ "https://commons.wikimedia.org/wiki/File:KerbIcon.svg" ] + }, + { + "path": "flush.svg", + "license": "CC0", + "authors": [ + "Jeroen Hoek" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dflush.svg" + ] + }, + { + "path": "lowered.svg", + "license": "CC0", + "authors": [ + "Jeroen Hoek" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dlowered.svg" + ] + }, + { + "path": "no.svg", + "license": "CC0", + "authors": [ + "Jeroen Hoek" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dno.svg" + ] + }, + { + "path": "raised.svg", + "license": "CC0", + "authors": [ + "Jeroen Hoek" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Draised.svg" + ] } ] \ No newline at end of file diff --git a/assets/layers/kerbs/lowered.svg b/assets/layers/kerbs/lowered.svg new file mode 100644 index 0000000000..13737e5822 --- /dev/null +++ b/assets/layers/kerbs/lowered.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/layers/kerbs/no.svg b/assets/layers/kerbs/no.svg new file mode 100644 index 0000000000..e7cc817ff6 --- /dev/null +++ b/assets/layers/kerbs/no.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/layers/kerbs/raised.svg b/assets/layers/kerbs/raised.svg new file mode 100644 index 0000000000..629a326062 --- /dev/null +++ b/assets/layers/kerbs/raised.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json index ad908d604f..c1179ce957 100644 --- a/assets/layers/note/note.json +++ b/assets/layers/note/note.json @@ -293,7 +293,7 @@ { "id": "no_imports", "options": [ - { + { "question": { "en": "All Notes", "nl": "Alle Notes" @@ -317,4 +317,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index cea34d79c8..835cb7e6c4 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -570,4 +570,4 @@ "nl": "Deze laag toont bewakingscamera's en laat toe om de informatie te verrijken en om nieuwe camera\"s toe te voegen", "de": "Diese Ebene zeigt die Überwachungskameras an und ermöglicht es, Informationen zu aktualisieren und neue Kameras hinzuzufügen" } -} +} \ No newline at end of file diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index d5b7687d0d..f45efb6781 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -743,4 +743,4 @@ "es": "Una capa que muestra árboles", "de": "Eine Ebene, die Bäume zeigt" } -} +} \ No newline at end of file diff --git a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json index 721a000ac4..ba23176410 100644 --- a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json +++ b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json @@ -15,7 +15,15 @@ "startLat": 53.23776, "startLon": 6.53812, "layers": [ - "crossings", + { + "builtin": "crossings", + "override": { + "=presets": [], + "source": { + "osmTags": "highway=crossing" + } + } + }, "kerbs" ] } \ 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 14f91d45e1..924a272e9e 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": "Zeigt Änderungen von MapComplete", - "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 Änderungen die mit MapComplete gemacht wurden", - "es": "Este mapa muestra todos los cambios hechos con MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "maintainer": "", "icon": "./assets/svg/logo.svg", @@ -28,9 +22,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Schwerpunkte von Änderungssätzen", - "es": "Centros de conjuntos de cambios" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -44,45 +36,35 @@ ], "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungen für {theme}", - "es": "Conjunto de cambios para {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "de": "Zeigt alle MapComplete Änderungen", - "es": "Muestra todos los cambios de MapComplete" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "render_id", "render": { - "en": "Changeset {id}", - "de": "Änderung {id}", - "es": "Conjunto de cambios {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "render": { - "en": "Change made by {_last_edit:contributor}", - "de": "Änderung wurde von {_last_edit:contributor} gemacht", - "es": "Cambio hecho por {_last_edit:contributor}" + "en": "Change made by {_last_edit:contributor}" } }, { "id": "theme", "render": { - "en": "Change with theme {theme}", - "de": "Änderung mit Thema {theme}" + "en": "Change with theme {theme}" }, "mappings": [ { "if": "theme~http.*", "then": { - "en": "Change with unofficial theme {theme}", - "de": "Änderung mit inoffiziellem Thema {theme}" + "en": "Change with unofficial theme {theme}" } } ] @@ -354,8 +336,7 @@ } ], "question": { - "en": "Themename contains {search}", - "de": "Themenname enthält {search}" + "en": "Themename contains {search}" } } ] @@ -371,9 +352,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "es": "Hecho por contributor/a {search}" + "en": "Made by contributor {search}" } } ] @@ -389,9 +368,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "es": "No hecho por contributor/a {search}" + "en": "Not made by contributor {search}" } } ] @@ -406,9 +383,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Weitere Statistiken finden Sie hier", - "es": "Se pueden encontrar más estadísticas aquí" + "en": "More statistics can be found here" } }, { diff --git a/langs/layers/en.json b/langs/layers/en.json index 09a9376d25..bf75f1a668 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4003,6 +4003,12 @@ "kerbs": { "description": "A layer showing kerbs.", "name": "Kerbs", + "presets": { + "0": { + "description": "Kerb in a footway", + "title": "a kerb" + } + }, "tagRenderings": { "kerb-type": { "mappings": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index a82105e4a5..952d2b13f5 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3852,6 +3852,12 @@ "kerbs": { "description": "Een laag met stoepranden.", "name": "Stoepranden", + "presets": { + "0": { + "description": "Stoeprand in een voetpad", + "title": "een stoeprand" + } + }, "tagRenderings": { "kerb-type": { "mappings": { diff --git a/langs/shared-questions/ca.json b/langs/shared-questions/ca.json index b69f0decf5..18468023ea 100644 --- a/langs/shared-questions/ca.json +++ b/langs/shared-questions/ca.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "No hi ha cap enllaça a Viquipèdia encara" + }, "1": { "then": "No hi ha cap enllaça a Viquipèdia encara" } diff --git a/langs/shared-questions/da.json b/langs/shared-questions/da.json index 390bc0d818..db62dfd4f1 100644 --- a/langs/shared-questions/da.json +++ b/langs/shared-questions/da.json @@ -94,6 +94,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Der er endnu ikke linket til nogen Wikipedia-side" + }, "1": { "then": "Der er endnu ikke linket til nogen Wikipedia-side" } diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index b752664b92..2c736c0d1d 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Es wurde noch keine Wikipedia-Seite verlinkt" + }, "1": { "then": "Es wurde noch keine Wikipedia-Seite verlinkt" } diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index 42858b62ae..fce4c92175 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "No Wikipedia page has been linked yet" + }, "1": { "then": "No Wikipedia page has been linked yet" } diff --git a/langs/shared-questions/es.json b/langs/shared-questions/es.json index 438ee688a7..91619211ba 100644 --- a/langs/shared-questions/es.json +++ b/langs/shared-questions/es.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Todavía no se ha enlazado una página de wikipedia" + }, "1": { "then": "Todavía no se ha enlazado una página de wikipedia" } diff --git a/langs/shared-questions/fil.json b/langs/shared-questions/fil.json index 9b505b25d8..80f5ab9a50 100644 --- a/langs/shared-questions/fil.json +++ b/langs/shared-questions/fil.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Wala pang kawing ng Wikipedia page" + }, "1": { "then": "Wala pang kawing ng Wikipedia page" } diff --git a/langs/shared-questions/fr.json b/langs/shared-questions/fr.json index b14771839f..4e7d5bcc89 100644 --- a/langs/shared-questions/fr.json +++ b/langs/shared-questions/fr.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Pas encore de lien vers une page Wikipedia" + }, "1": { "then": "Pas encore de lien vers une page Wikipedia" } diff --git a/langs/shared-questions/hu.json b/langs/shared-questions/hu.json index 5e2572c139..e9a7dd6391 100644 --- a/langs/shared-questions/hu.json +++ b/langs/shared-questions/hu.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Még nincs Wikipédia-oldal belinkelve" + }, "1": { "then": "Még nincs Wikipédia-oldal belinkelve" } diff --git a/langs/shared-questions/it.json b/langs/shared-questions/it.json index af3118fb33..dfb6cd01ea 100644 --- a/langs/shared-questions/it.json +++ b/langs/shared-questions/it.json @@ -81,6 +81,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Nessuna pagina Wikipedia è ancora stata collegata" + }, "1": { "then": "Nessuna pagina Wikipedia è ancora stata collegata" } diff --git a/langs/shared-questions/ja.json b/langs/shared-questions/ja.json index b8f22df6a8..db7fbb13f6 100644 --- a/langs/shared-questions/ja.json +++ b/langs/shared-questions/ja.json @@ -98,6 +98,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "ウィキペディアのページはまだリンクされていません" + }, "1": { "then": "ウィキペディアのページはまだリンクされていません" } diff --git a/langs/shared-questions/nb_NO.json b/langs/shared-questions/nb_NO.json index d1491cb836..abcfa6e180 100644 --- a/langs/shared-questions/nb_NO.json +++ b/langs/shared-questions/nb_NO.json @@ -96,6 +96,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Ingen Wikipedia-side lenket enda" + }, "1": { "then": "Ingen Wikipedia-side lenket enda" } diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index 4370fb3a21..c5bd2085e4 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Er werd nog geen Wikipedia-pagina gekoppeld" + }, "1": { "then": "Er werd nog geen Wikipedia-pagina gekoppeld" } diff --git a/langs/shared-questions/pl.json b/langs/shared-questions/pl.json index da5e6d2fc7..a2a4184de5 100644 --- a/langs/shared-questions/pl.json +++ b/langs/shared-questions/pl.json @@ -98,6 +98,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Link do strony Wikipedii nie został jeszcze określony" + }, "1": { "then": "Link do strony Wikipedii nie został jeszcze określony" } diff --git a/langs/shared-questions/pt.json b/langs/shared-questions/pt.json index e942b68862..aedacdb06d 100644 --- a/langs/shared-questions/pt.json +++ b/langs/shared-questions/pt.json @@ -110,6 +110,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Ainda não foi vinculada nenhuma página da Wikipédia" + }, "1": { "then": "Ainda não foi vinculada nenhuma página da Wikipédia" } diff --git a/langs/shared-questions/ru.json b/langs/shared-questions/ru.json index 7dbe2be7c2..5e920eabcf 100644 --- a/langs/shared-questions/ru.json +++ b/langs/shared-questions/ru.json @@ -77,6 +77,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Никакой страницы на Википедии не было прикреплено" + }, "1": { "then": "Никакой страницы на Википедии не было прикреплено" } diff --git a/langs/shared-questions/sv.json b/langs/shared-questions/sv.json index 54dd3fbe58..26e6e4a886 100644 --- a/langs/shared-questions/sv.json +++ b/langs/shared-questions/sv.json @@ -98,6 +98,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Ingen Wikipedia-sida har länkats än" + }, "1": { "then": "Ingen Wikipedia-sida har länkats än" } diff --git a/langs/shared-questions/zh_Hans.json b/langs/shared-questions/zh_Hans.json index 083e7bc4be..111e964e9b 100644 --- a/langs/shared-questions/zh_Hans.json +++ b/langs/shared-questions/zh_Hans.json @@ -55,6 +55,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "尚未有连接到的维基百科页面" + }, "1": { "then": "尚未有连接到的维基百科页面" } diff --git a/langs/shared-questions/zh_Hant.json b/langs/shared-questions/zh_Hant.json index 7e6fa861c0..e25c7d16f1 100644 --- a/langs/shared-questions/zh_Hant.json +++ b/langs/shared-questions/zh_Hant.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "還沒有連結到維基百科頁面" + }, "1": { "then": "還沒有連結到維基百科頁面" } diff --git a/langs/themes/de.json b/langs/themes/de.json index 5ccf252a98..785b281962 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -640,6 +640,68 @@ "shortDescription": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen.", "title": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen" }, + "mapcomplete-changes": { + "description": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", + "layers": { + "0": { + "description": "Zeigt alle MapComplete Änderungen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenname enthält {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Erstellt von {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Nicht erstellt von {search}" + } + } + } + }, + "name": "Schwerpunkte von Änderungssätzen", + "tagRenderings": { + "contributor": { + "render": "Änderung wurde von {_last_edit:contributor} gemacht" + }, + "render_id": { + "render": "Änderung {id}" + }, + "theme": { + "mappings": { + "0": { + "then": "Änderung mit inoffiziellem Thema {theme}" + } + }, + "render": "Änderung mit Thema {theme}" + } + }, + "title": { + "render": "Änderungen für {theme}" + } + }, + "1": { + "override": { + "tagRenderings": { + "link_to_more": { + "render": "Weitere Statistiken finden Sie hier" + } + } + } + } + }, + "shortDescription": "Zeigt Änderungen von MapComplete", + "title": "Änderungen mit MapComplete" + }, "maps": { "description": "Auf dieser Karte findest du alle Karten, die OpenStreetMap kennt - typischerweise eine große Karte auf einer Informationstafel, die das Gebiet, die Stadt oder die Region zeigt, z.B. eine touristische Karte auf der Rückseite einer Plakatwand, eine Karte eines Naturschutzgebietes, eine Karte der Radwegenetze in der Region, ...)

Wenn eine Karte fehlt, können Sie diese leicht auf OpenStreetMap kartieren.", "shortDescription": "Dieses Thema zeigt alle (touristischen) Karten, die OpenStreetMap kennt", diff --git a/langs/themes/es.json b/langs/themes/es.json index f78451cfb7..a5f1913799 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -317,6 +317,53 @@ "shortDescription": "Mapa para mostrar hidrantes, extintores, parques de bomberos y parques de ambulancias.", "title": "Hidrantes, Extintores, Parques de bomberos y Parques de ambulancias" }, + "mapcomplete-changes": { + "description": "Este mapa muestra todos los cambios hechos con MapComplete", + "layers": { + "0": { + "description": "Muestra todos los cambios de MapComplete", + "filter": { + "1": { + "options": { + "0": { + "question": "Hecho por contributor/a {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "No hecho por contributor/a {search}" + } + } + } + }, + "name": "Centros de conjuntos de cambios", + "tagRenderings": { + "contributor": { + "render": "Cambio hecho por {_last_edit:contributor}" + }, + "render_id": { + "render": "Conjunto de cambios {id}" + } + }, + "title": { + "render": "Conjunto de cambios para {theme}" + } + }, + "1": { + "override": { + "tagRenderings": { + "link_to_more": { + "render": "Se pueden encontrar más estadísticas aquí" + } + } + } + } + }, + "shortDescription": "Muestra los cambios hechos por MapComplete", + "title": "Cambios hechos con MapComplete" + }, "maps": { "description": "En este mapa puedes encontrar todos los mapas que OpenStreetMap conoce - típicamente un mapa grande con un tablero que muestra el área, la ciudad o la región, ej. un mapa turista detrás de una vaya publicitaria, un mapa de una reserva natura, un mapa de redes ciclistas en la región, ...)

Si falta un mapa, puedes mapear este mapa fácilmente en OpenStreetMap.", "shortDescription": "Este tema muestra todos los mapas (turísticos) que OpenStreetMap conoce", From a10d7e56c0d56556013665e138360136749f6bda Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 8 May 2022 14:34:33 +0200 Subject: [PATCH 05/13] Don't fill polygons --- assets/layers/kerbs/kerbs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index ebf631c7f1..31b0aca162 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -47,6 +47,7 @@ }, { "color": "#f44e42", + "fill": "no", "width": "8" } ], From 7dcad1b379c498f3ce30285dd8534a9138df2254 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 8 May 2022 18:04:20 +0200 Subject: [PATCH 06/13] Only ask questions for nodes --- assets/layers/kerbs/kerbs.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index 31b0aca162..aa8d72a4f1 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -96,7 +96,8 @@ }, "hideInAnswer": true } - ] + ], + "condition": "_geometry:type=Point" }, { "id": "tactile-paving", @@ -123,7 +124,8 @@ }, "hideInAnswer": true } - ] + ], + "condition": "_geometry:type=Point" } ], "presets": [ From 57f4fef68fd50e7010393dfd6d43a0ff26acbd8b Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 8 May 2022 18:28:22 +0200 Subject: [PATCH 07/13] More sensical titles for cycleways_and_roads layer --- .../cycleways_and_roads.json | 74 +++++++++++++++++-- langs/layers/ca.json | 11 ++- langs/layers/da.json | 6 +- langs/layers/de.json | 21 ++++-- langs/layers/en.json | 39 ++++++++-- langs/layers/fr.json | 13 ++-- langs/layers/nl.json | 25 +++++-- langs/layers/ru.json | 5 +- langs/themes/de.json | 62 ---------------- langs/themes/es.json | 47 ------------ 10 files changed, 151 insertions(+), 152 deletions(-) diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index d3060cf284..9867e412bb 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -37,14 +37,23 @@ }, "title": { "render": { - "en": "Cycleways", - "nl": "Fietspaden", - "de": "Radwege", - "ru": "Велосипедные дорожки", - "fr": "Pistes cyclables", - "ca": "Vies ciclistes" + "en": "Way", + "nl": "Weg" }, "mappings": [ + { + "if": { + "and": [ + "highway=cycleway", + "name~*" + ] + }, + "then": { + "nl": "Fietsweg {name}", + "en": "Cycleway {name}", + "de": "Radweg {name}" + } + }, { "if": { "or": [ @@ -62,6 +71,18 @@ "da": "Cykelsti" } }, + { + "if": { + "and": [ + "cycleway=shared_lane", + "name~*" + ] + }, + "then": { + "nl": "Weg met fietssugestiestrook {name}", + "en": "Road with shared lane {name}" + } + }, { "if": "cycleway=shared_lane", "then": { @@ -72,6 +93,18 @@ "ca": "Carril compartit" } }, + { + "if": { + "and": [ + "cycleway=lane", + "name~*" + ] + }, + "then": { + "nl": "Weg met fietsstrook {name}", + "en": "Road with bike lane {name}" + } + }, { "if": "cycleway=lane", "then": { @@ -82,6 +115,18 @@ "ca": "Carril bici" } }, + { + "if": { + "and": [ + "cycleway=track", + "name~*" + ] + }, + "then": { + "nl": "Weg met fietspad naast de weg {name}", + "en": "Road with cycleway next to the road {name}" + } + }, { "if": "cycleway=track", "then": { @@ -92,6 +137,19 @@ "da": "Cykelsti ved siden af vejen" } }, + { + "if": { + "and": [ + "cyclestreet=yes", + "name~*" + ] + }, + "then": { + "nl": "Fietsstraat {name}", + "en": "Cyclestreet {name}", + "de": "Fahrradstraße {name}" + } + }, { "if": "cyclestreet=yes", "then": { @@ -102,6 +160,10 @@ "ca": "Carrer ciclista", "da": "Cykelgade" } + }, + { + "if": "name~*", + "then": "{name}" } ] }, diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 7e1050a67d..2afbfcb926 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -514,20 +514,19 @@ }, "title": { "mappings": { - "0": { + "1": { "then": "Via ciclista" }, - "1": { + "3": { "then": "Carril compartit" }, - "2": { + "5": { "then": "Carril bici" }, - "4": { + "9": { "then": "Carrer ciclista" } - }, - "render": "Vies ciclistes" + } } }, "defibrillator": { diff --git a/langs/layers/da.json b/langs/layers/da.json index 7b7bd47cbc..2e70a0a239 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -1190,13 +1190,13 @@ }, "title": { "mappings": { - "0": { + "1": { "then": "Cykelsti" }, - "3": { + "7": { "then": "Cykelsti ved siden af vejen" }, - "4": { + "9": { "then": "Cykelgade" } } diff --git a/langs/layers/de.json b/langs/layers/de.json index 60a8edba8d..aeb7f4da07 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -2360,22 +2360,27 @@ "title": { "mappings": { "0": { - "then": "Radweg" + "then": "Radweg {name}" }, "1": { - "then": "Gemeinsame Fahrspur" - }, - "2": { - "then": "Fahrradspur" + "then": "Radweg" }, "3": { + "then": "Gemeinsame Fahrspur" + }, + "5": { + "then": "Fahrradspur" + }, + "7": { "then": "Radweg neben der Straße" }, - "4": { + "8": { + "then": "Fahrradstraße {name}" + }, + "9": { "then": "Fahrradstraße" } - }, - "render": "Radwege" + } } }, "defibrillator": { diff --git a/langs/layers/en.json b/langs/layers/en.json index bf75f1a668..8c30a87a85 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3080,22 +3080,37 @@ "title": { "mappings": { "0": { - "then": "Cycleway" + "then": "Cycleway {name}" }, "1": { - "then": "Shared lane" + "then": "Cycleway" }, "2": { - "then": "Bike lane" + "then": "Road with shared lane {name}" }, "3": { - "then": "Cycleway next to the road" + "then": "Shared lane" }, "4": { + "then": "Road with bike lane {name}" + }, + "5": { + "then": "Bike lane" + }, + "6": { + "then": "Road with cycleway next to the road {name}" + }, + "7": { + "then": "Cycleway next to the road" + }, + "8": { + "then": "Cyclestreet {name}" + }, + "9": { "then": "Cyclestreet" } }, - "render": "Cycleways" + "render": "Way" } }, "defibrillator": { @@ -4029,6 +4044,20 @@ } }, "question": "What is the height of this kerb?" + }, + "tactile-paving": { + "mappings": { + "0": { + "then": "This kerb has tactile paving." + }, + "1": { + "then": "This kerb does not have tactile paving." + }, + "2": { + "then": "This kerb has tactile paving, but it is incorrect" + } + }, + "question": "Is there tactile paving at this kerb?" } }, "title": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 59838c3b8a..c000015b9a 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -1306,23 +1306,22 @@ "name": "Pistes cyclables et routes", "title": { "mappings": { - "0": { + "1": { "then": "Piste cyclable" }, - "1": { + "3": { "then": "Voie partagée" }, - "2": { + "5": { "then": "Bande cyclable" }, - "3": { + "7": { "then": "Piste cyclable séparée de la route" }, - "4": { + "9": { "then": "Vélorue" } - }, - "render": "Pistes cyclables" + } } }, "defibrillator": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 952d2b13f5..0ea6d24e76 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3040,22 +3040,37 @@ "title": { "mappings": { "0": { - "then": "Fietsweg" + "then": "Fietsweg {name}" }, "1": { - "then": "Fietssuggestiestrook" + "then": "Fietsweg" }, "2": { - "then": "Fietsstrook" + "then": "Weg met fietssugestiestrook {name}" }, "3": { - "then": "Fietsweg naast de weg" + "then": "Fietssuggestiestrook" }, "4": { + "then": "Weg met fietsstrook {name}" + }, + "5": { + "then": "Fietsstrook" + }, + "6": { + "then": "Weg met fietspad naast de weg {name}" + }, + "7": { + "then": "Fietsweg naast de weg" + }, + "8": { + "then": "Fietsstraat {name}" + }, + "9": { "then": "Fietsstraat" } }, - "render": "Fietspaden" + "render": "Weg" } }, "defibrillator": { diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 9d4b2bc2c8..d4ad9320ad 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -842,11 +842,10 @@ "cycleways_and_roads": { "title": { "mappings": { - "0": { + "1": { "then": "Велосипедная дорожка" } - }, - "render": "Велосипедные дорожки" + } } }, "defibrillator": { diff --git a/langs/themes/de.json b/langs/themes/de.json index 785b281962..5ccf252a98 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -640,68 +640,6 @@ "shortDescription": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen.", "title": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen" }, - "mapcomplete-changes": { - "description": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", - "layers": { - "0": { - "description": "Zeigt alle MapComplete Änderungen", - "filter": { - "0": { - "options": { - "0": { - "question": "Themenname enthält {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Erstellt von {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Nicht erstellt von {search}" - } - } - } - }, - "name": "Schwerpunkte von Änderungssätzen", - "tagRenderings": { - "contributor": { - "render": "Änderung wurde von {_last_edit:contributor} gemacht" - }, - "render_id": { - "render": "Änderung {id}" - }, - "theme": { - "mappings": { - "0": { - "then": "Änderung mit inoffiziellem Thema {theme}" - } - }, - "render": "Änderung mit Thema {theme}" - } - }, - "title": { - "render": "Änderungen für {theme}" - } - }, - "1": { - "override": { - "tagRenderings": { - "link_to_more": { - "render": "Weitere Statistiken finden Sie hier" - } - } - } - } - }, - "shortDescription": "Zeigt Änderungen von MapComplete", - "title": "Änderungen mit MapComplete" - }, "maps": { "description": "Auf dieser Karte findest du alle Karten, die OpenStreetMap kennt - typischerweise eine große Karte auf einer Informationstafel, die das Gebiet, die Stadt oder die Region zeigt, z.B. eine touristische Karte auf der Rückseite einer Plakatwand, eine Karte eines Naturschutzgebietes, eine Karte der Radwegenetze in der Region, ...)

Wenn eine Karte fehlt, können Sie diese leicht auf OpenStreetMap kartieren.", "shortDescription": "Dieses Thema zeigt alle (touristischen) Karten, die OpenStreetMap kennt", diff --git a/langs/themes/es.json b/langs/themes/es.json index a5f1913799..f78451cfb7 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -317,53 +317,6 @@ "shortDescription": "Mapa para mostrar hidrantes, extintores, parques de bomberos y parques de ambulancias.", "title": "Hidrantes, Extintores, Parques de bomberos y Parques de ambulancias" }, - "mapcomplete-changes": { - "description": "Este mapa muestra todos los cambios hechos con MapComplete", - "layers": { - "0": { - "description": "Muestra todos los cambios de MapComplete", - "filter": { - "1": { - "options": { - "0": { - "question": "Hecho por contributor/a {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "No hecho por contributor/a {search}" - } - } - } - }, - "name": "Centros de conjuntos de cambios", - "tagRenderings": { - "contributor": { - "render": "Cambio hecho por {_last_edit:contributor}" - }, - "render_id": { - "render": "Conjunto de cambios {id}" - } - }, - "title": { - "render": "Conjunto de cambios para {theme}" - } - }, - "1": { - "override": { - "tagRenderings": { - "link_to_more": { - "render": "Se pueden encontrar más estadísticas aquí" - } - } - } - } - }, - "shortDescription": "Muestra los cambios hechos por MapComplete", - "title": "Cambios hechos con MapComplete" - }, "maps": { "description": "En este mapa puedes encontrar todos los mapas que OpenStreetMap conoce - típicamente un mapa grande con un tablero que muestra el área, la ciudad o la región, ej. un mapa turista detrás de una vaya publicitaria, un mapa de una reserva natura, un mapa de redes ciclistas en la región, ...)

Si falta un mapa, puedes mapear este mapa fácilmente en OpenStreetMap.", "shortDescription": "Este tema muestra todos los mapas (turísticos) que OpenStreetMap conoce", From b2564109b21316aa7b6ef4b312bcf1df3d6b58dc Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 8 May 2022 18:32:45 +0200 Subject: [PATCH 08/13] Change some wording --- assets/layers/kerbs/kerbs.json | 20 +++++++++---------- .../kerbs_and_crossings.json | 4 ++-- langs/layers/en.json | 10 +++++----- langs/layers/nl.json | 10 +++++----- langs/themes/en.json | 2 +- langs/themes/nl.json | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index aa8d72a4f1..5fb82dbc4e 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -62,37 +62,37 @@ { "if": "kerb=raised", "then": { - "en": "Raised (>3 cm)", - "nl": "Hoog (>3 cm)" + "en": "This kerb is raised (>3 cm)", + "nl": "Deze stoeprand is hoog (>3 cm)" } }, { "if": "kerb=lowered", "then": { - "en": "Lowered (~3 cm)", - "nl": "Verlaagd (~3 cm)" + "en": "This kerb is lowered (~3 cm)", + "nl": "Deze stoeprand is verlaagd (~3 cm)" } }, { "if": "kerb=flush", "then": { - "en": "Flush (0cm)", - "nl": "Vlak (0cm)" + "en": "This kerb is flush (~0cm)", + "nl": "Deze stoeprand is vlak (~0cm)" } }, { "if": "kerb=no", "then": { - "en": "None", - "nl": "Geen" + "en": "There is no kerb here", + "nl": "Er is hier geen stoeprand" }, "hideInAnswer": true }, { "if": "kerb=yes", "then": { - "en": "Yes", - "nl": "Ja" + "en": "There is a kerb of unknown height", + "nl": "Er is een stoeprand met onbekende hoogte" }, "hideInAnswer": true } diff --git a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json index ba23176410..ddb32ee8d6 100644 --- a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json +++ b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json @@ -3,8 +3,8 @@ "maintainer": "Robin van der Linde", "version": "20211215", "title": { - "en": "Crossings and Kerbs", - "nl": "Oversteekplaatsen en stoepranden" + "en": "Kerbs and crossings", + "nl": "Stoepranden en oversteekplaatsen" }, "description": { "en": "A map showing kerbs and crossings.", diff --git a/langs/layers/en.json b/langs/layers/en.json index 8c30a87a85..4e8de8e759 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4028,19 +4028,19 @@ "kerb-type": { "mappings": { "0": { - "then": "Raised (>3 cm)" + "then": "This kerb is raised (>3 cm)" }, "1": { - "then": "Lowered (~3 cm)" + "then": "This kerb is lowered (~3 cm)" }, "2": { - "then": "Flush (0cm)" + "then": "This kerb is flush (~0cm)" }, "3": { - "then": "None" + "then": "There is no kerb here" }, "4": { - "then": "Yes" + "then": "There is a kerb of unknown height" } }, "question": "What is the height of this kerb?" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 0ea6d24e76..dc0f29ecda 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3877,19 +3877,19 @@ "kerb-type": { "mappings": { "0": { - "then": "Hoog (>3 cm)" + "then": "Deze stoeprand is hoog (>3 cm)" }, "1": { - "then": "Verlaagd (~3 cm)" + "then": "Deze stoeprand is verlaagd (~3 cm)" }, "2": { - "then": "Vlak (0cm)" + "then": "Deze stoeprand is vlak (~0cm)" }, "3": { - "then": "Geen" + "then": "Er is hier geen stoeprand" }, "4": { - "then": "Ja" + "then": "Er is een stoeprand met onbekende hoogte" } }, "question": "Hoe hoog is deze stoeprand?" diff --git a/langs/themes/en.json b/langs/themes/en.json index ba9b2c93d5..96f41514b4 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -642,7 +642,7 @@ }, "kerbs_and_crossings": { "description": "A map showing kerbs and crossings.", - "title": "Crossings and Kerbs" + "title": "Kerbs and crossings" }, "mapcomplete-changes": { "description": "This maps shows all the changes made with MapComplete", diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 20b23f1636..70d17e2b3e 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -749,7 +749,7 @@ }, "kerbs_and_crossings": { "description": "Een kaart met stoepranden en oversteekplaatsen.", - "title": "Oversteekplaatsen en stoepranden" + "title": "Stoepranden en oversteekplaatsen" }, "maps": { "description": "Op deze kaart kan je alle kaarten zien die OpenStreetMap kent.

Ontbreekt er een kaart, dan kan je die kaart hier ook gemakelijk aan deze kaart toevoegen.", From 8eab5bfdd2880508442a8c4af291af1e84703f93 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 29 Jun 2022 22:37:06 +0200 Subject: [PATCH 09/13] Added icons to mappings --- .../cycleways_and_roads.json | 4 ++-- assets/layers/kerbs/KerbIcon.svg | 18 +++++++++--------- assets/layers/kerbs/kerbs.json | 18 +++++++++++++++++- assets/layers/school/school.json | 19 +++++++++++-------- langs/layers/de.json | 3 +++ langs/layers/en.json | 15 +++++++++++++++ langs/layers/es.json | 17 ++++++++--------- langs/layers/fr.json | 3 +++ langs/layers/nl.json | 15 +++++++++++++++ 9 files changed, 83 insertions(+), 29 deletions(-) diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 5aa30603f7..1b86a6009e 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -70,7 +70,7 @@ "fr": "Piste cyclable", "ca": "Via ciclista", "da": "Cykelsti", - "es": "Carril bici" + "es": "Carril compartido" } }, { @@ -93,7 +93,7 @@ "de": "Gemeinsame Fahrspur", "fr": "Voie partagée", "ca": "Carril compartit", - "es": "Carril compartido" + "es": "Vía ciclista al lado de la carretera" } }, { diff --git a/assets/layers/kerbs/KerbIcon.svg b/assets/layers/kerbs/KerbIcon.svg index d19fa5ad27..2e4172e4d5 100644 --- a/assets/layers/kerbs/KerbIcon.svg +++ b/assets/layers/kerbs/KerbIcon.svg @@ -7,8 +7,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="16" - height="16" + width="500" + height="500" id="svg2" version="1.1" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" @@ -22,9 +22,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="32" - inkscape:cx="4.775012" - inkscape:cy="8.2391685" + inkscape:zoom="2" + inkscape:cx="304.38287" + inkscape:cy="103.37718" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -32,9 +32,9 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:window-width="2160" - inkscape:window-height="1346" - inkscape:window-x="-11" + inkscape:window-width="3840" + inkscape:window-height="2066" + inkscape:window-x="2149" inkscape:window-y="-11" inkscape:window-maximized="1" inkscape:document-rotation="0"> @@ -69,7 +69,7 @@ transform="translate(-334.84375,-558.61859)"> + transform="matrix(32.352738,0,0,32.352738,-10498.292,-17490.849)"> 3 cm)", "nl": "Deze stoeprand is hoog (>3 cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/raised.svg", + "class": "small" } }, { @@ -71,6 +75,10 @@ "then": { "en": "This kerb is lowered (~3 cm)", "nl": "Deze stoeprand is verlaagd (~3 cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/lowered.svg", + "class": "small" } }, { @@ -78,6 +86,10 @@ "then": { "en": "This kerb is flush (~0cm)", "nl": "Deze stoeprand is vlak (~0cm)" + }, + "icon": { + "path": "./assets/layers/kerbs/flush.svg", + "class": "small" } }, { @@ -86,7 +98,11 @@ "en": "There is no kerb here", "nl": "Er is hier geen stoeprand" }, - "hideInAnswer": true + "hideInAnswer": true, + "icon": { + "path": "./assets/layers/kerbs/no.svg", + "class": "small" + } }, { "if": "kerb=yes", diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index 6fafa0f8af..0d79aac11b 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -298,16 +298,17 @@ "fr": "Quelle est la langue principale de cette école ?
Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?
" }, "render": { - "en": "{school:language} is the main language of {name}", - "nl": "{school:language} is de voertaal van {name}", - "de": "{school:language} ist die Hauptsprache von {name}" + "en": "{school:language} is the main language of {title()}", + "nl": "{school:language} is de voertaal van {title()}", + "de": "{school:language} ist die Hauptsprache von {title()}" }, "freeform": { "key": "school:language", "inline": true, "placeholder": { - "en":"Language in lowercase English", - "nl":"Taal in lowercase Engel"}, + "en": "Language in lowercase English", + "nl": "Taal in lowercase Engel" + }, "addExtraTags": [ "fixme=Freeform tag `school:language` used, to be doublechecked" ] @@ -316,8 +317,10 @@ { "if": "school:language=english", "then": { - "en": "English is the main language of {name}", - "nl": "Engels is de voertaal van {name}" + "en": "The main language of this school is unknown", + "nl": "De voertaal van deze school is niet gekend", + "de": "Die Hauptsprache dieser Schule ist unbekannt", + "fr": "La langue principale de cette école est inconnue" } }, { @@ -395,4 +398,4 @@ "width": 1 } ] -} +} \ No newline at end of file diff --git a/langs/layers/de.json b/langs/layers/de.json index 78b05ee3a0..b609f0f216 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5046,6 +5046,9 @@ "mappings": { "0": { "then": "Die Hauptsprache dieser Schule ist unbekannt" + }, + "4": { + "then": "Die Hauptsprache dieser Schule ist unbekannt" } }, "question": "Was ist die Hauptsprache dieser Schule?
Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?
", diff --git a/langs/layers/en.json b/langs/layers/en.json index 6c0fa5b123..5c1bc31c2d 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5106,9 +5106,24 @@ "question": "Which genders can enroll at this school?" }, "language": { + "freeform": { + "placeholder": "Language in lowercase English" + }, "mappings": { "0": { "then": "The main language of this school is unknown" + }, + "1": { + "then": "French is the main language of {name}" + }, + "2": { + "then": "Dutch is the main language of {name}" + }, + "3": { + "then": "German is the main language of {name}" + }, + "4": { + "then": "The main language of this school is unknown" } }, "question": "What is the main language of this school?
What language is spoken with the students in non-language related courses and with the administration?
", diff --git a/langs/layers/es.json b/langs/layers/es.json index fad9c74954..8910cbdce7 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -1952,23 +1952,22 @@ }, "title": { "mappings": { - "0": { - "then": "Carril bici" - }, "1": { "then": "Carril compartido" }, - "2": { - "then": "Carril bici" - }, "3": { "then": "Vía ciclista al lado de la carretera" }, - "4": { + "5": { + "then": "Carril bici" + }, + "7": { + "then": "Vía ciclista al lado de la carretera" + }, + "9": { "then": "Ciclocalle" } - }, - "render": "Ciclovías" + } } }, "defibrillator": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 3fd6aa4fab..e04ac8e1f6 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2470,6 +2470,9 @@ "mappings": { "0": { "then": "La langue principale de cette école est inconnue" + }, + "4": { + "then": "La langue principale de cette école est inconnue" } }, "question": "Quelle est la langue principale de cette école ?
Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?
" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index cfbba9c9d6..9224f00e75 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -5026,9 +5026,24 @@ "question": "Mogen jongens en meisjes les volgen op deze school?" }, "language": { + "freeform": { + "placeholder": "Taal in lowercase Engel" + }, "mappings": { "0": { "then": "De voertaal van deze school is niet gekend" + }, + "1": { + "then": "Frans is de voertaal van {name}" + }, + "2": { + "then": "Nederlands is de voertaal van {name}" + }, + "3": { + "then": "Duits is de voertaal van {name}" + }, + "4": { + "then": "De voertaal van deze school is niet gekend" } }, "question": "Wat is de voertaal van deze school?
Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?
", From 2b3f1653b5e4606f192897202a8fb92afc4bd4bf Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 29 Jun 2022 22:41:03 +0200 Subject: [PATCH 10/13] Regenerate translations --- langs/themes/de.json | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/langs/themes/de.json b/langs/themes/de.json index 2ad828ca4a..1773fd9272 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -647,6 +647,68 @@ "shortDescription": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen.", "title": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen" }, + "mapcomplete-changes": { + "description": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", + "layers": { + "0": { + "description": "Zeigt alle MapComplete Änderungen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenname enthält {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Erstellt von {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Nicht erstellt von {search}" + } + } + } + }, + "name": "Schwerpunkte von Änderungssätzen", + "tagRenderings": { + "contributor": { + "render": "Änderung wurde von {_last_edit:contributor} gemacht" + }, + "render_id": { + "render": "Änderung {id}" + }, + "theme": { + "mappings": { + "0": { + "then": "Änderung mit inoffiziellem Thema {theme}" + } + }, + "render": "Änderung mit Thema {theme}" + } + }, + "title": { + "render": "Änderungen für {theme}" + } + }, + "1": { + "override": { + "tagRenderings": { + "link_to_more": { + "render": "Weitere Statistiken finden Sie hier" + } + } + } + } + }, + "shortDescription": "Zeigt Änderungen von MapComplete", + "title": "Änderungen mit MapComplete" + }, "maps": { "description": "Auf dieser Karte findest du alle Karten, die OpenStreetMap kennt - typischerweise eine große Karte auf einer Informationstafel, die das Gebiet, die Stadt oder die Region zeigt, z.B. eine touristische Karte auf der Rückseite einer Plakatwand, eine Karte eines Naturschutzgebietes, eine Karte der Radwegenetze in der Region, ...)

Wenn eine Karte fehlt, können Sie diese leicht auf OpenStreetMap kartieren.", "shortDescription": "Dieses Thema zeigt alle (touristischen) Karten, die OpenStreetMap kennt", From 2b6598b1cb376308e106b871e02896cdba94fa97 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 30 Jun 2022 13:06:48 +0200 Subject: [PATCH 11/13] Added filters to kerb layer --- assets/layers/kerbs/kerbs.json | 76 ++++++++++++++++++++++++++++++++++ langs/layers/en.json | 40 ++++++++++++++++++ langs/layers/nl.json | 24 +++++++++++ 3 files changed, 140 insertions(+) diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index a255e83a08..9d5a8bd8c2 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -166,5 +166,81 @@ ] } } + ], + "filter": [ + { + "id": "kerb-type", + "options": [ + { + "question": { + "en": "All types of kerbs", + "nl": "Alle typen stoepranden" + } + }, + { + "osmTags": "kerb=raised", + "question": { + "en": "Raised kerb (>3 cm)", + "nl": "Hoge stoeprand (>3 cm)" + } + }, + { + "osmTags": "kerb=lowered", + "question": { + "en": "Lowered kerb (~3 cm)", + "nl": "Verlaagde stoeprand (~3 cm)" + } + }, + { + "osmTags": "kerb=flush", + "question": { + "en": "Flush kerb (~0cm)", + "nl": "Vlakke stoeprand (~0cm)" + } + }, + { + "osmTags": "kerb=no", + "question": { + "en": "No kerb", + "nl": "Geen stoeprand" + } + }, + { + "osmTags": "kerb=", + "question": { + "en": "Kerb with unknown height", + "nl": "Stoeprand met onbekende hoogte" + } + } + ] + }, + { + "id": "tactile-paving", + "options": [ + { + "question": { + "en": "Kerbs with or without tactile paving" + } + }, + { + "osmTags": "tactile_paving=yes", + "question": { + "en": "Kerb with tactile paving" + } + }, + { + "osmTags": "tactile_paving=no", + "question": { + "en": "Kerb without tactile paving" + } + }, + { + "osmTags": "tactile_paving=", + "question": { + "en": "Kerb wihout information about tactile paving" + } + } + ] + } ] } \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 5c1bc31c2d..536129307e 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4069,6 +4069,46 @@ }, "kerbs": { "description": "A layer showing kerbs.", + "filter": { + "0": { + "options": { + "0": { + "question": "All types of kerbs" + }, + "1": { + "question": "Raised kerb (>3 cm)" + }, + "2": { + "question": "Lowered kerb (~3 cm)" + }, + "3": { + "question": "Flush kerb (~0cm)" + }, + "4": { + "question": "No kerb" + }, + "5": { + "question": "Kerb with unknown height" + } + } + }, + "1": { + "options": { + "0": { + "question": "Kerbs with or without tactile paving" + }, + "1": { + "question": "Kerb with tactile paving" + }, + "2": { + "question": "Kerb without tactile paving" + }, + "3": { + "question": "Kerb wihout information about tactile paving" + } + } + } + }, "name": "Kerbs", "presets": { "0": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 9224f00e75..0d22edb34a 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3998,6 +3998,30 @@ }, "kerbs": { "description": "Een laag met stoepranden.", + "filter": { + "0": { + "options": { + "0": { + "question": "Alle typen stoepranden" + }, + "1": { + "question": "Hoge stoeprand (>3 cm)" + }, + "2": { + "question": "Verlaagde stoeprand (~3 cm)" + }, + "3": { + "question": "Vlakke stoeprand (~0cm)" + }, + "4": { + "question": "Geen stoeprand" + }, + "5": { + "question": "Stoeprand met onbekende hoogte" + } + } + } + }, "name": "Stoepranden", "presets": { "0": { From 06a7a8d57f8f498a6b1feb87ed4e0972bedf2a40 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 1 Jul 2022 16:22:46 +0200 Subject: [PATCH 12/13] Added kerb height --- assets/layers/kerbs/kerbs.json | 59 ++++++++++++++++++++++++++++++++++ langs/layers/en.json | 21 ++++++++++++ langs/layers/nl.json | 21 ++++++++++++ 3 files changed, 101 insertions(+) diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index 9d5a8bd8c2..a9f20f6deb 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -142,6 +142,25 @@ } ], "condition": "_geometry:type=Point" + }, + { + "id": "kerb-height", + "question": { + "en": "What is the height of this kerb?", + "nl": "Hoe hoog is deze stoeprand?" + }, + "render": { + "en": "Kerb height: {{kerb:height}}", + "nl": "Stoeprandhoogte: {{kerb:height}}" + }, + "freeform": { + "key": "kerb:height", + "placeholder": { + "en": "Height of the kerb", + "nl": "Hoogte van de stoeprand" + }, + "type": "pnat" + } } ], "presets": [ @@ -242,5 +261,45 @@ } ] } + ], + "units": [ + { + "applicableUnits": [ + { + "canonicalDenomination": "cm", + "alternativeDenomination": [ + "centimeter", + "centimeters" + ], + "human": { + "en": "centimeters", + "nl": "centimeter" + }, + "humanSingular": { + "en": "centimeter", + "nl": "centimeter" + }, + "default": true + }, + { + "canonicalDenomination": "m", + "alternativeDenomination": [ + "meter", + "meters" + ], + "human": { + "en": "meters", + "nl": "meter" + }, + "humanSingular": { + "en": "meter", + "nl": "meter" + } + } + ], + "appliesToKey": [ + "kerb:height" + ] + } ] } \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 536129307e..7c83c4e626 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4117,6 +4117,13 @@ } }, "tagRenderings": { + "kerb-height": { + "freeform": { + "placeholder": "Height of the kerb" + }, + "question": "What is the height of this kerb?", + "render": "Kerb height: {{kerb:height}}" + }, "kerb-type": { "mappings": { "0": { @@ -4154,6 +4161,20 @@ }, "title": { "render": "Kerb" + }, + "units": { + "0": { + "applicableUnits": { + "0": { + "human": "centimeters", + "humanSingular": "centimeter" + }, + "1": { + "human": "meters", + "humanSingular": "meter" + } + } + } } }, "kindergarten_childcare": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 0d22edb34a..f3b77fc05e 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4030,6 +4030,13 @@ } }, "tagRenderings": { + "kerb-height": { + "freeform": { + "placeholder": "Hoogte van de stoeprand" + }, + "question": "Hoe hoog is deze stoeprand?", + "render": "Stoeprandhoogte: {{kerb:height}}" + }, "kerb-type": { "mappings": { "0": { @@ -4053,6 +4060,20 @@ }, "title": { "render": "Stoeprand" + }, + "units": { + "0": { + "applicableUnits": { + "0": { + "human": "centimeter", + "humanSingular": "centimeter" + }, + "1": { + "human": "meter", + "humanSingular": "meter" + } + } + } } }, "kindergarten_childcare": { From ce96db7e40e8b52565a827dac2dd108571b19f8e Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 2 Jul 2022 11:53:22 +0200 Subject: [PATCH 13/13] Add `highway=living_street` --- assets/layers/cycleways_and_roads/cycleways_and_roads.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 1b86a6009e..25fe94364e 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -27,6 +27,7 @@ "highway=service", "highway=footway", "highway=pedestrian", + "highway=living_street", { "and": [ "highway=path",