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"
}
}
]
}

View file

@ -7,7 +7,8 @@
},
"description": {
"en": "Crossings for pedestrians and cyclists",
"nl": "Oversteekplaatsen voor voetgangers en fietsers"
"nl": "Oversteekplaatsen voor voetgangers en fietsers",
"de": "Übergänge für Fußgänger und Radfahrer"
},
"source": {
"osmTags": {
@ -21,7 +22,8 @@
"title": {
"render": {
"en": "Crossing",
"nl": "Oversteekplaats"
"nl": "Oversteekplaats",
"de": "Kreuzung"
},
"mappings": [
{

View file

@ -2,7 +2,8 @@
"id": "cycleways_and_roads",
"name": {
"en": "Cycleways and roads",
"nl": "Fietspaden, straten en wegen"
"nl": "Fietspaden, straten en wegen",
"de": "Radwege und Straßen"
},
"minzoom": 16,
"source": {

View file

@ -5,7 +5,8 @@
"nl": "Richtingsvisualisatie",
"fr": "Visualisation de la direction",
"it": "Visualizzazione della direzione",
"ru": "Визуализация направления"
"ru": "Визуализация направления",
"de": "Visualisierung der Richtung"
},
"minzoom": 16,
"source": {
@ -23,7 +24,8 @@
"en": "This layer visualizes directions",
"nl": "Deze laag toont de oriëntatie van een object",
"fr": "Cette couche visualise les directions",
"it": "Questo livello visualizza le direzioni"
"it": "Questo livello visualizza le direzioni",
"de": "Diese Ebene visualisiert Richtungen"
},
"tagRenderings": [],
"icon": {

View file

@ -33,7 +33,8 @@
"operational_status=closed"
]
},
"then": "close:#c33"
"then": "close:#c33",
"badge": true
}
],
"iconSize": "40,40,bottom",

View file

@ -35,7 +35,8 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen"
"then": "isOpen",
"badge": true
},
{
"if": {
@ -46,7 +47,8 @@
},
"then": {
"render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg"
}
},
"badge": true
}
],
"label": {

View file

@ -31,7 +31,8 @@
"en": "A map, meant for tourists which is permanently installed in the public space",
"nl": "Een permantent geinstalleerde kaart",
"it": "Una mappa, destinata ai turisti e che è sistemata in maniera permanente in uno spazio pubblico",
"fr": "Une carte, destinée aux touristes, installée en permanence dans l'espace public"
"fr": "Une carte, destinée aux touristes, installée en permanence dans l'espace public",
"de": "Eine Karte, die für Touristen gedacht ist und dauerhaft im öffentlichen Raum aufgestellt ist"
},
"tagRenderings": [
"images",

View file

@ -3,14 +3,16 @@
"name": {
"en": "Observation towers",
"nl": "Uitkijktorens",
"ru": "Смотровые башни"
"ru": "Смотровые башни",
"de": "Beobachtungstürme"
},
"minzoom": 8,
"title": {
"render": {
"en": "Observation tower",
"nl": "Uitkijktoren",
"ru": "Смотровая башня"
"ru": "Смотровая башня",
"de": "Beobachtungsturm"
},
"mappings": [
{
@ -25,7 +27,8 @@
},
"description": {
"en": "Towers with a panoramic view",
"nl": "Torens om van het uitzicht te genieten"
"nl": "Torens om van het uitzicht te genieten",
"de": "Türme mit Panoramablick"
},
"tagRenderings": [
"images",

View file

@ -27,7 +27,8 @@
"nl": "Deze laag toont picnictafels",
"it": "Il livello che mostra i tavoli da picnic",
"fr": "La couche montrant les tables de pique-nique",
"ru": "Слой, отображающий столы для пикника"
"ru": "Слой, отображающий столы для пикника",
"de": "Die Ebene zeigt Picknicktische an"
},
"tagRenderings": [
{

View file

@ -482,7 +482,8 @@
"opening_hours~*"
]
},
"then": "isOpen"
"then": "isOpen",
"badge": true
}
],
"width": {

View file

@ -21,7 +21,8 @@
"fr": "Magasin",
"ru": "Магазин",
"ja": "店",
"nl": "Winkel"
"nl": "Winkel",
"de": "Geschäft"
},
"mappings": [
{
@ -279,7 +280,8 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen"
"then": "isOpen",
"badge": true
}
],
"width": {

View file

@ -5,7 +5,8 @@
"fr": "Terrains de sport",
"en": "Sport pitches",
"ru": "Спортивные площадки",
"it": "Campi sportivi"
"it": "Campi sportivi",
"de": "Sportplätze"
},
"wayHandling": 1,
"minzoom": 12,
@ -25,7 +26,8 @@
"fr": "Terrain de sport",
"en": "Sport pitch",
"ru": "Спортивная площадка",
"it": "Campo sportivo"
"it": "Campo sportivo",
"de": "Sportplatz"
}
},
"description": {
@ -33,7 +35,8 @@
"fr": "Un terrain de sport",
"en": "A sport pitch",
"it": "Un campo sportivo",
"ru": "Спортивная площадка"
"ru": "Спортивная площадка",
"de": "Ein Sportplatz"
},
"tagRenderings": [
"images",
@ -420,7 +423,8 @@
"opening_hours~*"
]
},
"then": "isOpen"
"then": "isOpen",
"badge": true
},
{
"if": {
@ -430,7 +434,8 @@
"access=no"
]
},
"then": "circle:white;./assets/layers/sport_pitch/lock.svg"
"then": "circle:white;./assets/layers/sport_pitch/lock.svg",
"badge": true
}
],
"width": {

View file

@ -5,7 +5,8 @@
"nl": "Bewakingscamera's",
"ru": "Камеры наблюдения",
"fr": "Caméras de surveillance",
"it": "Videocamere di sorveglianza"
"it": "Videocamere di sorveglianza",
"de": "Überwachungskameras"
},
"minzoom": 12,
"source": {
@ -28,7 +29,8 @@
"nl": "Bewakingscamera",
"ru": "Камера наблюдения",
"fr": "Caméra de surveillance",
"it": "Videocamera di sorveglianza"
"it": "Videocamera di sorveglianza",
"de": "Überwachungskamera"
}
},
"tagRenderings": [

View file

@ -3,7 +3,8 @@
"name": {
"en": "Trails",
"nl": "Wandeltochten",
"ru": "Тропы"
"ru": "Тропы",
"de": "Wanderwege"
},
"minzoom": 12,
"source": {
@ -23,7 +24,8 @@
"render": {
"en": "Trail",
"nl": "Wandeltocht",
"ru": "Тропа"
"ru": "Тропа",
"de": "Wanderweg"
},
"mappings": [
{

View file

@ -3,7 +3,8 @@
"name": {
"en": "Waste Basket",
"nl": "Vuilnisbak",
"ru": "Контейнер для мусора"
"ru": "Контейнер для мусора",
"de": "Abfalleimer"
},
"minzoom": 17,
"source": {
@ -17,7 +18,8 @@
"render": {
"en": "Waste Basket",
"nl": "Vuilnisbak",
"ru": "Контейнер для мусора"
"ru": "Контейнер для мусора",
"de": "Abfalleimer"
}
},
"description": {