Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pietervdvn committed Dec 5, 2024
2 parents edfd941 + f42983c commit 3e2c67b
Show file tree
Hide file tree
Showing 43 changed files with 518 additions and 123 deletions.
39 changes: 26 additions & 13 deletions assets/layers/aerialway/aerialway.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"de": "Seilbahnen",
"cs": "Letecké trasy",
"ca": "Vies aeries",
"es": "Teleféricos"
"es": "Teleféricos",
"nl": "Kabelbanen"
},
"description": {
"en": "Various forms of transport for passengers and goods that use wires, including cable cars, gondolas, chair lifts, drag lifts, and zip lines. ",
Expand Down Expand Up @@ -58,7 +59,8 @@
"pl": "{name}",
"es": "{name}",
"cs": "{name}",
"ca": "{name}"
"ca": "{name}",
"nl": "{name}"
},
"condition": "name~*",
"classes": "bg-white p-1 px-2 rounded"
Expand Down Expand Up @@ -126,7 +128,8 @@
"en": "An open chairlift with seats to sit on and open to the outside air.",
"de": "Ein offener Sessellift mit Sitzgelegenheiten und Zugang zur Außenluft.",
"cs": "Otevřená lanovka se sedačkami k sezení na čerstvém vzduchu.",
"es": "Un telesilla abierto con asientos para sentarse y abierto al aire libre."
"es": "Un telesilla abierto con asientos para sentarse y abierto al aire libre.",
"nl": "Een open stoeltjeslift met zitjes om op te zitten."
},
"icon": "./assets/layers/aerialway/chair_lift.svg"
},
Expand All @@ -146,7 +149,8 @@
"de": "Ein Schlepplift",
"pl": "Wyciąg orczykowy",
"cs": "Vlek",
"es": "Un remonte"
"es": "Un remonte",
"nl": "Een sleeplift"
},
"hideInAnswer": true
},
Expand All @@ -156,7 +160,8 @@
"en": "A drag lift with T-shaped carriers for two passengers at a time",
"de": "Ein Schlepplift mit T-förmigen Trägern für jeweils zwei Passagiere",
"cs": "Vlek s nosiči ve tvaru T pro dva cestující najednou",
"es": "Un remonte con transportadores en forma de T para dos pasajeros a la vez"
"es": "Un remonte con transportadores en forma de T para dos pasajeros a la vez",
"nl": "Een sleeplift met T-vormige armen voor twee passagiers"
}
},
{
Expand All @@ -165,7 +170,8 @@
"en": "A drag lift with L-shaped bars for a single passenger at a time",
"de": "Ein Schlepplift mit L-förmigen Trägern für jeweils einen Passagier",
"cs": "Vlek s tyčemi ve tvaru písmene L pro jednoho cestujícího",
"es": "Un remonte con barras en forma de L para un solo pasajero a la vez"
"es": "Un remonte con barras en forma de L para un solo pasajero a la vez",
"nl": "Een sleeplift met L-vormige stangen voor één passagier"
}
},
{
Expand Down Expand Up @@ -225,7 +231,8 @@
"pl": "To nie włącza czasu oczekiwania.",
"es": "Esto no incluye el tiempo de espera.",
"cs": "To nezahrnuje čekací dobu.",
"ca": "Això exclou el temps d'espera."
"ca": "Això exclou el temps d'espera.",
"nl": "Dit is exclusief wachttijd."
},
"freeform": {
"key": "duration"
Expand All @@ -237,7 +244,8 @@
"pl": "Pojedynczy przejazd trwa {duration} minut",
"es": "Un viaje sencillo tarda {duration} minutos",
"cs": "Jedna jízda trvá {duration} minut",
"ca": "Un viatge dura {duration} minuts"
"ca": "Un viatge dura {duration} minuts",
"nl": "Een enkele reis duurt {duration} minuten"
}
},
{
Expand All @@ -258,7 +266,8 @@
"de": "{aerialway:occupancy} Leute passen in eine Kabine",
"pl": "{aerialway:occupancy} osób mieści się w jednym wagonie",
"cs": "{aerialway:occupancy} osob se vejde do jednoho vozu",
"es": "En una sola cabina caben {aerialway:occupancy} personas"
"es": "En una sola cabina caben {aerialway:occupancy} personas",
"nl": "Er kunnen {aerialway:occupancy} mensen in een cabine"
}
},
"opening_hours",
Expand All @@ -268,7 +277,8 @@
"en": "In what direction can this aerialway be taken?",
"de": "In welche Richtung kann diese Seilbahn genutzt werden?",
"cs": "Jakým směrem tato dráha může vést?",
"es": "¿En qué dirección se puede tomar este teleférico?"
"es": "¿En qué dirección se puede tomar este teleférico?",
"nl": "In welke richting kan deze kabelbaan genomen worden?"
},
"mappings": [
{
Expand All @@ -278,7 +288,8 @@
"en": "This aerialway can only be taken to the top",
"de": "Diese Seilbahn kann nur nach oben gefahren werden",
"cs": "Touto lanovkou lze vyjet pouze na vrchol",
"es": "Este teleférico solo se puede tomar hacia arriba"
"es": "Este teleférico solo se puede tomar hacia arriba",
"nl": "Deze kabelbaan kan alleen naar de top worden genomen"
}
},
{
Expand All @@ -287,7 +298,8 @@
"en": "This aerialway can be taken in both directions",
"de": "Diese Seilbahn kann in beide Richtungen befahren werden",
"cs": "Tuto dráhu lze využít v obou směrech",
"es": "Este teleférico se puede tomar en ambas direcciones"
"es": "Este teleférico se puede tomar en ambas direcciones",
"nl": "Deze kabelbaan kan in beide richtingen genomen worden"
}
}
]
Expand All @@ -299,7 +311,8 @@
"de": "Die Seilbahn hat eine Länge von {_length:km} km",
"fr": "Cette voie aérienne fait {_length:km} kilomètre de long",
"cs": "Tato dráha je dlouhá {_length:km} kilometr",
"es": "Este teleférico tiene {_length:km} kilómetros de longitud"
"es": "Este teleférico tiene {_length:km} kilómetros de longitud",
"nl": "Deze kabelbaan is {_length:km} kilometer lang"
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion assets/layers/bench/bench.json
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,8 @@
"he": "הוא אנדרטה",
"pt_BR": "é um memorial",
"es": "es un monumento",
"pt": "é um memorial"
"pt": "é um memorial",
"uk": "це меморіал"
}
}
]
Expand Down
12 changes: 8 additions & 4 deletions assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
{
"question": {
"en": "What kind of components does this waiting aid have?",
"de": "Aus welchen Bestandteilen besteht diese Wartehilfe?"
"de": "Aus welchen Bestandteilen besteht diese Wartehilfe?",
"es": "¿Qué tipo de componentes tiene esta ayuda a la espera?"
},
"id": "type",
"multiAnswer": true,
Expand All @@ -32,15 +33,17 @@
"if": "footrest=yes",
"then": {
"en": "There is a board or peg to rest your foot on here",
"de": "Hier gibt es ein Brett oder einen Pflock zum Abstützen des Fußes"
"de": "Hier gibt es ein Brett oder einen Pflock zum Abstützen des Fußes",
"es": "Hay una tabla o clavija para apoyar el pie."
},
"ifnot": "footrest="
},
{
"if": "handrest=yes",
"then": {
"en": "There is a rail or a handle to hold on to here",
"de": "Hier gibt es eine Schiene oder einen Griff zum Festhalten"
"de": "Hier gibt es eine Schiene oder einen Griff zum Festhalten",
"es": "Hay una barandilla o un asa para agarrarse aquí"
},
"ifnot": "handrest="
}
Expand Down Expand Up @@ -132,7 +135,8 @@
"title": {
"render": {
"en": "Cyclist Waiting Aid",
"de": "Radfahrer-Wartehilfe"
"de": "Radfahrer-Wartehilfe",
"es": "Ayuda para ciclistas en espera"
}
},
"deletion": {
Expand Down
3 changes: 2 additions & 1 deletion assets/layers/playground/playground.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"pa_PK": "کھید دے میدان",
"cs": "Dětská hřiště",
"pl": "Place zabaw",
"es": "Parques Infantiles"
"es": "Parques Infantiles",
"uk": "Дитячі майданчики"
},
"description": {
"nl": "Speeltuinen",
Expand Down
3 changes: 2 additions & 1 deletion assets/layers/playground_equipment/playground_equipment.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"name": {
"en": "Playground equipment",
"de": "Spielgeräte",
"es": "Equipamiento del Parque Infantil"
"es": "Equipamiento del Parque Infantil",
"uk": "Обладнання для дитячих майданчиків"
},
"description": {
"en": "Layer showing playground equipment",
Expand Down
9 changes: 6 additions & 3 deletions assets/layers/postboxes/postboxes.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@
"title": {
"en": "a postbox on a wall",
"nl": "een brievenbus tegen een muur",
"de": "ein Briefkasten an einer Wand"
"de": "ein Briefkasten an einer Wand",
"es": "un buzón en una pared"
},
"snapToLayer": [
"walls_and_buildings"
Expand All @@ -151,11 +152,13 @@
"id": "operator",
"question": {
"en": "Who operates this postbox?",
"de": "Wer betreibt diesen Briefkasten?"
"de": "Wer betreibt diesen Briefkasten?",
"es": "¿Quién gestiona este buzón?"
},
"render": {
"en": "This postbox is operated by <b>{operator}</b>",
"de": "Dieser Briefkasten wird von <b>{operator}</b> betrieben"
"de": "Dieser Briefkasten wird von <b>{operator}</b> betrieben",
"es": "Este buzón es operado por <b>{operator}</b>."
},
"freeform": {
"key": "operator"
Expand Down
9 changes: 6 additions & 3 deletions assets/layers/questions/questions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3161,23 +3161,26 @@
"question": {
"en": "Is this object located indoors?",
"nl": "Bevindt dit object zich binnen?",
"de": "Befindet sich das Objekt in einem Innenraum?"
"de": "Befindet sich das Objekt in einem Innenraum?",
"es": "¿Se encuentra este objeto en el interior?"
},
"mappings": [
{
"if": "indoor=yes",
"then": {
"en": "This object is located indoors",
"nl": "Dit object bevindt zich binnen",
"de": "Dieses Objekt befindet sich in einem Innenraum"
"de": "Dieses Objekt befindet sich in einem Innenraum",
"es": "Este objeto se encuentra en el interior"
}
},
{
"if": "indoor=no",
"then": {
"en": "This object is located outdoors",
"nl": "Dit object bevindt zich buiten",
"de": "Dieses Objekt befindet sich im Freien"
"de": "Dieses Objekt befindet sich im Freien",
"es": "Este objeto se encuentra al aire libre"
}
}
]
Expand Down
27 changes: 18 additions & 9 deletions assets/layers/sports_centre/sports_centre.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,15 @@
{
"if": "sport=9pin",
"then": {
"en": "Nine-pin bowling"
"en": "Nine-pin bowling",
"es": "Bolos de nueve bolos"
}
},
{
"if": "sport=10pin",
"then": {
"en": "Ten-pin bowling"
"en": "Ten-pin bowling",
"es": "Bolos de diez bolos"
}
},
{
Expand Down Expand Up @@ -152,7 +154,8 @@
{
"if": "sport=base",
"then": {
"en": "BASE jumping"
"en": "BASE jumping",
"es": "Salto BASE"
}
},
{
Expand Down Expand Up @@ -692,37 +695,43 @@
{
"if": "sport=skateboard",
"then": {
"en": "Skateboard"
"en": "Skateboard",
"es": "Monopatín"
}
},
{
"if": "sport=ski_jumping",
"then": {
"en": "Ski jumping"
"en": "Ski jumping",
"es": "Salto de esquí"
}
},
{
"if": "sport=snooker",
"then": {
"en": "Snooker"
"en": "Snooker",
"es": "Snooker"
}
},
{
"if": "sport=soccer",
"then": {
"en": "Soccer"
"en": "Soccer",
"es": "Fútbol"
}
},
{
"if": "sport=softball",
"then": {
"en": "Softball"
"en": "Softball",
"es": "Softball"
}
},
{
"if": "sport=speedway",
"then": {
"en": "Motorcycle speedway"
"en": "Motorcycle speedway",
"es": "Circuito de motos"
}
},
{
Expand Down
9 changes: 6 additions & 3 deletions assets/layers/toilet/toilet.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"da": "Toiletter",
"pa_PK": "ٹوئیلٹاں",
"cs": "Toalety",
"sl": "Stranišča"
"sl": "Stranišča",
"uk": "Туалети"
},
"description": {
"en": "A layer showing (public) toilets",
Expand Down Expand Up @@ -1027,7 +1028,8 @@
"da": "Tilgængelig for kørestolsbrugere",
"ca": "Accessible amb cadira de rodes",
"cs": "Bezbariérový přístup",
"sl": "Dostopno z vozičkom"
"sl": "Dostopno z vozičkom",
"uk": "Доступ для інвалідних візків"
},
"osmTags": {
"or": [
Expand All @@ -1051,7 +1053,8 @@
"da": "Har et puslebord",
"ca": "Té un canviador",
"cs": "Má přebalovací pult",
"sl": "Ima previjalno mizo"
"sl": "Ima previjalno mizo",
"uk": "Є пеленальний столик"
},
"osmTags": "changing_table=yes"
}
Expand Down
3 changes: 2 additions & 1 deletion assets/layers/waste_basket/waste_basket.json
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,8 @@
"ca": "Papereres amb dispensador de bosses d'excrements (per a gossos)",
"fr": "Poubelle avec distributeur de sacs pour ramasser les déjections canines",
"cs": "Odpadkový koš se zásobníkem na sáčky na (psí) exkrementy",
"ru": "Корзина для мусора с дозатором для пакетов (собачьих) экскрементов"
"ru": "Корзина для мусора с дозатором для пакетов (собачьих) экскрементов",
"uk": "Кошик для сміття з дозатором для пакетиків з (собачими) екскрементами"
},
"osmTags": "vending=dog_excrement_bag"
}
Expand Down
2 changes: 1 addition & 1 deletion assets/themes/cafes_and_pubs/cafes_and_pubs.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ru": "Кафе и пабы",
"hu": "Kávézók és kocsmák",
"ca": "Cafés i bars",
"es": "Cafés y pubs",
"es": "Cafeterías y bares",
"fr": "Cafés et pubs",
"da": "Caféer og pubber",
"pa_PK": "کیفے یا پب",
Expand Down
2 changes: 1 addition & 1 deletion langs/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -723,4 +723,4 @@
"description": "Un identificador de Wikidata"
}
}
}
}
2 changes: 1 addition & 1 deletion langs/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -913,4 +913,4 @@
"startsWithQ": "Identifikátor wikidat začíná písmenem Q a následuje za ním číslo"
}
}
}
}
Loading

0 comments on commit 3e2c67b

Please sign in to comment.