diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json
index b63f91a9b..2ef6650e9 100644
--- a/assets/layers/bike_parking/bike_parking.json
+++ b/assets/layers/bike_parking/bike_parking.json
@@ -271,7 +271,7 @@
"pt_BR": "Estacionamento ao nível da superfície",
"pt": "Estacionamento ao nível da superfície"
},
- "hideInAnwser": true
+ "hideInAnswer": true
},
{
"if": "location=rooftop",
diff --git a/assets/layers/charging_station/README.md b/assets/layers/charging_station/README.md
index 4c57a9c15..d6481024e 100644
--- a/assets/layers/charging_station/README.md
+++ b/assets/layers/charging_station/README.md
@@ -26,13 +26,14 @@ The CSV File
The columns in the CSV file are:
-- key: the key as described on the wiki, starts with `socket:`
-- image: The associated image (a .svg)
-- description:en A description in english
-- description:nl A description in english
-- countryWhiteList: Only show this plug type in these countries
-- countryBlackList: Don't show this plug type in these countries. NOt compatibel with the whiteList
-- commonVoltages, commonCurrents, commonOutputs: common values for these tags
-- associatedVehicleTypes and neverAssociatedWith: these work in tandem to hide options. If every associated vehicle type
+- `key`: the key as described on the wiki, starts with `socket:`
+- `image`: The associated image (a .svg)
+- `description:en` A description in english
+- `description:nl` A description in english
+- `countryWhiteList`: Only show this plug type in these countries
+- `countryBlackList`: Don't show this plug type in these countries. NOt compatibel with the whiteList
+- `commonVoltages`, `commonCurrents`, `commonOutputs`: common values for these tags
+- `associatedVehicleTypes` and `neverAssociatedWith`: these work in tandem to hide options. If every associated vehicle type
is `no`, then the option is hidden If at least one `neverAssociatedVehicleType` is `yes` and none of the associated
types is yes, then the option is hidden too
+- `extraVisualisationCondition`: in some exceptional cases, a socket type is branded differently. This extra condition allows tho hide these cases in the big multi-answer
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 3d89e0214..3e7da3ab0 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -2,8 +2,7 @@
"id": "charging_station",
"name": {
"en": "Charging stations",
- "nl": "Oplaadpunten",
- "de": "Ladestationen"
+ "nl": "Oplaadpunten"
},
"minzoom": 10,
"source": {
@@ -24,8 +23,7 @@
},
"description": {
"en": "A charging station",
- "nl": "Oplaadpunten",
- "de": "Eine Ladestation"
+ "nl": "Oplaadpunten"
},
"tagRenderings": [
"images",
@@ -180,7 +178,8 @@
"if": {
"and": [
"socket:schuko~*",
- "socket:schuko!=1"
+ "socket:schuko!=1",
+ ""
]
},
"then": {
@@ -201,7 +200,8 @@
"if": {
"and": [
"socket:typee~*",
- "socket:typee!=1"
+ "socket:typee!=1",
+ ""
]
},
"then": {
@@ -248,7 +248,8 @@
"if": {
"and": [
"socket:chademo~*",
- "socket:chademo!=1"
+ "socket:chademo!=1",
+ ""
]
},
"then": {
@@ -295,7 +296,8 @@
"if": {
"and": [
"socket:type1_cable~*",
- "socket:type1_cable!=1"
+ "socket:type1_cable!=1",
+ ""
]
},
"then": {
@@ -342,7 +344,8 @@
"if": {
"and": [
"socket:type1~*",
- "socket:type1!=1"
+ "socket:type1!=1",
+ ""
]
},
"then": {
@@ -389,7 +392,8 @@
"if": {
"and": [
"socket:type1_combo~*",
- "socket:type1_combo!=1"
+ "socket:type1_combo!=1",
+ ""
]
},
"then": {
@@ -436,7 +440,8 @@
"if": {
"and": [
"socket:tesla_supercharger~*",
- "socket:tesla_supercharger!=1"
+ "socket:tesla_supercharger!=1",
+ ""
]
},
"then": {
@@ -483,7 +488,8 @@
"if": {
"and": [
"socket:type2~*",
- "socket:type2!=1"
+ "socket:type2!=1",
+ ""
]
},
"then": {
@@ -530,7 +536,8 @@
"if": {
"and": [
"socket:type2_combo~*",
- "socket:type2_combo!=1"
+ "socket:type2_combo!=1",
+ ""
]
},
"then": {
@@ -577,7 +584,8 @@
"if": {
"and": [
"socket:type2_cable~*",
- "socket:type2_cable!=1"
+ "socket:type2_cable!=1",
+ ""
]
},
"then": {
@@ -624,7 +632,8 @@
"if": {
"and": [
"socket:tesla_supercharger_ccs~*",
- "socket:tesla_supercharger_ccs!=1"
+ "socket:tesla_supercharger_ccs!=1",
+ ""
]
},
"then": {
@@ -676,7 +685,8 @@
"if": {
"and": [
"socket:tesla_destination~*",
- "socket:tesla_destination!=1"
+ "socket:tesla_destination!=1",
+ "_country=us"
]
},
"then": {
@@ -689,7 +699,7 @@
"if": "socket:tesla_destination=1",
"ifnot": "socket:tesla_destination=",
"then": {
- "en": "
Tesla supercharger (destination (A Type 2 with cable branded as tesla) Tesla supercharger (destination) (A Type 2 with cable branded as tesla) ",
"nl": " Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) "
},
"hideInAnswer": {
@@ -728,11 +738,12 @@
"if": {
"and": [
"socket:tesla_destination~*",
- "socket:tesla_destination!=1"
+ "socket:tesla_destination!=1",
+ "_country!=us"
]
},
"then": {
- "en": " Tesla supercharger (destination (A Type 2 with cable branded as tesla) ",
+ "en": " Tesla supercharger (destination) (A Type 2 with cable branded as tesla) ",
"nl": " Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) "
},
"hideInAnswer": true
@@ -749,7 +760,8 @@
"if": {
"and": [
"socket:USB-A~*",
- "socket:USB-A!=1"
+ "socket:USB-A!=1",
+ ""
]
},
"then": {
@@ -792,7 +804,8 @@
"if": {
"and": [
"socket:bosch_3pin~*",
- "socket:bosch_3pin!=1"
+ "socket:bosch_3pin!=1",
+ ""
]
},
"then": {
@@ -835,7 +848,8 @@
"if": {
"and": [
"socket:bosch_5pin~*",
- "socket:bosch_5pin!=1"
+ "socket:bosch_5pin!=1",
+ ""
]
},
"then": {
@@ -1101,11 +1115,11 @@
{
"id": "plugs-12",
"question": {
- "en": "How much plugs of type Tesla supercharger (destination (A Type 2 with cable branded as tesla) are available here?",
+ "en": "How much plugs of type Tesla supercharger (destination) (A Type 2 with cable branded as tesla) are available here?",
"nl": "Hoeveel stekkers van type Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) heeft dit oplaadpunt?"
},
"render": {
- "en": "There are {socket:tesla_destination} plugs of type Tesla supercharger (destination (A Type 2 with cable branded as tesla) available here",
+ "en": "There are {socket:tesla_destination} plugs of type Tesla supercharger (destination) (A Type 2 with cable branded as tesla) available here",
"nl": "Hier zijn {socket:tesla_destination} stekkers van het type Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) "
},
"freeform": {
@@ -2498,11 +2512,11 @@
"id": "voltage-12",
"group": "technical",
"question": {
- "en": "What voltage do the plugs with Tesla supercharger (destination (A Type 2 with cable branded as tesla) offer?",
+ "en": "What voltage do the plugs with Tesla supercharger (destination) (A Type 2 with cable branded as tesla) offer?",
"nl": "Welke spanning levert de stekker van type Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) "
},
"render": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs {socket:tesla_destination:voltage} volt",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs {socket:tesla_destination:voltage} volt",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) heeft een spanning van {socket:tesla_destination:voltage} volt"
},
"freeform": {
@@ -2513,14 +2527,14 @@
{
"if": "socket:socket:tesla_destination:voltage=230 V",
"then": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs 230 volt",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs 230 volt",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) heeft een spanning van 230 volt"
}
},
{
"if": "socket:socket:tesla_destination:voltage=400 V",
"then": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs 400 volt",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs 400 volt",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) heeft een spanning van 400 volt"
}
}
@@ -2536,11 +2550,11 @@
"id": "current-12",
"group": "technical",
"question": {
- "en": "What current do the plugs with Tesla supercharger (destination (A Type 2 with cable branded as tesla) offer?",
+ "en": "What current do the plugs with Tesla supercharger (destination) (A Type 2 with cable branded as tesla) offer?",
"nl": "Welke stroom levert de stekker van type Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) ?"
},
"render": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most {socket:tesla_destination:current}A",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most {socket:tesla_destination:current}A",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een stroom van maximaal {socket:tesla_destination:current}A"
},
"freeform": {
@@ -2551,14 +2565,14 @@
{
"if": "socket:socket:tesla_destination:current=16 A",
"then": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most 16 A",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 16 A",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een stroom van maximaal 16 A"
}
},
{
"if": "socket:socket:tesla_destination:current=32 A",
"then": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most 32 A",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 32 A",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een stroom van maximaal 32 A"
}
}
@@ -2574,11 +2588,11 @@
"id": "power-output-12",
"group": "technical",
"question": {
- "en": "What power output does a single plug of type Tesla supercharger (destination (A Type 2 with cable branded as tesla) offer?",
+ "en": "What power output does a single plug of type Tesla supercharger (destination) (A Type 2 with cable branded as tesla) offer?",
"nl": "Welk vermogen levert een enkele stekker van type Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) ?"
},
"render": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most {socket:tesla_destination:output}",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most {socket:tesla_destination:output}",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal {socket:tesla_destination:output}"
},
"freeform": {
@@ -2589,14 +2603,14 @@
{
"if": "socket:socket:tesla_destination:output=11 kw",
"then": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most 11 kw",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 11 kw",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 11 kw"
}
},
{
"if": "socket:socket:tesla_destination:output=22 kw",
"then": {
- "en": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most 22 kw",
+ "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 22 kw",
"nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 22 kw"
}
}
@@ -2997,8 +3011,7 @@
"#": "In some cases, charging is free but one has to be authenticated. We only ask for authentication if fee is no (or unset). By default one sees the questions for either the payment options or the authentication options, but normally not both",
"question": {
"en": "What kind of authentication is available at the charging station?",
- "nl": "Hoe kan men zich aanmelden aan dit oplaadstation?",
- "fr": "Quelle sorte d'authentification est disponible à cette station de charge ?"
+ "nl": "Hoe kan men zich aanmelden aan dit oplaadstation?"
},
"multiAnswer": true,
"mappings": [
@@ -3007,8 +3020,7 @@
"ifnot": "authentication:membership_card=no",
"then": {
"en": "Authentication by a membership card",
- "nl": "Aanmelden met een lidkaart is mogelijk",
- "fr": "Authentification par carte de membre"
+ "nl": "Aanmelden met een lidkaart is mogelijk"
}
},
{
@@ -3016,8 +3028,7 @@
"ifnot": "authentication:app=no",
"then": {
"en": "Authentication by an app",
- "nl": "Aanmelden via een applicatie is mogelijk",
- "fr": "Authentification par une app"
+ "nl": "Aanmelden via een applicatie is mogelijk"
}
},
{
@@ -3025,8 +3036,7 @@
"ifnot": "authentication:phone_call=no",
"then": {
"en": "Authentication via phone call is available",
- "nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk",
- "fr": "Authentification par appel téléphonique est disponible"
+ "nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk"
}
},
{
@@ -3034,8 +3044,7 @@
"ifnot": "authentication:short_message=no",
"then": {
"en": "Authentication via SMS is available",
- "nl": "Aanmelden via SMS is mogelijk",
- "fr": "Authentification par SMS est disponible"
+ "nl": "Aanmelden via SMS is mogelijk"
}
},
{
@@ -3043,8 +3052,7 @@
"ifnot": "authentication:nfc=no",
"then": {
"en": "Authentication via NFC is available",
- "nl": "Aanmelden via NFC is mogelijk",
- "fr": "Authentification par NFC est disponible"
+ "nl": "Aanmelden via NFC is mogelijk"
}
},
{
@@ -3060,8 +3068,7 @@
"ifnot": "authentication:debit_card=no",
"then": {
"en": "Authentication via debit card is available",
- "nl": "Aanmelden met een betaalkaart is mogelijk",
- "fr": "Authentification par carte de débit est disponible"
+ "nl": "Aanmelden met een betaalkaart is mogelijk"
}
},
{
@@ -3069,8 +3076,7 @@
"ifnot": "authentication:none=no",
"then": {
"en": "Charging here is (also) possible without authentication",
- "nl": "Hier opladen is (ook) mogelijk zonder aan te melden",
- "fr": "Charger ici est (aussi) possible sans authentification"
+ "nl": "Hier opladen is (ook) mogelijk zonder aan te melden"
}
}
],
@@ -3509,8 +3515,7 @@
],
"title": {
"en": "charging station for cars",
- "nl": "oplaadstation voor elektrische auto's",
- "de": "Ladestation für e-bikes"
+ "nl": "oplaadstation voor elektrische auto's"
},
"preciseInput": {
"preferredBackground": "map"
@@ -3524,26 +3529,20 @@
{
"question": {
"en": "All vehicle types",
- "nl": "Alle voertuigen",
- "de": "Alle Fahrzeugtypen",
- "fr": "Tout type de véhicule"
+ "nl": "Alle voertuigen"
}
},
{
"question": {
"en": "Charging station for bicycles",
- "nl": "Oplaadpunten voor fietsen",
- "de": "Ladestation für Fahrräder",
- "fr": "Station de charge pour vélos"
+ "nl": "Oplaadpunten voor fietsen"
},
"osmTags": "bicycle=yes"
},
{
"question": {
"en": "Charging station for cars",
- "nl": "Oplaadpunten voor auto's",
- "de": "Ladestation für Autos",
- "fr": "Station de charge pour automobiles"
+ "nl": "Oplaadpunten voor auto's"
},
"osmTags": {
"or": [
@@ -3560,8 +3559,7 @@
{
"question": {
"en": "Only working charging stations",
- "nl": "Enkel werkende oplaadpunten",
- "de": "Nur funktionierende Ladestationen"
+ "nl": "Enkel werkende oplaadpunten"
},
"osmTags": {
"and": [
@@ -3578,15 +3576,13 @@
{
"question": {
"en": "All connectors",
- "nl": "Alle types",
- "de": "Alle Anschlüsse"
+ "nl": "Alle types"
}
},
{
"question": {
"en": "Has a Schuko wall plug without ground pin (CEE7/4 type F) 
connector",
- "nl": "Heeft een Schuko stekker zonder aardingspin (CEE7/4 type F) ",
- "de": "Verfügt über einen Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F) "
+ "nl": "Heeft een Schuko stekker zonder aardingspin (CEE7/4 type F) "
},
"osmTags": "socket:schuko~*"
},
@@ -3600,40 +3596,35 @@
{
"question": {
"en": "Has a Chademo 
connector",
- "nl": "Heeft een Chademo ",
- "de": "Verfügt über einen Chademo Stecker"
+ "nl": "Heeft een Chademo "
},
"osmTags": "socket:chademo~*"
},
{
"question": {
"en": "Has a Type 1 with cable (J1772) 
connector",
- "nl": "Heeft een Type 1 met kabel (J1772) ",
- "de": "Verfügt über einen Typ 1 (J1772) Stecker mit Kabel"
+ "nl": "Heeft een Type 1 met kabel (J1772) "
},
"osmTags": "socket:type1_cable~*"
},
{
"question": {
"en": "Has a Type 1 without cable (J1772) connector",
- "nl": "Heeft een Type 1 zonder kabel (J1772) ",
- "de": "Verfügt über einen Typ 1 (J1772) Stecker ohne Kabel"
+ "nl": "Heeft een Type 1 zonder kabel (J1772) "
},
"osmTags": "socket:type1~*"
},
{
"question": {
"en": "Has a Type 1 CCS (aka Type 1 Combo) 
connector",
- "nl": "Heeft een Type 1 CCS (ook gekend als Type 1 Combo) ",
- "de": "Verfügt über einen Typ 1 CCS Stecker, auch bekannt als Typ 1 Combo"
+ "nl": "Heeft een Type 1 CCS (ook gekend als Type 1 Combo) "
},
"osmTags": "socket:type1_combo~*"
},
{
"question": {
"en": "Has a Tesla Supercharger 
connector",
- "nl": "Heeft een Tesla Supercharger ",
- "de": "Verfügt über einen Tesla Supercharger Stecker"
+ "nl": "Heeft een Tesla Supercharger "
},
"osmTags": "socket:tesla_supercharger~*"
},
@@ -3674,7 +3665,7 @@
},
{
"question": {
- "en": "Has a Tesla supercharger (destination (A Type 2 with cable branded as tesla) connector",
+ "en": "Has a Tesla supercharger (destination) (A Type 2 with cable branded as tesla) connector",
"nl": "Heeft een Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) "
},
"osmTags": "socket:tesla_destination~*"
@@ -3721,13 +3712,11 @@
],
"human": {
"en": " minutes",
- "nl": " minuten",
- "ru": " минут"
+ "nl": " minuten"
},
"humanSingular": {
"en": " minute",
- "nl": " minuut",
- "ru": " минута"
+ "nl": " minuut"
}
},
{
@@ -3743,13 +3732,11 @@
],
"human": {
"en": " hours",
- "nl": " uren",
- "ru": " часов"
+ "nl": " uren"
},
"humanSingular": {
"en": " hour",
- "nl": " uur",
- "ru": " час"
+ "nl": " uur"
}
},
{
@@ -3762,13 +3749,11 @@
],
"human": {
"en": " days",
- "nl": " day",
- "ru": " дней"
+ "nl": " day"
},
"humanSingular": {
"en": " day",
- "nl": " dag",
- "ru": " день"
+ "nl": " dag"
}
}
]
@@ -3804,8 +3789,7 @@
],
"human": {
"en": "Volts",
- "nl": "volt",
- "ru": "Вольт"
+ "nl": "volt"
}
}
],
@@ -3874,8 +3858,7 @@
],
"human": {
"en": "kilowatt",
- "nl": "kilowatt",
- "ru": "киловатт"
+ "nl": "kilowatt"
}
},
{
@@ -3885,8 +3868,7 @@
],
"human": {
"en": "megawatt",
- "nl": "megawatt",
- "ru": "мегаватт"
+ "nl": "megawatt"
}
}
],
diff --git a/assets/layers/charging_station/csvToJson.ts b/assets/layers/charging_station/csvToJson.ts
index 2d4bfe552..553f9806e 100644
--- a/assets/layers/charging_station/csvToJson.ts
+++ b/assets/layers/charging_station/csvToJson.ts
@@ -3,6 +3,7 @@ import {Utils} from "../../../Utils";
import {TagRenderingConfigJson} from "../../../Models/ThemeConfig/Json/TagRenderingConfigJson";
import ScriptUtils from "../../../scripts/ScriptUtils";
import {LayerConfigJson} from "../../../Models/ThemeConfig/Json/LayerConfigJson";
+import {TagsFilter} from "../../../Logic/Tags/TagsFilter";
function colonSplit(value: string): string[] {
@@ -19,7 +20,8 @@ function loadCsv(file): {
commonCurrents?: number[],
commonOutputs?: string[],
associatedVehicleTypes?: string[],
- neverAssociatedWith?: string[]
+ neverAssociatedWith?: string[],
+ extraVisualisationCondition: string
}[] {
const entries: string[] = Utils.NoNull(readFileSync(file, "utf8").split("\n").map(str => str.trim()))
const header = entries.shift().split(",")
@@ -120,7 +122,7 @@ function run(file, protojson) {
// We add a second time for any amount to trigger a visualisation; but this is not an answer option
const no_ask_json = {
if: {
- and: [`${e.key}~*`, `${e.key}!=1`]
+ and:Utils.NoNull( [`${e.key}~*`, `${e.key}!=1`, ...e.extraVisualisationCondition.split(";")])
},
then: txt,
hideInAnswer: true
diff --git a/assets/layers/charging_station/types.csv b/assets/layers/charging_station/types.csv
index 784a45eb9..d31c004ba 100644
--- a/assets/layers/charging_station/types.csv
+++ b/assets/layers/charging_station/types.csv
@@ -1,17 +1,17 @@
-key,image,description:en,countryWhiteList,countryBlackList,commonVoltages,commonCurrents,commonOutputs,description:nl,associatedVehicleTypes,neverAssociatedWith
-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: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
-socket:type1_combo,Type1-ccs.svg,Type 1 CCS (aka Type 1 Combo),,,400;1000,50;125,50 kW;62.5 kW;150 kW;350 kW;,Type 1 CCS (ook gekend als Type 1 Combo),car;motorcar;hgv;bus,bicycle;scooter
-socket:tesla_supercharger,Tesla-hpwc-model-s.svg,Tesla Supercharger,,,480,125;350,120 kW;150 kW;250 kW,Tesla Supercharger,car;motorcar;hgv;bus,bicycle;scooter
-socket:type2,Type2_socket.svg,Type 2 (mennekes),,,230;400,16;32,11 kW;22 kW,Type 2 (mennekes),car;motorcar;hgv;bus,bicycle;scooter
-socket:type2_combo,Type2_CCS.svg,Type 2 CCS (mennekes),,,500;920,125;350,50 kW,Type 2 CCS (mennekes),car;motorcar;hgv;bus,bicycle;scooter
-socket:type2_cable,Type2_tethered.svg,Type 2 with cable (mennekes),,,230;400,16;32,11 kW;22 kW,Type 2 met kabel (J1772),car;motorcar;hgv;bus,bicycle;scooter
-socket:tesla_supercharger_ccs,Type2_CCS.svg,Tesla Supercharger CCS (a branded type2_css),,,500;920,125;350,50 kW,Tesla Supercharger CCS (een type2 CCS met Tesla-logo),car;motorcar;hgv;bus,bicycle;scooter
-socket:tesla_destination,Tesla-hpwc-model-s.svg,Tesla Supercharger (destination),us,,480,125;350,120 kW;150 kW;250 kW,Tesla Supercharger (destination),car;motorcar;hgv;bus,bicycle;scooter
-socket:tesla_destination,Type2_tethered.svg,Tesla supercharger (destination (A Type 2 with cable branded as tesla),,us,230;400,16;32,11 kW;22 kW,Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo),car;motorcar;hgv;bus,bicycle;scooter
-socket:USB-A,usb_port.svg,USB to charge phones and small electronics,,,5,1;2,5W;10W,USB om GSMs en kleine electronica op te laden,*,
-socket:bosch_3pin,bosch-3pin.svg,Bosch Active Connect with 3 pins and cable,,,,,,Bosch Active Connect met 3 pinnen aan een kabel,bicycle,car;motorcar;hgv;bus
-socket:bosch_5pin,bosch-5pin.svg,Bosch Active Connect with 5 pins and cable,,,,,,Bosch Active Connect met 5 pinnen aan een kabel,bicycle,car;motorcar;hgv;bus
+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: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,
+socket:type1_combo,Type1-ccs.svg,Type 1 CCS (aka Type 1 Combo),,,400;1000,50;125,50 kW;62.5 kW;150 kW;350 kW;,Type 1 CCS (ook gekend als Type 1 Combo),car;motorcar;hgv;bus,bicycle;scooter,
+socket:tesla_supercharger,Tesla-hpwc-model-s.svg,Tesla Supercharger,,,480,125;350,120 kW;150 kW;250 kW,Tesla Supercharger,car;motorcar;hgv;bus,bicycle;scooter,
+socket:type2,Type2_socket.svg,Type 2 (mennekes),,,230;400,16;32,11 kW;22 kW,Type 2 (mennekes),car;motorcar;hgv;bus,bicycle;scooter,
+socket:type2_combo,Type2_CCS.svg,Type 2 CCS (mennekes),,,500;920,125;350,50 kW,Type 2 CCS (mennekes),car;motorcar;hgv;bus,bicycle;scooter,
+socket:type2_cable,Type2_tethered.svg,Type 2 with cable (mennekes),,,230;400,16;32,11 kW;22 kW,Type 2 met kabel (J1772),car;motorcar;hgv;bus,bicycle;scooter,
+socket:tesla_supercharger_ccs,Type2_CCS.svg,Tesla Supercharger CCS (a branded type2_css),,,500;920,125;350,50 kW,Tesla Supercharger CCS (een type2 CCS met Tesla-logo),car;motorcar;hgv;bus,bicycle;scooter,
+socket:tesla_destination,Tesla-hpwc-model-s.svg,Tesla Supercharger (destination),us,,480,125;350,120 kW;150 kW;250 kW,Tesla Supercharger (destination),car;motorcar;hgv;bus,bicycle;scooter,_country=us
+socket:tesla_destination,Type2_tethered.svg,Tesla supercharger (destination) (A Type 2 with cable branded as tesla),,us,230;400,16;32,11 kW;22 kW,Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo),car;motorcar;hgv;bus,bicycle;scooter,_country!=us
+socket:USB-A,usb_port.svg,USB to charge phones and small electronics,,,5,1;2,5W;10W,USB om GSMs en kleine electronica op te laden,*,,
+socket:bosch_3pin,bosch-3pin.svg,Bosch Active Connect with 3 pins and cable,,,,,,Bosch Active Connect met 3 pinnen aan een kabel,bicycle,car;motorcar;hgv;bus,
+socket:bosch_5pin,bosch-5pin.svg,Bosch Active Connect with 5 pins and cable,,,,,,Bosch Active Connect met 5 pinnen aan een kabel,bicycle,car;motorcar;hgv;bus,
diff --git a/langs/layers/de.json b/langs/layers/de.json
index dc35e9bcb..bce4a441c 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -62,8 +62,8 @@
"render": "Diese Rettungswache befindet sich in {addr:place}."
},
"ambulance-street": {
- "question": " Wie lautet der Name der Straße, in der sich die Rettungswache befindet?",
- "render": "Dieser Bahnhof liegt an der Straße {addr:street}."
+ "render": "Dieser Bahnhof liegt an der Straße {addr:street}.",
+ "question": " Wie lautet der Name der Straße, in der sich die Rettungswache befindet?"
}
},
"title": {
@@ -1089,7 +1089,10 @@
"presets": {
"1": {
"title": "Ladestation für e-bikes"
- }
+ },
+ "2": {
+ "title": "Ladestation für Autos"
+ }
}
},
"crossings": {
@@ -3155,4 +3158,4 @@
"watermill": {
"name": "Wassermühle"
}
-}
\ No newline at end of file
+}
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 113699c54..59d75cc71 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1113,7 +1113,7 @@
"question": "Has a Tesla Supercharger (destination) connector"
},
"13": {
- "question": "Has a Tesla supercharger (destination (A Type 2 with cable branded as tesla) connector"
+ "question": "Has a Tesla supercharger (destination) (A Type 2 with cable branded as tesla) connector"
},
"14": {
"question": "Has a USB to charge phones and small electronics 
connector"
@@ -1245,10 +1245,10 @@
"then": " Tesla Supercharger (destination) "
},
"24": {
- "then": " Tesla supercharger (destination (A Type 2 with cable branded as tesla) "
+ "then": " Tesla supercharger (destination) (A Type 2 with cable branded as tesla) "
},
"25": {
- "then": " Tesla supercharger (destination (A Type 2 with cable branded as tesla) "
+ "then": " Tesla supercharger (destination) (A Type 2 with cable branded as tesla) "
},
"26": {
"then": " USB to charge phones and small electronics "
@@ -1422,14 +1422,14 @@
"current-12": {
"mappings": {
"0": {
- "then": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most 16 A"
+ "then": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 16 A"
},
"1": {
- "then": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most 32 A"
+ "then": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 32 A"
}
},
- "question": "What current do the plugs with Tesla supercharger (destination (A Type 2 with cable branded as tesla) offer?",
- "render": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most {socket:tesla_destination:current}A"
+ "question": "What current do the plugs with Tesla supercharger (destination) (A Type 2 with cable branded as tesla) offer?",
+ "render": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most {socket:tesla_destination:current}A"
},
"current-13": {
"mappings": {
@@ -1604,8 +1604,8 @@
"render": "There are {socket:tesla_destination} plugs of type Tesla Supercharger (destination) available here"
},
"plugs-12": {
- "question": "How much plugs of type Tesla supercharger (destination (A Type 2 with cable branded as tesla) are available here?",
- "render": "There are {socket:tesla_destination} plugs of type Tesla supercharger (destination (A Type 2 with cable branded as tesla) available here"
+ "question": "How much plugs of type Tesla supercharger (destination) (A Type 2 with cable branded as tesla) are available here?",
+ "render": "There are {socket:tesla_destination} plugs of type Tesla supercharger (destination) (A Type 2 with cable branded as tesla) available here"
},
"plugs-13": {
"question": "How much plugs of type USB to charge phones and small electronics are available here?",
@@ -1699,14 +1699,14 @@
"power-output-12": {
"mappings": {
"0": {
- "then": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most 11 kw"
+ "then": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 11 kw"
},
"1": {
- "then": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most 22 kw"
+ "then": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 22 kw"
}
},
- "question": "What power output does a single plug of type Tesla supercharger (destination (A Type 2 with cable branded as tesla) offer?",
- "render": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs at most {socket:tesla_destination:output}"
+ "question": "What power output does a single plug of type Tesla supercharger (destination) (A Type 2 with cable branded as tesla) offer?",
+ "render": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most {socket:tesla_destination:output}"
},
"power-output-13": {
"mappings": {
@@ -1882,14 +1882,14 @@
"voltage-12": {
"mappings": {
"0": {
- "then": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs 230 volt"
+ "then": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs 230 volt"
},
"1": {
- "then": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs 400 volt"
+ "then": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs 400 volt"
}
},
- "question": "What voltage do the plugs with Tesla supercharger (destination (A Type 2 with cable branded as tesla) offer?",
- "render": "Tesla supercharger (destination (A Type 2 with cable branded as tesla) outputs {socket:tesla_destination:voltage} volt"
+ "question": "What voltage do the plugs with Tesla supercharger (destination) (A Type 2 with cable branded as tesla) offer?",
+ "render": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs {socket:tesla_destination:voltage} volt"
},
"voltage-13": {
"mappings": {
diff --git a/langs/ru.json b/langs/ru.json
index f93dbfee4..43825a9ce 100644
--- a/langs/ru.json
+++ b/langs/ru.json
@@ -174,7 +174,8 @@
},
"delete": {
"delete": "Удалить",
- "cancel": "Отмена"
+ "cancel": "Отмена",
+ "safeDelete": "Эта точка может быть безопасно удалена."
},
"split": {
"cancel": "Отмена"