contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Update presets

Browse source
This commit is contained in:
Robin van der Linde 2023-12-01 00:05:57 +01:00
parent 834e4b5e02
commit 76874e6de8
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
7 changed files with 43 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.vscode/settings.json vendored
View file

@ -18,5 +18,8 @@
"[svelte]": { "[svelte]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"editor.formatOnSave": true "editor.formatOnSave": true,
"files.associations": {
"*.protojson": "json"
}
} }

15
assets/layers/charging_station/charging_station.json
View file

@ -329,7 +329,7 @@
"class": "medium" "class": "medium"
}, },
"hideInAnswer": { "hideInAnswer": {
"or": [ "and": [
"_country!=af", "_country!=af",
"_country!=al", "_country!=al",
"_country!=dz", "_country!=dz",
@ -445,7 +445,7 @@
"class": "medium" "class": "medium"
}, },
"hideInAnswer": { "hideInAnswer": {
"or": [ "and": [
"_country!=be", "_country!=be",
"_country!=bj", "_country!=bj",
"_country!=bf", "_country!=bf",
@ -1142,7 +1142,7 @@
] ]
}, },
{ {
"or": [ "and": [
"_country!=us" "_country!=us"
] ]
} }
@ -5213,16 +5213,15 @@
"tags": [ "tags": [
"amenity=charging_station", "amenity=charging_station",
"motorcar=no", "motorcar=no",
"bicycle=yes", "bicycle=yes"
"socket:typee=1"
], ],
"title": { "title": {
"en": "a charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (meant to charge electrical bikes)", "en": "a charging station for electrical bikes",
"nl": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (speciaal bedoeld voor fietsen)", "nl": "een oplaadpunt voor elektrische fietsen",
"ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal<img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (destinat a carregar bicicletes elèctriques)", "ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal<img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (destinat a carregar bicicletes elèctriques)",
"cs": "nabíjecí stanice pro elektrokola s běžnou evropskou zástrčkou <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (určeno k nabíjení elektrických kol)", "cs": "nabíjecí stanice pro elektrokola s běžnou evropskou zástrčkou <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (určeno k nabíjení elektrických kol)",
"da": "en ladestation til elektriske cykler med et normalt europæisk vægstik <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (beregnet til opladning af elektriske cykler)", "da": "en ladestation til elektriske cykler med et normalt europæisk vægstik <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (beregnet til opladning af elektriske cykler)",
"de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (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 <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (pensado para cargar bicicletas eléctricas)" "es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (pensado para cargar bicicletas eléctricas)"
} }
}, },

55
assets/layers/charging_station/charging_station.protojson
View file

@ -735,30 +735,32 @@
"point", "point",
"centroid" "centroid"
], ],
"marker": [{ "marker": [
"icon": "pin", {
"color": "#fff" "icon": "pin",
},{ "color": "#fff"
"icon": { },
"render":"./assets/themes/charging_stations/plug.svg", {
"mappings": [ "icon": {
{ "render": "./assets/themes/charging_stations/plug.svg",
"if": "bicycle=yes", "mappings": [
"then": "./assets/themes/charging_stations/bicycle.svg" {
}, "if": "bicycle=yes",
{ "then": "./assets/themes/charging_stations/bicycle.svg"
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
}, },
"then": "./assets/themes/charging_stations/car.svg" {
} "if": {
] "or": [
"car=yes",
"motorcar=yes"
]
},
"then": "./assets/themes/charging_stations/car.svg"
}
]
}
} }
}], ],
"iconBadges": [ "iconBadges": [
{ {
"if": { "if": {
@ -802,12 +804,11 @@
"tags": [ "tags": [
"amenity=charging_station", "amenity=charging_station",
"motorcar=no", "motorcar=no",
"bicycle=yes", "bicycle=yes"
"socket:typee=1"
], ],
"title": { "title": {
"en": "charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/TypeE.svg' class='w-4 h-4 mx-1 bg-white rounded-full'/>", "en": "charging station for electrical bikes",
"nl": "oplaadpunt voor elektrische fietsen met een gewone, europese stekker <img src='./assets/layers/charging_station/TypeE.svg' class='w-4 h-4 mx-1 bg-white rounded-full'/>" "nl": "oplaadpunt voor elektrische fietsen"
} }
}, },
{ {
@ -949,4 +950,4 @@
}, },
"neededChangesets": 10 "neededChangesets": 10
} }
} }

2
assets/layers/charging_station/csvToJson.ts
View file

@ -91,7 +91,7 @@ function run(file, protojson) {
if (e.countryWhiteList.length > 0) { if (e.countryWhiteList.length > 0) {
// This is a 'hideInAnswer', thus _reverse_ logic! // This is a 'hideInAnswer', thus _reverse_ logic!
const countries = e.countryWhiteList.map(country => "_country!=" + country) //HideInAnswer if it is in the wrong country 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) { } else if (e.countryBlackList.length > 0) {
const countries = e.countryBlackList.map(country => "_country=" + country) //HideInAnswer if it is in the wrong country const countries = e.countryBlackList.map(country => "_country=" + country) //HideInAnswer if it is in the wrong country
json["hideInAnswer"] = {or: countries} json["hideInAnswer"] = {or: countries}

2
langs/layers/de.json
View file

@ -1993,7 +1993,7 @@
"name": "Ladestationen", "name": "Ladestationen",
"presets": { "presets": {
"0": { "0": {
"title": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (zum Laden von Elektrofahrrädern)" "title": "eine Ladestation für Elektrofahrräder"
}, },
"1": { "1": {
"title": "Eine Ladestation für Elektrofahrzeuge" "title": "Eine Ladestation für Elektrofahrzeuge"

2
langs/layers/en.json
View file

@ -1993,7 +1993,7 @@
"name": "Charging stations", "name": "Charging stations",
"presets": { "presets": {
"0": { "0": {
"title": "a charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (meant to charge electrical bikes)" "title": "a charging station for electrical bikes"
}, },
"1": { "1": {
"title": "a charging station for cars" "title": "a charging station for cars"

2
langs/layers/nl.json
View file

@ -1842,7 +1842,7 @@
"name": "Oplaadpunten", "name": "Oplaadpunten",
"presets": { "presets": {
"0": { "0": {
"title": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact <img src='./assets/layers/charging_station/typee.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (speciaal bedoeld voor fietsen)" "title": "een oplaadpunt voor elektrische fietsen"
}, },
"1": { "1": {
"title": "een oplaadstation voor elektrische auto's" "title": "een oplaadstation voor elektrische auto's"