Merge develop

This commit is contained in:
Pieter Vander Vennet 2021-10-26 01:27:35 +02:00
commit 07bc5d6a6d
88 changed files with 3284 additions and 2363 deletions

File diff suppressed because it is too large Load diff

View file

@ -544,16 +544,6 @@
}
},
"bike_repair_station": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
},
"name": "Bike stations (repair, pump or both)",
"presets": {
"0": {
@ -700,6 +690,13 @@
}
},
"render": "Bike station (pump & repair)"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
}
},
"bike_shop": {
@ -1016,6 +1013,15 @@
"presets": {
"0": {
"title": "Charging station"
},
"1": {
"title": "charging station for e-bikes"
},
"2": {
"title": "charging station for cars"
},
"3": {
"title": "charging station"
}
},
"tagRenderings": {
@ -1134,7 +1140,21 @@
},
"access": {
"question": "Who is allowed to use this charging station?",
"render": "Access is {access}"
"render": "Access is {access}",
"mappings": {
"0": {
"then": "Anyone can use this charging station (payment might be needed)"
},
"1": {
"then": "Anyone can use this charging station (payment might be needed)"
},
"2": {
"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>"
},
"3": {
"then": "Not accessible to the general public (e.g. only accessible to the owners, employees, ...)"
}
}
},
"capacity": {
"question": "How much vehicles can be charged here at the same time?",
@ -1144,15 +1164,6 @@
"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": {
@ -1185,6 +1196,30 @@
"website": {
"question": "What is the website of the operator?",
"render": "More info on <a href='{website}'>{website}</a>"
},
"fee": {
"mappings": {
"0": {
"then": "Free to use"
},
"1": {
"then": "Free to use (without authenticating)"
},
"2": {
"then": "Free to use, but one has to authenticate"
},
"3": {
"then": "Paid use, but free for customers of the hotel/pub/hospital/... who operates the charging station"
},
"4": {
"then": "Paid use"
}
},
"question": "Does one have to pay to use this charging station?"
},
"charge": {
"question": "How much does one have to pay to use this charging station?",
"render": "Using this charging station costs <b>{charge}</b>"
}
},
"title": {
@ -1743,24 +1778,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": {
@ -1877,6 +1894,17 @@
},
"title": {
"render": "Defibrillator"
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
}
},
"direction": {
@ -3200,17 +3228,6 @@
}
}
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Waste Basket"
}
}
}
}
},
"name": "Waste Basket",
"presets": {
"0": {
@ -3258,6 +3275,17 @@
},
"title": {
"render": "Waste Basket"
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Waste Basket"
}
}
}
}
}
},
"watermill": {

View file

@ -90,8 +90,10 @@
}
},
"bike_repair_station": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
"presets": {
"0": {
"title": "Pyöräpumppu"
}
},
"mapRendering": {
"0": {
@ -99,11 +101,6 @@
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
},
"presets": {
"0": {
"title": "Pyöräpumppu"
}
}
},
"ghost_bike": {

View file

@ -453,16 +453,6 @@
}
},
"bike_repair_station": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
},
"name": "Station velo (réparation, pompe à vélo)",
"presets": {
"0": {
@ -600,6 +590,13 @@
}
},
"render": "Point station velo avec pompe"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
}
},
"bike_shop": {
@ -756,24 +753,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": "Défibrillateurs",
"presets": {
"0": {
@ -890,6 +869,17 @@
},
"title": {
"render": "Défibrillateur"
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
}
},
"direction": {

View file

@ -453,16 +453,6 @@
}
},
"bike_repair_station": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
},
"name": "Stazioni bici (riparazione, gonfiaggio o entrambi)",
"presets": {
"0": {
@ -600,6 +590,13 @@
}
},
"render": "Stazione bici (gonfiaggio & riparazione)"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
}
},
"bike_shop": {
@ -759,12 +756,12 @@
"description": "Una stazione di ricarica",
"name": "Stazioni di ricarica",
"tagRenderings": {
"Auth phone": {
"OH": {
"question": "Quali sono gli orari di apertura di questa stazione di ricarica?"
},
"Network": {
"question": "A quale rete appartiene questa stazione di ricarica?",
"render": "{network}"
},
"Authentication": {
"question": "Quali sono gli orari di apertura di questa stazione di ricarica?"
}
},
"title": {
@ -772,24 +769,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": "Defibrillatori",
"presets": {
"0": {
@ -906,6 +885,17 @@
},
"title": {
"render": "Defibrillatore"
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
}
},
"direction": {

View file

@ -76,11 +76,11 @@
"description": "充電ステーション",
"name": "充電ステーション",
"tagRenderings": {
"Auth phone": {
"Network": {
"question": "この充電ステーションの運営チェーンはどこですか?",
"render": "{network}"
},
"Authentication": {
"OH": {
"question": "この充電ステーションはいつオープンしますか?"
}
},

View file

@ -1 +0,0 @@
{}

View file

@ -174,10 +174,10 @@
"description": "En ladestasjon",
"name": "Ladestasjoner",
"tagRenderings": {
"Auth phone": {
"Network": {
"render": "{network}"
},
"Authentication": {
"OH": {
"question": "Når åpnet denne ladestasjonen?"
}
},

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": {
@ -1058,6 +1058,13 @@
}
}
},
"1": {
"options": {
"0": {
"question": "Enkel werkende oplaadpunten"
}
}
},
"2": {
"options": {
"0": {
@ -1139,15 +1146,6 @@
"question": "Hoeveel voertuigen kunnen hier opgeladen worden?",
"render": "{capacity} voertuigen kunnen hier op hetzelfde moment opgeladen worden"
},
"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": {
@ -1168,6 +1166,157 @@
}
}
}
},
"website": {
"question": "Wat is de website waar men meer info kan vinden over dit oplaadpunt?",
"render": "Meer informatie op <a href='{website}'>{website}</a>"
},
"ref": {
"question": "Wat is het referentienummer van dit oplaadstation?",
"render": "Het referentienummer van dit oplaadpunt is <b>{ref}</b>"
},
"phone": {
"question": "Wat is het telefoonnummer van de beheerder van dit oplaadpunt?",
"render": "Bij problemen, bel naar <a href='tel:{phone}'>{phone}</a>"
},
"fee": {
"mappings": {
"0": {
"then": "Gratis te gebruiken"
},
"1": {
"then": "Gratis te gebruiken (zonder aan te melden)"
},
"2": {
"then": "Gratis te gebruiken, maar aanmelden met een applicatie is verplicht"
},
"3": {
"then": "Betalend te gebruiken, maar gratis voor klanten van het bijhorende hotel/café/ziekenhuis/..."
},
"4": {
"then": "Betalend"
}
},
"question": "Moet men betalen om dit oplaadpunt te gebruiken?"
},
"email": {
"question": "Wat is het email-adres van de operator?",
"render": "Bij problemen, email naar <a href='mailto:{email}'>{email}</a>"
},
"charge": {
"question": "Hoeveel moet men betalen om dit oplaadpunt te gebruiken?",
"render": "Dit oplaadpunt gebruiken kost <b>{charge}</b>"
},
"access": {
"mappings": {
"0": {
"then": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)"
},
"1": {
"then": "Toegankelijk voor iedereen (mogelijks met aanmelden en/of te betalen)"
},
"2": {
"then": "Enkel <b>klanten van de bijhorende plaats</b> mogen dit oplaadpunt gebruiken<br/><span class='subtle'>Bijvoorbeeld een oplaadpunt op de parking van een restaurant dat enkel door klanten van het restaurant gebruikt mag worden</span>"
},
"3": {
"then": "Niet toegankelijk voor het publiek <span class='subtle'>Enkel toegankelijk voor de eigenaar, medewerkers ,...</span> "
}
},
"question": "Wie mag er dit oplaadpunt gebruiken?",
"render": "Toegang voor {access}"
},
"Type": {
"mappings": {
"0": {
"then": "<b>Fietsen</b> kunnen hier opgeladen worden"
},
"1": {
"then": "<b>Elektrische auto's</b> kunnen hier opgeladen worden"
},
"2": {
"then": "<b>Electrische scooters</b> (snorfiets of bromfiets) kunnen hier opgeladen worden"
},
"3": {
"then": "<b>Vrachtwagens</b> kunnen hier opgeladen worden"
},
"4": {
"then": "<b>Bussen</b> kunnen hier opgeladen worden"
}
},
"question": "Welke voertuigen kunnen hier opgeladen worden?"
},
"Parking:fee": {
"mappings": {
"0": {
"then": "Geen extra parkeerkost tijdens het opladen"
},
"1": {
"then": "Tijdens het opladen moet er parkeergeld betaald worden"
}
},
"question": "Moet men parkeergeld betalen tijdens het opladen?"
},
"Operator": {
"mappings": {
"0": {
"then": "Eigenlijk is {operator} het netwerk waarvan het deel uitmaakt"
}
},
"question": "Wie beheert dit oplaadpunt?",
"render": "Wordt beheerd door {operator}"
},
"OH": {
"mappings": {
"0": {
"then": "24/7 open - ook tijdens vakanties"
}
},
"question": "Wanneer is dit oplaadpunt beschikbaar??"
},
"Network": {
"mappings": {
"0": {
"then": "Maakt geen deel uit van een groter netwerk"
},
"1": {
"then": "Maakt geen deel uit van een groter netwerk"
}
},
"question": "Is dit oplaadpunt deel van een groter netwerk?",
"render": "Maakt deel uit van het <b>{network}</b>-netwerk"
},
"Authentication": {
"mappings": {
"0": {
"then": "Aanmelden met een lidkaart is mogelijk"
},
"1": {
"then": "Aanmelden via een applicatie is mogelijk"
},
"2": {
"then": "Aanmelden door te bellen naar een telefoonnummer is mogelijk"
},
"3": {
"then": "Aanmelden via SMS is mogelijk"
},
"4": {
"then": "Aanmelden via NFC is mogelijk"
},
"5": {
"then": "Aanmelden met Money Card is mogelijk"
},
"6": {
"then": "Aanmelden met een betaalkaart is mogelijk"
},
"7": {
"then": "Hier opladen is (ook) mogelijk zonder aan te melden"
}
},
"question": "Hoe kan men zich aanmelden aan dit oplaadstation?"
},
"Auth phone": {
"question": "Wat is het telefoonnummer dat men moet bellen of SMS'en om zich aan te melden?",
"render": "Aanmelden door te bellen of te SMS'en naar <a href='tel:{authentication:phone_call:number}'>{authentication:phone_call:number}</a>"
}
},
"units": {
@ -1211,7 +1360,26 @@
}
}
}
}
},
"title": {
"render": "Oplaadpunten"
},
"presets": {
"0": {
"title": "gewone stekker <img src='./assets/layers/charging_station/TypeE.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (bedoeld om electrische fietsen op te laden)"
},
"1": {
"title": "oplaadpunt voor elektrische fietsen"
},
"2": {
"title": "oplaadstation voor elektrische auto's"
},
"3": {
"title": "oplaadstation"
}
},
"name": "Oplaadpunten",
"description": "Oplaadpunten"
},
"crossings": {
"description": "Oversteekplaatsen voor voetgangers en fietsers",
@ -3473,17 +3641,6 @@
}
}
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Vuilnisbak"
}
}
}
}
},
"name": "Vuilnisbak",
"presets": {
"0": {
@ -3513,10 +3670,35 @@
}
},
"question": "Wat voor soort vuilnisbak is dit?"
},
"dispensing_dog_bags": {
"mappings": {
"0": {
"then": "Deze vuilnisbak heeft een verdeler voor hondenpoepzakjes"
},
"1": {
"then": "Deze vuilbak heeft <b>geen</b> verdeler voor hondenpoepzakjes"
},
"2": {
"then": "Deze vuilnisbak heeft <b>geen</b> verdeler voor hondenpoepzakjes"
}
},
"question": "Heeft deze vuilnisbak een verdeler voor hondenpoepzakjes?"
}
},
"title": {
"render": "Vuilnisbak"
},
"mapRendering": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Vuilnisbak"
}
}
}
}
}
},
"watermill": {

View file

@ -338,16 +338,6 @@
}
},
"bike_repair_station": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
},
"presets": {
"0": {
"description": "Um aparelho para encher os seus pneus num local fixa no espaço público<h3>Exemplos de bombas de bicicletas</h3><div style='width: 100%; display: flex; align-items: stretch;'><img src='./assets/layers/bike_repair_station/pump_example_manual.jpg' style='height: 200px; width: auto;'/><img src='./assets/layers/bike_repair_station/pump_example.png' style='height: 200px; width: auto;'/><img src='./assets/layers/bike_repair_station/pump_example_round.jpg' style='height: 200px; width: auto;'/></div>"
@ -435,6 +425,13 @@
"then": "Estação de reparo de bicicletas"
}
}
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
}
},
"bike_shop": {

View file

@ -338,16 +338,6 @@
}
},
"bike_repair_station": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
},
"name": "Estações de bicicletas (reparo, bomba ou ambos)",
"presets": {
"0": {
@ -447,6 +437,13 @@
}
},
"render": "Estação de bicicletas (bomba e reparo)"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
}
},
"bike_shop": {

View file

@ -400,16 +400,6 @@
}
},
"bike_repair_station": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
},
"presets": {
"0": {
"title": "Велосипедный насос"
@ -483,6 +473,13 @@
"then": "Велосипедный насос"
}
}
},
"mapRendering": {
"0": {
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg"
}
}
}
},
"bike_shop": {
@ -650,12 +647,12 @@
}
},
"tagRenderings": {
"Auth phone": {
"OH": {
"question": "В какое время работает эта зарядная станция?"
},
"Network": {
"question": "К какой сети относится эта станция?",
"render": "{network}"
},
"Authentication": {
"question": "В какое время работает эта зарядная станция?"
}
},
"title": {
@ -722,24 +719,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": {
@ -787,6 +766,17 @@
},
"title": {
"render": "Дефибриллятор"
},
"mapRendering": {
"0": {
"icon": {
"mappings": {
"0": {
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
}
}
}
}
},
"direction": {
@ -1457,13 +1447,15 @@
}
},
"waste_basket": {
"iconSize": {
"mappings": {
"0": {
"then": "Контейнер для мусора"
}
"name": "Контейнер для мусора",
"presets": {
"0": {
"title": "Контейнер для мусора"
}
},
"title": {
"render": "Контейнер для мусора"
},
"mapRendering": {
"0": {
"iconSize": {
@ -1474,15 +1466,6 @@
}
}
}
},
"name": "Контейнер для мусора",
"presets": {
"0": {
"title": "Контейнер для мусора"
}
},
"title": {
"render": "Контейнер для мусора"
}
},
"watermill": {

View file

@ -449,11 +449,11 @@
"description": "充電站",
"name": "充電站",
"tagRenderings": {
"Auth phone": {
"Network": {
"question": "充電站所屬的網路是?",
"render": "{network}"
},
"Authentication": {
"OH": {
"question": "何時是充電站開放使用的時間?"
}
},