diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8e1ede94e..e975a613f 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 1828087e2..691616f83 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 828045f39..7f8356a66 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 ff1a50fb6..e0ee8f610 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 4067c6339..e6d3e3058 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 4fdcba826..b5a7cd153 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 5184c7223..5db8c5b88 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"