diff --git a/Docs/TagInfo/mapcomplete_charging_stations.json b/Docs/TagInfo/mapcomplete_charging_stations.json
index 0306d7284..22ca1d0a4 100644
--- a/Docs/TagInfo/mapcomplete_charging_stations.json
+++ b/Docs/TagInfo/mapcomplete_charging_stations.json
@@ -106,84 +106,84 @@
},
{
"key": "socket:schuko",
- "description": "Layer 'Charging stations' shows socket:schuko=1 with a fixed text, namely ' Schuko wall plug without ground pin (CEE7/4 type F)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:schuko=1 with a fixed text, namely ' Schuko wall plug without ground pin (CEE7/4 type F)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:schuko",
- "description": "Layer 'Charging stations' shows socket:schuko~^..*$&socket:schuko!~^1$ with a fixed text, namely ' Schuko wall plug without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:schuko~^..*$&socket:schuko!~^1$ with a fixed text, namely ' Schuko wall plug without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:typee",
- "description": "Layer 'Charging stations' shows socket:typee=1 with a fixed text, namely ' European wall plug with ground pin (CEE7/4 type E)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:typee=1 with a fixed text, namely ' European wall plug with ground pin (CEE7/4 type E)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:typee",
- "description": "Layer 'Charging stations' shows socket:typee~^..*$&socket:typee!~^1$ with a fixed text, namely ' European wall plug with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:typee~^..*$&socket:typee!~^1$ with a fixed text, namely ' European wall plug with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:chademo",
- "description": "Layer 'Charging stations' shows socket:chademo=1 with a fixed text, namely ' Chademo' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:chademo=1 with a fixed text, namely ' Chademo' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:chademo",
- "description": "Layer 'Charging stations' shows socket:chademo~^..*$&socket:chademo!~^1$ with a fixed text, namely ' Chademo' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:chademo~^..*$&socket:chademo!~^1$ with a fixed text, namely ' Chademo' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:type1_cable",
- "description": "Layer 'Charging stations' shows socket:type1_cable=1 with a fixed text, namely ' Type 1 with cable (J1772)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:type1_cable=1 with a fixed text, namely ' Type 1 with cable (J1772)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:type1_cable",
- "description": "Layer 'Charging stations' shows socket:type1_cable~^..*$&socket:type1_cable!~^1$ with a fixed text, namely ' Type 1 with cable (J1772)' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:type1_cable~^..*$&socket:type1_cable!~^1$ with a fixed text, namely ' Type 1 with cable (J1772)' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:type1",
- "description": "Layer 'Charging stations' shows socket:type1=1 with a fixed text, namely ' Type 1 without cable (J1772)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:type1=1 with a fixed text, namely ' Type 1 without cable (J1772)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:type1",
- "description": "Layer 'Charging stations' shows socket:type1~^..*$&socket:type1!~^1$ with a fixed text, namely ' Type 1 without cable (J1772)' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:type1~^..*$&socket:type1!~^1$ with a fixed text, namely ' Type 1 without cable (J1772)' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:type1_combo",
- "description": "Layer 'Charging stations' shows socket:type1_combo=1 with a fixed text, namely ' Type 1 CCS (aka Type 1 Combo)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:type1_combo=1 with a fixed text, namely ' Type 1 CCS (aka Type 1 Combo)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:type1_combo",
- "description": "Layer 'Charging stations' shows socket:type1_combo~^..*$&socket:type1_combo!~^1$ with a fixed text, namely ' Type 1 CCS (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:type1_combo~^..*$&socket:type1_combo!~^1$ with a fixed text, namely ' Type 1 CCS (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:tesla_supercharger",
- "description": "Layer 'Charging stations' shows socket:tesla_supercharger=1 with a fixed text, namely ' Tesla Supercharger' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:tesla_supercharger=1 with a fixed text, namely ' Tesla Supercharger' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:tesla_supercharger",
- "description": "Layer 'Charging stations' shows socket:tesla_supercharger~^..*$&socket:tesla_supercharger!~^1$ with a fixed text, namely ' Tesla Supercharger' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:tesla_supercharger~^..*$&socket:tesla_supercharger!~^1$ with a fixed text, namely ' Tesla Supercharger' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:type2",
- "description": "Layer 'Charging stations' shows socket:type2=1 with a fixed text, namely ' Type 2 (mennekes)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:type2=1 with a fixed text, namely ' Type 2 (mennekes)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:type2",
- "description": "Layer 'Charging stations' shows socket:type2~^..*$&socket:type2!~^1$ with a fixed text, namely ' Type 2 (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:type2~^..*$&socket:type2!~^1$ with a fixed text, namely ' Type 2 (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:type2_combo",
- "description": "Layer 'Charging stations' shows socket:type2_combo=1 with a fixed text, namely ' Type 2 CCS (mennekes)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+ "description": "Layer 'Charging stations' shows socket:type2_combo=1 with a fixed text, namely ' Type 2 CCS (mennekes)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
"value": "1"
},
{
"key": "socket:type2_combo",
- "description": "Layer 'Charging stations' shows socket:type2_combo~^..*$&socket:type2_combo!~^1$ with a fixed text, namely ' Type 2 CCS (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
+ "description": "Layer 'Charging stations' shows socket:type2_combo~^..*$&socket:type2_combo!~^1$ with a fixed text, namely ' Type 2 CCS (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
},
{
"key": "socket:schuko",
@@ -793,4 +793,4 @@
"value": "yes"
}
]
-}
\ 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 3935c515f..e20cde958 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -151,8 +151,8 @@
"if": "socket:schuko=1",
"ifnot": "socket:schuko=",
"then": {
- "en": " Schuko wall plug without ground pin (CEE7/4 type F)",
- "nl": " Schuko stekker zonder aardingspin (CEE7/4 type F)"
+ "en": " Schuko wall plug without ground pin (CEE7/4 type F)",
+ "nl": " Schuko stekker zonder aardingspin (CEE7/4 type F)"
}
},
{
@@ -163,8 +163,8 @@
]
},
"then": {
- "en": " Schuko wall plug without ground pin (CEE7/4 type F)",
- "nl": " Schuko stekker zonder aardingspin (CEE7/4 type F)"
+ "en": " Schuko wall plug without ground pin (CEE7/4 type F)",
+ "nl": " Schuko stekker zonder aardingspin (CEE7/4 type F)"
},
"hideInAnswer": true
},
@@ -172,8 +172,8 @@
"if": "socket:typee=1",
"ifnot": "socket:typee=",
"then": {
- "en": " European wall plug with ground pin (CEE7/4 type E)",
- "nl": " Europese stekker met aardingspin (CEE7/4 type E)"
+ "en": " European wall plug with ground pin (CEE7/4 type E)",
+ "nl": " Europese stekker met aardingspin (CEE7/4 type E)"
}
},
{
@@ -184,8 +184,8 @@
]
},
"then": {
- "en": " European wall plug with ground pin (CEE7/4 type E)",
- "nl": " Europese stekker met aardingspin (CEE7/4 type E)"
+ "en": " European wall plug with ground pin (CEE7/4 type E)",
+ "nl": " Europese stekker met aardingspin (CEE7/4 type E)"
},
"hideInAnswer": true
},
@@ -193,8 +193,8 @@
"if": "socket:chademo=1",
"ifnot": "socket:chademo=",
"then": {
- "en": " Chademo",
- "nl": " "
+ "en": " Chademo",
+ "nl": " "
}
},
{
@@ -205,8 +205,8 @@
]
},
"then": {
- "en": " Chademo",
- "nl": " "
+ "en": " Chademo",
+ "nl": " "
},
"hideInAnswer": true
},
@@ -214,8 +214,8 @@
"if": "socket:type1_cable=1",
"ifnot": "socket:type1_cable=",
"then": {
- "en": " Type 1 with cable (J1772)",
- "nl": " Type 1 met kabel (J1772)"
+ "en": " Type 1 with cable (J1772)",
+ "nl": " Type 1 met kabel (J1772)"
}
},
{
@@ -226,8 +226,8 @@
]
},
"then": {
- "en": " Type 1 with cable (J1772)",
- "nl": " Type 1 met kabel (J1772)"
+ "en": " Type 1 with cable (J1772)",
+ "nl": " Type 1 met kabel (J1772)"
},
"hideInAnswer": true
},
@@ -235,8 +235,8 @@
"if": "socket:type1=1",
"ifnot": "socket:type1=",
"then": {
- "en": " Type 1 without cable (J1772)",
- "nl": " Type 1 zonder kabel (J1772)"
+ "en": " Type 1 without cable (J1772)",
+ "nl": " Type 1 zonder kabel (J1772)"
}
},
{
@@ -247,8 +247,8 @@
]
},
"then": {
- "en": " Type 1 without cable (J1772)",
- "nl": " Type 1 zonder kabel (J1772)"
+ "en": " Type 1 without cable (J1772)",
+ "nl": " Type 1 zonder kabel (J1772)"
},
"hideInAnswer": true
},
@@ -256,8 +256,8 @@
"if": "socket:type1_combo=1",
"ifnot": "socket:type1_combo=",
"then": {
- "en": " Type 1 CCS (aka Type 1 Combo)",
- "nl": " "
+ "en": " Type 1 CCS (aka Type 1 Combo)",
+ "nl": " "
}
},
{
@@ -268,8 +268,8 @@
]
},
"then": {
- "en": " Type 1 CCS (aka Type 1 Combo)",
- "nl": " "
+ "en": " Type 1 CCS (aka Type 1 Combo)",
+ "nl": " "
},
"hideInAnswer": true
},
@@ -277,8 +277,8 @@
"if": "socket:tesla_supercharger=1",
"ifnot": "socket:tesla_supercharger=",
"then": {
- "en": " Tesla Supercharger",
- "nl": " "
+ "en": " Tesla Supercharger",
+ "nl": " "
}
},
{
@@ -289,8 +289,8 @@
]
},
"then": {
- "en": " Tesla Supercharger",
- "nl": " "
+ "en": " Tesla Supercharger",
+ "nl": " "
},
"hideInAnswer": true
},
@@ -298,8 +298,8 @@
"if": "socket:type2=1",
"ifnot": "socket:type2=",
"then": {
- "en": " Type 2 (mennekes)",
- "nl": " "
+ "en": " Type 2 (mennekes)",
+ "nl": " "
}
},
{
@@ -310,8 +310,8 @@
]
},
"then": {
- "en": " Type 2 (mennekes)",
- "nl": " "
+ "en": " Type 2 (mennekes)",
+ "nl": " "
},
"hideInAnswer": true
},
@@ -319,8 +319,8 @@
"if": "socket:type2_combo=1",
"ifnot": "socket:type2_combo=",
"then": {
- "en": " Type 2 CCS (mennekes)",
- "nl": " "
+ "en": " Type 2 CCS (mennekes)",
+ "nl": " "
}
},
{
@@ -331,8 +331,8 @@
]
},
"then": {
- "en": " Type 2 CCS (mennekes)",
- "nl": " "
+ "en": " Type 2 CCS (mennekes)",
+ "nl": " "
},
"hideInAnswer": true
}
@@ -2180,4 +2180,4 @@
"eraseInvalidValues": true
}
]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/charging_station/csvToJson.ts b/assets/layers/charging_station/csvToJson.ts
index 7ea31a10f..80c3e557e 100644
--- a/assets/layers/charging_station/csvToJson.ts
+++ b/assets/layers/charging_station/csvToJson.ts
@@ -64,8 +64,8 @@ function run(file, protojson) {
const entries = loadCsv(file)
for (const e of entries) {
const txt = {
- en: ` ${e.description.get("en")}`,
- nl: ` ${e.description.get("nl")}`
+ en: ` ${e.description.get("en")}`,
+ nl: ` ${e.description.get("nl")}`
}
const json = {
if: `${e.key}=1`,
@@ -220,8 +220,8 @@ function run(file, protojson) {
options: filterOptions
})
-
-
+
+
const extraUnits = [
{
appliesToKey: entries.map(e => e.key + ":voltage"),
@@ -273,7 +273,7 @@ function run(file, protojson) {
proto["units"] = []
}
proto["units"].push(...extraUnits)
-
+
writeFileSync("charging_station.json", JSON.stringify(proto, undefined, " "))
}
diff --git a/css/index-tailwind-output.css b/css/index-tailwind-output.css
index e3d669e7c..1f7b87e18 100644
--- a/css/index-tailwind-output.css
+++ b/css/index-tailwind-output.css
@@ -839,6 +839,11 @@ video {
margin-bottom: 0.75rem;
}
+.mx-4 {
+ margin-left: 1rem;
+ margin-right: 1rem;
+}
+
.-ml-1 {
margin-left: -0.25rem;
}
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 9149f1966..a6472bf0f 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -960,58 +960,58 @@
"4": {
"mappings": {
"0": {
- "then": " Schuko wall plug without ground pin (CEE7/4 type F)"
+ "then": " Schuko wall plug without ground pin (CEE7/4 type F)"
},
"1": {
- "then": " Schuko wall plug without ground pin (CEE7/4 type F)"
+ "then": " Schuko wall plug without ground pin (CEE7/4 type F)"
},
"2": {
- "then": " European wall plug with ground pin (CEE7/4 type E)"
+ "then": " European wall plug with ground pin (CEE7/4 type E)"
},
"3": {
- "then": " European wall plug with ground pin (CEE7/4 type E)"
+ "then": " European wall plug with ground pin (CEE7/4 type E)"
},
"4": {
- "then": " Chademo"
+ "then": " Chademo"
},
"5": {
- "then": " Chademo"
+ "then": " Chademo"
},
"6": {
- "then": " Type 1 with cable (J1772)"
+ "then": " Type 1 with cable (J1772)"
},
"7": {
- "then": " Type 1 with cable (J1772)"
+ "then": " Type 1 with cable (J1772)"
},
"8": {
- "then": " Type 1 without cable (J1772)"
+ "then": " Type 1 without cable (J1772)"
},
"9": {
- "then": " Type 1 without cable (J1772)"
+ "then": " Type 1 without cable (J1772)"
},
"10": {
- "then": " Type 1 CCS (aka Type 1 Combo)"
+ "then": " Type 1 CCS (aka Type 1 Combo)"
},
"11": {
- "then": " Type 1 CCS (aka Type 1 Combo)"
+ "then": " Type 1 CCS (aka Type 1 Combo)"
},
"12": {
- "then": " Tesla Supercharger"
+ "then": " Tesla Supercharger"
},
"13": {
- "then": " Tesla Supercharger"
+ "then": " Tesla Supercharger"
},
"14": {
- "then": " Type 2 (mennekes)"
+ "then": " Type 2 (mennekes)"
},
"15": {
- "then": " Type 2 (mennekes)"
+ "then": " Type 2 (mennekes)"
},
"16": {
- "then": " Type 2 CCS (mennekes)"
+ "then": " Type 2 CCS (mennekes)"
},
"17": {
- "then": " Type 2 CCS (mennekes)"
+ "then": " Type 2 CCS (mennekes)"
}
},
"question": "Which charging stations are available here?"
@@ -3383,4 +3383,4 @@
"watermill": {
"name": "Watermill"
}
-}
\ No newline at end of file
+}
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index bddc9c255..a4be84c4f 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1036,58 +1036,58 @@
"4": {
"mappings": {
"0": {
- "then": " Schuko stekker zonder aardingspin (CEE7/4 type F)"
+ "then": " Schuko stekker zonder aardingspin (CEE7/4 type F)"
},
"1": {
- "then": " Schuko stekker zonder aardingspin (CEE7/4 type F)"
+ "then": " Schuko stekker zonder aardingspin (CEE7/4 type F)"
},
"2": {
- "then": " Europese stekker met aardingspin (CEE7/4 type E)"
+ "then": " Europese stekker met aardingspin (CEE7/4 type E)"
},
"3": {
- "then": " Europese stekker met aardingspin (CEE7/4 type E)"
+ "then": " Europese stekker met aardingspin (CEE7/4 type E)"
},
"4": {
- "then": " "
+ "then": " "
},
"5": {
- "then": " "
+ "then": " "
},
"6": {
- "then": " Type 1 met kabel (J1772)"
+ "then": " Type 1 met kabel (J1772)"
},
"7": {
- "then": " Type 1 met kabel (J1772)"
+ "then": " Type 1 met kabel (J1772)"
},
"8": {
- "then": " Type 1 zonder kabel (J1772)"
+ "then": " Type 1 zonder kabel (J1772)"
},
"9": {
- "then": " Type 1 zonder kabel (J1772)"
+ "then": " Type 1 zonder kabel (J1772)"
},
"10": {
- "then": " "
+ "then": " "
},
"11": {
- "then": " "
+ "then": " "
},
"12": {
- "then": " "
+ "then": " "
},
"13": {
- "then": " "
+ "then": " "
},
"14": {
- "then": " "
+ "then": " "
},
"15": {
- "then": " "
+ "then": " "
},
"16": {
- "then": " "
+ "then": " "
},
"17": {
- "then": " "
+ "then": " "
}
}
},
@@ -3781,4 +3781,4 @@
"render": "Watermolens"
}
}
-}
\ No newline at end of file
+}