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

This commit is contained in:
Pieter Vander Vennet 2021-10-26 01:45:17 +02:00
commit 0e963d65a3
6 changed files with 541 additions and 441 deletions

View file

@ -1014,19 +1014,19 @@
"Operational status": {
"mappings": {
"0": {
"then": "Diese Ladestation ist kaputt"
"then": "Diese Ladestation funktioniert"
},
"1": {
"then": "Hier ist eine Ladestation geplant"
"then": "Diese Ladestation ist kaputt"
},
"2": {
"then": "Hier wird eine Ladestation gebaut"
"then": "Hier ist eine Ladestation geplant"
},
"3": {
"then": "Diese Ladestation wurde dauerhaft deaktiviert und wird nicht mehr benutzt, ist aber noch sichtbar"
"then": "Hier wird eine Ladestation gebaut"
},
"4": {
"then": "Diese Ladestation funktioniert"
"then": "Diese Ladestation wurde dauerhaft deaktiviert und wird nicht mehr benutzt, ist aber noch sichtbar"
}
},
"question": "Ist dieser Ladepunkt in Betrieb?"
@ -1051,14 +1051,6 @@
},
"question": "Muss man beim Laden eine Parkgebühr bezahlen?"
},
"fee/charge": {
"mappings": {
"0": {
"then": "Nutzung kostenlos"
}
},
"render": "Die Nutzung dieser Ladestation kostet <b>{charge}</b>"
},
"maxstay": {
"render": "Die maximale Parkzeit beträgt <b>{canonical(maxstay)}</b>"
},
@ -1067,6 +1059,14 @@
},
"website": {
"render": "Weitere Informationen auf <a href='{website}'>{website}</a>"
},
"fee/charge": {
"mappings": {
"0": {
"then": "Nutzung kostenlos"
}
},
"render": "Die Nutzung dieser Ladestation kostet <b>{charge}</b>"
}
},
"title": {
@ -1423,24 +1423,6 @@
}
},
"defibrillator": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
},
"name": "Defibrillatoren",
"presets": {
"0": {
@ -1556,6 +1538,24 @@
},
"title": {
"render": "Defibrillator"
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
},
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
},
"direction": {
@ -2596,17 +2596,6 @@
}
}
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Abfalleimer"
}
}
}
}
},
"name": "Abfalleimer",
"presets": {
"0": {
@ -2636,6 +2625,17 @@
},
"title": {
"render": "Abfalleimer"
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Abfalleimer"
}
}
}
}
}
},
"watermill": {

View file

@ -1074,19 +1074,19 @@
"Operational status": {
"mappings": {
"0": {
"then": "This charging station is broken"
"then": "This charging station works"
},
"1": {
"then": "A charging station is planned here"
"then": "This charging station is broken"
},
"2": {
"then": "A charging station is constructed here"
"then": "A charging station is planned here"
},
"3": {
"then": "This charging station has beed permanently disabled and is not in use anymore but is still visible"
"then": "A charging station is constructed here"
},
"4": {
"then": "This charging station works"
"then": "This charging station has beed permanently disabled and is not in use anymore but is still visible"
}
},
"question": "Is this charging point in use?"
@ -1111,23 +1111,10 @@
},
"question": "Does one have to pay a parking fee while charging?"
},
"current-15": {
"question": "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?",
"render": "<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"
},
"email": {
"question": "What is the email address of the operator?",
"render": "In case of problems, send an email to <a href='mailto:{email}'>{email}</a>"
},
"fee/charge": {
"mappings": {
"0": {
"then": "Free to use"
}
},
"question": "How much does one have to pay to use this charging station?",
"render": "Using this charging station costs <b>{charge}</b>"
},
"maxstay": {
"mappings": {
"0": {
@ -1157,21 +1144,34 @@
"question": "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?",
"render": "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"
},
"power-output-15": {
"question": "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?",
"render": "<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}"
},
"ref": {
"question": "What is the reference number of this charging station?",
"render": "Reference number is <b>{ref}</b>"
},
"website": {
"question": "What is the website of the operator?",
"render": "More info on <a href='{website}'>{website}</a>"
},
"voltage-15": {
"question": "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?",
"render": "<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"
},
"website": {
"question": "What is the website of the operator?",
"render": "More info on <a href='{website}'>{website}</a>"
"power-output-15": {
"question": "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?",
"render": "<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}"
},
"fee/charge": {
"mappings": {
"0": {
"then": "Free to use"
}
},
"question": "How much does one have to pay to use this charging station?",
"render": "Using this charging station costs <b>{charge}</b>"
},
"current-15": {
"question": "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?",
"render": "<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"
}
},
"title": {
@ -1730,24 +1730,6 @@
}
},
"defibrillator": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
},
"name": "Defibrillators",
"presets": {
"0": {
@ -1864,6 +1846,24 @@
},
"title": {
"render": "Defibrillator"
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
},
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
},
"direction": {
@ -3187,17 +3187,6 @@
}
}
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Waste Basket"
}
}
}
}
},
"name": "Waste Basket",
"presets": {
"0": {
@ -3245,6 +3234,17 @@
},
"title": {
"render": "Waste Basket"
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Waste Basket"
}
}
}
}
}
},
"watermill": {

View file

@ -896,13 +896,6 @@
"icon": {
"render": "./assets/layers/birdhide/birdhide.svg"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/birdhide/birdhide.svg"
}
}
},
"name": "Vogelkijkhutten",
"presets": {
"0": {
@ -981,6 +974,13 @@
}
},
"render": "Vogelkijkplaats"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/birdhide/birdhide.svg"
}
}
}
},
"cafe_pub": {
@ -1131,36 +1131,23 @@
"Operational status": {
"mappings": {
"0": {
"then": "Dit oplaadpunt is kapot"
"then": "Dit oplaadpunt werkt"
},
"1": {
"then": "Hier zal binnenkort een oplaadpunt gebouwd worden"
"then": "Dit oplaadpunt is kapot"
},
"2": {
"then": "Hier wordt op dit moment een oplaadpunt gebouwd"
"then": "Hier zal binnenkort een oplaadpunt gebouwd worden"
},
"3": {
"then": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig"
"then": "Hier wordt op dit moment een oplaadpunt gebouwd"
},
"4": {
"then": "Dit oplaadpunt werkt"
"then": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig"
}
},
"question": "Is dit oplaadpunt operationeel?"
},
"current-15": {
"question": "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": "<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"
},
"fee/charge": {
"mappings": {
"0": {
"then": "Gratis te gebruiken"
}
},
"question": "Hoeveel kost het gebruik van dit oplaadpunt?",
"render": "Dit oplaadpunt gebruiken kost <b>{charge}</b>"
},
"maxstay": {
"mappings": {
"0": {
@ -1186,13 +1173,26 @@
"question": "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": "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>"
},
"voltage-15": {
"question": "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": "<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"
},
"power-output-15": {
"question": "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": "<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}"
},
"voltage-15": {
"question": "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": "<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"
"fee/charge": {
"mappings": {
"0": {
"then": "Gratis te gebruiken"
}
},
"question": "Hoeveel kost het gebruik van dit oplaadpunt?",
"render": "Dit oplaadpunt gebruiken kost <b>{charge}</b>"
},
"current-15": {
"question": "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": "<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"
}
},
"title": {
@ -3501,17 +3501,6 @@
}
}
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Vuilnisbak"
}
}
}
}
},
"name": "Vuilnisbak",
"presets": {
"0": {
@ -3545,6 +3534,17 @@
},
"title": {
"render": "Vuilnisbak"
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Vuilnisbak"
}
}
}
}
}
},
"watermill": {

View file

@ -643,12 +643,12 @@
}
},
"tagRenderings": {
"Authentication": {
"question": "В какое время работает эта зарядная станция?"
},
"Auth phone": {
"question": "К какой сети относится эта станция?",
"render": "{network}"
},
"Authentication": {
"question": "В какое время работает эта зарядная станция?"
}
},
"title": {
@ -715,24 +715,6 @@
}
},
"defibrillator": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
},
"name": "Дефибрилляторы",
"presets": {
"0": {
@ -780,6 +762,24 @@
},
"title": {
"render": "Дефибриллятор"
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
},
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
},
"direction": {
@ -1450,13 +1450,15 @@
}
},
"waste_basket": {
"iconSize": {
"mappings": {
"0": {
"then": "Контейнер для мусора"
}
"name": "Контейнер для мусора",
"presets": {
"0": {
"title": "Контейнер для мусора"
}
},
"title": {
"render": "Контейнер для мусора"
},
"mapRendering": {
"0": {
"iconSize": {
@ -1468,14 +1470,12 @@
}
}
},
"name": "Контейнер для мусора",
"presets": {
"0": {
"title": "Контейнер для мусора"
"iconSize": {
"mappings": {
"0": {
"then": "Контейнер для мусора"
}
}
},
"title": {
"render": "Контейнер для мусора"
}
},
"watermill": {