Merge branch 'develop' into features/left-right-rendering

This commit is contained in:
Pieter Vander Vennet 2021-10-22 14:01:47 +02:00
commit e334f806bc
37 changed files with 1667 additions and 561 deletions

View file

@ -27,7 +27,8 @@
"ja": "充電ステーション",
"nb_NO": "Ladestasjon",
"ru": "Зарядная станция",
"zh_Hant": "充電站"
"zh_Hant": "充電站",
"de": "Ladestation"
}
},
"description": {
@ -42,115 +43,91 @@
"tagRenderings": [
"images",
{
"id": "Type",
"id": "plugs-15",
"question": {
"en": "Which vehicles are allowed to charge here?",
"de": "Welche Fahrzeuge dürfen hier geladen werden?"
},
"multiAnswer": true,
"mappings": [
{
"if": "bicycle=yes",
"ifnot": "bicycle=no",
"then": {
"en": "<b>bicycles</b> can be charged here",
"de": "<b>Fahrräder</b> können hier geladen werden"
}
},
{
"if": "motorcar=yes",
"ifnot": "motorcar=no",
"then": {
"en": "<b>Cars</b> can be charged here",
"de": "<b>Autos</b> können hier geladen werden"
}
},
{
"if": "scooter=yes",
"ifnot": "scooter=no",
"then": {
"en": "<b>Scooters</b> can be charged here",
"de": "<b> Roller</b> können hier geladen werden"
}
},
{
"if": "hgv=yes",
"ifnot": "hgv=no",
"then": {
"en": "<b>Heavy good vehicles</b> (such as trucks) can be charged here",
"de": "<b>Lastkraftwagen</b> (LKW) können hier geladen werden"
}
},
{
"if": "bus=yes",
"ifnot": "bus=no",
"then": {
"en": "<b>Buses</b> can be charged here",
"de": "<b>Busse</b> können hier geladen werden"
}
}
]
},
{
"id": "access",
"question": {
"en": "Who is allowed to use this charging station?",
"de": "Wer darf diese Ladestation benutzen?"
"en": "How much plugs of type <div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> are available here?",
"nl": "Hoeveel stekkers van type <div style='display: inline-block'><b><b>Bosch Active Connect met 5 pinnen</b> aan een kabel</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> heeft dit oplaadpunt?"
},
"render": {
"en": "Access is {access}",
"de": "Zugang ist {access}"
"en": "There are <b class='text-xl'>{socket:bosch_5pin}</b> plugs of type <div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> available here",
"nl": "Hier zijn <b class='text-xl'>{socket:bosch_5pin}</b> stekkers van het type <div style='display: inline-block'><b><b>Bosch Active Connect met 5 pinnen</b> aan een kabel</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div>"
},
"freeform": {
"key": "access",
"addExtraTags": [
"fixme=Freeform field used for access - doublecheck the value"
]
},
"mappings": [
{
"if": "access=yes",
"then": "Anyone can use this charging station (payment might be needed)"
},
{
"if": {
"or": [
"access=permissive",
"access=public"
]
},
"then": "Anyone can use this charging station (payment might be needed)",
"hideInAnswer": true
},
{
"if": "access=customers",
"then": "Only customers of the place this station belongs to can use this charging station<br/><span class='subtle'>E.g. a charging station operated by hotel which is only usable by their guests</span> "
},
{
"if": "access=private",
"then": "Not accessible to the general public (e.g. only accessible to the owners, employees, ...)"
}
]
},
{
"id": "capacity",
"render": {
"en": "{capacity} vehicles can be charged here at the same time",
"nl": "{capacity} voertuigen kunnen hier op hetzelfde moment opgeladen worden",
"de": "{capacity} Fahrzeuge können hier gleichzeitig geladen werden"
},
"question": {
"en": "How much vehicles can be charged here at the same time?",
"nl": "Hoeveel voertuigen kunnen hier opgeladen worden?",
"de": "Wie viele Fahrzeuge können hier gleichzeitig geladen werden?"
},
"freeform": {
"key": "capacity",
"key": "socket:bosch_5pin",
"type": "pnat"
},
"condition": {
"and": [
"socket:bosch_5pin~*",
"socket:bosch_5pin!=0"
]
}
},
{
"id": "$$$"
"id": "voltage-15",
"question": {
"en": "What voltage do the plugs with <div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> offer?",
"nl": "Welke spanning levert de stekker van type <div style='display: inline-block'><b><b>Bosch Active Connect met 5 pinnen</b> aan een kabel</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div>"
},
"render": {
"en": "<div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> outputs {socket:bosch_5pin:voltage} volt",
"nl": "<div style='display: inline-block'><b><b>Bosch Active Connect met 5 pinnen</b> aan een kabel</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> heeft een spanning van {socket:bosch_5pin:voltage} volt"
},
"freeform": {
"key": "socket:bosch_5pin:voltage",
"type": "pfloat"
},
"mappings": [],
"condition": {
"and": [
"socket:bosch_5pin~*",
"socket:bosch_5pin!=0"
]
}
},
{
"id": "current-15",
"question": {
"en": "What current do the plugs with <div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> offer?",
"nl": "Welke stroom levert de stekker van type <div style='display: inline-block'><b><b>Bosch Active Connect met 5 pinnen</b> aan een kabel</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div>?"
},
"render": {
"en": "<div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> outputs at most {socket:bosch_5pin:current}A",
"nl": "<div style='display: inline-block'><b><b>Bosch Active Connect met 5 pinnen</b> aan een kabel</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> levert een stroom van maximaal {socket:bosch_5pin:current}A"
},
"freeform": {
"key": "socket:bosch_5pin:current",
"type": "pfloat"
},
"mappings": [],
"condition": {
"and": [
"socket:bosch_5pin~*",
"socket:bosch_5pin!=0"
]
}
},
{
"id": "power-output-15",
"question": {
"en": "What power output does a single plug of type <div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> offer?",
"nl": "Welk vermogen levert een enkele stekker van type <div style='display: inline-block'><b><b>Bosch Active Connect met 5 pinnen</b> aan een kabel</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div>?"
},
"render": {
"en": "<div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> outputs at most {socket:bosch_5pin:output}",
"nl": "<div style='display: inline-block'><b><b>Bosch Active Connect met 5 pinnen</b> aan een kabel</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> levert een vermogen van maximaal {socket:bosch_5pin:output}"
},
"freeform": {
"key": "socket:bosch_5pin:output",
"type": "pfloat"
},
"mappings": [],
"condition": {
"and": [
"socket:bosch_5pin~*",
"socket:bosch_5pin!=0"
]
}
},
{
"id": "Authentication",
@ -606,69 +583,6 @@
]
}
],
"mapRendering": [
{
"location": [
"point",
"centroid"
],
"icon": {
"render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"if": "bicycle=yes",
"then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
},
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
},
"then": "pin:#fff;./assets/themes/charging_stations/car.svg"
}
]
},
"iconBadges": [
{
"if": {
"or": [
"disused:amenity=charging_station",
"operational_status=broken"
]
},
"then": "cross:#c22;"
},
{
"if": {
"or": [
"proposed:amenity=charging_station",
"planned:amenity=charging_station"
]
},
"then": "./assets/layers/charging_station/under_construction.svg"
},
{
"if": {
"and": [
"bicycle=yes",
{
"or": [
"motorcar=yes",
"car=yes"
]
}
]
},
"then": "circle:#fff;./assets/themes/charging_stations/car.svg"
}
],
"iconSize": {
"render": "50,50,bottom"
}
}
],
"presets": [
{
"tags": [
@ -1054,5 +968,68 @@
],
"eraseInvalidValues": true
}
],
"mapRendering": [
{
"location": [
"point",
"centroid"
],
"icon": {
"render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"if": "bicycle=yes",
"then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
},
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
},
"then": "pin:#fff;./assets/themes/charging_stations/car.svg"
}
]
},
"iconBadges": [
{
"if": {
"or": [
"disused:amenity=charging_station",
"operational_status=broken"
]
},
"then": "cross:#c22;"
},
{
"if": {
"or": [
"proposed:amenity=charging_station",
"planned:amenity=charging_station"
]
},
"then": "./assets/layers/charging_station/under_construction.svg"
},
{
"if": {
"and": [
"bicycle=yes",
{
"or": [
"motorcar=yes",
"car=yes"
]
}
]
},
"then": "circle:#fff;./assets/themes/charging_stations/car.svg"
}
],
"iconSize": {
"render": "50,50,bottom"
}
}
]
}