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] 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",