diff --git a/assets/layers/charging_station/.~lock.types.csv# b/assets/layers/charging_station/.~lock.types.csv#
new file mode 100644
index 0000000000..1bcf1ea170
--- /dev/null
+++ b/assets/layers/charging_station/.~lock.types.csv#
@@ -0,0 +1 @@
+,pietervdvn,pietervdvn-Latitude-5591,07.09.2021 18:13,file:///home/pietervdvn/.config/libreoffice/4;
\ No newline at end of file
diff --git a/assets/layers/charging_station/Type2_CCS.svg b/assets/layers/charging_station/Type2_CCS.svg
new file mode 100644
index 0000000000..78e888bcc1
--- /dev/null
+++ b/assets/layers/charging_station/Type2_CCS.svg
@@ -0,0 +1,145 @@
+
+
diff --git a/assets/layers/charging_station/Type2_socket.svg b/assets/layers/charging_station/Type2_socket.svg
new file mode 100644
index 0000000000..6369b80f53
--- /dev/null
+++ b/assets/layers/charging_station/Type2_socket.svg
@@ -0,0 +1,118 @@
+
+
diff --git a/assets/layers/charging_station/Type2_tethered.svg b/assets/layers/charging_station/Type2_tethered.svg
new file mode 100644
index 0000000000..3d649eb318
--- /dev/null
+++ b/assets/layers/charging_station/Type2_tethered.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/assets/layers/charging_station/Type3c.svg b/assets/layers/charging_station/Type3c.svg
new file mode 100644
index 0000000000..63591f7b8e
--- /dev/null
+++ b/assets/layers/charging_station/Type3c.svg
@@ -0,0 +1,123 @@
+
+
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index bcd2e66593..6b176b381e 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -11,8 +11,9 @@
"minzoom": 10,
"source": {
"osmTags": {
- "and": [
- "amenity=charging_station"
+ "or": [
+ "amenity=charging_station",
+ "disused:amenity=charging_station"
]
}
},
@@ -148,14 +149,7 @@
"then": "
Schuko wall plug without ground pin (CEE7/4 type F)",
"hideInAnswer": {
"or": [
- "_country!=be",
- "_country!=fr",
- "_country!=ma",
- "_country!=tn",
- "_country!=pl",
- "_country!=cs",
- "_country!=sk",
- "_country!=mo"
+ "_country!=be"
]
}
},
@@ -167,7 +161,7 @@
{
"if": "socket:chademo=1",
"ifnot": "socket:chademo=",
- "then": "
Chademo (type 4)"
+ "then": " Chademo"
},
{
"if": "socket:type1_cable=1",
@@ -188,6 +182,16 @@
"if": "socket:tesla_supercharger=1",
"ifnot": "socket:tesla_supercharger=",
"then": "
Tesla Supercharger"
+ },
+ {
+ "if": "socket:type2=1",
+ "ifnot": "socket:type2=",
+ "then": "
Type 2 (mennekes)"
+ },
+ {
+ "if": "socket:type2_combo=1",
+ "ifnot": "socket:type2_combo=",
+ "then": "
Type 2 CCS (mennekes)"
}
]
},
@@ -215,9 +219,9 @@
},
{
"question": {
- "en": "How much plugs of type Chademo (type 4) are available here?"
+ "en": "How much plugs of type Chademo are available here?"
},
- "render": "There are {socket:chademo} plugs of type Chademo (type 4) available here",
+ "render": "There are {socket:chademo} plugs of type Chademo available here",
"freeform": {
"key": "socket:chademo",
"type": "pnat"
@@ -268,6 +272,28 @@
},
"condition": "socket:tesla_supercharger~*"
},
+ {
+ "question": {
+ "en": "How much plugs of type Type 2 (mennekes) are available here?"
+ },
+ "render": "There are {socket:type2} plugs of type Type 2 (mennekes) available here",
+ "freeform": {
+ "key": "socket:type2",
+ "type": "pnat"
+ },
+ "condition": "socket:type2~*"
+ },
+ {
+ "question": {
+ "en": "How much plugs of type Type 2 CCS (mennekes) are available here?"
+ },
+ "render": "There are {socket:type2_combo} plugs of type Type 2 CCS (mennekes) available here",
+ "freeform": {
+ "key": "socket:type2_combo",
+ "type": "pnat"
+ },
+ "condition": "socket:type2_combo~*"
+ },
{
"#": "Authentication",
"question": {
@@ -474,6 +500,41 @@
"hideInAnswer": "operator="
}
]
+ },
+ {
+ "#": "Operational status",
+ "question": {
+ "en": "Is this charging point in use?",
+ "nl": "Is dit oplaadpunt operationeel?"
+ },
+ "mappings": [
+ {
+ "if": "operational_status=",
+ "then": {
+ "en": "This charging station works",
+ "nl": "Dit oplaadpunt werkt"
+ }
+ },
+ {
+ "if": "operational_status=broken",
+ "then": {
+ "en": "This charging station is broken",
+ "nl": "Dit oplaadpunt is kapot"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "disused:amenity=charging_station",
+ "amenity="
+ ]
+ },
+ "then": {
+ "en": "This charging station has beed permanently disabled and is not in use anymore but is still visible",
+ "nl": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig"
+ }
+ }
+ ]
}
],
"icon": {
@@ -495,6 +556,15 @@
]
},
"iconOverlays": [
+ {
+ "if": {
+ "or": [
+ "disused:amenity=charging_station",
+ "operational_status=broken"
+ ]
+ },
+ "then": "cross_bottom_right:#c22;"
+ },
{
"if": {
"and": [
@@ -555,7 +625,7 @@
"osmTags": {
"or": [
"car=yes",
- "motor_car=yes"
+ "motorcar=yes"
]
}
}
@@ -575,7 +645,7 @@
"osmTags": "socket:typee~*"
},
{
- "question": "Has a Chademo (type 4) connector",
+ "question": "Has a Chademo connector",
"osmTags": "socket:chademo~*"
},
{
@@ -593,6 +663,14 @@
{
"question": "Has a Tesla Supercharger connector",
"osmTags": "socket:tesla_supercharger~*"
+ },
+ {
+ "question": "Has a Type 2 (mennekes) connector",
+ "osmTags": "socket:type2~*"
+ },
+ {
+ "question": "Has a Type 2 CCS (mennekes) connector",
+ "osmTags": "socket:type2_combo~*"
}
]
}
diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson
index bc1cbc5078..a5aa6f068c 100644
--- a/assets/layers/charging_station/charging_station.protojson
+++ b/assets/layers/charging_station/charging_station.protojson
@@ -11,8 +11,9 @@
"minzoom": 10,
"source": {
"osmTags": {
- "and": [
- "amenity=charging_station"
+ "or": [
+ "amenity=charging_station",
+ "disused:amenity=charging_station"
]
}
},
@@ -343,6 +344,41 @@
"hideInAnswer": "operator="
}
]
+ },
+ {
+ "#": "Operational status",
+ "question": {
+ "en": "Is this charging point in use?",
+ "nl": "Is dit oplaadpunt operationeel?"
+ },
+ "mappings": [
+ {
+ "if": "operational_status=",
+ "then": {
+ "en": "This charging station works",
+ "nl": "Dit oplaadpunt werkt"
+ }
+ },
+ {
+ "if": "operational_status=broken",
+ "then": {
+ "en": "This charging station is broken",
+ "nl": "Dit oplaadpunt is kapot"
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "disused:amenity=charging_station",
+ "amenity="
+ ]
+ },
+ "then": {
+ "en": "This charging station has beed permanently disabled and is not in use anymore but is still visible",
+ "nl": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig"
+ }
+ }
+ ]
}
],
"icon": {
@@ -364,6 +400,12 @@
]
},
"iconOverlays": [
+ {
+ "if": {
+ "or": ["disused:amenity=charging_station","operational_status=broken"]
+ },
+ "then": "cross_bottom_right:#c22;"
+ },
{
"if": {
"and": [
@@ -424,7 +466,7 @@
"osmTags": {
"or": [
"car=yes",
- "motor_car=yes"
+ "motorcar=yes"
]
}
}
diff --git a/assets/layers/charging_station/license_info.json b/assets/layers/charging_station/license_info.json
index 53a88ad1cc..d11e020e8f 100644
--- a/assets/layers/charging_station/license_info.json
+++ b/assets/layers/charging_station/license_info.json
@@ -10,6 +10,37 @@
"https://github.com/openchargemap/ocm-app/issues/22"
]
},
+ {
+ "path": "Type2_socket.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "GreatDrok"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Type_2_mennekes.svg"
+ ]
+ },
+ {
+ "path": "Type2_CCS.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "GreatDrok"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Combo-ccs-eu.svg"
+ ]
+ },
+ {
+ "path": "Type2_tethered.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "GreatDrok",
+ "Open Charge Map"
+ ],
+ "sources": [
+ "https://raw.githubusercontent.com/openchargemap/ocm-app/master/src/assets/images/icons/connectors/Type2_tethered.svg"
+ ]
+ },
{
"path": "TypeE.svg",
"license": "MIT",
@@ -57,5 +88,15 @@
"sources": [
"https://upload.wikimedia.org/wikipedia/commons/e/ec/Chademo_type4.svg"
]
+ },
+ {
+ "path": "Type3c.svg",
+ "license": "CC-BY-SA 4.0",
+ "authors": [
+ "Pyrog"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Type3c.svg"
+ ]
}
]
\ No newline at end of file
diff --git a/assets/layers/charging_station/types.csv b/assets/layers/charging_station/types.csv
index fe14106520..8ecef20472 100644
--- a/assets/layers/charging_station/types.csv
+++ b/assets/layers/charging_station/types.csv
@@ -1,8 +1,10 @@
-Key in OSM,image,Description,Country-whitelist
-socket:schuko,CEE7_4F.svg,Schuko wall plug without ground pin (CEE7/4 type F),be;fr;ma;tn;pl;cs;sk;mo
-socket:typee,TypeE.svg,European wall plug with ground pin (CEE7/4 type E),
-socket:chademo,Chademo_type4.svg,Chademo (type 4),
-socket:type1_cable,Type1_J1772.svg,Type 1 with cable (J1772),
-socket:type1,Type1_J1772.svg,Type 1 without cable (J1772),
-socket:type1_combo,Type1-ccs.svg,Type 1 CCS (aka Type 1 Combo),
-socket:tesla_supercharger,Tesla-hpwc-model-s.svg,Tesla Supercharger,
+Key in OSM,image,Description,Country-whitelist,,,,,,,
+socket:schuko,CEE7_4F.svg,Schuko wall plug without ground pin (CEE7/4 type F),be,fr,ma,tn,pl,cs,sk,mo
+socket:typee,TypeE.svg,European wall plug with ground pin (CEE7/4 type E),,,,,,,,
+socket:chademo,Chademo_type4.svg,Chademo,,,,,,,,
+socket:type1_cable,Type1_J1772.svg,Type 1 with cable (J1772),,,,,,,,
+socket:type1,Type1_J1772.svg,Type 1 without cable (J1772),,,,,,,,
+socket:type1_combo,Type1-ccs.svg,Type 1 CCS (aka Type 1 Combo),,,,,,,,
+socket:tesla_supercharger,Tesla-hpwc-model-s.svg,Tesla Supercharger,,,,,,,,
+socket:type2,Type2_socket.svg,Type 2 (mennekes),,,,,,,,
+socket:type2_combo,Type2_CCS.svg,Type 2 CCS (mennekes),,,,,,,,
diff --git a/langs/layers/en.json b/langs/layers/en.json
index d93609a98b..aa535f8814 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -905,6 +905,20 @@
"then": "Not part of a bigger network"
}
}
+ },
+ "17": {
+ "question": "Is this charging point in use?",
+ "mappings": {
+ "0": {
+ "then": "This charging station works"
+ },
+ "1": {
+ "then": "This charging station is broken"
+ },
+ "2": {
+ "then": "This charging station has beed permanently disabled and is not in use anymore but is still visible"
+ }
+ }
}
},
"presets": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 0626c3d88d..cd5f5bc1ce 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -891,6 +891,22 @@
}
},
"charging_station": {
+ "tagRenderings": {
+ "17": {
+ "question": "Is dit oplaadpunt operationeel?",
+ "mappings": {
+ "0": {
+ "then": "Dit oplaadpunt werkt"
+ },
+ "1": {
+ "then": "Dit oplaadpunt is kapot"
+ },
+ "2": {
+ "then": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig"
+ }
+ }
+ }
+ },
"filter": {
"0": {
"options": {