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 1/3] 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 2bb5eb2bbd..8ecb092d63 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 3d08f50190..77fc07002b 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 0f2e3d6b5e..4fdcba8266 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 35f8706f07..5184c72233 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 1715908164..e1dd8e763a 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 f7fa4de1ba..8c0e84a1c3 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 73fdd61292..302dce5d09 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 cc768eb169..75aa2f5ada 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 7d423c5dea..5a01a4795c 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 45cf01b25d..cc5186749a 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 38dbc4d733..371633038f 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 45464a5dc1..457e34574d 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 abc997dee5..aff67e03cc 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 16e57a9b2f..ecf3d12b3b 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 22eee941e5..a8f2b1e2d4 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" From 834e4b5e0234754268fcb6c85d1d84500ca98a67 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 30 Nov 2023 23:46:08 +0100 Subject: [PATCH 2/3] Update plug types from Wikipedia --- .../charging_station/charging_station.json | 123 +++++++++++++++++- assets/layers/charging_station/types.csv | 4 +- 2 files changed, 119 insertions(+), 8 deletions(-) diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 91d305c3ff..1828087e25 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -330,14 +330,79 @@ }, "hideInAnswer": { "or": [ - "_country!=be", + "_country!=af", + "_country!=al", + "_country!=dz", + "_country!=as", + "_country!=ad", + "_country!=ao", + "_country!=am", + "_country!=aw", + "_country!=az", + "_country!=by", + "_country!=bt", + "_country!=ba", + "_country!=bg", + "_country!=cv", + "_country!=td", + "_country!=cl", + "_country!=hr", + "_country!=dk", + "_country!=eg", + "_country!=ee", + "_country!=et", + "_country!=fo", "_country!=fr", - "_country!=ma", - "_country!=tn", - "_country!=pl", - "_country!=cs", + "_country!=pf", + "_country!=ge", + "_country!=gr", + "_country!=gl", + "_country!=gn", + "_country!=gw", + "_country!=is", + "_country!=id", + "_country!=ir", + "_country!=jo", + "_country!=kz", + "_country!=kg", + "_country!=la", + "_country!=lv", + "_country!=lr", + "_country!=ly", + "_country!=lt", + "_country!=lu", + "_country!=mo", + "_country!=mr", + "_country!=md", + "_country!=mc", + "_country!=mn", + "_country!=me", + "_country!=mz", + "_country!=nl", + "_country!=nc", + "_country!=ne", + "_country!=kp", + "_country!=mk", + "_country!=pt", + "_country!=qa", + "_country!=ro", + "_country!=ru", + "_country!=rw", + "_country!=sm", "_country!=sk", - "_country!=mo" + "_country!=si", + "_country!=kr", + "_country!=es", + "_country!=sr", + "_country!=tj", + "_country!=th", + "_country!=tl", + "_country!=tr", + "_country!=tm", + "_country!=ua", + "_country!=uy", + "_country!=uz", + "_country!=vn" ] } }, @@ -378,6 +443,52 @@ "icon": { "path": "./assets/layers/charging_station/TypeE.svg", "class": "medium" + }, + "hideInAnswer": { + "or": [ + "_country!=be", + "_country!=bj", + "_country!=bf", + "_country!=bi", + "_country!=cm", + "_country!=cf", + "_country!=td", + "_country!=km", + "_country!=cz", + "_country!=dk", + "_country!=dj", + "_country!=gq", + "_country!=et", + "_country!=fo", + "_country!=fr", + "_country!=gf", + "_country!=pf", + "_country!=gl", + "_country!=gp", + "_country!=gw", + "_country!=la", + "_country!=lr", + "_country!=mg", + "_country!=ml", + "_country!=mq", + "_country!=mr", + "_country!=mu", + "_country!=mc", + "_country!=mn", + "_country!=ma", + "_country!=ne", + "_country!=pl", + "_country!=pt", + "_country!=rw", + "_country!=mf", + "_country!=pm", + "_country!=sn", + "_country!=sk", + "_country!=sy", + "_country!=tl", + "_country!=tn", + "_country!=uz" + ] } }, { diff --git a/assets/layers/charging_station/types.csv b/assets/layers/charging_station/types.csv index d31c004ba2..8d9795616c 100644 --- a/assets/layers/charging_station/types.csv +++ b/assets/layers/charging_station/types.csv @@ -1,6 +1,6 @@ key,image,description:en,countryWhiteList,countryBlackList,commonVoltages,commonCurrents,commonOutputs,description:nl,associatedVehicleTypes,neverAssociatedWith,extraVisualisationCondition -socket:schuko,CEE7_4F.svg,Schuko wall plug without ground pin (CEE7/4 type F),be;fr;ma;tn;pl;cs;sk;mo,,230,16,3.6 kW,Schuko stekker zonder aardingspin (CEE7/4 type F),*,, -socket:typee,TypeE.svg,European wall plug with ground pin (CEE7/4 type E),,,230,16,3 kW;22 kW;,Europese stekker met aardingspin (CEE7/4 type E),*,, +socket:schuko,CEE7_4F.svg,Schuko wall plug without ground pin (CEE7/4 type F),af;al;dz;as;ad;ao;am;aw;az;by;bt;ba;bg;cv;td;cl;hr;dk;eg;ee;et;fo;fr;pf;ge;gr;gl;gn;gw;is;id;ir;jo;kz;kg;la;lv;lr;ly;lt;lu;mo;mr;md;mc;mn;me;mz;nl;nc;ne;kp;mk;pt;qa;ro;ru;rw;sm;sk;si;kr;es;sr;tj;th;tl;tr;tm;ua;uy;uz;vn,,230,16,3.6 kW,Schuko stekker zonder aardingspin (CEE7/4 type F),*,, +socket:typee,TypeE.svg,European wall plug with ground pin (CEE7/4 type E),be;bj;bf;bi;cm;cf;td;km;cz;dk;dj;gq;et;fo;fr;gf;pf;gl;gp;gw;la;lr;mg;ml;mq;mr;mu;mc;mn;ma;ne;pl;pt;rw;mf;pm;sn;sk;sy;tl;tn;uz,,230,16,3 kW;22 kW;,Europese stekker met aardingspin (CEE7/4 type E),*,, socket:chademo,Chademo_type4.svg,Chademo,,,500,120,50 kW,Chademo,car;motorcar;hgv;bus,bicycle;scooter, socket:type1_cable,Type1_J1772.svg,Type 1 with cable (J1772),,,200;240,32,3.7 kW;7 kW,Type 1 met kabel (J1772),car;motorcar;hgv;bus,bicycle;scooter, socket:type1,Type1_J1772.svg,Type 1 without cable (J1772),,,200;240,32,3.7 kW;6.6 kW;7 kW;7.2 kW,Type 1 zonder kabel (J1772),car;motorcar;hgv;bus,bicycle;scooter, From 76874e6de89949d00816acf78ab224678c92aaab Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 1 Dec 2023 00:05:57 +0100 Subject: [PATCH 3/3] Update presets --- .vscode/settings.json | 5 +- .../charging_station/charging_station.json | 15 +++-- .../charging_station.protojson | 55 ++++++++++--------- assets/layers/charging_station/csvToJson.ts | 2 +- langs/layers/de.json | 2 +- langs/layers/en.json | 2 +- langs/layers/nl.json | 2 +- 7 files changed, 43 insertions(+), 40 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8e1ede94ea..e975a613f1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,5 +18,8 @@ "[svelte]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "editor.formatOnSave": true + "editor.formatOnSave": true, + "files.associations": { + "*.protojson": "json" + } } diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 1828087e25..691616f83f 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -329,7 +329,7 @@ "class": "medium" }, "hideInAnswer": { - "or": [ + "and": [ "_country!=af", "_country!=al", "_country!=dz", @@ -445,7 +445,7 @@ "class": "medium" }, "hideInAnswer": { - "or": [ + "and": [ "_country!=be", "_country!=bj", "_country!=bf", @@ -1142,7 +1142,7 @@ ] }, { - "or": [ + "and": [ "_country!=us" ] } @@ -5213,16 +5213,15 @@ "tags": [ "amenity=charging_station", "motorcar=no", - "bicycle=yes", - "socket:typee=1" + "bicycle=yes" ], "title": { - "en": "a charging station for electrical bikes with a normal european wall plug (meant to charge electrical bikes)", - "nl": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact (speciaal bedoeld voor fietsen)", + "en": "a charging station for electrical bikes", + "nl": "een oplaadpunt voor elektrische fietsen", "ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal (destinat a carregar bicicletes elèctriques)", "cs": "nabíjecí stanice pro elektrokola s běžnou evropskou zástrčkou (určeno k nabíjení elektrických kol)", "da": "en ladestation til elektriske cykler med et normalt europæisk vægstik (beregnet til opladning af elektriske cykler)", - "de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose (zum Laden von Elektrofahrrädern)", + "de": "eine Ladestation für Elektrofahrräder", "es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal (pensado para cargar bicicletas eléctricas)" } }, diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson index 828045f398..7f8356a666 100644 --- a/assets/layers/charging_station/charging_station.protojson +++ b/assets/layers/charging_station/charging_station.protojson @@ -735,30 +735,32 @@ "point", "centroid" ], - "marker": [{ - "icon": "pin", - "color": "#fff" - },{ - "icon": { - "render":"./assets/themes/charging_stations/plug.svg", - "mappings": [ - { - "if": "bicycle=yes", - "then": "./assets/themes/charging_stations/bicycle.svg" - }, - { - "if": { - "or": [ - "car=yes", - "motorcar=yes" - ] + "marker": [ + { + "icon": "pin", + "color": "#fff" + }, + { + "icon": { + "render": "./assets/themes/charging_stations/plug.svg", + "mappings": [ + { + "if": "bicycle=yes", + "then": "./assets/themes/charging_stations/bicycle.svg" }, - "then": "./assets/themes/charging_stations/car.svg" - } - ] - + { + "if": { + "or": [ + "car=yes", + "motorcar=yes" + ] + }, + "then": "./assets/themes/charging_stations/car.svg" + } + ] + } } - }], + ], "iconBadges": [ { "if": { @@ -802,12 +804,11 @@ "tags": [ "amenity=charging_station", "motorcar=no", - "bicycle=yes", - "socket:typee=1" + "bicycle=yes" ], "title": { - "en": "charging station for electrical bikes with a normal european wall plug ", - "nl": "oplaadpunt voor elektrische fietsen met een gewone, europese stekker " + "en": "charging station for electrical bikes", + "nl": "oplaadpunt voor elektrische fietsen" } }, { @@ -949,4 +950,4 @@ }, "neededChangesets": 10 } -} +} \ No newline at end of file diff --git a/assets/layers/charging_station/csvToJson.ts b/assets/layers/charging_station/csvToJson.ts index ff1a50fb61..e0ee8f610c 100644 --- a/assets/layers/charging_station/csvToJson.ts +++ b/assets/layers/charging_station/csvToJson.ts @@ -91,7 +91,7 @@ function run(file, protojson) { if (e.countryWhiteList.length > 0) { // This is a 'hideInAnswer', thus _reverse_ logic! const countries = e.countryWhiteList.map(country => "_country!=" + country) //HideInAnswer if it is in the wrong country - json["hideInAnswer"] = {or: countries} + json["hideInAnswer"] = {and: countries} // Should be and, as we want to hide if it does not match any of the countries } else if (e.countryBlackList.length > 0) { const countries = e.countryBlackList.map(country => "_country=" + country) //HideInAnswer if it is in the wrong country json["hideInAnswer"] = {or: countries} diff --git a/langs/layers/de.json b/langs/layers/de.json index 4067c6339a..e6d3e30587 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -1993,7 +1993,7 @@ "name": "Ladestationen", "presets": { "0": { - "title": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose (zum Laden von Elektrofahrrädern)" + "title": "eine Ladestation für Elektrofahrräder" }, "1": { "title": "Eine Ladestation für Elektrofahrzeuge" diff --git a/langs/layers/en.json b/langs/layers/en.json index 4fdcba8266..b5a7cd1535 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -1993,7 +1993,7 @@ "name": "Charging stations", "presets": { "0": { - "title": "a charging station for electrical bikes with a normal european wall plug (meant to charge electrical bikes)" + "title": "a charging station for electrical bikes" }, "1": { "title": "a charging station for cars" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 5184c72233..5db8c5b88a 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1842,7 +1842,7 @@ "name": "Oplaadpunten", "presets": { "0": { - "title": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact (speciaal bedoeld voor fietsen)" + "title": "een oplaadpunt voor elektrische fietsen" }, "1": { "title": "een oplaadstation voor elektrische auto's"