From b5627da624cf7c8296dd7d1ee74a2a52508738e5 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 3 Nov 2023 22:20:27 +0100 Subject: [PATCH] Show proposed routes/nodes,show route=hiking --- assets/themes/cyclenodes/cyclenodes.json | 70 +++++++++++++++----- assets/themes/walkingnodes/walkingnodes.json | 60 +++++++++++++---- langs/layers/en.json | 31 +++++++++ langs/layers/nl.json | 6 ++ langs/themes/ca.json | 11 ++- langs/themes/cs.json | 11 ++- langs/themes/da.json | 4 +- langs/themes/de.json | 17 +++-- langs/themes/en.json | 24 +++++-- langs/themes/es.json | 11 ++- langs/themes/fr.json | 11 ++- langs/themes/it.json | 4 +- langs/themes/nb_NO.json | 7 +- langs/themes/nl.json | 24 +++++-- langs/themes/pl.json | 11 ++- 15 files changed, 238 insertions(+), 64 deletions(-) diff --git a/assets/themes/cyclenodes/cyclenodes.json b/assets/themes/cyclenodes/cyclenodes.json index 2bb5eb2bb..8ecb092d6 100644 --- a/assets/themes/cyclenodes/cyclenodes.json +++ b/assets/themes/cyclenodes/cyclenodes.json @@ -112,7 +112,15 @@ "lineRendering": [ { "width": "4", - "color": "#00a703" + "color": { + "render": "#00a703", + "mappings": [ + { + "if": "state=proposed", + "then": "#f0a513" + } + ] + } } ], "pointRendering": null @@ -134,8 +142,9 @@ }, "source": { "osmTags": { - "and": [ - "rcn_ref~*" + "or": [ + "rcn_ref~*", + "proposed:rcn_ref~*" ] } }, @@ -146,14 +155,15 @@ "centroid" ], "label": { + "render": "
?
", "mappings": [ { "if": "rcn_ref~*", - "then": "
{rcn_ref}
" + "then": "
{rcn_ref}
" }, { - "if": "rcn_ref=", - "then": "
?
" + "if": "proposed:rcn_ref~*", + "then": "
{proposed:rcn_ref}
" } ] } @@ -162,16 +172,39 @@ "minzoom": 12, "title": { "render": { - "en": "Cycle node {rcn_ref}", - "de": "Fahrradknotenpunkt {rcn_ref}", - "es": "nodo ciclista {rcn_ref}", - "nb_NO": "sykkelnode {rcn_ref}", - "nl": "Fietsknooppunt {rcn_ref}", - "fr": "nœud cycliste {rcn_ref}", - "ca": "node ciclista {rcn_ref}", - "cs": "uzel cyklu {rcn_ref}", - "pl": "węzeł rowerowy {rcn_ref}" - } + "en": "Cycle node", + "de": "Fahrradknotenpunkt", + "es": "nodo ciclista", + "nb_NO": "sykkelnode", + "nl": "Fietsknooppunt", + "fr": "nœud cycliste", + "ca": "node ciclista", + "cs": "uzel cyklu", + "pl": "węzeł rowerowy" + }, + "mappings": [ + { + "if": "rcn_ref~*", + "then": { + "en": "Cycle node {rcn_ref}", + "de": "Fahrradknotenpunkt {rcn_ref}", + "es": "nodo ciclista {rcn_ref}", + "nb_NO": "sykkelnode {rcn_ref}", + "nl": "Fietsknooppunt {rcn_ref}", + "fr": "nœud cycliste {rcn_ref}", + "ca": "node ciclista {rcn_ref}", + "cs": "uzel cyklu {rcn_ref}", + "pl": "węzeł rowerowy {rcn_ref}" + } + }, + { + "if": "proposed:rcn_ref~*", + "then": { + "en": "Proposed cycle node {proposed:rcn_ref}", + "nl": "Voorgesteld fietsknooppunt {proposed:rcn_ref}" + } + } + ] }, "tagRenderings": [ { @@ -194,7 +227,8 @@ "en": "This cycling node has reference number {rcn_ref}", "nl": "Dit fietsknooppunt heeft referentienummer {rcn_ref}", "de": "Knotenpunktnummer {rcn_ref} des Fahrradknotenpunktnetzwerks" - } + }, + "condition": "rcn_ref~*" }, { "builtin": "survey_date", @@ -347,4 +381,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/themes/walkingnodes/walkingnodes.json b/assets/themes/walkingnodes/walkingnodes.json index 3d08f5019..77fc07002 100644 --- a/assets/themes/walkingnodes/walkingnodes.json +++ b/assets/themes/walkingnodes/walkingnodes.json @@ -34,9 +34,14 @@ "source": { "osmTags": { "and": [ + { + "or": [ + "route=hiking", + "route=foot" + ] + }, "network=rwn", - "network:type=node_network", - "route=foot" + "network:type=node_network" ] } }, @@ -71,7 +76,15 @@ "lineRendering": [ { "width": "4", - "color": "#452b29" + "color": { + "render": "#452b29", + "mappings": [ + { + "if": "state=proposed", + "then": "#f0a513" + } + ] + } } ], "pointRendering": null, @@ -122,8 +135,9 @@ }, "source": { "osmTags": { - "and": [ - "rwn_ref~*" + "or": [ + "rwn_ref~*", + "proposed:rwn_ref~*" ] } }, @@ -134,14 +148,15 @@ "centroid" ], "label": { + "render": "
?
", "mappings": [ { "if": "rwn_ref~*", - "then": "
{rwn_ref}
" + "then": "
{rwn_ref}
" }, { - "if": "rwn_ref=", - "then": "
?
" + "if": "proposed:rwn_ref~*", + "then": "
{proposed:rwn_ref}
" } ] } @@ -150,10 +165,26 @@ "minzoom": 12, "title": { "render": { - "en": "Walking node {rwn_ref}", - "nl": "Wandelknooppunt {rwn_ref}", - "de": "Wanderknoten {rwn_ref}" - } + "en": "Walking node", + "nl": "Wandelknooppunt" + }, + "mappings": [ + { + "if": "rwn_ref~*", + "then": { + "en": "Walking node {rwn_ref}", + "nl": "Wandelknooppunt {rwn_ref}", + "de": "Wanderknoten {rwn_ref}" + } + }, + { + "if": "proposed:rwn_ref~*", + "then": { + "en": "Proposed walking node {proposed:rwn_ref}", + "nl": "Voorgesteld wandelknooppunt {proposed:rwn_ref}" + } + } + ] }, "tagRenderings": [ { @@ -176,7 +207,8 @@ "en": "This walking node has reference number {rwn_ref}", "nl": "Dit wandelknooppunt heeft referentienummer {rwn_ref}", "de": "Dieser Wanderknoten hat die Referenznummer {rwn_ref}" - } + }, + "condition": "rwn_ref~*" }, { "builtin": "survey_date", @@ -312,4 +344,4 @@ } } ] -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 0f2e3d6b5..4fdcba826 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4218,6 +4218,9 @@ }, "1": { "then": "This is a water tap or water pump with non-drinkable water.
Examples are water taps with rain water to tap water for nearby plants
" + }, + "2": { + "then": "This is a historic, manual water pump where no drinking water can be found" } } }, @@ -4256,8 +4259,33 @@ "question": "Is this drinking water spot still operational?", "render": "The operational status is {operational_status}" }, + "fee": { + "mappings": { + "0": { + "then": "Free to use" + }, + "1": { + "then": "One needs to pay to use this drinking water point" + } + }, + "question": "Is this drinking water point free to use?" + }, "render-closest-drinking-water": { "render": "There is another drinking water fountain at {_closest_other_drinking_water_distance} meters" + }, + "type": { + "mappings": { + "0": { + "then": "This is a bubbler fountain. A water jet to drink from is sent upwards, typically controlled by a push button." + }, + "1": { + "then": "This is a bottle refill point where the water is sent downwards, typically controlled by a push button or a motion sensor. Drinking directly from the stream might be very hard or impossible." + }, + "2": { + "then": "This is a water tap. The water flows downward and the stream is controlled by a valve or push-button." + } + }, + "question": "What type of drinking water point is this?" } }, "title": { @@ -8979,6 +9007,9 @@ }, "4": { "then": "The surface is concrete" + }, + "5": { + "then": "The surface is fine gravel" } }, "question": "Which is the surface of this sport pitch?", diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 35f8706f0..5184c7223 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4094,6 +4094,9 @@ }, "render-closest-drinking-water": { "render": "Er bevindt zich een ander drinkwaterpunt op {_closest_other_drinking_water_distance} meter" + }, + "type": { + "question": "Wat voor soort drinkwaterpunt is dit?" } }, "title": { @@ -7927,6 +7930,9 @@ }, "4": { "then": "De ondergrond is beton" + }, + "5": { + "then": "De ondergrond bestaat uit grind" } }, "question": "Wat is de ondergrond van dit sportveld?", diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 171590816..e1dd8e763 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -509,7 +509,12 @@ } }, "title": { - "render": "node ciclista {rcn_ref}" + "mappings": { + "0": { + "then": "node ciclista {rcn_ref}" + } + }, + "render": "node ciclista" } } }, @@ -1159,10 +1164,10 @@ "1": { "mappings": { "0": { - "then": "Sí, hi ha una vorera a aquest costat del carrer" + "then": "Hi ha una vorera a aquest costat del carrer" }, "1": { - "then": "No, no hi ha vorera per la que caminar" + "then": "No hi ha vorera per la que caminar" }, "2": { "then": "Hi ha una vorera mapejada separadament per on caminar" diff --git a/langs/themes/cs.json b/langs/themes/cs.json index f7fa4de1b..8c0e84a1c 100644 --- a/langs/themes/cs.json +++ b/langs/themes/cs.json @@ -509,7 +509,12 @@ } }, "title": { - "render": "uzel cyklu {rcn_ref}" + "mappings": { + "0": { + "then": "uzel cyklu {rcn_ref}" + } + }, + "render": "uzel cyklu" } } }, @@ -1163,10 +1168,10 @@ "1": { "mappings": { "0": { - "then": "Ano, na této straně silnice je chodník" + "then": "Na této straně silnice je chodník" }, "1": { - "then": "Ne, není tu žádný chodník" + "then": "Není tu žádný chodník" }, "2": { "then": "Na mapě je vyznačen samostatný chodník" diff --git a/langs/themes/da.json b/langs/themes/da.json index 73fdd6129..302dce5d0 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -806,10 +806,10 @@ "1": { "mappings": { "0": { - "then": "Ja, der er et fortov på denne side af vejen" + "then": "Der er et fortov på denne side af vejen" }, "1": { - "then": "Nej, der er ikke noget fortov at gå på" + "then": "Der er ikke noget fortov at gå på" }, "2": { "then": "Der er et særskilt kortlagt fortov at gå på" diff --git a/langs/themes/de.json b/langs/themes/de.json index cc768eb16..75aa2f5ad 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -524,7 +524,12 @@ } }, "title": { - "render": "Fahrradknotenpunkt {rcn_ref}" + "mappings": { + "0": { + "then": "Fahrradknotenpunkt {rcn_ref}" + } + }, + "render": "Fahrradknotenpunkt" } }, "2": { @@ -1199,10 +1204,10 @@ "1": { "mappings": { "0": { - "then": "Ja, es gibt einen Bürgersteig auf dieser Straßenseite" + "then": "Es gibt einen Bürgersteig auf dieser Straßenseite" }, "1": { - "then": "Nein, es gibt keinen Bürgersteig für Fußgänger" + "then": "Es gibt keinen Bürgersteig für Fußgänger" }, "2": { "then": "Es gibt einen separat kartierten Bürgersteig für Fußgänger" @@ -1422,7 +1427,11 @@ } }, "title": { - "render": "Wanderknoten {rwn_ref}" + "mappings": { + "0": { + "then": "Wanderknoten {rwn_ref}" + } + } } }, "2": { diff --git a/langs/themes/en.json b/langs/themes/en.json index 7d423c5de..5a01a4795 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -524,7 +524,15 @@ } }, "title": { - "render": "Cycle node {rcn_ref}" + "mappings": { + "0": { + "then": "Cycle node {rcn_ref}" + }, + "1": { + "then": "Proposed cycle node {proposed:rcn_ref}" + } + }, + "render": "Cycle node" } }, "2": { @@ -1199,10 +1207,10 @@ "1": { "mappings": { "0": { - "then": "Yes, there is a sidewalk on this side of the road" + "then": "There is a sidewalk on this side of the road" }, "1": { - "then": "No, there is no sidewalk to walk on" + "then": "There is no sidewalk to walk on" }, "2": { "then": "There is a separately mapped sidewalk to walk on" @@ -1422,7 +1430,15 @@ } }, "title": { - "render": "Walking node {rwn_ref}" + "mappings": { + "0": { + "then": "Walking node {rwn_ref}" + }, + "1": { + "then": "Proposed walking node {proposed:rwn_ref}" + } + }, + "render": "Walking node" } }, "2": { diff --git a/langs/themes/es.json b/langs/themes/es.json index 45cf01b25..cc5186749 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -509,7 +509,12 @@ } }, "title": { - "render": "nodo ciclista {rcn_ref}" + "mappings": { + "0": { + "then": "nodo ciclista {rcn_ref}" + } + }, + "render": "nodo ciclista" } } }, @@ -1163,10 +1168,10 @@ "1": { "mappings": { "0": { - "then": "Sí, hay una acera en este lado de la calle" + "then": "Hay una acera en este lado de la calle" }, "1": { - "then": "No, no hay acera por la que caminar" + "then": "No hay acera por la que caminar" }, "2": { "then": "Hay una acera mapeada por separado por la que caminar" diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 38dbc4d73..371633038 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -506,7 +506,12 @@ } }, "title": { - "render": "nœud cycliste {rcn_ref}" + "mappings": { + "0": { + "then": "nœud cycliste {rcn_ref}" + } + }, + "render": "nœud cycliste" } } }, @@ -1102,10 +1107,10 @@ "1": { "mappings": { "0": { - "then": "Oui, il y a un trottoir de ce côté de la route" + "then": "Il y a un trottoir de ce côté de la route" }, "1": { - "then": "Non, il n'y a pas de trottoir où marcher" + "then": "Il n'y a pas de trottoir où marcher" }, "2": { "then": "Il y a un trottoir où marcher cartographié séparément" diff --git a/langs/themes/it.json b/langs/themes/it.json index 45464a5dc..457e34574 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -599,10 +599,10 @@ "1": { "mappings": { "0": { - "then": "Sì, c'è un marciapiede su questo lato della strada" + "then": "C'è un marciapiede su questo lato della strada" }, "1": { - "then": "No, non c'è un marciapiede su cui camminare" + "then": "Non c'è un marciapiede su cui camminare" } } } diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index abc997dee..aff67e03c 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -283,7 +283,12 @@ "1": { "name": "noder", "title": { - "render": "sykkelnode {rcn_ref}" + "mappings": { + "0": { + "then": "sykkelnode {rcn_ref}" + } + }, + "render": "sykkelnode" } } }, diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 16e57a9b2..ecf3d12b3 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -475,7 +475,15 @@ } }, "title": { - "render": "Fietsknooppunt {rcn_ref}" + "mappings": { + "0": { + "then": "Fietsknooppunt {rcn_ref}" + }, + "1": { + "then": "Voorgesteld fietsknooppunt {proposed:rcn_ref}" + } + }, + "render": "Fietsknooppunt" } } }, @@ -1156,10 +1164,10 @@ "1": { "mappings": { "0": { - "then": "Ja, er is een stoep aan deze kant van de weg" + "then": "Er is een stoep aan deze kant van de weg" }, "1": { - "then": "Nee, er is geen stoep om op te lopen" + "then": "Er is geen stoep om op te lopen" }, "2": { "then": "Er is een apart ingetekende stoep om op te lopen" @@ -1424,7 +1432,15 @@ } }, "title": { - "render": "Wandelknooppunt {rwn_ref}" + "mappings": { + "0": { + "then": "Wandelknooppunt {rwn_ref}" + }, + "1": { + "then": "Voorgesteld wandelknooppunt {proposed:rwn_ref}" + } + }, + "render": "Wandelknooppunt" } } }, diff --git a/langs/themes/pl.json b/langs/themes/pl.json index 22eee941e..a8f2b1e2d 100644 --- a/langs/themes/pl.json +++ b/langs/themes/pl.json @@ -509,7 +509,12 @@ } }, "title": { - "render": "węzeł rowerowy {rcn_ref}" + "mappings": { + "0": { + "then": "węzeł rowerowy {rcn_ref}" + } + }, + "render": "węzeł rowerowy" } } }, @@ -1163,10 +1168,10 @@ "1": { "mappings": { "0": { - "then": "Tak, jest chodnik z boku drogi" + "then": "Jest chodnik z boku drogi" }, "1": { - "then": "Nie, nie ma chodnika, którym można chodzić" + "then": "Nie ma chodnika, którym można chodzić" }, "2": { "then": "Jest oddzielnie oznaczony chodnik"