diff --git a/assets/layers/aerialway/aerialway.json b/assets/layers/aerialway/aerialway.json
index 6596c80273..c956043b3f 100644
--- a/assets/layers/aerialway/aerialway.json
+++ b/assets/layers/aerialway/aerialway.json
@@ -1,7 +1,9 @@
{
"pointRendering": [
{
- "location": ["start"],
+ "location": [
+ "start"
+ ],
"marker": [
{
"icon": "square"
@@ -9,7 +11,6 @@
],
"iconSize": "12,12"
},
-
{
"location": [
"point",
@@ -97,7 +98,8 @@
"en": "A magic carpet (a conveyor belt on the ground)"
}
},
- {"if": "aerialway=zip_line",
+ {
+ "if": "aerialway=zip_line",
"then": {
"en": "A zip line. (A touristical attraction where adventurous people go down at high speeds) "
}
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index d12d473a66..cbb5a3876b 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -8,7 +8,8 @@
"description": {
"en": "A charging station",
"nl": "Oplaadpunten",
- "de": "Eine Ladestation"
+ "de": "Eine Ladestation",
+ "ca": "Una estació de càrrega"
},
"source": {
"osmTags": {
@@ -277,7 +278,7 @@
"then": {
"en": "Only customers of the place this station belongs to can use this charging station
E.g. a charging station operated by hotel which is only usable by their guests",
"nl": "Enkel klanten van de bijhorende plaats mogen dit oplaadpunt gebruiken
Bv. op de parking van een hotel en enkel toegankelijk voor klanten van dit hotel",
- "ca": "Sols clientes del lloc al que pertany aquest punt de càrrega poden utilitzar-lo
p.e. un punt de càrrega d'un hotel que sols poden utilizar-los els hostes",
+ "ca": "Sols cliente del lloc al que pertany aquest punt de càrrega poden utilitzar-lo
p.e. un punt de càrrega d'un hotel que sols poden utilizar-los els hostes",
"de": "Nur Kunden des Ortes, zu dem diese Station gehört, können diese Ladestation nutzen
Z.B. eine von einem Hotel betriebene Ladestation, die nur von dessen Gästen genutzt werden kann"
}
},
@@ -2419,14 +2420,16 @@
"question": {
"en": "All vehicle types",
"nl": "Alle voertuigen",
- "de": "Ladestationen für alle Fahrzeugtypen"
+ "de": "Ladestationen für alle Fahrzeugtypen",
+ "ca": "Tots els tipus de vehicles"
}
},
{
"question": {
"en": "Charging station for bicycles",
"nl": "Oplaadpunten voor fietsen",
- "de": "Ladestationen für Fahrräder"
+ "de": "Ladestationen für Fahrräder",
+ "ca": "Punt de recàrrega per a bicicletes"
},
"osmTags": "bicycle=yes"
},
@@ -2477,7 +2480,8 @@
"question": {
"en": "Has a Schuko wall plug without ground pin (CEE7/4 type F) 
connector",
"nl": "Heeft een Schuko stekker zonder aardingspin (CEE7/4 type F) ",
- "de": "Verfügt über einen Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F) "
+ "de": "Verfügt über einen Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F) ",
+ "ca": "Té un connector Schuko sense pin de terra (CEE7/4 tipus F) "
},
"osmTags": "socket:schuko~*"
},
@@ -2485,7 +2489,8 @@
"question": {
"en": "Has a European wall plug with ground pin (CEE7/4 type E) 
connector",
"nl": "Heeft een Europese stekker met aardingspin (CEE7/4 type E) ",
- "de": "Verfügt über einen europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E) Anschluss"
+ "de": "Verfügt über einen europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E) Anschluss",
+ "ca": "Té un connector endoll de paret Europeu amb un pin de terra (CEE7/4 tipus F) "
},
"osmTags": "socket:typee~*"
},
@@ -2493,7 +2498,8 @@
"question": {
"en": "Has a Chademo 
connector",
"nl": "Heeft een Chademo ",
- "de": "Verfügt über einen Chademo Stecker"
+ "de": "Verfügt über einen Chademo Stecker",
+ "ca": "Té un connector Chademo "
},
"osmTags": "socket:chademo~*"
},
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 36b2e10ee5..e0bb68ecdd 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -644,7 +644,9 @@
"disused:shop:={shop}"
]
},
- "omitDefaultDeleteReasons": ["disused"],
+ "omitDefaultDeleteReasons": [
+ "disused"
+ ],
"nonDeleteMappings": [
{
"if": {
diff --git a/assets/layers/ski_piste/ski_piste.json b/assets/layers/ski_piste/ski_piste.json
index debef75be9..1cd365916c 100644
--- a/assets/layers/ski_piste/ski_piste.json
+++ b/assets/layers/ski_piste/ski_piste.json
@@ -109,9 +109,11 @@
"source": {
"osmTags": {
"and": [
- {"or":
- [ "piste:type=downhill",
- "piste:type=connection"]
+ {
+ "or": [
+ "piste:type=downhill",
+ "piste:type=connection"
+ ]
},
"area!=yes"
]
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index fd75206f95..5a5ab9b322 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -80,8 +80,10 @@
"pointRendering": [
{
"=marker": [
- {"icon": "circle",
- "color": "white"},
+ {
+ "icon": "circle",
+ "color": "white"
+ },
{
"icon": "./assets/themes/onwheels/entrance.svg"
}
@@ -413,8 +415,11 @@
"syncSelection": "theme-only",
"pointRendering": [
{
- "=marker": [ {"icon": "circle",
- "color": "white"},
+ "=marker": [
+ {
+ "icon": "circle",
+ "color": "white"
+ },
{
"icon": "./assets/themes/onwheels/elevator.svg"
}
diff --git a/assets/themes/ski/ski.json b/assets/themes/ski/ski.json
index e64f2f14a1..c6e1ac0ced 100644
--- a/assets/themes/ski/ski.json
+++ b/assets/themes/ski/ski.json
@@ -24,7 +24,7 @@
"pointRendering": [
{
"=iconSize": "25,25",
- "=label":null
+ "=label": null
}
]
}
diff --git a/langs/layers/en.json b/langs/layers/en.json
index dde4ed9a83..4870a3afe1 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -235,6 +235,63 @@
}
}
},
+ "aerialway": {
+ "description": "Various forms of transport for passengers and goods that use wires, including cable cars, gondolas, chair lifts, drag lifts, and zip lines. ",
+ "name": "Aerialways",
+ "pointRendering": {
+ "1": {
+ "label": {
+ "render": "{name}"
+ }
+ }
+ },
+ "tagRenderings": {
+ "length": {
+ "render": "This aerialway is {_length:km} kilometer long"
+ },
+ "type": {
+ "mappings": {
+ "0": {
+ "then": "This is a cable car where the car goes up and down again on the same cable."
+ },
+ "1": {
+ "then": "This is a gondola where the cars go around in continuous circles"
+ },
+ "2": {
+ "then": "An open chairlift with seats to sit on and open to the outside air."
+ },
+ "3": {
+ "then": "An aerialway which has both chairs and gondolas in the same continuous track"
+ },
+ "4": {
+ "then": "A drag lift"
+ },
+ "5": {
+ "then": "A drag lift with T-shaped carriers for two passengers at a time"
+ },
+ "6": {
+ "then": "A drag lift with L-shaped bars for a single passenger at a time"
+ },
+ "7": {
+ "then": "A drag lift with a platter to drag a single passenger at a time"
+ },
+ "8": {
+ "then": "A tow line which which drags skieers"
+ },
+ "9": {
+ "then": "A magic carpet (a conveyor belt on the ground)"
+ },
+ "10": {
+ "then": "A zip line. (A touristical attraction where adventurous people go down at high speeds) "
+ }
+ },
+ "question": "What type of aerialway is this?"
+ }
+ },
+ "title": {
+ "render": "Aerialway {name}"
+ }
+ },
"ambulancestation": {
"description": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies.",
"name": "Map of ambulance stations",
@@ -8291,6 +8348,41 @@
"render": "Shower"
}
},
+ "ski_piste": {
+ "description": "Ski and snowboard pistes",
+ "name": "Ski and snowboard pistes",
+ "tagRenderings": {
+ "length": {
+ "render": "This part of the ski piste is {_length:km} kilometer long"
+ },
+ "piste_difficulty": {
+ "mappings": {
+ "0": {
+ "then": "Novice (green)"
+ },
+ "1": {
+ "then": "Easy (blue)"
+ },
+ "2": {
+ "then": "Intermediate (red)"
+ },
+ "3": {
+ "then": "Advanced (black)"
+ },
+ "4": {
+ "then": "Expert (orange/double black)"
+ },
+ "5": {
+ "then": "Freeride"
+ }
+ },
+ "question": "What is the difficulty of this piste?"
+ }
+ },
+ "title": {
+ "render": "Ski piste {name}"
+ }
+ },
"slow_roads": {
"description": "All carfree roads",
"name": "Paths, carfree and slow roads",
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 934d2de157..b47384a053 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1311,6 +1311,10 @@
"shortDescription": "Sidewalk mapping",
"title": "Sidewalks"
},
+ "ski": {
+ "description": "Everything you need to go skiing",
+ "title": "Ski pistes and aerialways"
+ },
"sport_pitches": {
"description": "A sport pitch is an area where sports are played",
"shortDescription": "A map showing sport pitches",