diff --git a/assets/layers/address/address.json b/assets/layers/address/address.json
index 97260eb07..f3a61c03b 100644
--- a/assets/layers/address/address.json
+++ b/assets/layers/address/address.json
@@ -206,30 +206,6 @@
"address",
"hidden"
],
- "render": {
- "en": "The house number is {addr:housenumber}",
- "nl": "Het huisnummer is {addr:housenumber}",
- "de": "Die Hausnummer ist {addr:housenumber}",
- "hu": "A házszám: {addr:housenumber}",
- "fr": "Son numéro est le {addr:housenumber}",
- "pl": "Numer tego domu to {addr:housenumber}",
- "ru": "Номер дома {addr:housenumber}",
- "zh_Hans": "门牌号是 {addr:housenumber}",
- "id": "Nomor rumah ini {addr:housenumber}",
- "es": "El número de la casa es {addr:housenumber}",
- "da": "Husnummeret er {addr:housenumber}",
- "cs": "Číslo domu je {addr:housenumber}",
- "pt": "O número da casa é {addr:housenumber}",
- "nb_NO": "Husnummeret er {addr:housenumber}",
- "ca": "El número de porta és {addr:housenumber}",
- "pt_BR": "O número da casa é {addr:housenumber}",
- "he": "מספר הבית הוא {addr:housenumber}",
- "eu": "Etxearen zenbakia {addr:housenumber} da",
- "it": "Il numero civico della casa è {addr:housenumber}",
- "zh_Hant": "門牌號碼是 {addr:housenumber}",
- "uk": "Номер будинку {addr:housenumber}",
- "ko": "이 집의 번호는 {addr:housenumber} 입니다"
- },
"question": {
"en": "What is the number of this house?",
"de": "Wie lautet die Nummer dieses Hauses?",
@@ -254,6 +230,30 @@
"uk": "Який номер цього будинку?",
"ko": "이 집의 번호는 무엇입니까?"
},
+ "render": {
+ "en": "The house number is {addr:housenumber}",
+ "nl": "Het huisnummer is {addr:housenumber}",
+ "de": "Die Hausnummer ist {addr:housenumber}",
+ "hu": "A házszám: {addr:housenumber}",
+ "fr": "Son numéro est le {addr:housenumber}",
+ "pl": "Numer tego domu to {addr:housenumber}",
+ "ru": "Номер дома {addr:housenumber}",
+ "zh_Hans": "门牌号是 {addr:housenumber}",
+ "id": "Nomor rumah ini {addr:housenumber}",
+ "es": "El número de la casa es {addr:housenumber}",
+ "da": "Husnummeret er {addr:housenumber}",
+ "cs": "Číslo domu je {addr:housenumber}",
+ "pt": "O número da casa é {addr:housenumber}",
+ "nb_NO": "Husnummeret er {addr:housenumber}",
+ "ca": "El número de porta és {addr:housenumber}",
+ "pt_BR": "O número da casa é {addr:housenumber}",
+ "he": "מספר הבית הוא {addr:housenumber}",
+ "eu": "Etxearen zenbakia {addr:housenumber} da",
+ "it": "Il numero civico della casa è {addr:housenumber}",
+ "zh_Hant": "門牌號碼是 {addr:housenumber}",
+ "uk": "Номер будинку {addr:housenumber}",
+ "ko": "이 집의 번호는 {addr:housenumber} 입니다"
+ },
"freeform": {
"key": "addr:housenumber",
"addExtraTags": [
@@ -303,27 +303,6 @@
"address",
"hidden"
],
- "render": {
- "en": "This address is in street {addr:street}",
- "de": "Diese Adresse befindet sich in der Straße {addr:street}",
- "hu": "Ez a cím a következő utcában van: {addr:street}",
- "nl": "Dit adres bevindt zich in de straat {addr:street}",
- "fr": "Le nom de la voie est {addr:street}",
- "pl": "Ten adres znajduje się na ulicy {addr:street}",
- "zh_Hans": "这个地址位于{addr:street}街",
- "id": "Alamat ini ada di jalan {addr:street}",
- "es": "Esta dirección está en la calle {addr:street}",
- "da": "Denne adresse er på gaden {addr:street}",
- "cs": "Tato adresa se nachází v ulici {addr:street}",
- "ca": "L'adreça està a aquest carrer {addr:street}",
- "pt": "Este endereço é na rua {addr:street}",
- "pt_BR": "Este endereço fica na rua {addr:street}",
- "he": "כתובת זו נמצאת ברחוב {addr:street}",
- "eu": "Helbide hau {addr:street} kalean dago",
- "it": "L'indirizzo è in via {addr:street}",
- "zh_Hant": "此地址位於街道 {addr:street}",
- "uk": "Ця адреса знаходиться на вулиці {addr:street}"
- },
"question": {
"en": "What street is this address located in?",
"de": "In welcher Straße befindet sich diese Adresse?",
@@ -354,6 +333,27 @@
"zh_Hant": "不要包含門牌號碼",
"it": "Non includere il numero civico"
},
+ "render": {
+ "en": "This address is in street {addr:street}",
+ "de": "Diese Adresse befindet sich in der Straße {addr:street}",
+ "hu": "Ez a cím a következő utcában van: {addr:street}",
+ "nl": "Dit adres bevindt zich in de straat {addr:street}",
+ "fr": "Le nom de la voie est {addr:street}",
+ "pl": "Ten adres znajduje się na ulicy {addr:street}",
+ "zh_Hans": "这个地址位于{addr:street}街",
+ "id": "Alamat ini ada di jalan {addr:street}",
+ "es": "Esta dirección está en la calle {addr:street}",
+ "da": "Denne adresse er på gaden {addr:street}",
+ "cs": "Tato adresa se nachází v ulici {addr:street}",
+ "ca": "L'adreça està a aquest carrer {addr:street}",
+ "pt": "Este endereço é na rua {addr:street}",
+ "pt_BR": "Este endereço fica na rua {addr:street}",
+ "he": "כתובת זו נמצאת ברחוב {addr:street}",
+ "eu": "Helbide hau {addr:street} kalean dago",
+ "it": "L'indirizzo è in via {addr:street}",
+ "zh_Hant": "此地址位於街道 {addr:street}",
+ "uk": "Ця адреса знаходиться на вулиці {addr:street}"
+ },
"freeform": {
"inline": false,
"key": "addr:street"
@@ -409,7 +409,6 @@
},
{
"id": "fixme",
- "render": "Fixme description{fixme}",
"question": {
"en": "What should be fixed here? Please explain",
"zh_Hant": "這裡需要修什麼？請直接解釋",
@@ -434,6 +433,7 @@
"uk": "Що тут треба виправити? Поясніть, будь ласка",
"ko": "수정할 내용이 있습니까? 설명 부탁드립니다"
},
+ "render": "Fixme description{fixme}",
"freeform": {
"key": "fixme"
},
diff --git a/assets/layers/adult_changing_table/adult_changing_table.json b/assets/layers/adult_changing_table/adult_changing_table.json
index 053b35938..72780f866 100644
--- a/assets/layers/adult_changing_table/adult_changing_table.json
+++ b/assets/layers/adult_changing_table/adult_changing_table.json
@@ -76,17 +76,12 @@
"it": "Questa è misurata tra il pavimento e la parte superiore del fasciatoio",
"cs": "Měří se od podlahy k horní ploše stolu"
},
- "mappings": [
- {
- "if": "height=adjustable",
- "then": {
- "en": "The changing table is adjustable in height",
- "nl": "De verzorgingstafel is in hoogte verstelbaar",
- "it": "Il fasciatoio è regolabile in altezza",
- "cs": "Převlékací stůl má nastavitelnou výšku"
- }
- }
- ],
+ "render": {
+ "en": "The changing table is {canonical(height)} high",
+ "nl": "De verzorgingstafel is {canonical(height)} hoog",
+ "it": "Il fasciatoio è alto {canonical(height)}",
+ "cs": "Výška stolu je {canonical(height)}"
+ },
"freeform": {
"key": "height",
"type": "pfloat",
@@ -104,18 +99,23 @@
"max": 2
}
},
- "render": {
- "en": "The changing table is {canonical(height)} high",
- "nl": "De verzorgingstafel is {canonical(height)} hoog",
- "it": "Il fasciatoio è alto {canonical(height)}",
- "cs": "Výška stolu je {canonical(height)}"
- }
+ "mappings": [
+ {
+ "if": "height=adjustable",
+ "then": {
+ "en": "The changing table is adjustable in height",
+ "nl": "De verzorgingstafel is in hoogte verstelbaar",
+ "it": "Il fasciatoio è regolabile in altezza",
+ "cs": "Převlékací stůl má nastavitelnou výšku"
+ }
+ }
+ ]
},
{
+ "id": "adult-changing-table-min_height",
"labels": [
"relevant_questions"
],
- "id": "adult-changing-table-min_height",
"question": {
"en": "What is the lowest height the adult changing table can be moved to?",
"nl": "Wat is de laagste stand waarop de verzorgingstafel voor volwassenen gezet kan worden?",
@@ -128,6 +128,12 @@
"it": "Questa è misurata tra il pavimento e la parte superiore del fasciatoio",
"cs": "Měří se od podlahy k horní ploše stolu"
},
+ "render": {
+ "en": "The lowest height of the adult changing table is {canonical(min_height)}",
+ "nl": "De laagste stand van de verzorgingstafel is {canonical(min_height)} hoog",
+ "it": "L'altezza minima del fasciatoio per adulti è {canonical(min_height)}",
+ "cs": "Nejmenší výška převlékacího stolu pro dospělé je {canonical(min_height)}"
+ },
"freeform": {
"key": "min_height",
"type": "pfloat",
@@ -145,12 +151,6 @@
"max": 2
}
},
- "render": {
- "en": "The lowest height of the adult changing table is {canonical(min_height)}",
- "nl": "De laagste stand van de verzorgingstafel is {canonical(min_height)} hoog",
- "it": "L'altezza minima del fasciatoio per adulti è {canonical(min_height)}",
- "cs": "Nejmenší výška převlékacího stolu pro dospělé je {canonical(min_height)}"
- },
"condition": {
"and": [
"height=adjustable"
@@ -158,10 +158,10 @@
}
},
{
+ "id": "adult-changing-table-max_height",
"labels": [
"relevant_questions"
],
- "id": "adult-changing-table-max_height",
"question": {
"en": "What is the highest height the adult changing table can be moved to?",
"nl": "Wat is de hoogste stand waarop de verzorgingstafel voor volwassenen gezet kan worden?",
@@ -174,6 +174,12 @@
"it": "Questa è misurata tra il pavimento e la parte superiore del fasciatoio",
"cs": "Měří se od podlahy k horní ploše stolu"
},
+ "render": {
+ "en": "The highest height of the adult changing table is {canonical(max_height)}",
+ "nl": "De hoogste stand van de verzorgingstafel is {canonical(max_height)} hoog",
+ "it": "L'altezza massima del fasciatoio per adulti è {canonical(max_height)}",
+ "cs": "Největší výška převlékacího stolu pro dospělé je {canonical(max_height)}"
+ },
"freeform": {
"key": "max_height",
"type": "pfloat",
@@ -191,12 +197,6 @@
"max": 2
}
},
- "render": {
- "en": "The highest height of the adult changing table is {canonical(max_height)}",
- "nl": "De hoogste stand van de verzorgingstafel is {canonical(max_height)} hoog",
- "it": "L'altezza massima del fasciatoio per adulti è {canonical(max_height)}",
- "cs": "Největší výška převlékacího stolu pro dospělé je {canonical(max_height)}"
- },
"condition": {
"and": [
"height=adjustable"
@@ -204,10 +204,10 @@
}
},
{
+ "id": "adult-changing-table-mechanism",
"labels": [
"relevant_questions"
],
- "id": "adult-changing-table-mechanism",
"question": {
"en": "How is the height of the changing table adjusted?",
"nl": "Hoe wordt de hoogte van de verzorgingstafel aangepast?",
diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json
index 93675138b..74ee1f392 100644
--- a/assets/layers/advertising/advertising.json
+++ b/assets/layers/advertising/advertising.json
@@ -937,6 +937,21 @@
"images",
{
"id": "type",
+ "question": {
+ "ca": "Quin tipus d'element publicitari és aquest?",
+ "es": "¿Qué tipo de elemento publicitario es este?",
+ "en": "Which type of advertising feature is this?",
+ "de": "Welche Art von Werbung ist das?",
+ "cs": "O jaký typ reklamního prvku se jedná?",
+ "fr": "De quel type de dispositif publicitaire s'agit-il ?",
+ "pl": "Jakiego rodzaju jest to obiekt reklamowy?",
+ "pt_BR": "Que tipo de recurso de publicitário é este?",
+ "zh_Hans": "这是哪种类型的广告功能？",
+ "pt": "Que tipo de recurso de publicitário é este?",
+ "uk": "Який це тип рекламного об'єкту?",
+ "nl": "Wat voor advertentieobject is dit?",
+ "it": "Che tipo di elemento pubblicitario è questo?"
+ },
"render": {
"ca": "Açò és un {advertising}",
"es": "Se trata de un {advertising}",
@@ -953,21 +968,6 @@
"uk": "Це {advertising}",
"it": "Questo è un {advertising}"
},
- "question": {
- "ca": "Quin tipus d'element publicitari és aquest?",
- "es": "¿Qué tipo de elemento publicitario es este?",
- "en": "Which type of advertising feature is this?",
- "de": "Welche Art von Werbung ist das?",
- "cs": "O jaký typ reklamního prvku se jedná?",
- "fr": "De quel type de dispositif publicitaire s'agit-il ?",
- "pl": "Jakiego rodzaju jest to obiekt reklamowy?",
- "pt_BR": "Que tipo de recurso de publicitário é este?",
- "zh_Hans": "这是哪种类型的广告功能？",
- "pt": "Que tipo de recurso de publicitário é este?",
- "uk": "Який це тип рекламного об'єкту?",
- "nl": "Wat voor advertentieobject is dit?",
- "it": "Che tipo di elemento pubblicitario è questo?"
- },
"freeform": {
"key": "advertising"
},
@@ -1259,17 +1259,6 @@
"nl": "Doorloopt deze advertentie meerdere berichten?",
"it": "Questa pubblicità mostra messaggi multipli in sequenza?"
},
- "condition": {
- "#": "Screens are _always_ animated; flags, tarps, and wall_paintings cannot be animated; signs can be anything so we don't make guesses",
- "and": [
- "advertising!=screen",
- "advertising!=flag",
- "advertising!=tarp",
- "advertising!=wall_painting",
- "advertising!=sign",
- "advertising!=board"
- ]
- },
"mappings": [
{
"if": "animated=no",
@@ -1386,7 +1375,18 @@
]
}
}
- ]
+ ],
+ "condition": {
+ "#": "Screens are _always_ animated; flags, tarps, and wall_paintings cannot be animated; signs can be anything so we don't make guesses",
+ "and": [
+ "advertising!=screen",
+ "advertising!=flag",
+ "advertising!=tarp",
+ "advertising!=wall_painting",
+ "advertising!=sign",
+ "advertising!=board"
+ ]
+ }
},
{
"id": "luminous_or_lit_advertising",
@@ -1427,22 +1427,6 @@
},
{
"id": "operator",
- "render": {
- "ca": "L'operador és {operator}",
- "es": "Operado por {operator}",
- "en": "Operated by {operator}",
- "de": "Betrieben von {operator}",
- "cs": "Provozuje {operator}",
- "fr": "Exploité par {operator}",
- "nl": "Uitgebaat door {operator}",
- "pt": "Operado por {operator}",
- "pt_BR": "Operado por {operator}",
- "he": "מופעל על ידי {operator}",
- "pl": "Obsługiwane przez {operator}",
- "zh_Hans": "由{operator}运营",
- "uk": "Управляється {operator}",
- "it": "Gestito da {operator}"
- },
"question": {
"ca": "Qui opera aquest element?",
"es": "¿Quién opera este elemento?",
@@ -1459,6 +1443,22 @@
"uk": "Хто керує цим об'єктом?",
"it": "Chi gestisce questa caratteristica?"
},
+ "render": {
+ "ca": "L'operador és {operator}",
+ "es": "Operado por {operator}",
+ "en": "Operated by {operator}",
+ "de": "Betrieben von {operator}",
+ "cs": "Provozuje {operator}",
+ "fr": "Exploité par {operator}",
+ "nl": "Uitgebaat door {operator}",
+ "pt": "Operado por {operator}",
+ "pt_BR": "Operado por {operator}",
+ "he": "מופעל על ידי {operator}",
+ "pl": "Obsługiwane przez {operator}",
+ "zh_Hans": "由{operator}运营",
+ "uk": "Управляється {operator}",
+ "it": "Gestito da {operator}"
+ },
"freeform": {
"addExtraTags": [],
"key": "operator"
@@ -1706,18 +1706,6 @@
},
{
"id": "Sides",
- "condition": {
- "and": [
- "_referencing_ways=",
- {
- "or": [
- "advertising=poster_box",
- "advertising=screen",
- "advertising=billboard"
- ]
- }
- ]
- },
"question": {
"ca": "Per quants costats pots veure publicitat?",
"es": "¿Desde cuántos lados se puede ver la publicidad?",
@@ -1773,25 +1761,22 @@
"it": "Questo oggetto ha la pubblicità su entrambi i lati"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "_referencing_ways=",
+ {
+ "or": [
+ "advertising=poster_box",
+ "advertising=screen",
+ "advertising=billboard"
+ ]
+ }
+ ]
+ }
},
{
"id": "ref",
- "render": {
- "ca": "El número de referència és {ref}",
- "es": "El número de referencia es {ref}",
- "en": "Reference number is {ref}",
- "de": "Die Referenznummer lautet {ref}",
- "cs": "Referenční číslo je {ref}",
- "fr": "Le numéro de référence est {ref}",
- "nl": "Het referentienummer is {ref}",
- "pt": "O número de referência é {ref}",
- "pt_BR": "O número de referência é {ref}",
- "pl": "Numer referencyjny to {ref}",
- "zh_Hans": "编号是{ref}",
- "uk": "Номер посилання: {ref}",
- "it": "Il numero di riferimento è {ref}"
- },
"question": {
"ca": "Quin és el número de refèrencia?",
"es": "¿Cuál es el número de referencia?",
@@ -1807,6 +1792,21 @@
"uk": "Який номер посилання?",
"it": "Qual è il numero di riferimento?"
},
+ "render": {
+ "ca": "El número de referència és {ref}",
+ "es": "El número de referencia es {ref}",
+ "en": "Reference number is {ref}",
+ "de": "Die Referenznummer lautet {ref}",
+ "cs": "Referenční číslo je {ref}",
+ "fr": "Le numéro de référence est {ref}",
+ "nl": "Het referentienummer is {ref}",
+ "pt": "O número de referência é {ref}",
+ "pt_BR": "O número de referência é {ref}",
+ "pl": "Numer referencyjny to {ref}",
+ "zh_Hans": "编号是{ref}",
+ "uk": "Номер посилання: {ref}",
+ "it": "Il numero di riferimento è {ref}"
+ },
"freeform": {
"key": "ref"
},
diff --git a/assets/layers/aerialway/aerialway.json b/assets/layers/aerialway/aerialway.json
index 4fb8bea4f..eabb1b41c 100644
--- a/assets/layers/aerialway/aerialway.json
+++ b/assets/layers/aerialway/aerialway.json
@@ -100,6 +100,7 @@
"tagRenderings": [
"images",
{
+ "id": "type",
"question": {
"en": "What type of aerialway is this?",
"de": "Um welchen Seilbahntyp handelt es sich?",
@@ -109,7 +110,6 @@
"ca": "Quin tipus de telefèric és aquest?",
"it": "Che tipo di impianto a fune è questo?"
},
- "id": "type",
"mappings": [
{
"if": "aerialway=cable_car",
@@ -274,9 +274,6 @@
"nl": "Dit is exclusief wachttijd.",
"it": "Questo esclude il tempo di attesa."
},
- "freeform": {
- "key": "duration"
- },
"render": {
"en": "A single journey takes {duration} minutes",
"de": "Eine Fahrt dauert {duration} Minuten",
@@ -287,13 +284,13 @@
"ca": "Un viatge dura {duration} minuts",
"nl": "Een enkele reis duurt {duration} minuten",
"it": "Un singolo viaggio dura {duration} minuti"
+ },
+ "freeform": {
+ "key": "duration"
}
},
{
"id": "occupancy",
- "freeform": {
- "key": "aerialway:occupancy"
- },
"question": {
"en": "How many people fit a single carriage?",
"de": "Wie viele Leute passen in eine Kabine?",
@@ -313,6 +310,9 @@
"nl": "Er kunnen {aerialway:occupancy} mensen in een cabine",
"ca": "En una única cabina caben {aerialway:occupancy} persones",
"it": "{aerialway:occupancy} persone possono stare in una singola cabina"
+ },
+ "freeform": {
+ "key": "aerialway:occupancy"
}
},
"opening_hours",
diff --git a/assets/layers/ambulancestation/ambulancestation.json b/assets/layers/ambulancestation/ambulancestation.json
index e1659b7cb..137588505 100644
--- a/assets/layers/ambulancestation/ambulancestation.json
+++ b/assets/layers/ambulancestation/ambulancestation.json
@@ -143,9 +143,6 @@
"tagRenderings": [
{
"id": "ambulance-name",
- "freeform": {
- "key": "name"
- },
"question": {
"en": "What is the name of this ambulance station?",
"ja": "この救急ステーションの名前は何ですか?",
@@ -185,13 +182,13 @@
"pl": "Ta stacja nazywa się {name}.",
"pt_BR": "Esta estação é chamada de {name}.",
"pt": "Esta estação é chamada de {name}."
+ },
+ "freeform": {
+ "key": "name"
}
},
{
"id": "ambulance-street",
- "freeform": {
- "key": "addr:street"
- },
"question": {
"en": "What is the street name where the station located?",
"ja": " 救急ステーションの所在地はどこですか?",
@@ -229,6 +226,9 @@
"pt_BR": "Essa estação está em uma via chamada {addr:street}.",
"zh_Hans": "该站位于一条名为 {addr:street} 的公路沿线。",
"pt": "Esta estação está numa autoestrada chamada {addr:street}."
+ },
+ "freeform": {
+ "key": "addr:street"
}
},
{
@@ -252,9 +252,6 @@
"pt": "Onde está a estação localizada ? (por exemplo, nome do bairro, vila ou cidade)",
"uk": "Де знаходиться станція? (наприклад, назва району, села чи міста)"
},
- "freeform": {
- "key": "addr:place"
- },
"render": {
"en": "This station is found within {addr:place}.",
"ja": "このステーションは{addr:place}にあります。",
@@ -271,6 +268,9 @@
"pt_BR": "Essa estação está localizada em {addr:place}.",
"zh_Hans": "该站位于{addr:place}内。",
"pt": "Esta estação está localizada em {addr:place}."
+ },
+ "freeform": {
+ "key": "addr:place"
}
},
{
diff --git a/assets/layers/animal_shelter/animal_shelter.json b/assets/layers/animal_shelter/animal_shelter.json
index 1bbe64b24..445f7ca41 100644
--- a/assets/layers/animal_shelter/animal_shelter.json
+++ b/assets/layers/animal_shelter/animal_shelter.json
@@ -109,9 +109,6 @@
"reviews",
{
"id": "2",
- "freeform": {
- "key": "name"
- },
"question": {
"en": "What is the name of this animal shelter?",
"de": "Wie lautet der Name des Tierheims?",
@@ -137,6 +134,9 @@
"uk": "Цей притулок для тварин називається {name}",
"ca": "Aquest refugi d'animals s'anomena {name}",
"it": "Questo rifugio per animali si chiama {name}"
+ },
+ "freeform": {
+ "key": "name"
}
},
"website",
@@ -205,6 +205,7 @@
},
"opening_hours_by_appointment",
{
+ "id": "boarded_animals",
"question": {
"en": "Which animals are accepted here?",
"de": "Welche Tiere werden hier akzeptiert?",
@@ -215,7 +216,18 @@
"nl": "Welke dieren worden hier opgevangen?",
"it": "Quali animali vengono accettati qui?"
},
- "id": "boarded_animals",
+ "render": {
+ "en": "{animal_shelter} is kept here",
+ "de": "{animal_shelter} wird hier gehalten",
+ "cs": "{animal_shelter} je uložen zde",
+ "es": "{animal_shelter} se mantiene aquí",
+ "nl": "{animal_shelter} worden hier opgevangen",
+ "ca": "{animal_shelter} es manté aquí",
+ "it": "Qui vengono tenuti {animal_shelter}"
+ },
+ "freeform": {
+ "key": "animal_shelter"
+ },
"mappings": [
{
"if": "animal_shelter=dog",
@@ -283,18 +295,6 @@
}
}
],
- "render": {
- "en": "{animal_shelter} is kept here",
- "de": "{animal_shelter} wird hier gehalten",
- "cs": "{animal_shelter} je uložen zde",
- "es": "{animal_shelter} se mantiene aquí",
- "nl": "{animal_shelter} worden hier opgevangen",
- "ca": "{animal_shelter} es manté aquí",
- "it": "Qui vengono tenuti {animal_shelter}"
- },
- "freeform": {
- "key": "animal_shelter"
- },
"multiAnswer": true
}
],
diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json
index a859e331c..71b41be80 100644
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@@ -194,31 +194,10 @@
"tagRenderings": [
"images_no_blur",
{
+ "id": "artwork-artwork_type",
"labels": [
"artwork-question"
],
- "render": {
- "en": "This is a {artwork_type}",
- "nl": "Dit is een {artwork_type}",
- "fr": "Type d'œuvre : {artwork_type}",
- "de": "Dies ist ein {artwork_type}",
- "it": "Si tratta di un {artwork_type}",
- "ru": "Это {artwork_type}",
- "es": "Se trata de un {artwork_type}",
- "ja": "これは{artwork_type}です",
- "zh_Hant": "這是 {artwork_type}",
- "nb_NO": "Dette er et kunstverk av typen {artwork_type}",
- "id": "Ini adalah {artwork_type}",
- "pt": "Isto é um(a) {artwork_type}",
- "hu": "Ez egy {artwork_type}",
- "pl": "Jest to {artwork_type}",
- "da": "Dette er en {artwork_type}",
- "cs": "Toto je {artwork_type}",
- "ca": "Aquesta és un {artwork_type}",
- "he": "זהו {artwork_type}",
- "pt_BR": "Isso é um(a) {artwork_type}",
- "uk": "Це {artwork_type}"
- },
"question": {
"en": "What is the type of this artwork?",
"nl": "Wat voor soort kunstwerk is dit?",
@@ -241,6 +220,28 @@
"pt_BR": "Qual é o tipo dessa obra de arte?",
"uk": "Якого типу ця робота?"
},
+ "render": {
+ "en": "This is a {artwork_type}",
+ "nl": "Dit is een {artwork_type}",
+ "fr": "Type d'œuvre : {artwork_type}",
+ "de": "Dies ist ein {artwork_type}",
+ "it": "Si tratta di un {artwork_type}",
+ "ru": "Это {artwork_type}",
+ "es": "Se trata de un {artwork_type}",
+ "ja": "これは{artwork_type}です",
+ "zh_Hant": "這是 {artwork_type}",
+ "nb_NO": "Dette er et kunstverk av typen {artwork_type}",
+ "id": "Ini adalah {artwork_type}",
+ "pt": "Isto é um(a) {artwork_type}",
+ "hu": "Ez egy {artwork_type}",
+ "pl": "Jest to {artwork_type}",
+ "da": "Dette er en {artwork_type}",
+ "cs": "Toto je {artwork_type}",
+ "ca": "Aquesta és un {artwork_type}",
+ "he": "זהו {artwork_type}",
+ "pt_BR": "Isso é um(a) {artwork_type}",
+ "uk": "Це {artwork_type}"
+ },
"freeform": {
"key": "artwork_type",
"addExtraTags": [
@@ -597,28 +598,13 @@
"cs": "Báseň"
}
}
- ],
- "id": "artwork-artwork_type"
+ ]
},
{
"id": "artwork-artist-wikidata",
"labels": [
"artwork-question"
],
- "render": {
- "en": "This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "de": "Dieses Kunstwerk wurde geschaffen von {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "nl": "Dit kunstwerk is gemaakt door {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "cs": "Toto dílo vytvořil {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "pt": "Esta obra de arte foi feita por {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "es": "Esta obra de arte fue hecha por {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "ca": "Aquesta obra d'art la va crear {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "fr": "Cette oeuvre a été crée par {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "pl": "To dzieło sztuki zostało zrobione przez {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "pt_BR": "Essa obra de arte foi feita por {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
- "zh_Hans": "此艺术作品由 {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)} 创建",
- "it": "Quest'opera d'arte è stata creata da {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}"
- },
"question": {
"en": "Who made this artwork?",
"de": "Wer hat dieses Kunstwerk geschaffen?",
@@ -636,6 +622,20 @@
"uk": "Хто створив цю роботу?",
"it": "Chi ha creato quest'opera d'arte?"
},
+ "render": {
+ "en": "This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "de": "Dieses Kunstwerk wurde geschaffen von {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "nl": "Dit kunstwerk is gemaakt door {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "cs": "Toto dílo vytvořil {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "pt": "Esta obra de arte foi feita por {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "es": "Esta obra de arte fue hecha por {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "ca": "Aquesta obra d'art la va crear {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "fr": "Cette oeuvre a été crée par {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "pl": "To dzieło sztuki zostało zrobione przez {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "pt_BR": "Essa obra de arte foi feita por {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}",
+ "zh_Hans": "此艺术作品由 {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)} 创建",
+ "it": "Quest'opera d'arte è stata creata da {wikidata_label(artist:wikidata):font-weight:bold}
{wikipedia(artist:wikidata)}"
+ },
"freeform": {
"key": "artist:wikidata",
"type": "wikidata",
@@ -650,6 +650,10 @@
}
},
{
+ "id": "artwork-artist_name",
+ "labels": [
+ "artwork-question"
+ ],
"question": {
"en": "Which artist created this?",
"nl": "Welke kunstenaar creëerde dit kunstwerk?",
@@ -703,13 +707,13 @@
"and": [
"artist:wikidata="
]
- },
- "id": "artwork-artist_name",
- "labels": [
- "artwork-question"
- ]
+ }
},
{
+ "id": "artwork-website",
+ "labels": [
+ "artwork-question"
+ ],
"question": {
"en": "Is there a website with more information about this artwork?",
"nl": "Is er een website met meer informatie over dit kunstwerk?",
@@ -766,10 +770,6 @@
"url="
]
},
- "id": "artwork-website",
- "labels": [
- "artwork-question"
- ],
"pl": {
"mappings": {
"0": {
@@ -788,12 +788,9 @@
"wikipedia",
{
"id": "artwork_subject",
- "condition": {
- "#and": "We hide this in the case of `historic=memorial`, as that one has a 'wikidata' too ",
- "and": [
- "historic!=memorial"
- ]
- },
+ "labels": [
+ "artwork-question"
+ ],
"question": {
"en": "What does this artwork depict?",
"de": "Was zeigt dieses Kunstwerk?",
@@ -808,10 +805,6 @@
"pt_BR": "O que esta obra de arte representa?",
"it": "Che cosa rappresenta quest'opera d'arte?"
},
- "freeform": {
- "key": "subject:wikidata",
- "type": "wikidata"
- },
"render": {
"en": "This artwork depicts {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}",
"de": "Das Kunstwerk zeigt {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}",
@@ -826,9 +819,16 @@
"pt_BR": "Essa arte representa {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}",
"it": "Quest'opera d'arte rappresenta {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}"
},
- "labels": [
- "artwork-question"
- ]
+ "freeform": {
+ "key": "subject:wikidata",
+ "type": "wikidata"
+ },
+ "condition": {
+ "#and": "We hide this in the case of `historic=memorial`, as that one has a 'wikidata' too ",
+ "and": [
+ "historic!=memorial"
+ ]
+ }
},
{
"id": "doubles_as_memorial",
diff --git a/assets/layers/assembly_point/assembly_point.json b/assets/layers/assembly_point/assembly_point.json
index b2050fa98..1c5d293b1 100644
--- a/assets/layers/assembly_point/assembly_point.json
+++ b/assets/layers/assembly_point/assembly_point.json
@@ -75,9 +75,6 @@
"images",
{
"id": "assembly_point_name",
- "freeform": {
- "key": "name"
- },
"question": {
"en": "What is the name of this assembly point?",
"it": "Qual è il nome di questo punto di raccolta?",
@@ -97,19 +94,13 @@
"es": "Este punto de reunión se llama {name}",
"nl": "De naam van deze verzamelplaats is {name}",
"ca": "Aquest punt de reunió s'anomena {name}"
+ },
+ "freeform": {
+ "key": "name"
}
},
{
"id": "assembly_point_operator",
- "render": {
- "en": "This assembly point is operated by {operator}",
- "it": "Questo punto di raccolta è gestita da {operator}",
- "de": "Diese Sammelstelle wird von {operator} betrieben",
- "cs": "Toto shromaždiště provozuje {operator}",
- "es": "Este punto de reunión es operado por {operator}",
- "nl": "Dit verzamelpunt wordt beheerd door {operator}",
- "ca": "Aquest punt de reunió és operat per {operator}"
- },
"question": {
"en": "What organization operates this assembly point?",
"it": "Quale organizzazione gestisce questo punto di raccolta?",
@@ -119,6 +110,15 @@
"nl": "Welke organisatie beheert dit verzamelpunt?",
"ca": "Quina organització opera aquest punt de reunió?"
},
+ "render": {
+ "en": "This assembly point is operated by {operator}",
+ "it": "Questo punto di raccolta è gestita da {operator}",
+ "de": "Diese Sammelstelle wird von {operator} betrieben",
+ "cs": "Toto shromaždiště provozuje {operator}",
+ "es": "Este punto de reunión es operado por {operator}",
+ "nl": "Dit verzamelpunt wordt beheerd door {operator}",
+ "ca": "Aquest punt de reunió és operat per {operator}"
+ },
"freeform": {
"key": "operator",
"type": "string"
@@ -135,7 +135,6 @@
"nl": "Voor welk soort ramp is dit verzamelpunt bedoeld?",
"ca": "Per a quin tipus de desastre està destinant aquest punt de reunió?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "assembly_point:earthquake=yes",
@@ -212,7 +211,8 @@
"class": "medium"
}
}
- ]
+ ],
+ "multiAnswer": true
}
],
"allowMove": {
diff --git a/assets/layers/assisted_repair/assisted_repair.json b/assets/layers/assisted_repair/assisted_repair.json
index 5b3d2943e..794afd850 100644
--- a/assets/layers/assisted_repair/assisted_repair.json
+++ b/assets/layers/assisted_repair/assisted_repair.json
@@ -115,6 +115,7 @@
"images",
"preset_description",
{
+ "id": "name",
"question": {
"en": "What is the name of this repair workshop?",
"de": "Wie heißt diese Reparaturwerkstatt?",
@@ -124,7 +125,6 @@
"ca": "Quin és el nom d'aquest taller de reparació?",
"it": "Qual è il nome di questo laboratorio di riparazione?"
},
- "id": "name",
"render": {
"en": "This workshop is called {name}",
"de": "Diese Werkstatt heißt {name}",
@@ -143,6 +143,7 @@
"mastodon",
"facebook",
{
+ "id": "item:repair",
"question": {
"en": "What type of items are repaired here?",
"de": "Welche Art von Gegenständen wird hier repariert?",
@@ -152,7 +153,6 @@
"ca": "Quin tipus d'articles es reparen aquí?",
"it": "Che tipo di oggetti vengono riparati qui?"
},
- "id": "item:repair",
"mappings": [
{
"if": "service:mobile_phone:repair=yes",
diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json
index dea4fac7c..4101aa11b 100644
--- a/assets/layers/atm/atm.json
+++ b/assets/layers/atm/atm.json
@@ -156,6 +156,21 @@
"pt": "De qual marca é este multibanco?",
"it": "Di quale marchio è questo sportello bancomat?"
},
+ "render": {
+ "en": "The brand of this ATM is {brand}",
+ "de": "Die Marke des Geldautomaten ist {brand}",
+ "fr": "La marque de ce DAB est {brand}",
+ "nl": "Het merk van deze geldautomaat is {brand}",
+ "nb_NO": "Merkenavnet for denne minibanken er {brand}",
+ "ca": "La marca d'aquest caixer és {brand}",
+ "cs": "Značka tohoto bankomatu je {brand}",
+ "he": "המותג של כספומט זה הוא {brand}",
+ "pt_BR": "A marca desse caixa eletrônico é {brand}",
+ "es": "La marca de este cajero automático es {brand}",
+ "pt": "A marca deste multibanco é {brand}",
+ "pl": "Marka tego bankomatu to {brand}",
+ "it": "Il marchio di questo sportello bancomat è {brand}"
+ },
"freeform": {
"key": "brand",
"placeholder": {
@@ -173,26 +188,10 @@
"pt": "Nome da marca",
"it": "Nome del marchio"
}
- },
- "render": {
- "en": "The brand of this ATM is {brand}",
- "de": "Die Marke des Geldautomaten ist {brand}",
- "fr": "La marque de ce DAB est {brand}",
- "nl": "Het merk van deze geldautomaat is {brand}",
- "nb_NO": "Merkenavnet for denne minibanken er {brand}",
- "ca": "La marca d'aquest caixer és {brand}",
- "cs": "Značka tohoto bankomatu je {brand}",
- "he": "המותג של כספומט זה הוא {brand}",
- "pt_BR": "A marca desse caixa eletrônico é {brand}",
- "es": "La marca de este cajero automático es {brand}",
- "pt": "A marca deste multibanco é {brand}",
- "pl": "Marka tego bankomatu to {brand}",
- "it": "Il marchio di questo sportello bancomat è {brand}"
}
},
{
"id": "operator",
- "condition": "amenity!=bank",
"question": {
"en": "What company operates this ATM?",
"de": "Welches Unternehmen betreibt den Geldautomaten?",
@@ -208,6 +207,22 @@
"pt": "Qual companhia opera este multibanco?",
"it": "Quale azienda gestisce questo sportello bancomat?"
},
+ "render": {
+ "en": "The ATM is operated by {operator}",
+ "de": "Der Geldautomat wird betrieben von {operator}",
+ "fr": "Ce DAB est exploité par {operator}",
+ "nl": "Deze geldautomaat wordt beheerd door {operator}",
+ "nb_NO": "Minibanken drives av {operator}",
+ "ca": "{operator} opera aquest caixer",
+ "cs": "Bankomat provozuje {operator}",
+ "he": "הכספומט מופעל על ידי {operator}",
+ "pl": "Ten bankomat jest obsługiwany przez {operator}",
+ "pt_BR": "O caixa eletrônico é operado por {operator}",
+ "es": "El cajero automático es operado por {operator}",
+ "pt": "O multibanco é operado por {operator}",
+ "sl": "Ta bankomat upravlja {operator}",
+ "it": "Lo sportello bancomat è gestito da {operator}"
+ },
"freeform": {
"key": "operator",
"type": "string",
@@ -227,22 +242,7 @@
"cy": "Gweithredwr"
}
},
- "render": {
- "en": "The ATM is operated by {operator}",
- "de": "Der Geldautomat wird betrieben von {operator}",
- "fr": "Ce DAB est exploité par {operator}",
- "nl": "Deze geldautomaat wordt beheerd door {operator}",
- "nb_NO": "Minibanken drives av {operator}",
- "ca": "{operator} opera aquest caixer",
- "cs": "Bankomat provozuje {operator}",
- "he": "הכספומט מופעל על ידי {operator}",
- "pl": "Ten bankomat jest obsługiwany przez {operator}",
- "pt_BR": "O caixa eletrônico é operado por {operator}",
- "es": "El cajero automático es operado por {operator}",
- "pt": "O multibanco é operado por {operator}",
- "sl": "Ta bankomat upravlja {operator}",
- "it": "Lo sportello bancomat è gestito da {operator}"
- }
+ "condition": "amenity!=bank"
},
"opening_hours_24_7",
{
@@ -417,22 +417,6 @@
},
{
"id": "cash_out-denominations-notes",
- "condition": {
- "and": [
- {
- "or": [
- "cash_out=",
- "cash_out=yes"
- ]
- },
- {
- "or": [
- "_currency=",
- "_currency~.*EUR.*"
- ]
- }
- ]
- },
"question": {
"en": "What notes can you withdraw here?",
"nl": "Welke bankbiljetten kan je hier afhalen?",
@@ -447,7 +431,6 @@
"pt": "Quais notas pode levantar aqui?",
"it": "Quali banconote si possono ritirare qui?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "cash_out:notes:denominations=5 EUR",
@@ -561,7 +544,24 @@
"it": "Si possono prelevare banconote da 500 euro"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "cash_out=",
+ "cash_out=yes"
+ ]
+ },
+ {
+ "or": [
+ "_currency=",
+ "_currency~.*EUR.*"
+ ]
+ }
+ ]
+ },
+ "multiAnswer": true
},
{
"id": "speech_output",
@@ -613,7 +613,6 @@
},
{
"id": "speech_output_language",
- "condition": "speech_output=yes",
"render": {
"special": {
"type": "language_chooser",
@@ -654,7 +653,8 @@
"it": "Questo sportello bancomat ha l'uscita vocale in {language()}"
}
}
- }
+ },
+ "condition": "speech_output=yes"
}
],
"filter": [
diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index 363f81e05..3999b4182 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -204,7 +204,7 @@
"tagRenderings": [
"images",
{
- "condition": "_referencing_ways~*",
+ "id": "bicycle=yes/no",
"question": {
"en": "Can a bicycle go past this barrier?",
"nl": "Kan een fietser langs deze barrière?",
@@ -257,7 +257,7 @@
}
}
],
- "id": "bicycle=yes/no"
+ "condition": "_referencing_ways~*"
},
{
"id": "barrier_type",
@@ -301,6 +301,7 @@
]
},
{
+ "id": "Bollard type",
"question": {
"en": "What kind of bollard is this?",
"nl": "Wat voor soort paal is dit?",
@@ -316,7 +317,6 @@
"pt": "Que tipo de pilar é esse?",
"it": "Che tipo di dissuasore è questo?"
},
- "condition": "barrier=bollard",
"mappings": [
{
"if": "bollard=removable",
@@ -409,9 +409,10 @@
}
}
],
- "id": "Bollard type"
+ "condition": "barrier=bollard"
},
{
+ "id": "Cycle barrier type",
"question": {
"en": "What kind of cycling barrier is this?",
"nl": "Wat voor fietshekjes zijn dit?",
@@ -427,7 +428,6 @@
"pt": "Que tipo de barreira para ciclistas é esta?",
"it": "Che tipo di barriera ciclabile è questa?"
},
- "condition": "barrier=cycle_barrier",
"mappings": [
{
"if": "cycle_barrier=single",
@@ -516,10 +516,24 @@
}
}
],
- "id": "Cycle barrier type"
+ "condition": "barrier=cycle_barrier"
},
{
"id": "MaxWidth",
+ "question": {
+ "en": "How wide is the gap left over besides the barrier?",
+ "nl": "Hoe breed is de ruimte naast de barrière?",
+ "de": "Welche Durchfahrtsbreite hat das Hindernis?",
+ "hu": "Milyen széles az akadályon az a rés, amelyen át lehet haladni?",
+ "fr": "Quelle est la largeur du passage ?",
+ "es": "¿Qué ancho tiene el hueco que queda además de la barrera?",
+ "da": "Hvor stort er mellemrummet udover barrieren?",
+ "cs": "Jak široká je mezera, která zbývá vedle bariéry?",
+ "ca": "Com d'ample és el buit que queda als costats de la barrera?",
+ "pt_BR": "Qual é a largura da abertura deixada ao lado da barreira?",
+ "pt": "Qual é a largura da abertura deixada ao lado da barreira?",
+ "it": "Quanto è ampio lo spazio lasciato oltre la barriera?"
+ },
"render": {
"en": "Maximum width: {maxwidth:physical} m",
"nl": "Maximumbreedte: {maxwidth:physical} m",
@@ -536,27 +550,6 @@
"pl": "Maksymalna szerokość: {maxwidth:physical} m",
"it": "Larghezza massima: {maxwidth:physical} m"
},
- "question": {
- "en": "How wide is the gap left over besides the barrier?",
- "nl": "Hoe breed is de ruimte naast de barrière?",
- "de": "Welche Durchfahrtsbreite hat das Hindernis?",
- "hu": "Milyen széles az akadályon az a rés, amelyen át lehet haladni?",
- "fr": "Quelle est la largeur du passage ?",
- "es": "¿Qué ancho tiene el hueco que queda además de la barrera?",
- "da": "Hvor stort er mellemrummet udover barrieren?",
- "cs": "Jak široká je mezera, která zbývá vedle bariéry?",
- "ca": "Com d'ample és el buit que queda als costats de la barrera?",
- "pt_BR": "Qual é a largura da abertura deixada ao lado da barreira?",
- "pt": "Qual é a largura da abertura deixada ao lado da barreira?",
- "it": "Quanto è ampio lo spazio lasciato oltre la barriera?"
- },
- "condition": {
- "and": [
- "cycle_barrier!=double",
- "cycle_barrier!=triple",
- "_referencing_ways~*"
- ]
- },
"freeform": {
"key": "maxwidth:physical",
"type": "distance",
@@ -564,23 +557,17 @@
"zoom": 20,
"background": "map"
}
+ },
+ "condition": {
+ "and": [
+ "cycle_barrier!=double",
+ "cycle_barrier!=triple",
+ "_referencing_ways~*"
+ ]
}
},
{
- "render": {
- "en": "Space between barriers (along the length of the road): {width:separation} m",
- "nl": "Ruimte tussen barrières (langs de lengte van de weg): {width:separation} m",
- "de": "Abstand zwischen den Barrieren (entlang der Straße): {width:separation} m",
- "hu": "A korlátok közötti távolság (az út irányában): {width:separation} m",
- "fr": "Espace entre deux barrières successives : {width:separation} m",
- "es": "Espacio entre barreras (a lo largo de la carretera): {width:separation} m",
- "da": "Plads mellem barrierer (langs vejens længde): {width:separation} m",
- "cs": "Prostor mezi svodidly (po celé délce silnice): {width:separation} m",
- "ca": "Espai entre barreres (al llarg de la longitud de la carretera): {width:separation} m",
- "pt_BR": "Espaço entre as barreiras (ao longo do comprimento da estrada): {width:separation} m",
- "pt": "Espaço entre as barreiras (ao longo do comprimento da estrada): {width:separation} m",
- "it": "Spazio tra le barriere (lungo la lunghezza della strada): {width:separation} m"
- },
+ "id": "Space between barrier (cyclebarrier)",
"question": {
"en": "How much space is there between the barriers (along the length of the road)?",
"nl": "Hoeveel ruimte is er tussen de barrières (langs de lengte van de weg)?",
@@ -595,11 +582,19 @@
"pt": "Quanto espaço há entre as barreiras (ao longo do comprimento da estrada)?",
"it": "Quanto spazio c'è tra le barriere (lungo la lunghezza della strada)?"
},
- "condition": {
- "or": [
- "cycle_barrier=double",
- "cycle_barrier=triple"
- ]
+ "render": {
+ "en": "Space between barriers (along the length of the road): {width:separation} m",
+ "nl": "Ruimte tussen barrières (langs de lengte van de weg): {width:separation} m",
+ "de": "Abstand zwischen den Barrieren (entlang der Straße): {width:separation} m",
+ "hu": "A korlátok közötti távolság (az út irányában): {width:separation} m",
+ "fr": "Espace entre deux barrières successives : {width:separation} m",
+ "es": "Espacio entre barreras (a lo largo de la carretera): {width:separation} m",
+ "da": "Plads mellem barrierer (langs vejens længde): {width:separation} m",
+ "cs": "Prostor mezi svodidly (po celé délce silnice): {width:separation} m",
+ "ca": "Espai entre barreres (al llarg de la longitud de la carretera): {width:separation} m",
+ "pt_BR": "Espaço entre as barreiras (ao longo do comprimento da estrada): {width:separation} m",
+ "pt": "Espaço entre as barreiras (ao longo do comprimento da estrada): {width:separation} m",
+ "it": "Spazio tra le barriere (lungo la lunghezza della strada): {width:separation} m"
},
"freeform": {
"key": "width:separation",
@@ -609,23 +604,15 @@
"background": "map"
}
},
- "id": "Space between barrier (cyclebarrier)"
+ "condition": {
+ "or": [
+ "cycle_barrier=double",
+ "cycle_barrier=triple"
+ ]
+ }
},
{
- "render": {
- "en": "Width of opening: {width:opening} m",
- "nl": "Breedte van de opening: {width:opening} m",
- "de": "Breite der Öffnung: {width:opening} m",
- "fr": "Largeur de l'ouverture : {width:opening} m",
- "hu": "Nyílás szélessége: {width:opening} m",
- "es": "Ancho de abertura: {width:opening} m",
- "da": "Bredde af åbning: {width:opening} m",
- "cs": "Šířka otvoru: {width:opening} m",
- "ca": "Amplada de l'apertura: {width:opening} m",
- "pt_BR": "Largura da abertura: {width:opening} m",
- "pt": "Largura da abertura: {width:opening} m",
- "it": "Larghezza dell'apertura: {width:opening} m"
- },
+ "id": "Width of opening (cyclebarrier)",
"question": {
"en": "How wide is the smallest opening next to the barriers?",
"nl": "Hoe breed is de smalste opening naast de barrières?",
@@ -640,11 +627,19 @@
"pt": "Qual é a largura da menor abertura ao lado das barreiras?",
"it": "Quanto è ampia l'apertura più piccola accanto alle barriere?"
},
- "condition": {
- "or": [
- "cycle_barrier=double",
- "cycle_barrier=triple"
- ]
+ "render": {
+ "en": "Width of opening: {width:opening} m",
+ "nl": "Breedte van de opening: {width:opening} m",
+ "de": "Breite der Öffnung: {width:opening} m",
+ "fr": "Largeur de l'ouverture : {width:opening} m",
+ "hu": "Nyílás szélessége: {width:opening} m",
+ "es": "Ancho de abertura: {width:opening} m",
+ "da": "Bredde af åbning: {width:opening} m",
+ "cs": "Šířka otvoru: {width:opening} m",
+ "ca": "Amplada de l'apertura: {width:opening} m",
+ "pt_BR": "Largura da abertura: {width:opening} m",
+ "pt": "Largura da abertura: {width:opening} m",
+ "it": "Larghezza dell'apertura: {width:opening} m"
},
"freeform": {
"key": "width:opening",
@@ -654,23 +649,15 @@
"background": "map"
}
},
- "id": "Width of opening (cyclebarrier)"
+ "condition": {
+ "or": [
+ "cycle_barrier=double",
+ "cycle_barrier=triple"
+ ]
+ }
},
{
- "render": {
- "en": "Overlap: {overlap} m",
- "de": "Überschneidung: {overlap} m",
- "hu": "Átfedés: {overlap} m",
- "fr": "Chevauchement : {overlap} m",
- "nl": "Overlap: {overlap} m",
- "es": "Superposición: {overlap} m",
- "da": "Overlapning: {overlap} m",
- "cs": "Překrývání: {overlap} m",
- "ca": "Solapat: {overlap} m",
- "pt_BR": "Sobreposição: {overlap} m",
- "pt": "Sobreposição: {overlap} m",
- "it": "Sovrapposizione: {overlap} m"
- },
+ "id": "Overlap (cyclebarrier)",
"question": {
"en": "How much overlap do the barriers have?",
"nl": "Hoeveel overlappen de barrières?",
@@ -685,11 +672,19 @@
"pt": "Quanto as barreiras se sobrepõem?",
"it": "Quanto si sovrappongono le barriere?"
},
- "condition": {
- "or": [
- "cycle_barrier=double",
- "cycle_barrier=triple"
- ]
+ "render": {
+ "en": "Overlap: {overlap} m",
+ "de": "Überschneidung: {overlap} m",
+ "hu": "Átfedés: {overlap} m",
+ "fr": "Chevauchement : {overlap} m",
+ "nl": "Overlap: {overlap} m",
+ "es": "Superposición: {overlap} m",
+ "da": "Overlapning: {overlap} m",
+ "cs": "Překrývání: {overlap} m",
+ "ca": "Solapat: {overlap} m",
+ "pt_BR": "Sobreposição: {overlap} m",
+ "pt": "Sobreposição: {overlap} m",
+ "it": "Sovrapposizione: {overlap} m"
},
"freeform": {
"key": "overlap",
@@ -699,7 +694,12 @@
"background": "map"
}
},
- "id": "Overlap (cyclebarrier)"
+ "condition": {
+ "or": [
+ "cycle_barrier=double",
+ "cycle_barrier=triple"
+ ]
+ }
}
],
"deletion": {
diff --git a/assets/layers/beehive/beehive.json b/assets/layers/beehive/beehive.json
index 425a25694..a0b4ead64 100644
--- a/assets/layers/beehive/beehive.json
+++ b/assets/layers/beehive/beehive.json
@@ -70,6 +70,13 @@
"cs": "Kolik včelích úlů tu je?",
"it": "Quanti alveari ci sono?"
},
+ "render": {
+ "en": "There are {capacity} beehives",
+ "de": "Es gibt {capacity} Bienenstöcke",
+ "ca": "Hi ha {capacity} ruscs",
+ "cs": "Je tu {capacity} včelích úlů",
+ "it": "Ci sono {capacity} alveari"
+ },
"freeform": {
"key": "capacity",
"type": "pnat",
@@ -81,13 +88,6 @@
"it": "Numero di alveari"
}
},
- "render": {
- "en": "There are {capacity} beehives",
- "de": "Es gibt {capacity} Bienenstöcke",
- "ca": "Hi ha {capacity} ruscs",
- "cs": "Je tu {capacity} včelích úlů",
- "it": "Ci sono {capacity} alveari"
- },
"mappings": [
{
"if": "capacity=1",
diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json
index 5025fc062..4491a12e6 100644
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@@ -130,6 +130,32 @@
"tagRenderings": [
"images",
{
+ "id": "bench-backrest",
+ "labels": [
+ "bench-questions"
+ ],
+ "question": {
+ "en": "Does this bench have a backrest?",
+ "de": "Hat diese Sitzbank eine Rückenlehne?",
+ "fr": "Ce banc dispose-t-il d'un dossier ?",
+ "nl": "Heeft deze zitbank een rugleuning?",
+ "es": "¿Este banco tiene respaldo?",
+ "hu": "Van-e háttámlája ennek a padnak?",
+ "id": "Apakah bangku ini memiliki sandaran?",
+ "it": "Questa panchina ha lo schienale?",
+ "ru": "Есть ли у этой скамейки спинка?",
+ "zh_Hans": "这个长椅有靠背吗？",
+ "zh_Hant": "這個長椅是否有靠背？",
+ "nb_NO": "Har denne beken et rygglene?",
+ "pl": "Czy ta ławka ma oparcie?",
+ "pt_BR": "Esse banco tem um encosto?",
+ "pt": "Este assento tem um escosto?",
+ "da": "Har denne bænk et ryglæn?",
+ "cs": "Má tato lavička opěradlo?",
+ "ca": "Aquest banc té respatller?",
+ "he": "האם לספסל הזה יש משענת?",
+ "uk": "Чи є у цієї лавки спинка?"
+ },
"mappings": [
{
"if": {
@@ -223,35 +249,23 @@
"class": "large"
}
}
- ],
- "question": {
- "en": "Does this bench have a backrest?",
- "de": "Hat diese Sitzbank eine Rückenlehne?",
- "fr": "Ce banc dispose-t-il d'un dossier ?",
- "nl": "Heeft deze zitbank een rugleuning?",
- "es": "¿Este banco tiene respaldo?",
- "hu": "Van-e háttámlája ennek a padnak?",
- "id": "Apakah bangku ini memiliki sandaran?",
- "it": "Questa panchina ha lo schienale?",
- "ru": "Есть ли у этой скамейки спинка?",
- "zh_Hans": "这个长椅有靠背吗？",
- "zh_Hant": "這個長椅是否有靠背？",
- "nb_NO": "Har denne beken et rygglene?",
- "pl": "Czy ta ławka ma oparcie?",
- "pt_BR": "Esse banco tem um encosto?",
- "pt": "Este assento tem um escosto?",
- "da": "Har denne bænk et ryglæn?",
- "cs": "Má tato lavička opěradlo?",
- "ca": "Aquest banc té respatller?",
- "he": "האם לספסל הזה יש משענת?",
- "uk": "Чи є у цієї лавки спинка?"
- },
- "id": "bench-backrest",
- "labels": [
- "bench-questions"
]
},
{
+ "id": "bench-armrest",
+ "labels": [
+ "bench-questions"
+ ],
+ "question": {
+ "en": "Does this bench have one or more armrests?",
+ "de": "Hat diese Sitzbank eine oder mehrere Armlehnen?",
+ "nl": "Heeft deze bank armleuningen?",
+ "cs": "Má tato lavice jednu nebo více opěrek?",
+ "es": "¿Este banco tiene uno o más reposabrazos?",
+ "uk": "Чи має ця лавка один або кілька підлокітників?",
+ "ca": "Aquest banc té un o més reposabraços?",
+ "it": "Questa panchina ha uno o più braccioli?"
+ },
"mappings": [
{
"if": "armrest=yes",
@@ -279,23 +293,33 @@
"it": "Questa panchina non ha braccioli"
}
}
- ],
- "question": {
- "en": "Does this bench have one or more armrests?",
- "de": "Hat diese Sitzbank eine oder mehrere Armlehnen?",
- "nl": "Heeft deze bank armleuningen?",
- "cs": "Má tato lavice jednu nebo více opěrek?",
- "es": "¿Este banco tiene uno o más reposabrazos?",
- "uk": "Чи має ця лавка один або кілька підлокітників?",
- "ca": "Aquest banc té un o més reposabraços?",
- "it": "Questa panchina ha uno o più braccioli?"
- },
- "id": "bench-armrest",
- "labels": [
- "bench-questions"
]
},
{
+ "id": "bench-seats",
+ "labels": [
+ "bench-questions"
+ ],
+ "question": {
+ "en": "How many seats does this bench have?",
+ "de": "Wie viele Sitzplätze hat diese Bank?",
+ "fr": "De combien de places dispose ce banc ?",
+ "nl": "Hoeveel zitplaatsen heeft deze bank?",
+ "es": "¿Cuántos asientos tiene este banco?",
+ "hu": "Hány ülőhely van ezen a padon?",
+ "it": "Quanti posti ha questa panchina?",
+ "ru": "Сколько мест на этой скамейке?",
+ "zh_Hans": "这个长椅有几个座位？",
+ "zh_Hant": "這個長椅有幾個位子？",
+ "nb_NO": "Hvor mange sitteplasser har denne benken?",
+ "pl": "Ile siedzeń ma ta ławka?",
+ "pt_BR": "Quantos assentos este banco tem?",
+ "pt": "Quantos lugares este banco tem?",
+ "da": "Hvor mange pladser har denne bænk?",
+ "cs": "Kolik má tato lavice míst k sezení?",
+ "ca": "Quants seients té aquest banc?",
+ "he": "כמה מושבים יש לספסל הזה?"
+ },
"render": {
"en": "This bench has {seats} seats",
"de": "Diese Sitzbank hat {seats} Sitzplätze",
@@ -324,30 +348,6 @@
"seats:separated="
]
},
- "question": {
- "en": "How many seats does this bench have?",
- "de": "Wie viele Sitzplätze hat diese Bank?",
- "fr": "De combien de places dispose ce banc ?",
- "nl": "Hoeveel zitplaatsen heeft deze bank?",
- "es": "¿Cuántos asientos tiene este banco?",
- "hu": "Hány ülőhely van ezen a padon?",
- "it": "Quanti posti ha questa panchina?",
- "ru": "Сколько мест на этой скамейке?",
- "zh_Hans": "这个长椅有几个座位？",
- "zh_Hant": "這個長椅有幾個位子？",
- "nb_NO": "Hvor mange sitteplasser har denne benken?",
- "pl": "Ile siedzeń ma ta ławka?",
- "pt_BR": "Quantos assentos este banco tem?",
- "pt": "Quantos lugares este banco tem?",
- "da": "Hvor mange pladser har denne bænk?",
- "cs": "Kolik má tato lavice míst k sezení?",
- "ca": "Quants seients té aquest banc?",
- "he": "כמה מושבים יש לספסל הזה?"
- },
- "id": "bench-seats",
- "labels": [
- "bench-questions"
- ],
"mappings": [
{
"if": "seats:separated=no",
@@ -370,6 +370,30 @@
]
},
{
+ "id": "bench-material",
+ "labels": [
+ "bench-questions"
+ ],
+ "question": {
+ "en": "What is the bench (seating) made from?",
+ "de": "Aus welchem Material ist die Sitzfläche der Bank?",
+ "fr": "De quel matériau ce banc est-il fait ?",
+ "nl": "Uit welk materiaal is het zitgedeelte van deze zitbank gemaakt?",
+ "hu": "Miből van a pad (ülőfelülete)?",
+ "it": "Di che materiale è fatta la panchina (seduta)?",
+ "zh_Hans": "这个长椅（或座椅）是用什么材料做的？",
+ "ru": "Из какого материала сделана скамейка?",
+ "zh_Hant": "這個長椅 (座位) 是什麼做的？",
+ "pt_BR": "De que é feito o banco (assento)?",
+ "pl": "Z czego wykonana jest ławka (siedzisko)?",
+ "pt": "De que é feito o banco (assento)?",
+ "es": "¿De qué está hecho el banco (el asiento)?",
+ "da": "Hvad er bænken (sædet) lavet af?",
+ "cs": "Z čeho je vyrobena lavice (sedadlo)?",
+ "ca": "De què està fent el banc (seient)?",
+ "he": "ממה עשוי הספסל (המושב)?",
+ "uk": "З чого зроблені сидіння?"
+ },
"render": {
"en": "Material: {material}",
"de": "Material: {material}",
@@ -551,33 +575,13 @@
"uk": "Сидіння виготовлені зі сталі"
}
}
- ],
- "question": {
- "en": "What is the bench (seating) made from?",
- "de": "Aus welchem Material ist die Sitzfläche der Bank?",
- "fr": "De quel matériau ce banc est-il fait ?",
- "nl": "Uit welk materiaal is het zitgedeelte van deze zitbank gemaakt?",
- "hu": "Miből van a pad (ülőfelülete)?",
- "it": "Di che materiale è fatta la panchina (seduta)?",
- "zh_Hans": "这个长椅（或座椅）是用什么材料做的？",
- "ru": "Из какого материала сделана скамейка?",
- "zh_Hant": "這個長椅 (座位) 是什麼做的？",
- "pt_BR": "De que é feito o banco (assento)?",
- "pl": "Z czego wykonana jest ławka (siedzisko)?",
- "pt": "De que é feito o banco (assento)?",
- "es": "¿De qué está hecho el banco (el asiento)?",
- "da": "Hvad er bænken (sædet) lavet af?",
- "cs": "Z čeho je vyrobena lavice (sedadlo)?",
- "ca": "De què està fent el banc (seient)?",
- "he": "ממה עשוי הספסל (המושב)?",
- "uk": "З чого зроблені сидіння?"
- },
- "id": "bench-material",
- "labels": [
- "bench-questions"
]
},
{
+ "id": "bench-direction",
+ "labels": [
+ "bench-questions"
+ ],
"question": {
"en": "In which direction are you looking when sitting on the bench?",
"de": "In welche Richtung schaut man, wenn man auf der Bank sitzt?",
@@ -618,10 +622,6 @@
"key": "direction",
"type": "direction"
},
- "labels": [
- "bench-questions"
- ],
- "id": "bench-direction",
"condition": {
"and": [
"two_sided!=yes"
@@ -629,6 +629,29 @@
}
},
{
+ "id": "bench-colour",
+ "labels": [
+ "bench-questions"
+ ],
+ "question": {
+ "en": "Which colour does this bench have?",
+ "de": "Welche Farbe hat diese Sitzbank?",
+ "fr": "Quelle est la couleur de ce banc ?",
+ "nl": "Welke kleur heeft deze zitbank?",
+ "hu": "Milyen színű ez a pad?",
+ "it": "Di che colore è questa panchina?",
+ "ru": "Какого цвета скамейка?",
+ "zh_Hans": "这个长椅是什么颜色的？",
+ "zh_Hant": "這個長椅是什麼顏色的？",
+ "pt_BR": "Qual a cor dessa bancada?",
+ "pl": "Jaki kolor ma ta ławka?",
+ "pt": "Qual a cor dessa bancada?",
+ "es": "¿De qué color es este banco?",
+ "da": "Hvilken farve har denne bænk?",
+ "cs": "Jakou barvu má tato lavička?",
+ "ca": "De quin color és aquest banc?",
+ "he": "איזה צבע יש לספסל הזה?"
+ },
"render": {
"en": "Colour: {colour}",
"de": "Farbe: {colour}",
@@ -652,25 +675,6 @@
"cs": "Barva: {colour}",
"he": "צבע: {colour}"
},
- "question": {
- "en": "Which colour does this bench have?",
- "de": "Welche Farbe hat diese Sitzbank?",
- "fr": "Quelle est la couleur de ce banc ?",
- "nl": "Welke kleur heeft deze zitbank?",
- "hu": "Milyen színű ez a pad?",
- "it": "Di che colore è questa panchina?",
- "ru": "Какого цвета скамейка?",
- "zh_Hans": "这个长椅是什么颜色的？",
- "zh_Hant": "這個長椅是什麼顏色的？",
- "pt_BR": "Qual a cor dessa bancada?",
- "pl": "Jaki kolor ma ta ławka?",
- "pt": "Qual a cor dessa bancada?",
- "es": "¿De qué color es este banco?",
- "da": "Hvilken farve har denne bænk?",
- "cs": "Jakou barvu má tato lavička?",
- "ca": "De quin color és aquest banc?",
- "he": "איזה צבע יש לספסל הזה?"
- },
"freeform": {
"key": "colour",
"type": "color"
@@ -877,13 +881,13 @@
"he": "צבע: צהוב"
}
}
- ],
+ ]
+ },
+ {
+ "id": "bench-survey:date",
"labels": [
"bench-questions"
],
- "id": "bench-colour"
- },
- {
"question": {
"en": "When was this bench last surveyed?",
"nl": "Wanneer is deze laatste bank laatst gesurveyed?",
@@ -941,30 +945,13 @@
"it": "Verificata oggi!"
}
}
- ],
- "labels": [
- "bench-questions"
- ],
- "id": "bench-survey:date"
+ ]
},
{
"id": "bench-inscription",
"labels": [
"bench-questions"
],
- "render": {
- "en": "This bench has the following inscription:
{inscription}
",
- "nl": "Deze bank heeft een inscriptie:
{inscription}
",
- "de": "Diese Bank hat folgende Inschrift:
{inscription}
",
- "fr": "Ce banc a l'inscription suivante :
{inscription}
",
- "ca": "Aquest banc té la següent inscripció:
{inscription}
",
- "cs": "Tato lavice má následující nápis:
{inscription}
",
- "pt": "Este banco tem a seguinte inscrição:
{inscription}
",
- "pt_BR": "Esse banco tem a seguinte inscrição:
{inscription}
",
- "es": "Este banco tiene la siguiente inscripción:
{inscription}
",
- "uk": "Ця лавка має такий напис:
{inscription}
",
- "it": "Questa panchina ha la seguente iscrizione:
{inscription}
"
- },
"question": {
"en": "Does this bench have an inscription?",
"nl": "Heeft deze bank een inscriptie?",
@@ -978,6 +965,32 @@
"uk": "Чи є на цій лавці напис?",
"it": "Questa panchina ha un'iscrizione?"
},
+ "questionHint": {
+ "en": "E.g. on a mounted plaque, in the backrest, …",
+ "nl": "Bijvoorbeeld op een aangebracht plakkaat, ingesneden in de rugleuning, …",
+ "de": "Z.B. auf einer angebrachten Plakette, in der Rückenlehne, …",
+ "fr": "Par exemple, sur une plaque accrochée, sur le dossier, …",
+ "ca": "P. ex. en una placa, al respatller, …",
+ "cs": "Např. na připevněné desce, v opěradle, …",
+ "pt": "Por exemplo: em placa montada, no encosto, ...",
+ "pt_BR": "P. ex. em uma placa montada, no encosto, …",
+ "es": "Por ejemplo, en una placa montada, en el respaldo,…",
+ "uk": "Наприклад, на вмонтованій табличці, в спинці крісла, …",
+ "it": "Ad esempio su una targa montata, nello schienale, …"
+ },
+ "render": {
+ "en": "This bench has the following inscription:
{inscription}
",
+ "nl": "Deze bank heeft een inscriptie:
{inscription}
",
+ "de": "Diese Bank hat folgende Inschrift:
{inscription}
",
+ "fr": "Ce banc a l'inscription suivante :
{inscription}
",
+ "ca": "Aquest banc té la següent inscripció:
{inscription}
",
+ "cs": "Tato lavice má následující nápis:
{inscription}
",
+ "pt": "Este banco tem a seguinte inscrição:
{inscription}
",
+ "pt_BR": "Esse banco tem a seguinte inscrição:
{inscription}
",
+ "es": "Este banco tiene la siguiente inscripción:
{inscription}
",
+ "uk": "Ця лавка має такий напис:
{inscription}
",
+ "it": "Questa panchina ha la seguente iscrizione:
{inscription}
"
+ },
"freeform": {
"key": "inscription",
"type": "text",
@@ -1022,20 +1035,7 @@
},
"hideInAnswer": true
}
- ],
- "questionHint": {
- "en": "E.g. on a mounted plaque, in the backrest, …",
- "nl": "Bijvoorbeeld op een aangebracht plakkaat, ingesneden in de rugleuning, …",
- "de": "Z.B. auf einer angebrachten Plakette, in der Rückenlehne, …",
- "fr": "Par exemple, sur une plaque accrochée, sur le dossier, …",
- "ca": "P. ex. en una placa, al respatller, …",
- "cs": "Např. na připevněné desce, v opěradle, …",
- "pt": "Por exemplo: em placa montada, no encosto, ...",
- "pt_BR": "P. ex. em uma placa montada, no encosto, …",
- "es": "Por ejemplo, en una placa montada, en el respaldo,…",
- "uk": "Наприклад, на вмонтованій табличці, в спинці крісла, …",
- "it": "Ad esempio su una targa montata, nello schienale, …"
- }
+ ]
},
{
"id": "bench-artwork",
@@ -1054,6 +1054,20 @@
"uk": "Чи є в цій лавці художній елемент?",
"it": "Questa panchina ha un elemento artistico?"
},
+ "questionHint": {
+ "en": "E.g. it has an integrated painting, statue or other non-trivial, creative work",
+ "nl": "Bijvoorbeeld een standbeeld, schildering of ander, niet-triviaal kunstwerk",
+ "de": "Z.B. hat es ein integriertes Gemälde, eine Statue oder eine andere nicht triviale, kreative Arbeit",
+ "ca": "P.e. té una pintura integrada, estatua o altres treballs no trivials i creatius",
+ "cs": "Např. má integrovaný obraz, sochu nebo jiné netriviální tvůrčí dílo",
+ "fr": "Par ex. il intègre une peinture, statue ou autre élément non commune, travail créatif",
+ "pl": "Np. jest na niej coś namalowane, ma rzeźbę lub inną nietrywialną pracę",
+ "pt_BR": "Ex. possui uma pintura integrada, estátua ou outro trabalho criativo não trivial",
+ "es": "Por ejemplo, tiene una pintura, estatua u otra obra creativa no trivial integrada",
+ "pt": "Ex. possui uma pintura integrada, estátua ou outro trabalho criativo não trivial",
+ "uk": "Наприклад, він має інтегровану картину, статую або іншу нетривіальну, творчу роботу",
+ "it": "Ad esempio, ha un dipinto integrato, una statua o altra opera creativa non banale"
+ },
"mappings": [
{
"if": "tourism=artwork",
@@ -1114,39 +1128,13 @@
},
"hideInAnswer": true
}
- ],
- "questionHint": {
- "en": "E.g. it has an integrated painting, statue or other non-trivial, creative work",
- "nl": "Bijvoorbeeld een standbeeld, schildering of ander, niet-triviaal kunstwerk",
- "de": "Z.B. hat es ein integriertes Gemälde, eine Statue oder eine andere nicht triviale, kreative Arbeit",
- "ca": "P.e. té una pintura integrada, estatua o altres treballs no trivials i creatius",
- "cs": "Např. má integrovaný obraz, sochu nebo jiné netriviální tvůrčí dílo",
- "fr": "Par ex. il intègre une peinture, statue ou autre élément non commune, travail créatif",
- "pl": "Np. jest na niej coś namalowane, ma rzeźbę lub inną nietrywialną pracę",
- "pt_BR": "Ex. possui uma pintura integrada, estátua ou outro trabalho criativo não trivial",
- "es": "Por ejemplo, tiene una pintura, estatua u otra obra creativa no trivial integrada",
- "pt": "Ex. possui uma pintura integrada, estátua ou outro trabalho criativo não trivial",
- "uk": "Наприклад, він має інтегровану картину, статую або іншу нетривіальну, творчу роботу",
- "it": "Ad esempio, ha un dipinto integrato, una statua o altra opera creativa non banale"
- }
+ ]
},
{
"id": "bench-memorial",
"labels": [
"bench-questions"
],
- "condition": {
- "and": [
- {
- "or": [
- "historic=memorial",
- "inscription~*",
- "memorial=bench",
- "tourism=artwork"
- ]
- }
- ]
- },
"question": {
"en": "Does this bench act as memorial for someone or something?",
"nl": "Is deze bank een gedenkteken voor iemand of iets?",
@@ -1205,7 +1193,19 @@
"memorial="
]
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "historic=memorial",
+ "inscription~*",
+ "memorial=bench",
+ "tourism=artwork"
+ ]
+ }
+ ]
+ }
},
{
"builtin": "artwork.*artwork-question",
diff --git a/assets/layers/bench_at_pt/bench_at_pt.json b/assets/layers/bench_at_pt/bench_at_pt.json
index 83ba739ce..eb2f9f663 100644
--- a/assets/layers/bench_at_pt/bench_at_pt.json
+++ b/assets/layers/bench_at_pt/bench_at_pt.json
@@ -157,6 +157,7 @@
"tagRenderings": [
"images",
{
+ "id": "bench_at_pt-name",
"render": {
"en": "{name}",
"de": "{name}",
@@ -182,8 +183,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "bench_at_pt-name"
+ }
},
{
"id": "bench_at_pt-bench_type",
diff --git a/assets/layers/bicycle_counter/bicycle_counter.json b/assets/layers/bicycle_counter/bicycle_counter.json
index 35691b89b..5ba603268 100644
--- a/assets/layers/bicycle_counter/bicycle_counter.json
+++ b/assets/layers/bicycle_counter/bicycle_counter.json
@@ -138,6 +138,15 @@
"ca": "Quin és el nom de la ubicació comptada?",
"it": "Qual è il nome della posizione conteggiata?"
},
+ "render": {
+ "en": "Name of the counted location: {name}",
+ "de": "Name des Zählorts: {name}",
+ "cs": "Název započítávaného místa: {name}",
+ "es": "Nombre del lugar contado: {name}",
+ "nl": "Naam van de getelde locatie: {name}",
+ "ca": "Nom de la ubicació comptada: {name}",
+ "it": "Nome della posizione conteggiata: {name}"
+ },
"freeform": {
"key": "name",
"type": "string",
@@ -150,15 +159,6 @@
"ca": "Nom de la ubicació comptada",
"it": "Nome della posizione conteggiata"
}
- },
- "render": {
- "en": "Name of the counted location: {name}",
- "de": "Name des Zählorts: {name}",
- "cs": "Název započítávaného místa: {name}",
- "es": "Nombre del lugar contado: {name}",
- "nl": "Naam van de getelde locatie: {name}",
- "ca": "Nom de la ubicació comptada: {name}",
- "it": "Nome della posizione conteggiata: {name}"
}
},
{
@@ -172,6 +172,15 @@
"ca": "Quan va començar a comptar aquest comptador?",
"it": "Quando ha iniziato a contare questo contatore?"
},
+ "render": {
+ "en": "This counter started counting on {start_date}",
+ "de": "Die Zählstelle wurde am {start_date} aufgestellt",
+ "cs": "Toto počítadlo se začalo počítat dne {start_date}",
+ "es": "Este contador comenzó a contar el {start_date}",
+ "nl": "Deze teller is begonnen met teller op {start_date}",
+ "ca": "Aquest comptador va començar a comptar amb {start_date}",
+ "it": "Questo contatore ha iniziato a contare il {start_date}"
+ },
"freeform": {
"key": "start_date",
"type": "date",
@@ -184,15 +193,6 @@
"ca": "Data d'inici del comptador",
"it": "Data di inizio del contatore"
}
- },
- "render": {
- "en": "This counter started counting on {start_date}",
- "de": "Die Zählstelle wurde am {start_date} aufgestellt",
- "cs": "Toto počítadlo se začalo počítat dne {start_date}",
- "es": "Este contador comenzó a contar el {start_date}",
- "nl": "Deze teller is begonnen met teller op {start_date}",
- "ca": "Aquest comptador va començar a comptar amb {start_date}",
- "it": "Questo contatore ha iniziato a contare il {start_date}"
}
},
{
@@ -245,6 +245,16 @@
"ca": "Quin és el número de referència d'aquest comptador?",
"it": "Qual è il numero di riferimento di questo contatore?"
},
+ "render": {
+ "en": "Reference number of the counter: {ref}",
+ "de": "Kennziffer der Zählstelle: {ref}",
+ "cs": "Referenční číslo počítadla: {ref}",
+ "es": "Número de referencia del contador: {ref}",
+ "nl": "Referentienummer van de teller: {ref}",
+ "uk": "Реєстраційний номер стійки: {ref}",
+ "ca": "Número de referència del comptador: {ref}",
+ "it": "Numero di riferimento del contatore: {ref}"
+ },
"freeform": {
"key": "ref",
"type": "string",
@@ -262,16 +272,6 @@
"noref="
]
},
- "render": {
- "en": "Reference number of the counter: {ref}",
- "de": "Kennziffer der Zählstelle: {ref}",
- "cs": "Referenční číslo počítadla: {ref}",
- "es": "Número de referencia del contador: {ref}",
- "nl": "Referentienummer van de teller: {ref}",
- "uk": "Реєстраційний номер стійки: {ref}",
- "ca": "Número de referència del comptador: {ref}",
- "it": "Numero di riferimento del contatore: {ref}"
- },
"mappings": [
{
"if": "noref=yes",
@@ -300,6 +300,15 @@
"ca": "Hi ha una pàgina web per a aquest comptador de bicicletes?",
"it": "C'è un sito web per questo contatore di biciclette?"
},
+ "render": {
+ "en": "Website of the counter: {website}",
+ "de": "Website der Zählstelle: {website}",
+ "cs": "Webové stránky počítadla: {website}",
+ "es": "Sitio web del contador: {website}",
+ "nl": "Website van de teller {website}",
+ "ca": "Lloc web del comptador: {website}",
+ "it": "Sito web del contatore: {website}"
+ },
"freeform": {
"key": "website",
"type": "url",
@@ -313,15 +322,6 @@
"ca": "Lloc web del comptador",
"it": "Sito web del contatore"
}
- },
- "render": {
- "en": "Website of the counter: {website}",
- "de": "Website der Zählstelle: {website}",
- "cs": "Webové stránky počítadla: {website}",
- "es": "Sitio web del contador: {website}",
- "nl": "Website van de teller {website}",
- "ca": "Lloc web del comptador: {website}",
- "it": "Sito web del contatore: {website}"
}
}
],
diff --git a/assets/layers/bicycle_library/bicycle_library.json b/assets/layers/bicycle_library/bicycle_library.json
index 6ff98fecb..f4515eb82 100644
--- a/assets/layers/bicycle_library/bicycle_library.json
+++ b/assets/layers/bicycle_library/bicycle_library.json
@@ -150,6 +150,7 @@
"tagRenderings": [
"images",
{
+ "id": "bicycle_library-name",
"question": {
"en": "What is the name of this bicycle library?",
"nl": "Wat is de naam van deze fietsbieb?",
@@ -184,14 +185,14 @@
},
"freeform": {
"key": "name"
- },
- "id": "bicycle_library-name"
+ }
},
"website",
"phone",
"email",
"opening_hours",
{
+ "id": "bicycle_library-charge",
"question": {
"en": "How much does lending a bicycle cost?",
"nl": "Hoeveel kost het huren van een fiets?",
@@ -281,8 +282,7 @@
"ca": "El préstec d'una bicicleta costa 20€/any i 20€ de garantia"
}
}
- ],
- "id": "bicycle_library-charge"
+ ]
},
{
"id": "bicycle-library-target-group",
@@ -303,7 +303,6 @@
"cs": "Kdo si zde může půjčit jízdní kolo?",
"ca": "Qui pot llogar bicicletes aquí?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "bicycle_library:for=child",
@@ -359,7 +358,8 @@
"ca": "Bicicletes per a discapacitats disponibles"
}
}
- ]
+ ],
+ "multiAnswer": true
},
"description"
],
diff --git a/assets/layers/bicycle_rental/bicycle_rental.json b/assets/layers/bicycle_rental/bicycle_rental.json
index 3201204ab..bffe2850c 100644
--- a/assets/layers/bicycle_rental/bicycle_rental.json
+++ b/assets/layers/bicycle_rental/bicycle_rental.json
@@ -365,7 +365,6 @@
"key": "rental",
"inline": true
},
- "multiAnswer": true,
"mappings": [
{
"if": "rental=city_bike",
@@ -515,7 +514,8 @@
],
"condition": {
"and": []
- }
+ },
+ "multiAnswer": true
},
{
"id": "rental_types",
diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json
index 4ca1ca897..f009c865a 100644
--- a/assets/layers/bike_cafe/bike_cafe.json
+++ b/assets/layers/bike_cafe/bike_cafe.json
@@ -151,6 +151,7 @@
"tagRenderings": [
"images",
{
+ "id": "bike_cafe-name",
"question": {
"en": "What is the name of this bike cafe?",
"nl": "Wat is de naam van dit fietscafé?",
@@ -187,8 +188,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "bike_cafe-name"
+ }
},
{
"id": "bike_cafe-bike-pump",
diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json
index 82ba1c700..ba4c55aee 100644
--- a/assets/layers/bike_cleaning/bike_cleaning.json
+++ b/assets/layers/bike_cleaning/bike_cleaning.json
@@ -134,6 +134,7 @@
"images",
"opening_hours_24_7",
{
+ "id": "bike_cleaning-service_bicycle_cleaning_charge",
"question": {
"en": "How much does it cost to use the cleaning service?",
"de": "Wie viel kostet die Nutzung des Reinigungsdienstes?",
@@ -159,13 +160,6 @@
"pt": "Usar o serviço de limpeza custa {service:bicycle:cleaning:charge}",
"it": "L'utilizzo del servizio di pulizia costa {service:bicycle:cleaning:charge}"
},
- "condition": {
- "and": [
- "amenity!=bicycle_wash",
- "service:bicycle:cleaning!=no",
- "service:bicycle:cleaning!="
- ]
- },
"freeform": {
"key": "service:bicycle:cleaning:charge",
"addExtraTags": [
@@ -218,9 +212,16 @@
"hideInAnswer": true
}
],
- "id": "bike_cleaning-service_bicycle_cleaning_charge"
+ "condition": {
+ "and": [
+ "amenity!=bicycle_wash",
+ "service:bicycle:cleaning!=no",
+ "service:bicycle:cleaning!="
+ ]
+ }
},
{
+ "id": "bike_cleaning-charge",
"question": {
"en": "How much does it cost to use the cleaning service?",
"de": "Wie viel kostet die Nutzung des Reinigungsdienstes?",
@@ -247,11 +248,6 @@
"pt": "Usar o serviço de limpeza custa {charge}",
"it": "L'utilizzo del servizio di pulizia costa {charge}"
},
- "condition": {
- "or": [
- "amenity=bicycle_wash"
- ]
- },
"freeform": {
"key": "charge",
"addExtraTags": [
@@ -294,7 +290,11 @@
}
}
],
- "id": "bike_cleaning-charge"
+ "condition": {
+ "or": [
+ "amenity=bicycle_wash"
+ ]
+ }
},
{
"builtin": "payment-options-split",
@@ -315,6 +315,7 @@
}
},
{
+ "id": "automated",
"question": {
"en": "Is this bicycle cleaning service automated?",
"nl": "Is dit fietsschoonmaakpunt geautomatiseerd?",
@@ -324,7 +325,6 @@
"ca": "Aquest servei de neteja de bicicletes està automatitzat?",
"it": "Questo servizio di pulizia biciclette è automatizzato?"
},
- "id": "automated",
"mappings": [
{
"if": "automated=no",
@@ -356,6 +356,7 @@
"condition": "amenity=bicycle_wash"
},
{
+ "id": "self_service",
"question": {
"nl": "Is dit fietsschoonmaakpunt zelfbediening?",
"en": "Is this cleaning service self-service?",
@@ -365,7 +366,6 @@
"ca": "Aquest servei de neteja és d'autoservei?",
"it": "Questo servizio di pulizia è self-service?"
},
- "id": "self_service",
"mappings": [
{
"if": "self_service=yes",
diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json
index 7b636b381..6d2feea11 100644
--- a/assets/layers/bike_parking/bike_parking.json
+++ b/assets/layers/bike_parking/bike_parking.json
@@ -116,6 +116,7 @@
"tagRenderings": [
"images",
{
+ "id": "Bicycle parking type",
"question": {
"en": "What is the type of this bicycle parking?",
"nl": "Van welk type is deze fietsparking?",
@@ -415,10 +416,10 @@
"cs": "Kotva - kovová smyčka dost široká pro zámek na kolo připojená ke stěně, podlaze nebo balvanu."
}
}
- ],
- "id": "Bicycle parking type"
+ ]
},
{
+ "id": "location",
"question": {
"en": "What is the relative location of this bicycle parking?",
"nl": "Wat is de relatieve locatie van deze parking??",
@@ -515,10 +516,10 @@
},
"hideInAnswer": true
}
- ],
- "id": "location"
+ ]
},
{
+ "id": "covered_and_building",
"question": {
"en": "Is this parking covered?",
"nl": "Is deze parking overdekt?",
@@ -535,12 +536,6 @@
"cs": "Je toto parkoviště zastřešené?",
"ca": "Aquest aparcament està cobert?"
},
- "condition": {
- "and": [
- "bicycle_parking!=shed",
- "location!=underground"
- ]
- },
"mappings": [
{
"if": "building=bicycle_shed",
@@ -641,9 +636,15 @@
}
}
],
- "id": "covered_and_building"
+ "condition": {
+ "and": [
+ "bicycle_parking!=shed",
+ "location!=underground"
+ ]
+ }
},
{
+ "id": "Capacity",
"question": {
"en": "How many bicycles fit in this bicycle parking?",
"fr": "Combien de vélos entrent dans ce parking à vélos (y compris les éventuels vélos de transport) ?",
@@ -690,10 +691,10 @@
"freeform": {
"key": "capacity",
"type": "nat"
- },
- "id": "Capacity"
+ }
},
{
+ "id": "Access",
"question": {
"en": "Who can use this bicycle parking?",
"nl": "Wie mag er deze fietsenstalling gebruiken?",
@@ -804,8 +805,7 @@
"it": "Parcheggio biciclette privato che non è mai disponibile al pubblico, nemmeno tramite una quota di iscrizione"
}
}
- ],
- "id": "Access"
+ ]
},
{
"id": "fee",
@@ -853,7 +853,6 @@
},
{
"id": "charge",
- "condition": "fee=yes",
"question": {
"en": "How much does it cost to park your bike here?",
"nl": "Hoeveel kost het om een fiets te stallen?",
@@ -884,7 +883,8 @@
"freeform": {
"key": "charge",
"type": "currency"
- }
+ },
+ "condition": "fee=yes"
},
"opening_hours_24_7_default",
{
@@ -934,6 +934,7 @@
"uk": "За цим номером можна буде зателефонувати у разі виникнення проблем, наприклад, щоб прибрати недоглянуті велосипеди",
"it": "Potrebbe essere possibile chiamare questo numero in caso di problemi, ad esempio per rimuovere biciclette non mantenute"
},
+ "render": "{operator:phone}",
"icon": "./assets/layers/questions/phone.svg",
"freeform": {
"key": "operator:phone",
@@ -943,7 +944,6 @@
"contact:phone="
]
},
- "render": "{operator:phone}",
"mappings": [
{
"if": "phone~*",
@@ -975,6 +975,7 @@
"ca": "Quin és el número de pàgina web de l'operador d'aquest aparcament de bicicletes?",
"it": "Qual è il sito web dell'operatore di questo parcheggio per biciclette?"
},
+ "render": "{operator:website}",
"icon": "./assets/layers/icons/website.svg",
"freeform": {
"key": "operator:website",
@@ -984,7 +985,6 @@
"contact:website="
]
},
- "render": "{operator:website}",
"mappings": [
{
"if": "website~*",
@@ -1016,14 +1016,15 @@
"uk": "Яка електронна адреса оператора цієї велопарковки?",
"it": "Qual è l'indirizzo email dell'operatore di questo parcheggio per biciclette?"
},
+ "render": "{operator:email}",
"icon": "./assets/svg/envelope.svg",
"freeform": {
"key": "operator:email",
"type": "email"
- },
- "render": "{operator:email}"
+ }
},
{
+ "id": "Cargo bike spaces?",
"question": {
"en": "Does this bicycle parking have spots for cargo bikes?",
"nl": "Heeft deze fietsparking plaats voor bakfietsen?",
@@ -1093,10 +1094,10 @@
"ca": "No teniu permís per aparcar bicicletes de càrrega o no hi ha places previstes per a bicicletes de càrrega"
}
}
- ],
- "id": "Cargo bike spaces?"
+ ]
},
{
+ "id": "Cargo bike capacity?",
"question": {
"en": "How many cargo bicycles fit in this bicycle parking?",
"nl": "Voor hoeveel bakfietsen heeft deze fietsparking plaats?",
@@ -1125,12 +1126,6 @@
"cs": "Toto parkoviště je vhodné pro {capacity:cargo_bike} nákladních kol",
"ca": "A aquest aparcament caben {capacity:cargo_bike} bicicletes de càrrega"
},
- "condition": {
- "or": [
- "capacity:cargo_bike~*",
- "cargo_bike~designated|yes"
- ]
- },
"freeform": {
"key": "capacity:cargo_bike",
"type": "nat"
@@ -1153,7 +1148,12 @@
]
}
],
- "id": "Cargo bike capacity?"
+ "condition": {
+ "or": [
+ "capacity:cargo_bike~*",
+ "cargo_bike~designated|yes"
+ ]
+ }
},
{
"id": "maxstay",
@@ -1175,10 +1175,6 @@
"ca": "Si la bicicleta està aparcada per més temps, l'operador podria ser retirada per l'operador",
"it": "Se la bicicletta è parcheggiata per un periodo più lungo, potrebbe essere rimossa dall'operatore"
},
- "freeform": {
- "key": "maxstay",
- "type": "pnat"
- },
"render": {
"en": "A bike can be parked here for at most {canonical(maxstay)}",
"nl": "Een fiets mag hier maximaal {canonical(maxstay)} parkeren",
@@ -1187,6 +1183,10 @@
"es": "Una bicicleta se puede aparcar aquí como máximo durante {canonical(maxstay)}",
"cs": "Kolo zde může být zaparkováno maximálně po dobu {canonical(maxstay)}",
"it": "Una bicicletta può essere parcheggiata qui per un massimo di {canonical(maxstay)}"
+ },
+ "freeform": {
+ "key": "maxstay",
+ "type": "pnat"
}
}
],
diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index 2f559f3b9..09d7ce13e 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -527,6 +527,7 @@
]
},
{
+ "id": "Operational status",
"question": {
"en": "Is the bike pump still operational?",
"nl": "Werkt de fietspomp nog?",
@@ -542,7 +543,6 @@
"ca": "La bomba per a la bicicleta encara funciona?",
"uk": "Велосипедний насос ще працює?"
},
- "condition": "service:bicycle:pump=yes",
"mappings": [
{
"if": "service:bicycle:pump:operational_status=broken",
@@ -581,7 +581,7 @@
}
}
],
- "id": "Operational status"
+ "condition": "service:bicycle:pump=yes"
},
{
"builtin": "opening_hours_24_7",
@@ -693,6 +693,7 @@
]
},
{
+ "id": "bike_repair_station-operator",
"labels": [
"operator-info"
],
@@ -724,10 +725,10 @@
},
"freeform": {
"key": "operator"
- },
- "id": "bike_repair_station-operator"
+ }
},
{
+ "id": "bike_repair_station-email",
"labels": [
"operator-info"
],
@@ -743,14 +744,14 @@
"uk": "Яка адреса електронної пошти супровідника?",
"it": "Qual è l'indirizzo email del manutentore?"
},
+ "render": "{email}",
"freeform": {
"key": "email",
"type": "email"
- },
- "render": "{email}",
- "id": "bike_repair_station-email"
+ }
},
{
+ "id": "bike_repair_station-phone",
"labels": [
"operator-info"
],
@@ -766,12 +767,11 @@
"uk": "Який номер телефону супровідника?",
"it": "Qual è il numero di telefono del manutentore?"
},
+ "render": "{phone}",
"freeform": {
"key": "phone",
"type": "phone"
- },
- "render": "{phone}",
- "id": "bike_repair_station-phone"
+ }
},
{
"id": "bike_repair_station-bike-chain-tool",
@@ -787,7 +787,6 @@
"cs": "Má tato opravna kol speciální nástroj na opravu řetězu?",
"ca": "Aquesta estació de reparació de bicicletes té una eina especial per reparar la vostra cadena de la biciclete?"
},
- "condition": "service:bicycle:tools=yes",
"mappings": [
{
"if": "service:bicycle:chain_tool=yes",
@@ -823,7 +822,8 @@
"ca": "No hi ha ferramentes per a la cadena"
}
}
- ]
+ ],
+ "condition": "service:bicycle:tools=yes"
},
{
"id": "bike_repair_station-bike-stand",
@@ -840,7 +840,6 @@
"ca": "Aquesta estació de bicicletes té un ganxo per penjar la bicicleta o un suport per aixecar-la?",
"uk": "Чи є на цій станції гачок, на який можна повісити велосипед, або підставка для його підйому?"
},
- "condition": "service:bicycle:tools=yes",
"mappings": [
{
"if": "service:bicycle:stand=yes",
@@ -878,15 +877,11 @@
"uk": "Немає гачка або підставки"
}
}
- ]
+ ],
+ "condition": "service:bicycle:tools=yes"
},
{
- "condition": {
- "and": [
- "email~*",
- "service:bicycle:pump:operational_status=broken"
- ]
- },
+ "id": "send_email_about_broken_pump",
"render": {
"special": {
"type": "send_email",
@@ -929,9 +924,15 @@
}
}
},
- "id": "send_email_about_broken_pump"
+ "condition": {
+ "and": [
+ "email~*",
+ "service:bicycle:pump:operational_status=broken"
+ ]
+ }
},
{
+ "id": "bike_repair_station-valves",
"question": {
"en": "What valves are supported?",
"nl": "Welke ventielen werken er met de pomp?",
@@ -965,7 +966,6 @@
],
"key": "valves"
},
- "multiAnswer": true,
"mappings": [
{
"if": "valves=sclaverand",
@@ -1018,8 +1018,8 @@
}
}
],
- "id": "bike_repair_station-valves",
- "condition": "service:bicycle:pump=yes"
+ "condition": "service:bicycle:pump=yes",
+ "multiAnswer": true
},
{
"id": "bike_repair_station-electrical_pump",
@@ -1037,7 +1037,6 @@
"cs": "Je to elektrická pumpa na kolo?",
"ca": "És una bomba per a bicicletes elèctrica?"
},
- "condition": "service:bicycle:pump=yes",
"mappings": [
{
"if": "manual=yes",
@@ -1077,7 +1076,8 @@
"cs": "Elektrická pumpa"
}
}
- ]
+ ],
+ "condition": "service:bicycle:pump=yes"
},
{
"id": "bike_repair_station-manometer",
@@ -1094,7 +1094,6 @@
"cs": "Má vzduchový kompresor ukazatel tlaku nebo manometr?",
"ca": "La bomba té un indicador de pressió o un manòmetre?"
},
- "condition": "service:bicycle:pump=yes",
"mappings": [
{
"if": "manometer=yes",
@@ -1153,7 +1152,8 @@
"ca": "Hi ha manòmetre però està trencat"
}
}
- ]
+ ],
+ "condition": "service:bicycle:pump=yes"
},
"level"
],
diff --git a/assets/layers/binocular/binocular.json b/assets/layers/binocular/binocular.json
index 5870ca0b5..8e4d3516c 100644
--- a/assets/layers/binocular/binocular.json
+++ b/assets/layers/binocular/binocular.json
@@ -109,6 +109,35 @@
"tagRenderings": [
"images",
{
+ "id": "binocular-charge",
+ "question": {
+ "en": "How much does one have to pay to use these binoculars?",
+ "nl": "Hoeveel moet men betalen om deze verrekijker te gebruiken?",
+ "de": "Wie viel muss man für die Nutzung dieser Ferngläser bezahlen?",
+ "es": "¿Cuánto hay que pagar para usar estos prismáticos?",
+ "da": "Hvor meget koster det at bruge denne kikkert?",
+ "fr": "Combien l’utilisation des ces jumelles coûte-t-elle ?",
+ "ca": "Quant s'ha de pagar per utilitzar aquests prismàtics?",
+ "cs": "Kolik se platí za používání těchto dalekohledů?",
+ "it": "Quanto si deve pagare per utilizzare questi binocoli?"
+ },
+ "render": {
+ "en": "Using these binoculars costs {charge}",
+ "nl": "Deze verrekijker gebruiken kost {charge}",
+ "de": "Die Benutzung dieses Fernglases kostet {charge}",
+ "es": "Usar estos prismáticos cuesta {charge}",
+ "da": "Brug af denne kikkert koster {charge}",
+ "fr": "L’utilisation des ces jumelles coûte {charge}",
+ "ca": "L'ús d'aquests prismàtics costa {charge}",
+ "cs": "Použití tohoto dalekohledu stojí {charge}",
+ "it": "L'utilizzo di questi binocoli costa {charge}"
+ },
+ "freeform": {
+ "key": "charge",
+ "addExtraTags": [
+ "fee=yes"
+ ]
+ },
"mappings": [
{
"if": {
@@ -130,38 +159,10 @@
"uk": "Безкоштовне використання"
}
}
- ],
- "freeform": {
- "key": "charge",
- "addExtraTags": [
- "fee=yes"
- ]
- },
- "render": {
- "en": "Using these binoculars costs {charge}",
- "nl": "Deze verrekijker gebruiken kost {charge}",
- "de": "Die Benutzung dieses Fernglases kostet {charge}",
- "es": "Usar estos prismáticos cuesta {charge}",
- "da": "Brug af denne kikkert koster {charge}",
- "fr": "L’utilisation des ces jumelles coûte {charge}",
- "ca": "L'ús d'aquests prismàtics costa {charge}",
- "cs": "Použití tohoto dalekohledu stojí {charge}",
- "it": "L'utilizzo di questi binocoli costa {charge}"
- },
- "question": {
- "en": "How much does one have to pay to use these binoculars?",
- "nl": "Hoeveel moet men betalen om deze verrekijker te gebruiken?",
- "de": "Wie viel muss man für die Nutzung dieser Ferngläser bezahlen?",
- "es": "¿Cuánto hay que pagar para usar estos prismáticos?",
- "da": "Hvor meget koster det at bruge denne kikkert?",
- "fr": "Combien l’utilisation des ces jumelles coûte-t-elle ?",
- "ca": "Quant s'ha de pagar per utilitzar aquests prismàtics?",
- "cs": "Kolik se platí za používání těchto dalekohledů?",
- "it": "Quanto si deve pagare per utilizzare questi binocoli?"
- },
- "id": "binocular-charge"
+ ]
},
{
+ "id": "binocular-direction",
"question": {
"en": "When looking through this binocular, in what direction does one look?",
"nl": "Welke richting kijkt men uit als men door deze verrekijker kijkt?",
@@ -187,8 +188,7 @@
"freeform": {
"key": "direction",
"type": "direction"
- },
- "id": "binocular-direction"
+ }
}
],
"deletion": {
diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json
index c041a7fba..ee8899a95 100644
--- a/assets/layers/birdhide/birdhide.json
+++ b/assets/layers/birdhide/birdhide.json
@@ -376,6 +376,18 @@
]
},
{
+ "id": "birdhide-operator",
+ "question": {
+ "en": "Who operates this birdhide?",
+ "nl": "Wie beheert deze vogelkijkplaats?",
+ "da": "Hvem driver dette fugleskjul?",
+ "de": "Wer betreibt diesen Ort zur Vogelbeobachtung?",
+ "fr": "Qui opère cet observatoire ornithologique ?",
+ "ca": "Qui gestiona aquest observatori d'ocells?",
+ "cs": "Kdo provozuje tuto ptačí pozorovatelnu?",
+ "es": "¿Quién opera este observatorio de aves?",
+ "it": "Chi gestisce questo capanno per l'osservazione degli uccelli?"
+ },
"render": {
"en": "Operated by {operator}",
"nl": "Beheer door {operator}",
@@ -391,17 +403,6 @@
"freeform": {
"key": "operator"
},
- "question": {
- "en": "Who operates this birdhide?",
- "nl": "Wie beheert deze vogelkijkplaats?",
- "da": "Hvem driver dette fugleskjul?",
- "de": "Wer betreibt diesen Ort zur Vogelbeobachtung?",
- "fr": "Qui opère cet observatoire ornithologique ?",
- "ca": "Qui gestiona aquest observatori d'ocells?",
- "cs": "Kdo provozuje tuto ptačí pozorovatelnu?",
- "es": "¿Quién opera este observatorio de aves?",
- "it": "Chi gestisce questo capanno per l'osservazione degli uccelli?"
- },
"mappings": [
{
"if": "operator=Natuurpunt",
@@ -432,8 +433,7 @@
"it": "Gestito dall'Agenzia per la Natura e le Foreste"
}
}
- ],
- "id": "birdhide-operator"
+ ]
}
],
"filter": [
diff --git a/assets/layers/brothel/brothel.json b/assets/layers/brothel/brothel.json
index 167c602a3..8d75bc4d4 100644
--- a/assets/layers/brothel/brothel.json
+++ b/assets/layers/brothel/brothel.json
@@ -76,12 +76,7 @@
"images",
"reviews",
{
- "multiAnswer": false,
"id": "name",
- "freeform": {
- "inline": false,
- "key": "name"
- },
"question": {
"en": "What is the name of this brothel?",
"de": "Wie lautet der Name des Bordells?",
@@ -99,7 +94,12 @@
"nl": "Dit bordeel heet {name}",
"ca": "Aquest bordell s'anomena {name}",
"it": "Questa casa di appuntamenti si chiama {name}"
- }
+ },
+ "freeform": {
+ "inline": false,
+ "key": "name"
+ },
+ "multiAnswer": false
},
"opening_hours",
"contact"
diff --git a/assets/layers/building/building.json b/assets/layers/building/building.json
index b113ebaee..4d8265a8f 100644
--- a/assets/layers/building/building.json
+++ b/assets/layers/building/building.json
@@ -64,6 +64,17 @@
"uk": "Який архітектурний стиль цієї будівлі?",
"it": "Qual è lo stile architettonico di questo edificio?"
},
+ "render": {
+ "en": "{building:architecture}",
+ "ca": "{building:architecture}",
+ "cy": "{building:architecture}",
+ "de": "{building:architecture}",
+ "cs": "{building:architecture}",
+ "it": "{building:architecture}"
+ },
+ "freeform": {
+ "key": "building:architecture"
+ },
"mappings": [
{
"if": "building:architecture=islamic",
@@ -422,18 +433,7 @@
}
}
],
- "render": {
- "en": "{building:architecture}",
- "ca": "{building:architecture}",
- "cy": "{building:architecture}",
- "de": "{building:architecture}",
- "cs": "{building:architecture}",
- "it": "{building:architecture}"
- },
- "multiAnswer": true,
- "freeform": {
- "key": "building:architecture"
- }
+ "multiAnswer": true
},
{
"id": "construction_date",
diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json
index b055f890d..1d751b4a1 100644
--- a/assets/layers/cafe_pub/cafe_pub.json
+++ b/assets/layers/cafe_pub/cafe_pub.json
@@ -287,6 +287,7 @@
"images",
"reviews",
{
+ "id": "Name",
"question": {
"nl": "Wat is de naam van deze zaak?",
"en": "What is the name of this business?",
@@ -315,10 +316,10 @@
},
"freeform": {
"key": "name"
- },
- "id": "Name"
+ }
},
{
+ "id": "Classification",
"question": {
"en": "What kind of cafe is this?",
"nl": "Welk soort café is dit?",
@@ -424,8 +425,7 @@
"it": "Questa è una discoteca o night club con focus sul ballo, musica di un DJ con spettacolo di luci e un bar per prendere bevande (alcoliche)"
}
}
- ],
- "id": "Classification"
+ ]
},
"opening_hours",
"website",
@@ -436,11 +436,11 @@
"smoking",
"wheelchair-access",
{
+ "id": "pub_reusable_packaging",
"question": {
"en": "Does {title()} accept bring-your-own reusable cups?",
"cs": "Přijímá {title()} přinesené opakovaně použitelné šálky?"
},
- "id": "pub_reusable_packaging",
"mappings": [
{
"if": "reusable_packaging:accept=yes",
diff --git a/assets/layers/campsite/campsite.json b/assets/layers/campsite/campsite.json
index 6fce4181d..3e2c954e1 100644
--- a/assets/layers/campsite/campsite.json
+++ b/assets/layers/campsite/campsite.json
@@ -84,6 +84,7 @@
"tagRenderings": [
"images",
{
+ "id": "group_only",
"question": {
"de": "Ist dieser Zeltplatz ausschließlich für Gruppen?",
"en": "Is this campsite exclusively for groups?",
@@ -120,10 +121,10 @@
"it": "Questo campeggio non è esclusivamente per gruppi"
}
}
- ],
- "id": "group_only"
+ ]
},
{
+ "id": "name",
"question": {
"en": "What is the name of this campsite?",
"de": "Wie heißt dieser Zeltplatz?",
@@ -140,11 +141,11 @@
},
"freeform": {
"key": "name"
- },
- "id": "name"
+ }
},
"contact",
{
+ "id": "capacity_persons",
"question": {
"de": "Wie viele Personen können hier übernachten?",
"en": "How many people can stay here?",
@@ -162,16 +163,9 @@
"freeform": {
"key": "capacity:persons",
"type": "pnat"
- },
- "id": "capacity_persons"
+ }
},
{
- "icon": "./assets/layers/questions/cash.svg",
- "condition": {
- "and": [
- "charge="
- ]
- },
"id": "fee",
"question": {
"en": "Is there a fee?",
@@ -179,6 +173,7 @@
"it": "C'è un costo?",
"cs": "Platí se tu poplatek?"
},
+ "icon": "./assets/layers/questions/cash.svg",
"mappings": [
{
"if": "fee=no",
@@ -203,16 +198,14 @@
},
"icon": "./assets/layers/questions/cash.svg"
}
- ]
- },
- {
- "icon": "./assets/layers/questions/cash.svg",
+ ],
"condition": {
"and": [
- "charge!~^(.*;|)[^;/]*/day(|[^/].*)$",
- "fee!=no"
+ "charge="
]
- },
+ }
+ },
+ {
"id": "charge_person_day",
"question": {
"en": "What is the charge per person per day?",
@@ -226,6 +219,7 @@
"it": "Costo per persona al giorno: {charge}",
"cs": "Poplatek na osobu a den: {charge}"
},
+ "icon": "./assets/layers/questions/cash.svg",
"freeform": {
"key": "charge",
"type": "currency",
@@ -234,16 +228,15 @@
"addExtraTags": [
"fee=yes"
]
+ },
+ "condition": {
+ "and": [
+ "charge!~^(.*;|)[^;/]*/day(|[^/].*)$",
+ "fee!=no"
+ ]
}
},
{
- "icon": "./assets/layers/questions/cash.svg",
- "condition": {
- "and": [
- "charge!~.*/person/day.*",
- "fee!=no"
- ]
- },
"id": "charge_day",
"question": {
"en": "What is the charge per day?",
@@ -257,6 +250,7 @@
"it": "Costo giornaliero: {charge}",
"cs": "Poplatek za den: {charge}"
},
+ "icon": "./assets/layers/questions/cash.svg",
"freeform": {
"key": "charge",
"type": "currency",
@@ -265,6 +259,12 @@
"addExtraTags": [
"fee=yes"
]
+ },
+ "condition": {
+ "and": [
+ "charge!~.*/person/day.*",
+ "fee!=no"
+ ]
}
},
"caravansites.caravansites-toilets",
diff --git a/assets/layers/car_rental/car_rental.json b/assets/layers/car_rental/car_rental.json
index 5d5aad878..a7b1ce40d 100644
--- a/assets/layers/car_rental/car_rental.json
+++ b/assets/layers/car_rental/car_rental.json
@@ -102,6 +102,28 @@
"images",
{
"id": "name",
+ "question": {
+ "en": "What is the name of this car rental?",
+ "nl": "Wat is de naam van deze autoverhuur?",
+ "de": "Wie lautet der Name dieser Autovermietung?",
+ "fr": "Quel est le nom de cette société de location de véhicules ?",
+ "ca": "Com es diu aquest lloguer de cotxes?",
+ "pl": "Jaka jest nazwa tej wypożyczalni samochodów?",
+ "cs": "Jak se jmenuje tato půjčovna aut?",
+ "es": "¿Cuál es el nombre de este alquiler de coches?",
+ "it": "Qual è il nome di questo autonoleggio?"
+ },
+ "render": {
+ "en": "This car rental is called {name}",
+ "nl": "Deze autoverhuur heet {name}",
+ "de": "Der Name der Autovermietung lautet {name}",
+ "fr": "Cette société de location de véhicules est appelée {name}",
+ "ca": "Aquest lloguer de cotxes es diu {name}",
+ "pl": "Ta wypożyczalnia samochodów nazywa się {name}",
+ "cs": "Tato autopůjčovna se jmenuje {name}",
+ "es": "Este alquiler de coches se llama {name}",
+ "it": "Questo autonoleggio si chiama {name}"
+ },
"freeform": {
"key": "name",
"type": "string",
@@ -120,17 +142,6 @@
"it": "Nome dell'autonoleggio"
}
},
- "question": {
- "en": "What is the name of this car rental?",
- "nl": "Wat is de naam van deze autoverhuur?",
- "de": "Wie lautet der Name dieser Autovermietung?",
- "fr": "Quel est le nom de cette société de location de véhicules ?",
- "ca": "Com es diu aquest lloguer de cotxes?",
- "pl": "Jaka jest nazwa tej wypożyczalni samochodów?",
- "cs": "Jak se jmenuje tato půjčovna aut?",
- "es": "¿Cuál es el nombre de este alquiler de coches?",
- "it": "Qual è il nome di questo autonoleggio?"
- },
"mappings": [
{
"if": "noname=yes",
@@ -149,18 +160,7 @@
"it": "Questo autonoleggio non ha un nome"
}
}
- ],
- "render": {
- "en": "This car rental is called {name}",
- "nl": "Deze autoverhuur heet {name}",
- "de": "Der Name der Autovermietung lautet {name}",
- "fr": "Cette société de location de véhicules est appelée {name}",
- "ca": "Aquest lloguer de cotxes es diu {name}",
- "pl": "Ta wypożyczalnia samochodów nazywa się {name}",
- "cs": "Tato autopůjčovna se jmenuje {name}",
- "es": "Este alquiler de coches se llama {name}",
- "it": "Questo autonoleggio si chiama {name}"
- }
+ ]
},
"website",
"email",
diff --git a/assets/layers/caravansites/caravansites.json b/assets/layers/caravansites/caravansites.json
index ef33c2638..c97e91bd8 100644
--- a/assets/layers/caravansites/caravansites.json
+++ b/assets/layers/caravansites/caravansites.json
@@ -185,25 +185,7 @@
"tagRenderings": [
"images",
{
- "render": {
- "en": "This place is called {name}",
- "it": "Questo posto si chiama {name}",
- "ru": "Это место называется {name}",
- "ja": "この場所は {name} と呼ばれています",
- "fr": "Cet endroit s'appelle {name}",
- "zh_Hant": "這個地方叫做 {name}",
- "nl": "Deze plaats heet {name}",
- "pt_BR": "Este lugar é chamado de {name}",
- "de": "Dieser Ort heißt {name}",
- "id": "Tempat ini disebut {name}",
- "es": "Este lugar se llama {name}",
- "da": "Dette sted hedder {name}",
- "nb_NO": "Dette stedet heter {name}",
- "ca": "Aquest lloc s'anomena {name}",
- "cs": "Toto místo se jmenuje {name}",
- "pl": "To miejsce nazywa się {name}",
- "pt": "Este lugar é chamado de {name}"
- },
+ "id": "caravansites-name",
"question": {
"en": "What is this place called?",
"id": "Apakah nama tempat ini?",
@@ -223,10 +205,28 @@
"pl": "Jak nazywa się to miejsce?",
"pt": "Qual o nome deste lugar?"
},
+ "render": {
+ "en": "This place is called {name}",
+ "it": "Questo posto si chiama {name}",
+ "ru": "Это место называется {name}",
+ "ja": "この場所は {name} と呼ばれています",
+ "fr": "Cet endroit s'appelle {name}",
+ "zh_Hant": "這個地方叫做 {name}",
+ "nl": "Deze plaats heet {name}",
+ "pt_BR": "Este lugar é chamado de {name}",
+ "de": "Dieser Ort heißt {name}",
+ "id": "Tempat ini disebut {name}",
+ "es": "Este lugar se llama {name}",
+ "da": "Dette sted hedder {name}",
+ "nb_NO": "Dette stedet heter {name}",
+ "ca": "Aquest lloc s'anomena {name}",
+ "cs": "Toto místo se jmenuje {name}",
+ "pl": "To miejsce nazywa się {name}",
+ "pt": "Este lugar é chamado de {name}"
+ },
"freeform": {
"key": "name"
- },
- "id": "caravansites-name"
+ }
},
{
"id": "caravansites-fee",
@@ -308,26 +308,7 @@
]
},
{
- "render": {
- "en": "This place charges {charge}",
- "it": "Questo posto costa {charge}",
- "ru": "Это место взимает {charge}",
- "ja": "この場所は{charge} が必要",
- "nb_NO": "Dette stedet tar {charge}",
- "zh_Hant": "這個地方收費 {charge}",
- "nl": "Deze plaats vraagt {charge}",
- "fr": "Ce site fait payer {charge}",
- "pt_BR": "Este lugar cobra {charge}",
- "de": "Die Gebühr beträgt {charge}",
- "es": "Este lugar cobra {charge}",
- "da": "Dette sted koster {charge}",
- "ca": "Aquest lloc cobra {charge}",
- "cs": "Toto místo si účtuje {charge}",
- "eu": "Leku honek {charge} kobratzen du",
- "pl": "To miejsce pobiera opłatę w wysokości {charge}",
- "pt": "Este lugar cobra {charge}",
- "zh_Hans": "这个地方收费 {charge}"
- },
+ "id": "caravansites-charge",
"question": {
"en": "How much does this place charge?",
"it": "Quanto costa questo posto?",
@@ -348,6 +329,26 @@
"pt": "Quanto este lugar cobra?",
"zh_Hans": "这个地方的收费是多少？"
},
+ "render": {
+ "en": "This place charges {charge}",
+ "it": "Questo posto costa {charge}",
+ "ru": "Это место взимает {charge}",
+ "ja": "この場所は{charge} が必要",
+ "nb_NO": "Dette stedet tar {charge}",
+ "zh_Hant": "這個地方收費 {charge}",
+ "nl": "Deze plaats vraagt {charge}",
+ "fr": "Ce site fait payer {charge}",
+ "pt_BR": "Este lugar cobra {charge}",
+ "de": "Die Gebühr beträgt {charge}",
+ "es": "Este lugar cobra {charge}",
+ "da": "Dette sted koster {charge}",
+ "ca": "Aquest lloc cobra {charge}",
+ "cs": "Toto místo si účtuje {charge}",
+ "eu": "Leku honek {charge} kobratzen du",
+ "pl": "To miejsce pobiera opłatę w wysokości {charge}",
+ "pt": "Este lugar cobra {charge}",
+ "zh_Hans": "这个地方收费 {charge}"
+ },
"freeform": {
"key": "charge"
},
@@ -355,8 +356,7 @@
"and": [
"fee=yes"
]
- },
- "id": "caravansites-charge"
+ }
},
{
"id": "caravansites-sanitary-dump",
@@ -432,25 +432,7 @@
]
},
{
- "render": {
- "en": "{capacity} campers can use this place at the same time",
- "it": "{capacity} camper possono utilizzare questo posto contemporaneamente",
- "ru": "{capacity} кемперов могут использовать это место одновременно",
- "ja": "{capacity} 人が同時に使用できます",
- "zh_Hant": "{capacity} 露營者能夠同時使用這個地方",
- "fr": "{capacity} personnes peuvent utiliser cet espace en même temps",
- "pt_BR": "{capacity} campistas podem usar este lugar ao mesmo tempo",
- "de": "{capacity} Wohnmobile können diesen Platz gleichzeitig nutzen",
- "nl": "{capacity} campers kunnen deze plaats tegelijk gebruiken",
- "es": "{capacity} autocaravanas pueden usar este lugar al mismo tiempo",
- "da": "{capacity} campister kan bruge dette sted på samme tid",
- "ca": "{capacity} els acampadors poden utilitzar aquest lloc al mateix temps",
- "cs": "{capacity} táborníků může toto místo využívat současně",
- "eu": "{capacity} kanpinlariek aldi berean erabil dezakete leku hau",
- "pl": "{capacity} kamperów może z tego miejsca korzystać jednocześnie",
- "pt": "{capacity} campistas podem usar este lugar ao mesmo tempo",
- "zh_Hans": "{capacity} 名露营者可以同时使用这个地方"
- },
+ "id": "caravansites-capacity",
"question": {
"en": "How many campers can stay here? (skip if there is no obvious number of spaces or allowed vehicles)",
"it": "Quanti camper possono sostare qui? (salta se non c'è un numero evidente di spazi o veicoli consentiti)",
@@ -470,11 +452,29 @@
"pt": "Quantos campistas podem ficar aqui? (pule se não houver um número óbvio de vagas ou veículos permitidos)",
"zh_Hans": "这里可以容纳多少辆露营车？（如果没有明显的车位数量或允许的车辆数，请跳过）"
},
+ "render": {
+ "en": "{capacity} campers can use this place at the same time",
+ "it": "{capacity} camper possono utilizzare questo posto contemporaneamente",
+ "ru": "{capacity} кемперов могут использовать это место одновременно",
+ "ja": "{capacity} 人が同時に使用できます",
+ "zh_Hant": "{capacity} 露營者能夠同時使用這個地方",
+ "fr": "{capacity} personnes peuvent utiliser cet espace en même temps",
+ "pt_BR": "{capacity} campistas podem usar este lugar ao mesmo tempo",
+ "de": "{capacity} Wohnmobile können diesen Platz gleichzeitig nutzen",
+ "nl": "{capacity} campers kunnen deze plaats tegelijk gebruiken",
+ "es": "{capacity} autocaravanas pueden usar este lugar al mismo tiempo",
+ "da": "{capacity} campister kan bruge dette sted på samme tid",
+ "ca": "{capacity} els acampadors poden utilitzar aquest lloc al mateix temps",
+ "cs": "{capacity} táborníků může toto místo využívat současně",
+ "eu": "{capacity} kanpinlariek aldi berean erabil dezakete leku hau",
+ "pl": "{capacity} kamperów może z tego miejsca korzystać jednocześnie",
+ "pt": "{capacity} campistas podem usar este lugar ao mesmo tempo",
+ "zh_Hans": "{capacity} 名露营者可以同时使用这个地方"
+ },
"freeform": {
"key": "capacity",
"type": "pnat"
- },
- "id": "caravansites-capacity"
+ }
},
{
"id": "caravansites-internet",
@@ -746,6 +746,28 @@
]
},
{
+ "id": "caravansites-website",
+ "question": {
+ "en": "Does this place have a website?",
+ "id": "Tempat sini terada situs web?",
+ "it": "Questo posto ha un sito web?",
+ "ru": "Есть ли у этого места веб-сайт?",
+ "ja": "ここにはウェブサイトがありますか?",
+ "nb_NO": "Har dette stedet en nettside?",
+ "zh_Hant": "這個地方有網站嗎？",
+ "fr": "Ce lieu a-t’il un site internet ?",
+ "pt_BR": "Este lugar tem um website?",
+ "de": "Hat dieser Ort eine Webseite?",
+ "nl": "Heeft deze plaats een website?",
+ "es": "¿Este lugar tiene una página web?",
+ "ca": "Aquest lloc té un lloc web?",
+ "da": "Har dette sted et websted?",
+ "cs": "Má toto místo webové stránky?",
+ "eu": "Toki honek webgunerik ba al du?",
+ "pl": "Czy to miejsce ma stronę internetową?",
+ "pt": "Este lugar tem um website?",
+ "uk": "Це місце має веб-сайт?"
+ },
"render": {
"en": "Official website: {website}",
"id": "Situs resmi: {website}",
@@ -769,29 +791,7 @@
"freeform": {
"type": "url",
"key": "website"
- },
- "question": {
- "en": "Does this place have a website?",
- "id": "Tempat sini terada situs web?",
- "it": "Questo posto ha un sito web?",
- "ru": "Есть ли у этого места веб-сайт?",
- "ja": "ここにはウェブサイトがありますか?",
- "nb_NO": "Har dette stedet en nettside?",
- "zh_Hant": "這個地方有網站嗎？",
- "fr": "Ce lieu a-t’il un site internet ?",
- "pt_BR": "Este lugar tem um website?",
- "de": "Hat dieser Ort eine Webseite?",
- "nl": "Heeft deze plaats een website?",
- "es": "¿Este lugar tiene una página web?",
- "ca": "Aquest lloc té un lloc web?",
- "da": "Har dette sted et websted?",
- "cs": "Má toto místo webové stránky?",
- "eu": "Toki honek webgunerik ba al du?",
- "pl": "Czy to miejsce ma stronę internetową?",
- "pt": "Este lugar tem um website?",
- "uk": "Це місце має веб-сайт?"
- },
- "id": "caravansites-website"
+ }
},
{
"id": "caravansites-long-term",
@@ -889,6 +889,25 @@
]
},
{
+ "id": "caravansites-description",
+ "question": {
+ "en": "Would you like to add a general description of this place? (Do not repeat information previously asked or shown above. Please keep it objective - opinions go into the reviews)",
+ "ru": "Хотели бы вы добавить общее описание этого места? (Не повторяйте информацию, которая уже написана выше или на которую вы уже ответили ранее. Пожалуйста, будьте объективны - мнения должны быть в отзывах)",
+ "ja": "この場所の一般的な説明を追加しますか?(前に問い合わせた情報や上記の情報を繰り返し入力しないでください。客観的な意見はレビューに反映されます)",
+ "zh_Hant": "你想要為這個地方加一般的敘述嗎？(不要重覆加先前問過或提供的資訊，請保持敘述性-請將意見留在評價)",
+ "it": "Vorresti aggiungere una descrizione generale di questo posto? (Non ripetere informazioni già richieste o mostrate sopra. Mantienila oggettiva - le opinioni vanno nelle recensioni)",
+ "fr": "Souhaitez-vous ajouter une description générale du lieu ? (Ne pas répéter les informations précédentes et rester neutre, les opinions vont dans les avis)",
+ "de": "Möchten Sie eine allgemeine Beschreibung für diesen Ort hinzufügen? (Bitte wiederholen Sie keine Informationen, die Sie bereits zuvor angegeben haben. Bitte bleiben Sie objektiv - Meinungen gehen in die Bewertungen ein)",
+ "nl": "Wil je graag een algemene beschrijving toevoegen van deze plaats? (Herhaal hier niet de antwoorden op de vragen die reeds gesteld zijn. Hou het objectief - je kan je mening geven via een review)",
+ "es": "¿Te gustaría añadir una descripción general de este lugar? (no repitas información previamente solicitada o mostrada arriba Manténla objetiva - las opiniones van en las reseñas)",
+ "ca": "T'agradaria afegir una descripció general d'aquest lloc? (No repeteixis informació prèviament preguntada o mostrada a dalt. Si us plau mantín-la objectiva - les opinions van en les «reviews»)",
+ "da": "Vil du tilføje en generel beskrivelse af dette sted? (Gentag ikke oplysninger, der tidligere er blevet spurgt eller vist ovenfor. Hold dem venligst objektive - udtalelser går ind i anmeldelserne)",
+ "nb_NO": "Vil du legge til en generell beskrivelse av dette stedet? (Ikke gjenta info det har blitt spurt om eller som vises ovenfor. Hold det objektivt. Meninger henvises til vurderingene.)",
+ "cs": "Chcete přidat obecný popis tohoto místa? (Neopakujte informace, na které jsme se ptali dříve, nebo které byly uvedeny výše. Zachovejte prosím objektivitu - názory patří do hodnocení)",
+ "eu": "Gustatuko litzaizuke toki honen deskribapen orokorra gehitzea? (Ez errepikatu aurretik eskatutako edo adierazitako informazioa. Mesedez, eutsi helburuari - berrikuspenetarako iritziak)",
+ "pl": "Chcesz dodać ogólny opis tego miejsca? (Nie powtarzaj informacji zadanych wcześniej lub pokazanych powyżej. Zachowaj obiektywizm – opinie trafiają do recenzji)",
+ "zh_Hans": "您想添加一个关于此地的一般描述吗？（请勿重复之前询问或显示的信息。请保持客观——意见和评价请在评论中提供）"
+ },
"render": {
"en": "More details about this place: {description}",
"ru": "Более подробная информация об этом месте: {description}",
@@ -908,29 +927,10 @@
"pt": "Mais pormenores sobre este lugar: {description}",
"zh_Hans": "关于此地的更多细节：{description}"
},
- "question": {
- "en": "Would you like to add a general description of this place? (Do not repeat information previously asked or shown above. Please keep it objective - opinions go into the reviews)",
- "ru": "Хотели бы вы добавить общее описание этого места? (Не повторяйте информацию, которая уже написана выше или на которую вы уже ответили ранее. Пожалуйста, будьте объективны - мнения должны быть в отзывах)",
- "ja": "この場所の一般的な説明を追加しますか?(前に問い合わせた情報や上記の情報を繰り返し入力しないでください。客観的な意見はレビューに反映されます)",
- "zh_Hant": "你想要為這個地方加一般的敘述嗎？(不要重覆加先前問過或提供的資訊，請保持敘述性-請將意見留在評價)",
- "it": "Vorresti aggiungere una descrizione generale di questo posto? (Non ripetere informazioni già richieste o mostrate sopra. Mantienila oggettiva - le opinioni vanno nelle recensioni)",
- "fr": "Souhaitez-vous ajouter une description générale du lieu ? (Ne pas répéter les informations précédentes et rester neutre, les opinions vont dans les avis)",
- "de": "Möchten Sie eine allgemeine Beschreibung für diesen Ort hinzufügen? (Bitte wiederholen Sie keine Informationen, die Sie bereits zuvor angegeben haben. Bitte bleiben Sie objektiv - Meinungen gehen in die Bewertungen ein)",
- "nl": "Wil je graag een algemene beschrijving toevoegen van deze plaats? (Herhaal hier niet de antwoorden op de vragen die reeds gesteld zijn. Hou het objectief - je kan je mening geven via een review)",
- "es": "¿Te gustaría añadir una descripción general de este lugar? (no repitas información previamente solicitada o mostrada arriba Manténla objetiva - las opiniones van en las reseñas)",
- "ca": "T'agradaria afegir una descripció general d'aquest lloc? (No repeteixis informació prèviament preguntada o mostrada a dalt. Si us plau mantín-la objectiva - les opinions van en les «reviews»)",
- "da": "Vil du tilføje en generel beskrivelse af dette sted? (Gentag ikke oplysninger, der tidligere er blevet spurgt eller vist ovenfor. Hold dem venligst objektive - udtalelser går ind i anmeldelserne)",
- "nb_NO": "Vil du legge til en generell beskrivelse av dette stedet? (Ikke gjenta info det har blitt spurt om eller som vises ovenfor. Hold det objektivt. Meninger henvises til vurderingene.)",
- "cs": "Chcete přidat obecný popis tohoto místa? (Neopakujte informace, na které jsme se ptali dříve, nebo které byly uvedeny výše. Zachovejte prosím objektivitu - názory patří do hodnocení)",
- "eu": "Gustatuko litzaizuke toki honen deskribapen orokorra gehitzea? (Ez errepikatu aurretik eskatutako edo adierazitako informazioa. Mesedez, eutsi helburuari - berrikuspenetarako iritziak)",
- "pl": "Chcesz dodać ogólny opis tego miejsca? (Nie powtarzaj informacji zadanych wcześniej lub pokazanych powyżej. Zachowaj obiektywizm – opinie trafiają do recenzji)",
- "zh_Hans": "您想添加一个关于此地的一般描述吗？（请勿重复之前询问或显示的信息。请保持客观——意见和评价请在评论中提供）"
- },
"freeform": {
"key": "description",
"type": "text"
- },
- "id": "caravansites-description"
+ }
},
"questions",
"reviews"
diff --git a/assets/layers/charge_point/charge_point.json b/assets/layers/charge_point/charge_point.json
index 0ebb68ddd..49d7462a7 100644
--- a/assets/layers/charge_point/charge_point.json
+++ b/assets/layers/charge_point/charge_point.json
@@ -78,6 +78,13 @@
"cs": "Jaké je referenční číslo tohoto nabíjecího bodu?",
"it": "Qual è il numero di riferimento di questo punto di ricarica?"
},
+ "render": {
+ "en": "The reference of this charge point is {ref}",
+ "de": "Die Referenz dieser Ladesäule ist {ref}",
+ "ca": "La referència d'aquest punt de càrrega és {ref}",
+ "cs": "Referenční číslo tohoto nabíjecího bodu je {ref}",
+ "it": "Il riferimento di questo punto di ricarica è {ref}"
+ },
"freeform": {
"key": "ref",
"placeholder": {
@@ -88,13 +95,6 @@
"cs": "Referenční číslo nabíjecího bodu, např. 2126",
"it": "Numero di riferimento del punto di ricarica, es. 2126"
}
- },
- "render": {
- "en": "The reference of this charge point is {ref}",
- "de": "Die Referenz dieser Ladesäule ist {ref}",
- "ca": "La referència d'aquest punt de càrrega és {ref}",
- "cs": "Referenční číslo tohoto nabíjecího bodu je {ref}",
- "it": "Il riferimento di questo punto di ricarica è {ref}"
}
},
"charging_station.capacity",
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 0912be190..7b4d25412 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -212,7 +212,6 @@
"images",
{
"id": "Type",
- "#": "Allowed vehicle types",
"question": {
"en": "Which vehicles are allowed to charge here?",
"nl": "Welke voertuigen kunnen hier opgeladen worden?",
@@ -224,7 +223,6 @@
"pl": "Jakie pojazdy mogą być tutaj ładowane?",
"uk": "Які транспортні засоби можуть тут заряджатися?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "bicycle=yes",
@@ -330,7 +328,9 @@
"uk": "Автобуси можна зарядити тут"
}
}
- ]
+ ],
+ "#": "Allowed vehicle types",
+ "multiAnswer": true
},
{
"id": "access",
@@ -446,17 +446,6 @@
},
{
"id": "capacity",
- "render": {
- "en": "{capacity} vehicles can be charged here at the same time",
- "nl": "{capacity} voertuigen kunnen hier op hetzelfde moment opgeladen worden",
- "ca": "Aquí poden carregar {capacity} vehicles a l'hora",
- "cs": "Současně tu lze nabíjet {capacity} vozidel",
- "de": "Hier können {capacity} Fahrzeuge gleichzeitig laden",
- "es": "{capacity} vehículos se pueden cargar aquí al mismo tiempo",
- "it": "{capacity} veicoli possono essere ricaricati qui contemporaneamente",
- "pl": "{capacity} pojazdów może być tutaj ładowanych jednocześnie",
- "uk": "Тут можуть заряджатися одночасно {capacity} транспортних засобів"
- },
"question": {
"en": "How much vehicles can be charged here at the same time?",
"nl": "Hoeveel voertuigen kunnen hier opgeladen worden?",
@@ -468,6 +457,17 @@
"pl": "Ile pojazdów może być tutaj ładowanych jednocześnie?",
"uk": "Скільки транспортних засобів можна зарядити тут одночасно?"
},
+ "render": {
+ "en": "{capacity} vehicles can be charged here at the same time",
+ "nl": "{capacity} voertuigen kunnen hier op hetzelfde moment opgeladen worden",
+ "ca": "Aquí poden carregar {capacity} vehicles a l'hora",
+ "cs": "Současně tu lze nabíjet {capacity} vozidel",
+ "de": "Hier können {capacity} Fahrzeuge gleichzeitig laden",
+ "es": "{capacity} vehículos se pueden cargar aquí al mismo tiempo",
+ "it": "{capacity} veicoli possono essere ricaricati qui contemporaneamente",
+ "pl": "{capacity} pojazdów może być tutaj ładowanych jednocześnie",
+ "uk": "Тут можуть заряджатися одночасно {capacity} транспортних засобів"
+ },
"freeform": {
"key": "capacity",
"type": "pnat"
@@ -484,7 +484,6 @@
"es": "¿Qué conexiones de carga están disponibles aquí?",
"it": "Quali connessioni di ricarica sono disponibili qui?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "socket:schuko=1",
@@ -1864,7 +1863,8 @@
"class": "medium"
}
}
- ]
+ ],
+ "multiAnswer": true
},
{
"id": "rewritten-questions",
@@ -2562,6 +2562,7 @@
]
},
{
+ "id": "OH",
"builtin": "opening_hours_24_7",
"override": {
"question": {
@@ -2574,8 +2575,7 @@
"it": "Quando è aperta questa stazione di ricarica?",
"pl": "Kiedy jest otwarta ta stacja ładowania?"
}
- },
- "id": "OH"
+ }
},
{
"id": "fee",
@@ -2759,18 +2759,18 @@
},
{
"id": "app-name",
- "condition": {
- "and": [
- "payment:app~*",
- "payment:app!=no"
- ]
- },
"question": {
"en": "What is the name of the app used for payment?",
"nl": "Hoe heet de app die gebruikt wordt voor betaling?",
"cs": "Jaký je název aplikace používané pro platby?",
"it": "Qual è il nome dell'app utilizzata per il pagamento?"
},
+ "render": {
+ "en": "Payment can be done using the app {payment:app}",
+ "nl": "Betalen kan met de app {payment:app}",
+ "cs": "Platbu lze provést pomocí aplikace {payment:app}",
+ "it": "Il pagamento può essere effettuato utilizzando l'app {payment:app}"
+ },
"freeform": {
"key": "payment:app",
"placeholder": {
@@ -2781,17 +2781,16 @@
},
"type": "string"
},
- "render": {
- "en": "Payment can be done using the app {payment:app}",
- "nl": "Betalen kan met de app {payment:app}",
- "cs": "Platbu lze provést pomocí aplikace {payment:app}",
- "it": "Il pagamento può essere effettuato utilizzando l'app {payment:app}"
+ "condition": {
+ "and": [
+ "payment:app~*",
+ "payment:app!=no"
+ ]
},
"invalidValues": "payment:app=yes"
},
{
"id": "Authentication",
- "#": "In some cases, charging is free but one has to be authenticated. We only ask for authentication if fee is no (or unset). By default one sees the questions for either the payment options or the authentication options, but normally not both",
"question": {
"en": "What kind of authentication is available at the charging station?",
"nl": "Hoe kan men zich aanmelden aan dit oplaadstation?",
@@ -2802,7 +2801,6 @@
"it": "Che tipo di autenticazione è disponibile presso la stazione di ricarica?",
"uk": "Яка автентифікація доступна на зарядній станції?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "authentication:membership_card=yes",
@@ -2926,20 +2924,12 @@
"fee=no",
"fee="
]
- }
+ },
+ "#": "In some cases, charging is free but one has to be authenticated. We only ask for authentication if fee is no (or unset). By default one sees the questions for either the payment options or the authentication options, but normally not both",
+ "multiAnswer": true
},
{
"id": "Auth phone",
- "render": {
- "en": "Authenticate by calling or SMS'ing to {authentication:phone_call:number}",
- "nl": "Aanmelden door te bellen of te SMS'en naar {authentication:phone_call:number}",
- "ca": "Autentiqueu-vos trucant o enviant SMS a {authentication:phone_call:number}",
- "cs": "Ověření zavoláním nebo posláním SMS na {authentication:phone_call:number}",
- "de": "Authentifiziere dich, indem du anrufst oder eine SMS sendest an {authentication:phone_call:number}",
- "es": "Autentifícate llamando o enviando un SMS a {authentication:phone_call:number}",
- "it": "Autenticati chiamando o inviando un SMS a {authentication:phone_call:number}",
- "uk": "Авторизуйтесь, зателефонувавши або надіславши SMS на {authentication:phone_call:number}"
- },
"question": {
"en": "What's the phone number for authentication call or SMS?",
"nl": "Wat is het telefoonnummer dat men moet bellen of SMS'en om zich aan te melden?",
@@ -2950,6 +2940,16 @@
"it": "Qual è il numero di telefono per l'autenticazione tramite chiamata o SMS?",
"uk": "Який номер телефону для аутентифікаційного дзвінка або SMS?"
},
+ "render": {
+ "en": "Authenticate by calling or SMS'ing to {authentication:phone_call:number}",
+ "nl": "Aanmelden door te bellen of te SMS'en naar {authentication:phone_call:number}",
+ "ca": "Autentiqueu-vos trucant o enviant SMS a {authentication:phone_call:number}",
+ "cs": "Ověření zavoláním nebo posláním SMS na {authentication:phone_call:number}",
+ "de": "Authentifiziere dich, indem du anrufst oder eine SMS sendest an {authentication:phone_call:number}",
+ "es": "Autentifícate llamando o enviando un SMS a {authentication:phone_call:number}",
+ "it": "Autenticati chiamando o inviando un SMS a {authentication:phone_call:number}",
+ "uk": "Авторизуйтесь, зателефонувавши або надіславши SMS на {authentication:phone_call:number}"
+ },
"freeform": {
"key": "authentication:phone_call:number",
"type": "phone"
@@ -2976,17 +2976,6 @@
},
{
"id": "Network",
- "render": {
- "en": "Part of the network {network}",
- "nl": "Maakt deel uit van het {network}-netwerk",
- "ca": "Part de la xarxa {network}",
- "cs": "Část sítě {network}",
- "de": "Teil des Netzwerks {network}",
- "es": "Parte de la red {network}",
- "it": "Parte della rete {network}",
- "pl": "Część sieci {network}",
- "uk": "Частина мережі {network}"
- },
"question": {
"en": "Is this charging station part of a network?",
"nl": "Is dit oplaadpunt deel van een groter netwerk?",
@@ -2998,6 +2987,17 @@
"pl": "Czy ta stacja ładowania jest częścią sieci?",
"uk": "Чи є ця зарядна станція частиною мережі?"
},
+ "render": {
+ "en": "Part of the network {network}",
+ "nl": "Maakt deel uit van het {network}-netwerk",
+ "ca": "Part de la xarxa {network}",
+ "cs": "Část sítě {network}",
+ "de": "Teil des Netzwerks {network}",
+ "es": "Parte de la red {network}",
+ "it": "Parte della rete {network}",
+ "pl": "Część sieci {network}",
+ "uk": "Частина мережі {network}"
+ },
"freeform": {
"key": "network"
},
@@ -3225,8 +3225,8 @@
"freeform": {
"key": "ref"
},
- "#": "Only asked if part of a bigger network. Small operators typically don't have a reference number",
- "condition": "network!="
+ "condition": "network!=",
+ "#": "Only asked if part of a bigger network. Small operators typically don't have a reference number"
},
{
"id": "Operational status",
diff --git a/assets/layers/climbing/climbing.json b/assets/layers/climbing/climbing.json
index 5d3f69db9..a0ea69bd4 100644
--- a/assets/layers/climbing/climbing.json
+++ b/assets/layers/climbing/climbing.json
@@ -30,6 +30,11 @@
"uk": "Чи існує (неофіційний) веб-сайт з додатковою інформацією (наприклад, топос)?",
"ca": "Hi ha un lloc web (no oficial) amb més informació (p. ex. topos)?"
},
+ "render": "{url}",
+ "freeform": {
+ "key": "url",
+ "type": "url"
+ },
"condition": {
"and": [
"leisure!~sports_centre",
@@ -37,26 +42,10 @@
"office=",
"club="
]
- },
- "render": "{url}",
- "freeform": {
- "key": "url",
- "type": "url"
}
},
{
"id": "average_length",
- "render": {
- "de": "Die Routen sind durchschnittlich {canonical(climbing:length)} lang",
- "en": "The routes are {canonical(climbing:length)} long on average",
- "nl": "De klimroutes zijn gemiddeld {canonical(climbing:length)} lang",
- "ja": "ルートの長さは平均で{canonical(climbing:length)}です",
- "fr": "Les voies font {canonical(climbing:length)} de long en moyenne",
- "it": "Le vie sono lunghe in media {canonical(climbing:length)}",
- "es": "Las vías tienen una longitud promedio de {canonical(climbing:length)}",
- "ca": "Les rutes mesuren {canonical(climbing:length)} de mitja",
- "cs": "Cesty jsou {canonical(climbing:length)} v průměru dlouhé"
- },
"question": {
"de": "Wie lang sind die Routen (durchschnittlich) in Metern?",
"en": "What is the (average) length of the routes in meters?",
@@ -68,6 +57,17 @@
"ca": "Quina és la longitud (mitjana) de les rutes en metres?",
"cs": "Jaká je (průměrná) délka tras v metrech?"
},
+ "render": {
+ "de": "Die Routen sind durchschnittlich {canonical(climbing:length)} lang",
+ "en": "The routes are {canonical(climbing:length)} long on average",
+ "nl": "De klimroutes zijn gemiddeld {canonical(climbing:length)} lang",
+ "ja": "ルートの長さは平均で{canonical(climbing:length)}です",
+ "fr": "Les voies font {canonical(climbing:length)} de long en moyenne",
+ "it": "Le vie sono lunghe in media {canonical(climbing:length)}",
+ "es": "Las vías tienen una longitud promedio de {canonical(climbing:length)}",
+ "ca": "Les rutes mesuren {canonical(climbing:length)} de mitja",
+ "cs": "Cesty jsou {canonical(climbing:length)} v průměru dlouhé"
+ },
"freeform": {
"key": "climbing:length",
"type": "pfloat"
diff --git a/assets/layers/climbing_area/climbing_area.json b/assets/layers/climbing_area/climbing_area.json
index b6c0357be..83a68987e 100644
--- a/assets/layers/climbing_area/climbing_area.json
+++ b/assets/layers/climbing_area/climbing_area.json
@@ -200,6 +200,7 @@
}
},
{
+ "id": "Contained routes length hist",
"render": {
"en": "Length overview
{histogram(_length_hist)}",
"fr": "Résumé de longueur
{histogram(_length_hist)}",
@@ -210,10 +211,10 @@
"es": "Resumen de longitudes
{histogram(_length_hist)}",
"ca": "Resum de la longitud
{histogram(lengthhist)}"
},
- "condition": "_length_hist!~\\[\\]",
- "id": "Contained routes length hist"
+ "condition": "_length_hist!~\\[\\]"
},
{
+ "id": "Contained routes hist",
"render": {
"en": "Grades overview
{histogram(_difficulty_hist)}",
"fr": "Résumé des difficultés
{histogram(_difficulty_hist)}",
@@ -224,10 +225,10 @@
"es": "Resumen de grados
{histogram(_difficulty_hist)}",
"ca": "Resum de les qualificacions
{histogram(dificultat)}"
},
- "condition": "_difficulty_hist!~\\[\\]",
- "id": "Contained routes hist"
+ "condition": "_difficulty_hist!~\\[\\]"
},
{
+ "id": "Contained_climbing_routes",
"render": {
"en": "Contains {_contained_climbing_routes_count} routes
{_contained_climbing_routes}
",
"fr": "Contient {_contained_climbing_routes_count} voies
{_contained_climbing_routes}
",
@@ -238,10 +239,21 @@
"cs": "Obsahuje {_contained_climbing_routes_count} tras
{_contained_climbing_routes}
",
"es": "Contiene {_contained_climbing_routes_count} vías
{_contained_climbing_routes}
"
},
- "condition": "_contained_climbing_routes~*",
- "id": "Contained_climbing_routes"
+ "condition": "_contained_climbing_routes~*"
},
{
+ "id": "name",
+ "question": {
+ "en": "What is the name of this climbing opportunity?",
+ "nl": "Wat is de naam van dit Klimgelegenheid?",
+ "de": "Wie heißt die Klettereinrichtung?",
+ "ja": "この登坂教室の名前は何ですか?",
+ "fr": "Quel est le nom de ce site ?",
+ "it": "Qual è il nome di questa opportunità di arrampicata?",
+ "cs": "Jak se jmenuje tato lezecká příležitost?",
+ "es": "¿Cuál es el nombre de esta posibilidad de escalada?",
+ "ca": "Quin és el nom d'aquesta oportunitat d'escalada?"
+ },
"render": {
"en": "{name}",
"nl": "{name}",
@@ -257,17 +269,6 @@
"es": "{name}",
"cy": "{name}"
},
- "question": {
- "en": "What is the name of this climbing opportunity?",
- "nl": "Wat is de naam van dit Klimgelegenheid?",
- "de": "Wie heißt die Klettereinrichtung?",
- "ja": "この登坂教室の名前は何ですか?",
- "fr": "Quel est le nom de ce site ?",
- "it": "Qual è il nome di questa opportunità di arrampicata?",
- "cs": "Jak se jmenuje tato lezecká příležitost?",
- "es": "¿Cuál es el nombre de esta posibilidad de escalada?",
- "ca": "Quin és el nom d'aquesta oportunitat d'escalada?"
- },
"freeform": {
"key": "name"
},
@@ -291,10 +292,10 @@
"ca": "Aquesta oportunitat d'escalada no té nom"
}
}
- ],
- "id": "name"
+ ]
},
{
+ "id": "Type",
"question": "What kind of climbing opportunity is this?",
"mappings": [
{
@@ -335,10 +336,10 @@
"it": "Un'area di arrampicata con una o più falesie e/o massi"
}
}
- ],
- "id": "Type"
+ ]
},
{
+ "id": "Rock type (crag/rock/cliff only)",
"question": {
"en": "What is the rock type here?",
"fr": "Quel est le type de roche ?",
@@ -387,8 +388,7 @@
"natural=cliff",
"natural=bare_rock"
]
- },
- "id": "Rock type (crag/rock/cliff only)"
+ }
},
"reviews",
{
diff --git a/assets/layers/climbing_club/climbing_club.json b/assets/layers/climbing_club/climbing_club.json
index 2e9bc9e6f..8d891f557 100644
--- a/assets/layers/climbing_club/climbing_club.json
+++ b/assets/layers/climbing_club/climbing_club.json
@@ -181,6 +181,19 @@
],
"tagRenderings": [
{
+ "id": "climbing_club-name",
+ "question": {
+ "en": "What is the name of this climbing club or NGO?",
+ "de": "Wie lautet der Name dieses Vereins oder Organisation?",
+ "nl": "Wat is de naam van deze klimclub?",
+ "ja": "この登山クラブやNGOの名前は何ですか?",
+ "fr": "Quel est le nom du club ou de l’association ?",
+ "it": "Qual è il nome di questo club di arrampicata o ONG?",
+ "hu": "Mi a neve ennek a mászóegyesületnek vagy szervezetnek?",
+ "cs": "Jak se jmenuje tento lezecký klub nebo nevládní organizace?",
+ "es": "¿Cuál es el nombre de este club u ONG de escalada?",
+ "ca": "Com es diu aquest club d'escalada o ONG?"
+ },
"render": {
"en": "{name}",
"nl": "{name}",
@@ -197,22 +210,9 @@
"es": "{name}",
"cy": "{name}"
},
- "question": {
- "en": "What is the name of this climbing club or NGO?",
- "de": "Wie lautet der Name dieses Vereins oder Organisation?",
- "nl": "Wat is de naam van deze klimclub?",
- "ja": "この登山クラブやNGOの名前は何ですか?",
- "fr": "Quel est le nom du club ou de l’association ?",
- "it": "Qual è il nome di questo club di arrampicata o ONG?",
- "hu": "Mi a neve ennek a mászóegyesületnek vagy szervezetnek?",
- "cs": "Jak se jmenuje tento lezecký klub nebo nevládní organizace?",
- "es": "¿Cuál es el nombre de este club u ONG de escalada?",
- "ca": "Com es diu aquest club d'escalada o ONG?"
- },
"freeform": {
"key": "name"
- },
- "id": "climbing_club-name"
+ }
},
"website",
"email",
diff --git a/assets/layers/climbing_gym/climbing_gym.json b/assets/layers/climbing_gym/climbing_gym.json
index 888a1cf94..d0b8130a6 100644
--- a/assets/layers/climbing_gym/climbing_gym.json
+++ b/assets/layers/climbing_gym/climbing_gym.json
@@ -122,9 +122,7 @@
"tagRenderings": [
"images",
{
- "render": {
- "*": "{name}"
- },
+ "id": "name",
"question": {
"en": "What is the name of this climbing gym?",
"nl": "Wat is de naam van deze klimzaal?",
@@ -137,10 +135,12 @@
"uk": "Як називається цей скеледром?",
"ca": "Quin és el nom d'aquest gimnàs d'escalada?"
},
+ "render": {
+ "*": "{name}"
+ },
"freeform": {
"key": "name"
- },
- "id": "name"
+ }
},
"website",
"phone",
@@ -262,28 +262,6 @@
"ca": "Aquí es pot llogar un arnès d'escalada per utilitzar al gimnàs?",
"it": "Si può noleggiare un'imbragatura da arrampicata qui da usare in palestra?"
},
- "condition": {
- "or": [
- {
- "and": [
- "climbing:sport!=",
- "climbing:sport!=no"
- ]
- },
- {
- "and": [
- "climbing:toprope!=",
- "climbing:toprope!=no"
- ]
- },
- {
- "and": [
- "climbing:speed!=",
- "climbing:speed!=no"
- ]
- }
- ]
- },
"mappings": [
{
"if": {
@@ -359,7 +337,29 @@
"service:climbing_harness:rental:charge="
]
}
- ]
+ ],
+ "condition": {
+ "or": [
+ {
+ "and": [
+ "climbing:sport!=",
+ "climbing:sport!=no"
+ ]
+ },
+ {
+ "and": [
+ "climbing:toprope!=",
+ "climbing:toprope!=no"
+ ]
+ },
+ {
+ "and": [
+ "climbing:speed!=",
+ "climbing:speed!=no"
+ ]
+ }
+ ]
+ }
},
{
"id": "auto_belay_toprope",
@@ -379,11 +379,13 @@
"it": "Esclusi gli auto-assicuratori solo per l'arrampicata velocità",
"cs": "Kromě automatických jištění, která jsou jen pro lezení na rychlost"
},
- "condition": {
- "and": [
- "climbing:toprope!=",
- "climbing:toprope!=no"
- ]
+ "render": {
+ "en": "There are {climbing:autobelay:toprope} auto belay devices for top roping",
+ "nl": "Er zijn {climbing:autobelay:toprope} autobelaytoestellen voor toprope",
+ "de": "Es gibt {climbing:autobelay:toprope} Selbstsicherungsgeräte für das Toprope-Klettern",
+ "ca": "Hi ha {climbing:autobelay:toprope} dispositius de relleu automàtic per a l'escalada en politja",
+ "it": "Ci sono {climbing:autobelay:toprope} dispositivi auto-assicuratori per il top rope",
+ "cs": "Je tu {climbing:autobelay:toprope} automatických jištění pro lezení s horním jištěním (top roping)"
},
"freeform": {
"key": "climbing:autobelay:toprope",
@@ -435,13 +437,11 @@
}
}
],
- "render": {
- "en": "There are {climbing:autobelay:toprope} auto belay devices for top roping",
- "nl": "Er zijn {climbing:autobelay:toprope} autobelaytoestellen voor toprope",
- "de": "Es gibt {climbing:autobelay:toprope} Selbstsicherungsgeräte für das Toprope-Klettern",
- "ca": "Hi ha {climbing:autobelay:toprope} dispositius de relleu automàtic per a l'escalada en politja",
- "it": "Ci sono {climbing:autobelay:toprope} dispositivi auto-assicuratori per il top rope",
- "cs": "Je tu {climbing:autobelay:toprope} automatických jištění pro lezení s horním jištěním (top roping)"
+ "condition": {
+ "and": [
+ "climbing:toprope!=",
+ "climbing:toprope!=no"
+ ]
}
},
{
@@ -454,11 +454,13 @@
"it": "Ci sono auto-assicuratori per l'arrampicata da primo qui?",
"cs": "Je tu automatické jištění pro lezení na obtížnost?"
},
- "condition": {
- "and": [
- "climbing:sport!=",
- "climbing:sport!=no"
- ]
+ "render": {
+ "en": "There are {climbing:autobelay:sport} auto belays for lead climbing",
+ "nl": "Er zijn {climbing:autobelay:sport} autobelays voor voorklimmen",
+ "de": "Es gibt {climbing:autobelay:sport} Selbstsicherungen für das Vorstiegsklettern",
+ "ca": "Hi ha {climbing:autobelay:sport} asseguraments automàtics per al cap de corda",
+ "it": "Ci sono {climbing:autobelay:sport} auto-assicuratori per l'arrampicata da primo",
+ "cs": "Je tu {climbing:autobelay:sport} automatických jištění pro lezení na obtížnost"
},
"freeform": {
"key": "climbing:autobelay:sport",
@@ -499,13 +501,11 @@
}
}
],
- "render": {
- "en": "There are {climbing:autobelay:sport} auto belays for lead climbing",
- "nl": "Er zijn {climbing:autobelay:sport} autobelays voor voorklimmen",
- "de": "Es gibt {climbing:autobelay:sport} Selbstsicherungen für das Vorstiegsklettern",
- "ca": "Hi ha {climbing:autobelay:sport} asseguraments automàtics per al cap de corda",
- "it": "Ci sono {climbing:autobelay:sport} auto-assicuratori per l'arrampicata da primo",
- "cs": "Je tu {climbing:autobelay:sport} automatických jištění pro lezení na obtížnost"
+ "condition": {
+ "and": [
+ "climbing:sport!=",
+ "climbing:sport!=no"
+ ]
}
},
{
@@ -520,22 +520,6 @@
"ca": "Aquí es pot llogar un aparell d'assegurament per utilitzar al gimnàs?",
"it": "Si può noleggiare un dispositivo di assicurazione qui da usare in palestra?"
},
- "condition": {
- "or": [
- {
- "and": [
- "climbing:sport!=",
- "climbing:sport!=no"
- ]
- },
- {
- "and": [
- "climbing:toprope!=",
- "climbing:toprope!=no"
- ]
- }
- ]
- },
"mappings": [
{
"if": "service:climbing_belay_device:provided_at_each_rope=yes",
@@ -632,7 +616,23 @@
"service:climbing_belay_device:rental:charge="
]
}
- ]
+ ],
+ "condition": {
+ "or": [
+ {
+ "and": [
+ "climbing:sport!=",
+ "climbing:sport!=no"
+ ]
+ },
+ {
+ "and": [
+ "climbing:toprope!=",
+ "climbing:toprope!=no"
+ ]
+ }
+ ]
+ }
},
{
"id": "rope_rental",
@@ -646,7 +646,6 @@
"ca": "Aquí es pot llogar una corda d'escalada per a utilitzar al gimnàs?",
"it": "Si può noleggiare una corda da arrampicata qui da usare in palestra?"
},
- "condition": "climbing:sport!=no",
"mappings": [
{
"if": {
@@ -722,7 +721,8 @@
"service:climbing_rope:rental:charge="
]
}
- ]
+ ],
+ "condition": "climbing:sport!=no"
},
{
"builtin": "climbing.average_length",
diff --git a/assets/layers/climbing_route/climbing_route.json b/assets/layers/climbing_route/climbing_route.json
index aa618bdc3..6c49d974b 100644
--- a/assets/layers/climbing_route/climbing_route.json
+++ b/assets/layers/climbing_route/climbing_route.json
@@ -129,6 +129,20 @@
"tagRenderings": [
"images",
{
+ "id": "Name",
+ "question": {
+ "en": "What is the name of this climbing route?",
+ "de": "Wie heißt diese Kletterroute?",
+ "nl": "Hoe heet deze klimroute?",
+ "ja": "この登坂ルートの名前は何ですか?",
+ "it": "Qual è il nome di questa via di arrampicata?",
+ "fr": "Quel est le nom de cette voie d’escalade ?",
+ "nb_NO": "Hva er navnet på denne klatreruten?",
+ "da": "Hvad hedder denne klatrerute?",
+ "ca": "Quin és el nom d'aquesta ruta d'escalada?",
+ "cs": "Jak se jmenuje tato lezecká cesta?",
+ "es": "¿Cuál es el nombre de esta vía de escalada?"
+ },
"render": {
"en": "{name}",
"nl": "{name}",
@@ -145,19 +159,6 @@
"es": "{name}",
"cy": "{name}"
},
- "question": {
- "en": "What is the name of this climbing route?",
- "de": "Wie heißt diese Kletterroute?",
- "nl": "Hoe heet deze klimroute?",
- "ja": "この登坂ルートの名前は何ですか?",
- "it": "Qual è il nome di questa via di arrampicata?",
- "fr": "Quel est le nom de cette voie d’escalade ?",
- "nb_NO": "Hva er navnet på denne klatreruten?",
- "da": "Hvad hedder denne klatrerute?",
- "ca": "Quin és el nom d'aquesta ruta d'escalada?",
- "cs": "Jak se jmenuje tato lezecká cesta?",
- "es": "¿Cuál es el nombre de esta vía de escalada?"
- },
"freeform": {
"key": "name"
},
@@ -183,10 +184,10 @@
"ca": "Aquesta ruta d'escalada no té nom"
}
}
- ],
- "id": "Name"
+ ]
},
{
+ "id": "Length",
"question": {
"en": "How long is this climbing route (in meters)?",
"nl": "Hoe lang is deze klimroute (in meters)?",
@@ -214,10 +215,10 @@
"freeform": {
"key": "climbing:length",
"type": "pnat"
- },
- "id": "Length"
+ }
},
{
+ "id": "Difficulty",
"question": {
"en": "What is the grade of this climbing route according to the french/belgian system?",
"nl": "Hoe moeilijk is deze klimroute volgens het Franse/Belgische systeem?",
@@ -241,8 +242,7 @@
},
"freeform": {
"key": "climbing:grade:french"
- },
- "id": "Difficulty"
+ }
},
{
"id": "bolts",
diff --git a/assets/layers/clock/clock.json b/assets/layers/clock/clock.json
index 5eabfe649..a5824cfbd 100644
--- a/assets/layers/clock/clock.json
+++ b/assets/layers/clock/clock.json
@@ -665,6 +665,16 @@
"es": "¿Cuántas caras tiene este reloj?",
"it": "Quanti quadranti ha questo orologio?"
},
+ "render": {
+ "en": "This clock has {faces} faces",
+ "nl": "Deze klok heeft {faces} wijzerplaten",
+ "de": "Diese Uhr hat {faces} Zifferblätter",
+ "ca": "Aquest rellotge té {faces} cares",
+ "fr": "Cette horloge a {faces} faces",
+ "cs": "Tyto hodiny mají {faces} ciferníků",
+ "es": "Este reloj tiene {faces} caras",
+ "it": "Questo orologio ha {faces} quadranti"
+ },
"freeform": {
"key": "faces",
"type": "pnat",
@@ -680,16 +690,6 @@
"it": "Numero di quadranti"
}
},
- "render": {
- "en": "This clock has {faces} faces",
- "nl": "Deze klok heeft {faces} wijzerplaten",
- "de": "Diese Uhr hat {faces} Zifferblätter",
- "ca": "Aquest rellotge té {faces} cares",
- "fr": "Cette horloge a {faces} faces",
- "cs": "Tyto hodiny mají {faces} ciferníků",
- "es": "Este reloj tiene {faces} caras",
- "it": "Questo orologio ha {faces} quadranti"
- },
"mappings": [
{
"if": "faces=1",
diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json
index 983370c00..915f297ed 100644
--- a/assets/layers/crossings/crossings.json
+++ b/assets/layers/crossings/crossings.json
@@ -234,6 +234,22 @@
"cs": "Jaký druh značení má tento přechod?",
"it": "Che tipo di segnaletica ha questo attraversamento?"
},
+ "render": {
+ "en": "This crossing has {crossing:markings} markings",
+ "nl": "Deze oversteekplaats heeft {crossing:markings} markeringen",
+ "de": "Dieser Übergang hat {crossing:markings} Markierungen",
+ "es": "Este cruce tiene marcas {crossing:markings}",
+ "ca": "Aquest encreuament té marques {crossing:markings}",
+ "cs": "Tento přechod má značení {crossing:markings}",
+ "it": "Questo attraversamento ha segnaletica {crossing:markings}"
+ },
+ "freeform": {
+ "key": "crossing:markings",
+ "type": "string",
+ "addExtraTags": [
+ "fixme=Free-form value used in MapComplete for crossing:markings"
+ ]
+ },
"mappings": [
{
"if": "crossing:markings=no",
@@ -461,24 +477,8 @@
}
}
],
- "render": {
- "en": "This crossing has {crossing:markings} markings",
- "nl": "Deze oversteekplaats heeft {crossing:markings} markeringen",
- "de": "Dieser Übergang hat {crossing:markings} Markierungen",
- "es": "Este cruce tiene marcas {crossing:markings}",
- "ca": "Aquest encreuament té marques {crossing:markings}",
- "cs": "Tento přechod má značení {crossing:markings}",
- "it": "Questo attraversamento ha segnaletica {crossing:markings}"
- },
- "freeform": {
- "key": "crossing:markings",
- "type": "string",
- "addExtraTags": [
- "fixme=Free-form value used in MapComplete for crossing:markings"
- ]
- },
- "multiAnswer": true,
"condition": "highway=crossing",
+ "multiAnswer": true,
"invalidValues": "crossing:markings=yes"
},
{
@@ -494,7 +494,6 @@
"cs": "Je tento přechod i pro kola?",
"it": "Questo attraversamento è anche per biciclette?"
},
- "condition": "highway=crossing",
"mappings": [
{
"if": "bicycle=yes",
@@ -524,7 +523,8 @@
"it": "Un ciclista non può utilizzare questo attraversamento"
}
}
- ]
+ ],
+ "condition": "highway=crossing"
},
{
"id": "crossing-has-island",
@@ -538,7 +538,6 @@
"cs": "Má tento přechod uprostřed ostrůvek?",
"it": "Questo attraversamento ha un'isola nel mezzo?"
},
- "condition": "highway=crossing",
"mappings": [
{
"if": "crossing:island=yes",
@@ -566,7 +565,8 @@
"it": "Questo attraversamento non ha un'isola nel mezzo"
}
}
- ]
+ ],
+ "condition": "highway=crossing"
},
{
"id": "crossing-tactile",
@@ -580,7 +580,6 @@
"cs": "Má tento přechod hmatovou dlažbu?",
"it": "Questo attraversamento ha pavimentazione tattile?"
},
- "condition": "highway=crossing",
"mappings": [
{
"if": "tactile_paving=yes",
@@ -631,7 +630,8 @@
"cs": "Přechod má hmatovou dlažbu, ale jen na jedné straně"
}
}
- ]
+ ],
+ "condition": "highway=crossing"
},
{
"id": "crossing-button",
@@ -645,12 +645,6 @@
"cs": "Má tento semafor tlačítko pro vyžádání zeleného světla?",
"it": "Questo semaforo ha un pulsante per richiedere il verde?"
},
- "condition": {
- "or": [
- "highway=traffic_signals",
- "crossing=traffic_signals"
- ]
- },
"mappings": [
{
"if": "button_operated=yes",
@@ -678,7 +672,13 @@
"it": "Questo semaforo non ha un pulsante per richiedere il verde"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "highway=traffic_signals",
+ "crossing=traffic_signals"
+ ]
+ }
},
{
"id": "crossing-sound",
@@ -692,7 +692,6 @@
"es": "¿Este semáforo tiene señales sonoras para ayudar a cruzar?",
"it": "Questo semaforo ha segnali sonori per aiutare l'attraversamento?"
},
- "condition": "crossing=traffic_signals",
"mappings": [
{
"if": "traffic_signals:sound=yes",
@@ -746,7 +745,8 @@
"it": "Questo semaforo ha un segnale sonoro per indicare che è sicuro attraversare, ma nessun segnale per aiutare a localizzare il palo."
}
}
- ]
+ ],
+ "condition": "crossing=traffic_signals"
},
{
"id": "crossing-vibration",
@@ -761,12 +761,6 @@
"es": "¿Este semáforo tiene señales de vibración para ayudar a cruzar? (normalmente ubicado en la parte inferior del botón de cruce)",
"it": "Questo semaforo ha segnali di vibrazione per aiutare l'attraversamento? (solitamente situati nella parte inferiore del pulsante di attraversamento)"
},
- "condition": {
- "and": [
- "crossing=traffic_signals",
- "button_operated=yes"
- ]
- },
"mappings": [
{
"if": "traffic_signals:vibration=yes",
@@ -798,7 +792,13 @@
"it": "Il pulsante di questo semaforo non ha un segnale di vibrazione per indicare che è sicuro attraversare."
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "crossing=traffic_signals",
+ "button_operated=yes"
+ ]
+ }
},
{
"id": "crossing-arrow",
@@ -810,7 +810,6 @@
"es": "¿Este semáforo tiene una flecha que apunta en la dirección del cruce?",
"it": "Questo semaforo ha una freccia che indica la direzione dell'attraversamento?"
},
- "condition": "crossing=traffic_signals",
"mappings": [
{
"if": "traffic_signals:arrow=yes",
@@ -834,7 +833,8 @@
"it": "Questo semaforo non ha una freccia che indica la direzione dell'attraversamento."
}
}
- ]
+ ],
+ "condition": "crossing=traffic_signals"
},
{
"id": "crossing-minimap",
@@ -846,7 +846,6 @@
"es": "¿Este semáforo tiene un mapa táctil que muestra el diseño del cruce?",
"it": "Questo semaforo ha una mappa tattile che mostra la disposizione dell'attraversamento?"
},
- "condition": "crossing=traffic_signals",
"mappings": [
{
"if": "traffic_signals:minimap=yes",
@@ -876,7 +875,8 @@
"it": "Questo semaforo non ha una mappa tattile che mostra la disposizione dell'attraversamento."
}
}
- ]
+ ],
+ "condition": "crossing=traffic_signals"
},
{
"id": "crossing-right-turn-through-red",
@@ -890,7 +890,6 @@
"cs": "Může cyklista odbočit doprava, když svítí červená?",
"it": "Un ciclista può svoltare a destra quando il semaforo è rosso?"
},
- "condition": "highway=traffic_signals",
"mappings": [
{
"if": "red_turn:right:bicycle=yes",
@@ -937,7 +936,8 @@
"it": "Un ciclista non può svoltare a destra se il semaforo è rosso"
}
}
- ]
+ ],
+ "condition": "highway=traffic_signals"
},
{
"id": "crossing-continue-through-red",
@@ -951,7 +951,6 @@
"cs": "Může cyklista jet rovně, když svítí červená?",
"it": "Un ciclista può proseguire dritto quando il semaforo è rosso?"
},
- "condition": "highway=traffic_signals",
"mappings": [
{
"if": "red_turn:straight:bicycle=yes",
@@ -995,7 +994,8 @@
"it": "Un ciclista non può proseguire dritto se il semaforo è rosso"
}
}
- ]
+ ],
+ "condition": "highway=traffic_signals"
}
],
"filter": [
diff --git a/assets/layers/cycle_highways/cycle_highways.json b/assets/layers/cycle_highways/cycle_highways.json
index d2651733a..990e652e6 100644
--- a/assets/layers/cycle_highways/cycle_highways.json
+++ b/assets/layers/cycle_highways/cycle_highways.json
@@ -58,24 +58,25 @@
],
"tagRenderings": [
{
- "render": "The name is {name}",
+ "id": "cycle_highways-name",
"question": "What is the name of this cycle highway?",
+ "render": "The name is {name}",
"freeform": {
"key": "name"
- },
- "id": "cycle_highways-name"
+ }
},
{
- "render": "Referentienummer is {ref}",
+ "id": "cycle_highways-ref",
"question": "What is the reference number of this cycle highway?",
+ "render": "Referentienummer is {ref}",
"freeform": {
"key": "ref"
- },
- "id": "cycle_highways-ref"
+ }
},
{
- "render": "The current state of this link is {state}",
+ "id": "cycle_highways-state",
"question": "What is the state of this link?",
+ "render": "The current state of this link is {state}",
"freeform": {
"key": "state"
},
@@ -115,8 +116,7 @@
"if": "state=",
"then": "This link is operational and signposted"
}
- ],
- "id": "cycle_highways-state"
+ ]
},
{
"id": "cycle-highway-length",
diff --git a/assets/layers/cyclestreets/cyclestreets.json b/assets/layers/cyclestreets/cyclestreets.json
index ab197b603..29fe5c383 100644
--- a/assets/layers/cyclestreets/cyclestreets.json
+++ b/assets/layers/cyclestreets/cyclestreets.json
@@ -318,12 +318,6 @@
},
{
"id": "supplementary_sign",
- "condition": {
- "and": [
- "bicycle_road=yes",
- "_country=de"
- ]
- },
"question": {
"en": "What sign does this bicycle road have?",
"de": "Welches Schild hat diese Fahrradstraße?",
@@ -473,7 +467,13 @@
"motor_vehicle="
]
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "bicycle_road=yes",
+ "_country=de"
+ ]
+ }
},
{
"id": "future_cyclestreet",
@@ -509,11 +509,11 @@
"pl": "Ta ulica stanie się ulicą rowerową {cyclestreet:start_date}",
"ko": "이 도로는 {cyclestreet:start_date}에 자전거 전용 도로로 전환될 예정입니다"
},
- "condition": "proposed:cyclestreet=yes",
"freeform": {
"type": "date",
"key": "cyclestreet:start_date"
- }
+ },
+ "condition": "proposed:cyclestreet=yes"
}
],
"allowMove": false,
diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
index 7b9f68663..8c80a67f4 100644
--- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json
+++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
@@ -293,6 +293,7 @@
"tagRenderings": [
"images",
{
+ "id": "Cycleway type for a road",
"question": {
"en": "What kind of cycleway is here?",
"nl": "Wat voor fietspad is hier?",
@@ -303,14 +304,6 @@
"cs": "Co je to za cyklostezku?",
"it": "Che tipo di pista ciclabile c'è qui?"
},
- "condition": {
- "and": [
- "highway!=cycleway",
- "highway!=path",
- "highway!=footway",
- "highway!=pedestrian"
- ]
- },
"mappings": [
{
"if": "cycleway=shared_lane",
@@ -397,9 +390,17 @@
]
}
],
- "id": "Cycleway type for a road"
+ "condition": {
+ "and": [
+ "highway!=cycleway",
+ "highway!=path",
+ "highway!=footway",
+ "highway!=pedestrian"
+ ]
+ }
},
{
+ "id": "is lit?",
"question": {
"en": "Is this street lit?",
"nl": "Is deze weg verlicht?",
@@ -473,8 +474,7 @@
"it": "Questa strada è illuminata 24/7"
}
}
- ],
- "id": "is lit?"
+ ]
},
{
"id": "is_cyclestreet_road",
@@ -503,6 +503,19 @@
},
"cyclestreets.supplementary_sign",
{
+ "id": "Maxspeed (for road)",
+ "question": {
+ "en": "What is the maximum speed in this street?",
+ "nl": "Wat is de maximumsnelheid in deze straat?",
+ "de": "Was ist die Höchstgeschwindigkeit auf dieser Straße?",
+ "id": "Berapa kecepatan maksimum di jalan ini?",
+ "es": "¿Cuál es la velocidad máxima en esta calle?",
+ "fr": "Quelle est la vitesse maximum dans cette rue ?",
+ "ca": "Quina és la velocitat màxima a aquest carrer?",
+ "pl": "Jaka jest maksymalna prędkość na tej ulicy?",
+ "cs": "Jaká je maximální rychlost na této silnici?",
+ "it": "Qual è la velocità massima in questa strada?"
+ },
"render": {
"en": "The maximum speed on this road is {maxspeed} km/h",
"nl": "De maximumsnelheid op deze weg is {maxspeed} km/u",
@@ -519,14 +532,6 @@
"key": "maxspeed",
"type": "nat"
},
- "condition": {
- "and": [
- "highway!=cycleway",
- "highway!=path",
- "highway!=footway",
- "highway!=pedestrian"
- ]
- },
"mappings": [
{
"if": "maxspeed=20",
@@ -601,21 +606,27 @@
}
}
],
- "question": {
- "en": "What is the maximum speed in this street?",
- "nl": "Wat is de maximumsnelheid in deze straat?",
- "de": "Was ist die Höchstgeschwindigkeit auf dieser Straße?",
- "id": "Berapa kecepatan maksimum di jalan ini?",
- "es": "¿Cuál es la velocidad máxima en esta calle?",
- "fr": "Quelle est la vitesse maximum dans cette rue ?",
- "ca": "Quina és la velocitat màxima a aquest carrer?",
- "pl": "Jaka jest maksymalna prędkość na tej ulicy?",
- "cs": "Jaká je maximální rychlost na této silnici?",
- "it": "Qual è la velocità massima in questa strada?"
- },
- "id": "Maxspeed (for road)"
+ "condition": {
+ "and": [
+ "highway!=cycleway",
+ "highway!=path",
+ "highway!=footway",
+ "highway!=pedestrian"
+ ]
+ }
},
{
+ "id": "Cycleway:surface",
+ "question": {
+ "en": "What is the surface of the cycleway made from?",
+ "nl": "Waaruit is het oppervlak van het fietspad van gemaakt?",
+ "de": "Was ist der Belag dieses Radwegs?",
+ "es": "¿De qué material está hecha la superficie del carril bici?",
+ "fr": "De quoi est faite la surface de la piste cyclable ?",
+ "ca": "De quina superfície està fet aquesta via ciclista?",
+ "cs": "Jaký je povrch cyklostezky?",
+ "it": "Di che materiale è fatta la superficie della pista ciclabile?"
+ },
"render": {
"en": "This cyleway is made of {cycleway:surface}",
"nl": "Dit fietspad is gemaakt van {cycleway:surface}",
@@ -629,13 +640,6 @@
"freeform": {
"key": "cycleway:surface"
},
- "condition": {
- "or": [
- "cycleway=shared_lane",
- "cycleway=lane",
- "cycleway=track"
- ]
- },
"mappings": [
{
"if": "cycleway:surface=unpaved",
@@ -810,17 +814,13 @@
}
}
],
- "question": {
- "en": "What is the surface of the cycleway made from?",
- "nl": "Waaruit is het oppervlak van het fietspad van gemaakt?",
- "de": "Was ist der Belag dieses Radwegs?",
- "es": "¿De qué material está hecha la superficie del carril bici?",
- "fr": "De quoi est faite la surface de la piste cyclable ?",
- "ca": "De quina superfície està fet aquesta via ciclista?",
- "cs": "Jaký je povrch cyklostezky?",
- "it": "Di che materiale è fatta la superficie della pista ciclabile?"
- },
- "id": "Cycleway:surface"
+ "condition": {
+ "or": [
+ "cycleway=shared_lane",
+ "cycleway=lane",
+ "cycleway=track"
+ ]
+ }
},
{
"id": "incline",
@@ -882,6 +882,7 @@
]
},
{
+ "id": "Cycleway:smoothness",
"question": {
"en": "What is the smoothness of this cycleway?",
"nl": "Wat is de kwaliteit van dit fietspad?",
@@ -892,13 +893,6 @@
"cs": "Jaká je hladkost této cyklostezky?",
"it": "Qual è la scorrevolezza di questa pista ciclabile?"
},
- "condition": {
- "or": [
- "cycleway=shared_lane",
- "cycleway=lane",
- "cycleway=track"
- ]
- },
"mappings": [
{
"if": "cycleway:smoothness=excellent",
@@ -1005,9 +999,27 @@
}
}
],
- "id": "Cycleway:smoothness"
+ "condition": {
+ "or": [
+ "cycleway=shared_lane",
+ "cycleway=lane",
+ "cycleway=track"
+ ]
+ }
},
{
+ "id": "Surface of the road",
+ "question": {
+ "en": "What is the surface of the street made from?",
+ "nl": "Waaruit is het oppervlak van de straat gemaakt?",
+ "de": "Was ist der Belag dieser Straße?",
+ "id": "Permukaan jalannya terbuat dari apa?",
+ "es": "¿De qué material está hecha la superficie de la calle?",
+ "fr": "De quel materiel est faite cette rue ?",
+ "ca": "De què està feta la superfície d'aquest carrer?",
+ "cs": "Z čeho je povrch ulice vyroben?",
+ "it": "Di che materiale è fatta la superficie della strada?"
+ },
"render": {
"en": "This road is made of {surface}",
"nl": "Deze weg is gemaakt van {surface}",
@@ -1206,21 +1218,10 @@
"it": "Questa strada è fatta di terreno naturale"
}
}
- ],
- "question": {
- "en": "What is the surface of the street made from?",
- "nl": "Waaruit is het oppervlak van de straat gemaakt?",
- "de": "Was ist der Belag dieser Straße?",
- "id": "Permukaan jalannya terbuat dari apa?",
- "es": "¿De qué material está hecha la superficie de la calle?",
- "fr": "De quel materiel est faite cette rue ?",
- "ca": "De què està feta la superfície d'aquest carrer?",
- "cs": "Z čeho je povrch ulice vyroben?",
- "it": "Di che materiale è fatta la superficie della strada?"
- },
- "id": "Surface of the road"
+ ]
},
{
+ "id": "Surface of the street",
"question": {
"en": "What is the smoothness of this street?",
"nl": "Wat is de kwaliteit van deze straat?",
@@ -1231,12 +1232,6 @@
"ca": "Quina és la suavitat d'aquest carrer?",
"it": "Qual è la scorrevolezza di questa strada?"
},
- "condition": {
- "or": [
- "cycleway=no",
- "highway=cycleway"
- ]
- },
"mappings": [
{
"if": "smoothness=excellent",
@@ -1349,15 +1344,34 @@
}
}
],
- "id": "Surface of the street"
+ "condition": {
+ "or": [
+ "cycleway=no",
+ "highway=cycleway"
+ ]
+ }
},
{
- "condition": {
- "and": [
- "highway!=cycleway",
- "highway!=path",
- "highway!=footway"
- ]
+ "id": "width",
+ "question": {
+ "en": "What is the carriage width of this road (in meters)?",
+ "nl": "Hoe breed is de rijbaan in deze straat (in meters)?",
+ "de": "Wie groß ist die Fahrbahnbreite dieser Straße (in Metern)?",
+ "fr": "Quelle est la largeur de cette chaussée (en mètres) ?",
+ "ca": "Quina és l'amplada dels carrils d'aquesta carretera (en metres)?",
+ "cs": "Jaká je šířka vozovky této silnice (v metrech)?",
+ "es": "¿Cuál es el ancho de la calzada de esta carretera (en metros)?",
+ "it": "Qual è la larghezza della carreggiata di questa strada (in metri)?"
+ },
+ "questionHint": {
+ "en": "This is measured curb to curb and thus includes the width of parallell parking lanes",
+ "nl": "Dit is gemeten van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook",
+ "de": "Diese wird von Bordstein zu Bordstein gemessen und schließt daher die Breite von parallelen Parkspuren ein",
+ "fr": "Elle est mesurée d'une bordure à l'autre et inclut donc la largeur des voies de stationnement parallèles",
+ "ca": "Això es mesura de vorera a vorera i, per tant, inclou l'amplada dels aparcaments en línia",
+ "cs": "Jedná se o měření od krajnice ke krajnici a to včetně šířky paralelních parkovacích pruhů",
+ "es": "Esto se mide de bordillo a bordillo e incluye el ancho de los carriles de aparcamiento paralelos",
+ "it": "Questa è misurata da cordolo a cordolo e quindi include la larghezza delle corsie di parcheggio parallele"
},
"render": {
"en": "The carriage width of this road is {width}m",
@@ -1377,26 +1391,12 @@
"background": "map"
}
},
- "question": {
- "en": "What is the carriage width of this road (in meters)?",
- "nl": "Hoe breed is de rijbaan in deze straat (in meters)?",
- "de": "Wie groß ist die Fahrbahnbreite dieser Straße (in Metern)?",
- "fr": "Quelle est la largeur de cette chaussée (en mètres) ?",
- "ca": "Quina és l'amplada dels carrils d'aquesta carretera (en metres)?",
- "cs": "Jaká je šířka vozovky této silnice (v metrech)?",
- "es": "¿Cuál es el ancho de la calzada de esta carretera (en metros)?",
- "it": "Qual è la larghezza della carreggiata di questa strada (in metri)?"
- },
- "id": "width",
- "questionHint": {
- "en": "This is measured curb to curb and thus includes the width of parallell parking lanes",
- "nl": "Dit is gemeten van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook",
- "de": "Diese wird von Bordstein zu Bordstein gemessen und schließt daher die Breite von parallelen Parkspuren ein",
- "fr": "Elle est mesurée d'une bordure à l'autre et inclut donc la largeur des voies de stationnement parallèles",
- "ca": "Això es mesura de vorera a vorera i, per tant, inclou l'amplada dels aparcaments en línia",
- "cs": "Jedná se o měření od krajnice ke krajnici a to včetně šířky paralelních parkovacích pruhů",
- "es": "Esto se mide de bordillo a bordillo e incluye el ancho de los carriles de aparcamiento paralelos",
- "it": "Questa è misurata da cordolo a cordolo e quindi include la larghezza delle corsie di parcheggio parallele"
+ "condition": {
+ "and": [
+ "highway!=cycleway",
+ "highway!=path",
+ "highway!=footway"
+ ]
}
},
{
@@ -1412,21 +1412,6 @@
"cs": "Jakou dopravní značku má tato cyklostezka?",
"it": "Quale segnale stradale ha questa pista ciclabile?"
},
- "condition": {
- "and": [
- {
- "or": [
- "cycleway=lane",
- "cycleway=track"
- ]
- },
- {
- "or": [
- "_country=be"
- ]
- }
- ]
- },
"mappings": [
{
"if": "cycleway:traffic_sign=BE:D7",
@@ -1526,7 +1511,22 @@
"it": "Nessun segnale stradale presente"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "cycleway=lane",
+ "cycleway=track"
+ ]
+ },
+ {
+ "or": [
+ "_country=be"
+ ]
+ }
+ ]
+ }
},
{
"id": "cycleway-traffic-signs",
@@ -1540,22 +1540,6 @@
"cs": "Jakou dopravní značku má tato cyklostezka?",
"it": "Quale segnale stradale ha questa pista ciclabile?"
},
- "condition": {
- "and": [
- {
- "or": [
- "highway=cycleway",
- "highway=path"
- ]
- },
- {
- "or": [
- "_country=be",
- "_country=nl"
- ]
- }
- ]
- },
"mappings": [
{
"if": "traffic_sign=BE:D7",
@@ -1731,7 +1715,23 @@
"it": "Nessun segnale stradale presente"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "highway=cycleway",
+ "highway=path"
+ ]
+ },
+ {
+ "or": [
+ "_country=be",
+ "_country=nl"
+ ]
+ }
+ ]
+ }
},
{
"id": "cycleway-traffic-signs-supplementary",
@@ -1745,12 +1745,6 @@
"ca": "El senyal de trànsit D7 (
) té un senyal suplementari?",
"it": "Il segnale stradale D7 (
) ha un segnale supplementare?"
},
- "condition": {
- "or": [
- "cycleway:traffic_sign=BE:D7",
- "cycleway:traffic_sign~BE:D7;.*"
- ]
- },
"mappings": [
{
"if": "cycleway:traffic_sign=BE:D7;BE:M6",
@@ -1893,18 +1887,16 @@
"it": "Nessun segnale stradale supplementare presente"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "cycleway:traffic_sign=BE:D7",
+ "cycleway:traffic_sign~BE:D7;.*"
+ ]
+ }
},
{
- "render": {
- "en": "The buffer besides this cycleway is {cycleway:buffer} m",
- "nl": "De schrikafstand van dit fietspad is {cycleway:buffer} m",
- "de": "Der Sicherheitsabstand zu diesem Radweg beträgt {cycleway:buffer} m",
- "cs": "Nárazník vedle této cyklostezky je {cycleway:buffer} m",
- "es": "El espacio junto a este carril bici es de {cycleway:buffer} m",
- "ca": "L'espai junt a aquest carril bici és de {cycleway:buffer} m",
- "it": "La zona cuscinetto accanto a questa pista ciclabile è di {cycleway:buffer} m"
- },
+ "id": "cycleways_and_roads-cycleway:buffer",
"question": {
"en": "How wide is the gap between the cycleway and the road?",
"nl": "Hoe breed is de ruimte tussen het fietspad en de weg?",
@@ -1915,11 +1907,14 @@
"cs": "Jak široká je mezera mezi cyklostezkou a silnicí?",
"it": "Quanto è ampio lo spazio tra la pista ciclabile e la strada?"
},
- "condition": {
- "or": [
- "cycleway=track",
- "cycleway=lane"
- ]
+ "render": {
+ "en": "The buffer besides this cycleway is {cycleway:buffer} m",
+ "nl": "De schrikafstand van dit fietspad is {cycleway:buffer} m",
+ "de": "Der Sicherheitsabstand zu diesem Radweg beträgt {cycleway:buffer} m",
+ "cs": "Nárazník vedle této cyklostezky je {cycleway:buffer} m",
+ "es": "El espacio junto a este carril bici es de {cycleway:buffer} m",
+ "ca": "L'espai junt a aquest carril bici és de {cycleway:buffer} m",
+ "it": "La zona cuscinetto accanto a questa pista ciclabile è di {cycleway:buffer} m"
},
"freeform": {
"key": "cycleway:buffer",
@@ -1929,7 +1924,12 @@
"zoom": 20
}
},
- "id": "cycleways_and_roads-cycleway:buffer"
+ "condition": {
+ "or": [
+ "cycleway=track",
+ "cycleway=lane"
+ ]
+ }
},
{
"id": "cyclelan-segregation",
@@ -1944,12 +1944,6 @@
"cs": "Jak je tato cyklostezka oddělena od silnice?",
"it": "Come è separata questa pista ciclabile dalla strada?"
},
- "condition": {
- "or": [
- "cycleway=track",
- "cycleway=lane"
- ]
- },
"mappings": [
{
"if": "cycleway:separation=dashed_line",
@@ -2007,7 +2001,13 @@
"it": "Questa pista ciclabile è separata da un cordolo"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "cycleway=track",
+ "cycleway=lane"
+ ]
+ }
},
{
"id": "cycleway-segregation",
@@ -2022,12 +2022,6 @@
"cs": "Jak je tato cyklostezka oddělena od silnice?",
"it": "Come è separata questa pista ciclabile dalla strada?"
},
- "condition": {
- "or": [
- "highway=cycleway",
- "highway=path"
- ]
- },
"mappings": [
{
"if": "separation=dashed_line",
@@ -2085,7 +2079,13 @@
"it": "Questa pista ciclabile è separata da un cordolo"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "highway=cycleway",
+ "highway=path"
+ ]
+ }
}
],
"allowMove": false,
diff --git a/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json b/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json
index d5297e8b8..708f0f107 100644
--- a/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json
+++ b/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json
@@ -84,6 +84,7 @@
"tagRenderings": [
"images",
{
+ "id": "type",
"question": {
"en": "What kind of components does this waiting aid have?",
"de": "Aus welchen Bestandteilen besteht diese Wartehilfe?",
@@ -92,8 +93,6 @@
"it": "Che tipo di componenti ha questo supporto?",
"cs": "Jaký druh komponent má tato čekací pomůcka?"
},
- "id": "type",
- "multiAnswer": true,
"mappings": [
{
"if": "footrest=yes",
@@ -119,9 +118,11 @@
},
"ifnot": "handrest="
}
- ]
+ ],
+ "multiAnswer": true
},
{
+ "id": "side",
"question": {
"en": "On what side of the road is this located?",
"de": "Auf welcher Straßenseite befindet sich dies?",
@@ -130,7 +131,6 @@
"it": "Su quale lato della strada si trova?",
"cs": "Na které straně cesty je to umístěno?"
},
- "id": "side",
"mappings": [
{
"if": "side=left",
@@ -168,8 +168,15 @@
]
},
{
- "condition": "direction~*",
"id": "direction",
+ "render": {
+ "en": "This waiting aid can be used when going in {direction} direction",
+ "de": "Diese Wartehilfe kann in Fahrtrichtung {direction} benutzt werden",
+ "es": "Esta ayuda a la espera puede utilizarse cuando se va en dirección {direction}",
+ "ca": "Aquesta ajuda a l'espera es pot utilitzar quan es va en direcció {direction}",
+ "it": "Questo supporto può essere utilizzato quando si procede in direzione {direction}",
+ "cs": "Tuto čekací pomůcku lze použít při jízdě ve směru {direction}"
+ },
"mappings": [
{
"if": "direction=forward",
@@ -194,14 +201,7 @@
}
}
],
- "render": {
- "en": "This waiting aid can be used when going in {direction} direction",
- "de": "Diese Wartehilfe kann in Fahrtrichtung {direction} benutzt werden",
- "es": "Esta ayuda a la espera puede utilizarse cuando se va en dirección {direction}",
- "ca": "Aquesta ajuda a l'espera es pot utilitzar quan es va en direcció {direction}",
- "it": "Questo supporto può essere utilizzato quando si procede in direzione {direction}",
- "cs": "Tuto čekací pomůcku lze použít při jízdě ve směru {direction}"
- }
+ "condition": "direction~*"
}
],
"deletion": {
diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index 2d266dd04..eecf15cac 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -201,6 +201,7 @@
]
},
{
+ "id": "defibrillator-access",
"question": {
"en": "Is this defibrillator freely accessible?",
"ca": "Està el desfibril·lador accessible lliurement?",
@@ -317,10 +318,10 @@
"cs": "Nepřístupné, případně pouze pro profesionální použití"
}
}
- ],
- "id": "defibrillator-access"
+ ]
},
{
+ "id": "defibrillator-level",
"question": {
"en": "On which floor is this defibrillator located?",
"ca": "A quina planta està el ubicat el desfibril·lador?",
@@ -333,15 +334,6 @@
"pl": "Na którym piętrze jest ten defibrylator?",
"cs": "Ve kterém patře je tento defibrilátor umístěn?"
},
- "condition": {
- "and": [
- "indoor=yes"
- ]
- },
- "freeform": {
- "key": "level",
- "type": "int"
- },
"render": {
"en": "This defibrillator is on floor {level}",
"ca": "Aquest desfibril·lador és a la planta {level}",
@@ -354,6 +346,10 @@
"pl": "Ten defibrylator jest na piętrze {level}",
"cs": "Tento defibrilátor je na {level} patře"
},
+ "freeform": {
+ "key": "level",
+ "type": "int"
+ },
"mappings": [
{
"if": "level=0",
@@ -386,21 +382,14 @@
}
}
],
- "id": "defibrillator-level"
+ "condition": {
+ "and": [
+ "indoor=yes"
+ ]
+ }
},
{
- "render": {
- "nl": "Meer informatie over de locatie (in de lokale taal):
{defibrillator:location}",
- "en": "Extra information about the location (in the local language):
{defibrillator:location}",
- "fr": "Informations supplémentaires à propos de l'emplacement (dans la langue locale) :
{defibrillator:location}",
- "it": "Informazioni aggiuntive sulla posizione (nella lingua locale):
{defibrillator:location}",
- "de": "Zusätzliche Informationen über den Standort (in der Landessprache):
{defibrillator:location}",
- "sl": "Dodatne informacije o lokaciji (v lokalnem jeziku):
{defibrillator:location}",
- "es": "Información adicional sobre la ubicación (en el idioma local):
{defibrillator:location}",
- "ca": "Informació extra sobre la localització (en la llengua local):
{defibrillator:location}",
- "pl": "Dodatkowe informacje o lokalizacji (w lokalnym języku):
{defibrillator:location}",
- "cs": "Další informace o místě (v místním jazyce):
{defibrillator:location}"
- },
+ "id": "defibrillator-defibrillator:location",
"question": {
"en": "Please give some explanation on where the defibrillator can be found (in the local language)",
"ca": "Dóna detalls d'on es pot trobar el desfibril·lador",
@@ -413,25 +402,25 @@
"pl": "Proszę podaj opis gdzie znajduje się defibrylator (w lokalnym języku)",
"cs": "Uveďte prosím nějaké vysvětlení, kde lze defibrilátor nalézt (v místním jazyce)"
},
+ "render": {
+ "nl": "Meer informatie over de locatie (in de lokale taal):
{defibrillator:location}",
+ "en": "Extra information about the location (in the local language):
{defibrillator:location}",
+ "fr": "Informations supplémentaires à propos de l'emplacement (dans la langue locale) :
{defibrillator:location}",
+ "it": "Informazioni aggiuntive sulla posizione (nella lingua locale):
{defibrillator:location}",
+ "de": "Zusätzliche Informationen über den Standort (in der Landessprache):
{defibrillator:location}",
+ "sl": "Dodatne informacije o lokaciji (v lokalnem jeziku):
{defibrillator:location}",
+ "es": "Información adicional sobre la ubicación (en el idioma local):
{defibrillator:location}",
+ "ca": "Informació extra sobre la localització (en la llengua local):
{defibrillator:location}",
+ "pl": "Dodatkowe informacje o lokalizacji (w lokalnym języku):
{defibrillator:location}",
+ "cs": "Další informace o místě (v místním jazyce):
{defibrillator:location}"
+ },
"freeform": {
"type": "text",
"key": "defibrillator:location"
- },
- "id": "defibrillator-defibrillator:location"
+ }
},
{
- "render": {
- "nl": "Meer informatie over de locatie (in het Engels):
{defibrillator:location:en}",
- "en": "Extra information about the location (in English):
{defibrillator:location:en}",
- "fr": "Informations supplémentaires à propos de l'emplacement (en anglais) :
{defibrillator:location:en}",
- "it": "Informazioni aggiuntive sulla posizione (in inglese):
{defibrillator:location:en}",
- "de": "Zusätzliche Informationen über den Standort (auf Englisch):
{defibrillator:location:en}",
- "sl": "Dodatne informacije o lokaciji (v Angleščini):
{defibrillator:location:en}",
- "es": "Información adicional sobre la ubicación (en inglés):
{defibrillator:location:en}",
- "ca": "Informació addicional sobre la ubicació (en anglès):
{defibrillator:location:en}",
- "pl": "Dodatkowe informacje o lokalizacji (po angielsku):
{defibrillator:location:en}",
- "cs": "Další informace o místě (v angličtině):
{defibrillator:location:en}"
- },
+ "id": "defibrillator-defibrillator:location:en",
"question": {
"en": "Please give some explanation on where the defibrillator can be found (in English)",
"ca": "Dona detalls d'on es pot trobar el desfibril·lador (en anglès)",
@@ -444,25 +433,25 @@
"pl": "Proszę podaj opis gdzie znajduje się defibrylator (po angielsku)",
"cs": "Uveďte prosím nějaké vysvětlení, kde lze defibrilátor nalézt (v angličtině)"
},
+ "render": {
+ "nl": "Meer informatie over de locatie (in het Engels):
{defibrillator:location:en}",
+ "en": "Extra information about the location (in English):
{defibrillator:location:en}",
+ "fr": "Informations supplémentaires à propos de l'emplacement (en anglais) :
{defibrillator:location:en}",
+ "it": "Informazioni aggiuntive sulla posizione (in inglese):
{defibrillator:location:en}",
+ "de": "Zusätzliche Informationen über den Standort (auf Englisch):
{defibrillator:location:en}",
+ "sl": "Dodatne informacije o lokaciji (v Angleščini):
{defibrillator:location:en}",
+ "es": "Información adicional sobre la ubicación (en inglés):
{defibrillator:location:en}",
+ "ca": "Informació addicional sobre la ubicació (en anglès):
{defibrillator:location:en}",
+ "pl": "Dodatkowe informacje o lokalizacji (po angielsku):
{defibrillator:location:en}",
+ "cs": "Další informace o místě (v angličtině):
{defibrillator:location:en}"
+ },
"freeform": {
"type": "text",
"key": "defibrillator:location:en"
- },
- "id": "defibrillator-defibrillator:location:en"
+ }
},
{
- "render": {
- "nl": "Meer informatie over de locatie (in het Frans):
{defibrillator:location:fr}",
- "en": "Extra information about the location (in French):
{defibrillator:location:fr}",
- "fr": "Informations supplémentaires à propos de l'emplacement (en Français) :
{defibrillator:location:fr}",
- "it": "Informazioni aggiuntive sulla posizione (in francese):
{defibrillator:location:fr}",
- "de": "Zusätzliche Informationen zum Standort (auf Französisch):
{defibrillator:location:fr}",
- "sl": "Dodatne informacije o lokaciji (v Francoščini):
{defibrillator:location:fr}",
- "es": "Información adicional sobre la ubicación (en francés):
{defibrillator:location:fr}",
- "ca": "Informació addicional sobre la ubicació (en francès):
{defibrillator:location:fr}",
- "pl": "Dodatkowe informacje o lokalizacji (po francusku):
{defibrillator:location:fr}",
- "cs": "Další informace o místě (ve francouzštině):
{defibrillator:location:fr}"
- },
+ "id": "defibrillator-defibrillator:location:fr",
"question": {
"en": "Please give some explanation on where the defibrillator can be found (in French)",
"ca": "Dóna detalls d'on es pot trobar el desfibril·lador (en francés)",
@@ -475,6 +464,18 @@
"pl": "Proszę podaj opis gdzie znajduje się defibrylator (po francusku)",
"cs": "Uveďte prosím nějaké vysvětlení, kde lze defibrilátor nalézt (ve francouzštině)"
},
+ "render": {
+ "nl": "Meer informatie over de locatie (in het Frans):
{defibrillator:location:fr}",
+ "en": "Extra information about the location (in French):
{defibrillator:location:fr}",
+ "fr": "Informations supplémentaires à propos de l'emplacement (en Français) :
{defibrillator:location:fr}",
+ "it": "Informazioni aggiuntive sulla posizione (in francese):
{defibrillator:location:fr}",
+ "de": "Zusätzliche Informationen zum Standort (auf Französisch):
{defibrillator:location:fr}",
+ "sl": "Dodatne informacije o lokaciji (v Francoščini):
{defibrillator:location:fr}",
+ "es": "Información adicional sobre la ubicación (en francés):
{defibrillator:location:fr}",
+ "ca": "Informació addicional sobre la ubicació (en francès):
{defibrillator:location:fr}",
+ "pl": "Dodatkowe informacje o lokalizacji (po francusku):
{defibrillator:location:fr}",
+ "cs": "Další informace o místě (ve francouzštině):
{defibrillator:location:fr}"
+ },
"freeform": {
"type": "text",
"key": "defibrillator:location:fr"
@@ -484,11 +485,22 @@
"_country=be",
"defibrillator:location:fr~*"
]
- },
- "id": "defibrillator-defibrillator:location:fr"
+ }
},
"wheelchair-access",
{
+ "id": "defibrillator-ref",
+ "question": {
+ "en": "What is the official identification number of the device? (if visible on device)",
+ "nl": "Wat is het officieel identificatienummer van het toestel? (indien zichtbaar op toestel)",
+ "fr": "Quel est le numéro d'identification officiel de ce dispositif ? (si il est visible sur le dispositif)",
+ "it": "Qual è il numero di identificazione ufficiale del dispositivo? (se visibile sul dispositivo)",
+ "de": "Wie lautet die offizielle Identifikationsnummer des Geräts? (falls am Gerät sichtbar)",
+ "sl": "Kakšna je uradna identifikacijska številka te naprave? (če je vidna na napravi)",
+ "es": "¿Cuál es el número de identificación oficial del dispositivo? (si es visible en el dispositivo)",
+ "ca": "Quin és el número d'identificació oficial del dispositiu? (si està visible al dispositiu)",
+ "cs": "Jaké je oficiální identifikační číslo zařízení? (pokud je na zařízení vidět)"
+ },
"render": {
"nl": "Officieel identificatienummer van het toestel: {ref}",
"en": "Official identification number of the device: {ref}",
@@ -501,35 +513,13 @@
"pl": "Oficjalny numer identyfikacyjny urządzenia: {ref}",
"cs": "Oficiální identifikační číslo zařízení: {ref}"
},
- "question": {
- "en": "What is the official identification number of the device? (if visible on device)",
- "nl": "Wat is het officieel identificatienummer van het toestel? (indien zichtbaar op toestel)",
- "fr": "Quel est le numéro d'identification officiel de ce dispositif ? (si il est visible sur le dispositif)",
- "it": "Qual è il numero di identificazione ufficiale del dispositivo? (se visibile sul dispositivo)",
- "de": "Wie lautet die offizielle Identifikationsnummer des Geräts? (falls am Gerät sichtbar)",
- "sl": "Kakšna je uradna identifikacijska številka te naprave? (če je vidna na napravi)",
- "es": "¿Cuál es el número de identificación oficial del dispositivo? (si es visible en el dispositivo)",
- "ca": "Quin és el número d'identificació oficial del dispositiu? (si està visible al dispositiu)",
- "cs": "Jaké je oficiální identifikační číslo zařízení? (pokud je na zařízení vidět)"
- },
"freeform": {
"type": "text",
"key": "ref"
- },
- "id": "defibrillator-ref"
+ }
},
{
- "render": {
- "en": "Email for questions about this defibrillator: {email}",
- "nl": "Email voor vragen over deze defibrillator: {email}",
- "fr": "Adresse électronique pour des questions à propos de ce défibrillateur : {email}",
- "it": "Email per domande su questo defibrillatore: {email}",
- "de": "E-Mail für Fragen zu diesem Defibrillator: {email}",
- "sl": "Email naslov za vprašanja o tem defibrilatorju: {email}",
- "es": "Correo electrónico para preguntas sobre este desfibrilador: {email}",
- "ca": "Correu electrònic per a preguntes sobre aquest desfibrilador: {email}",
- "cs": "E-mail pro dotazy týkající se tohoto defibrilátoru: {email}"
- },
+ "id": "defibrillator-email",
"question": {
"en": "What is the email for questions about this defibrillator?",
"nl": "Wat is het email-adres voor vragen over deze defibrillator",
@@ -541,25 +531,24 @@
"ca": "Quin és el correu electrònic on preguntar sobre aquest desfibril·lador?",
"cs": "Jaký je e-mail pro dotazy týkající se tohoto defibrilátoru?"
},
+ "render": {
+ "en": "Email for questions about this defibrillator: {email}",
+ "nl": "Email voor vragen over deze defibrillator: {email}",
+ "fr": "Adresse électronique pour des questions à propos de ce défibrillateur : {email}",
+ "it": "Email per domande su questo defibrillatore: {email}",
+ "de": "E-Mail für Fragen zu diesem Defibrillator: {email}",
+ "sl": "Email naslov za vprašanja o tem defibrilatorju: {email}",
+ "es": "Correo electrónico para preguntas sobre este desfibrilador: {email}",
+ "ca": "Correu electrònic per a preguntes sobre aquest desfibrilador: {email}",
+ "cs": "E-mail pro dotazy týkající se tohoto defibrilátoru: {email}"
+ },
"freeform": {
"key": "email",
"type": "email"
- },
- "id": "defibrillator-email"
+ }
},
{
- "render": {
- "en": "Telephone for questions about this defibrillator: {phone}",
- "fr": "Numéro de téléphone pour questions sur le défibrillateur : {phone}",
- "nl": "Telefoonnummer voor vragen over deze defibrillator: {phone}",
- "it": "Telefono per domande su questo defibrillatore: {phone}",
- "de": "Telefonnummer für Fragen zu diesem Defibrillator: {phone}",
- "sl": "Telefonska številka za vprašanja o tem defibrilatorju: {phone}",
- "ca": "Telèfon per a dubtes sobre aquest desfibril·lador: {phone}",
- "cs": "Telefon pro dotazy ohledně tohoto defibrilátoru: {phone}",
- "es": "Teléfono para preguntas sobre este desfibrilador: {phone}",
- "uk": "Телефонуйте з питань щодо цього дефібрилятора: {phone}"
- },
+ "id": "defibrillator-phone",
"question": {
"en": "What is the phone number for questions about this defibrillator?",
"fr": "Quel est le numéro de téléphone pour questions sur le défibrillateur ?",
@@ -572,11 +561,22 @@
"cs": "Jaké je telefonní číslo pro dotazy k tomuto defibrilátoru?",
"uk": "Який номер телефону для запитань щодо цього дефібрилятора?"
},
+ "render": {
+ "en": "Telephone for questions about this defibrillator: {phone}",
+ "fr": "Numéro de téléphone pour questions sur le défibrillateur : {phone}",
+ "nl": "Telefoonnummer voor vragen over deze defibrillator: {phone}",
+ "it": "Telefono per domande su questo defibrillatore: {phone}",
+ "de": "Telefonnummer für Fragen zu diesem Defibrillator: {phone}",
+ "sl": "Telefonska številka za vprašanja o tem defibrilatorju: {phone}",
+ "ca": "Telèfon per a dubtes sobre aquest desfibril·lador: {phone}",
+ "cs": "Telefon pro dotazy ohledně tohoto defibrilátoru: {phone}",
+ "es": "Teléfono para preguntas sobre este desfibrilador: {phone}",
+ "uk": "Телефонуйте з питань щодо цього дефібрилятора: {phone}"
+ },
"freeform": {
"key": "phone",
"type": "phone"
- },
- "id": "defibrillator-phone"
+ }
},
{
"builtin": "opening_hours_24_7",
@@ -612,6 +612,18 @@
}
},
{
+ "id": "defibrillator-description",
+ "question": {
+ "en": "Is there any useful information for users that you haven't been able to describe above? (leave blank if no)",
+ "nl": "Is er nog iets bijzonders aan deze defibrillator dat je nog niet hebt kunnen meegeven? (laat leeg indien niet)",
+ "fr": "Y a-t-il des informations utiles pour les utilisateurs que vous n'avez pas pu décrire ci-dessus ? (laisser vide sinon)",
+ "it": "Ci sono informazioni utili per gli utenti che non sei riuscito a descrivere sopra? (lascia vuoto se no)",
+ "de": "Gibt es nützliche Informationen für Benutzer, die Sie oben nicht beschreiben konnten? (leer lassen, wenn nein)",
+ "sl": "Ali imate še kakšne uporabne informacije za uporabnike, ki jih niste mogli podati zgoraj? (pustite prazno če jih nimate)",
+ "es": "¿Hay alguna información útil para los usuarios que no hayas podido describir anteriormente? (deja en blanco si no)",
+ "ca": "Hi ha informació útil per als usuaris que no hagis pogut descriure més amunt? (deixeu en blanc si no)",
+ "cs": "Existují nějaké užitečné informace pro uživatele, které jste nebyli schopni výše popsat? (nechte prázdné, pokud ne)"
+ },
"render": {
"en": "Additional information: {description}",
"nl": "Aanvullende info: {description}",
@@ -626,24 +638,13 @@
"pl": "Dodatkowe informacje: {description}",
"cs": "Další informace: {description}"
},
- "question": {
- "en": "Is there any useful information for users that you haven't been able to describe above? (leave blank if no)",
- "nl": "Is er nog iets bijzonders aan deze defibrillator dat je nog niet hebt kunnen meegeven? (laat leeg indien niet)",
- "fr": "Y a-t-il des informations utiles pour les utilisateurs que vous n'avez pas pu décrire ci-dessus ? (laisser vide sinon)",
- "it": "Ci sono informazioni utili per gli utenti che non sei riuscito a descrivere sopra? (lascia vuoto se no)",
- "de": "Gibt es nützliche Informationen für Benutzer, die Sie oben nicht beschreiben konnten? (leer lassen, wenn nein)",
- "sl": "Ali imate še kakšne uporabne informacije za uporabnike, ki jih niste mogli podati zgoraj? (pustite prazno če jih nimate)",
- "es": "¿Hay alguna información útil para los usuarios que no hayas podido describir anteriormente? (deja en blanco si no)",
- "ca": "Hi ha informació útil per als usuaris que no hagis pogut descriure més amunt? (deixeu en blanc si no)",
- "cs": "Existují nějaké užitečné informace pro uživatele, které jste nebyli schopni výše popsat? (nechte prázdné, pokud ne)"
- },
"freeform": {
"key": "description",
"type": "text"
- },
- "id": "defibrillator-description"
+ }
},
{
+ "id": "defibrillator-survey:date",
"question": {
"en": "When was this defibrillator last surveyed?",
"nl": "Wanneer is deze defibrillator het laatst gecontroleerd in OpenStreetMap?",
@@ -687,8 +688,7 @@
"cs": "Dnes zkontrolováno!"
}
}
- ],
- "id": "defibrillator-survey:date"
+ ]
},
"fixme"
],
diff --git a/assets/layers/dentist/dentist.json b/assets/layers/dentist/dentist.json
index 3c4b38de7..718580192 100644
--- a/assets/layers/dentist/dentist.json
+++ b/assets/layers/dentist/dentist.json
@@ -100,6 +100,7 @@
"contact",
"address.address",
{
+ "id": "name",
"question": {
"en": "What is the name of this dentist?",
"de": "Wie lautet der Name dieses Zahnarztes?",
@@ -124,8 +125,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "name"
+ }
}
],
"filter": [
diff --git a/assets/layers/diets/diets.json b/assets/layers/diets/diets.json
index d4789e855..d21eb5ac5 100644
--- a/assets/layers/diets/diets.json
+++ b/assets/layers/diets/diets.json
@@ -263,16 +263,6 @@
"it": "Questo luogo offre un'opzione vegana?",
"cs": "Má toto místo nabídku pro vegany?"
},
- "condition": {
- "and": [
- {
- "and": [
- "amenity!=fast_food",
- "amenity!=restaurant"
- ]
- }
- ]
- },
"mappings": [
{
"if": "diet:vegan=only",
@@ -319,11 +309,27 @@
}
}
],
+ "condition": {
+ "and": [
+ {
+ "and": [
+ "amenity!=fast_food",
+ "amenity!=restaurant"
+ ]
+ }
+ ]
+ },
"onSoftDelete": [
"diet:vegan="
]
},
{
+ "id": "vegan_food",
+ "labels": [
+ "diets_content",
+ "diets_grouped",
+ "hidden"
+ ],
"question": {
"en": "Does this business serve vegan meals?",
"nl": "Heeft deze eetgelegenheid een veganistische optie?",
@@ -334,21 +340,6 @@
"cs": "Podává tento podnik veganská jídla?",
"it": "Questa attività serve pasti vegani?"
},
- "labels": [
- "diets_content",
- "diets_grouped",
- "hidden"
- ],
- "condition": {
- "and": [
- {
- "or": [
- "amenity=fast_food",
- "amenity=restaurant"
- ]
- }
- ]
- },
"mappings": [
{
"if": "diet:vegan=no",
@@ -419,9 +410,25 @@
}
}
],
- "id": "vegan_food"
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "amenity=fast_food",
+ "amenity=restaurant"
+ ]
+ }
+ ]
+ }
},
{
+ "id": "vegetarian",
+ "labels": [
+ "diets",
+ "diets_content",
+ "diets_grouped",
+ "hidden"
+ ],
"question": {
"nl": "Heeft deze eetgelegenheid een vegetarische optie?",
"en": "Does this restaurant have a vegetarian option?",
@@ -505,16 +512,10 @@
"it": "Alcuni piatti potrebbero essere adattati in versione vegetariana, ma deve essere richiesto"
}
}
- ],
- "labels": [
- "diets",
- "diets_content",
- "diets_grouped",
- "hidden"
- ],
- "id": "vegetarian"
+ ]
},
{
+ "id": "halal",
"labels": [
"diets_content",
"diets_grouped",
@@ -585,16 +586,15 @@
"it": "Sono disponibili solo opzioni halal"
}
}
- ],
- "id": "halal"
+ ]
},
{
+ "id": "organic",
"labels": [
"diets_content",
"diets_grouped",
"hidden"
],
- "id": "organic",
"question": {
"en": "Does this restaurant offer organic food?",
"de": "Bietet das Restaurant biologische Speisen an?",
diff --git a/assets/layers/disaster_response/disaster_response.json b/assets/layers/disaster_response/disaster_response.json
index a9a9c254c..ac84f73b0 100644
--- a/assets/layers/disaster_response/disaster_response.json
+++ b/assets/layers/disaster_response/disaster_response.json
@@ -77,9 +77,6 @@
"website",
{
"id": "disaster_response_name",
- "freeform": {
- "key": "name"
- },
"question": {
"en": "What is the name of this organization?",
"it": "Qual è il nome di questa organizzazione?",
@@ -95,6 +92,9 @@
"es": "Esta organización se llama {name}",
"ca": "Aquesta organització s'anomena {name}",
"cs": "Tato organizace se jmenuje {name}"
+ },
+ "freeform": {
+ "key": "name"
}
}
],
diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json
index 17481ae5b..f2b4116e9 100644
--- a/assets/layers/doctors/doctors.json
+++ b/assets/layers/doctors/doctors.json
@@ -80,6 +80,7 @@
"tagRenderings": [
"images",
{
+ "id": "name",
"question": {
"en": "What is the name of this doctors place?",
"de": "Wie heißt diese Arztpraxis?",
@@ -105,14 +106,24 @@
},
"freeform": {
"key": "name"
- },
- "id": "name"
+ }
},
"opening_hours_by_appointment",
"contact",
"address.address",
{
"id": "specialty",
+ "question": {
+ "en": "What is this doctor specialized in?",
+ "de": "Worauf ist dieser Arzt spezialisiert?",
+ "nl": "Waar is deze dokter in gespecialiseerd?",
+ "fr": "En quoi ce médecin est-il spécialisé ?",
+ "pl": "W czym specjalizuje się ten lekarz?",
+ "ca": "En què està especialitzat aquest metge?",
+ "cs": "Na co se tento lékař specializuje?",
+ "es": "¿En qué se especializa este médico?",
+ "it": "In cosa è specializzato questo medico?"
+ },
"render": {
"en": "This doctor is specialized in {healthcare:speciality}",
"de": "Dieser Arzt ist spezialisiert auf {healthcare:speciality}",
@@ -125,21 +136,9 @@
"es": "Este médico está especializado en {healthcare:speciality}",
"it": "Questo medico è specializzato in {healthcare:speciality}"
},
- "question": {
- "en": "What is this doctor specialized in?",
- "de": "Worauf ist dieser Arzt spezialisiert?",
- "nl": "Waar is deze dokter in gespecialiseerd?",
- "fr": "En quoi ce médecin est-il spécialisé ?",
- "pl": "W czym specjalizuje się ten lekarz?",
- "ca": "En què està especialitzat aquest metge?",
- "cs": "Na co se tento lékař specializuje?",
- "es": "¿En qué se especializa este médico?",
- "it": "In cosa è specializzato questo medico?"
- },
"freeform": {
"key": "healthcare:speciality"
},
- "multiAnswer": true,
"mappings": [
{
"if": "healthcare:speciality=general",
@@ -196,7 +195,8 @@
"it": "Questo è un pediatra"
}
}
- ]
+ ],
+ "multiAnswer": true
},
"toilet_at_amenity_lib.all"
],
diff --git a/assets/layers/dogpark/dogpark.json b/assets/layers/dogpark/dogpark.json
index 3e703b1ec..147035318 100644
--- a/assets/layers/dogpark/dogpark.json
+++ b/assets/layers/dogpark/dogpark.json
@@ -107,6 +107,7 @@
"images",
"reviews",
{
+ "id": "Name",
"question": {
"en": "What is the name of this dog park?",
"da": "Hvad hedder denne hundeskov?",
@@ -128,8 +129,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "Name"
+ }
},
"opening_hours_24_7",
"website",
@@ -176,6 +176,16 @@
},
{
"id": "smalldogs",
+ "question": {
+ "en": "Does this dog park have a separate fenced in area for small dogs and puppies?",
+ "da": "Har denne hundeskov et separat indhegnet område for små hunde og hvalpe (hvalpegård)?",
+ "de": "Hat der Hundepark einen separaten Bereich für Hundewelpen und kleine Hunde?",
+ "es": "¿Tiene este parque canino un área separada y cercada para perros pequeños y cachorros?",
+ "nl": "Heeft deze hondenweide een gescheiden en omheind deel voor puppy's en kleine honden?",
+ "ca": "Aquest parc per a gossos té una zona tancada per a gossos petits i cadells?",
+ "cs": "Má tento psí park samostatný oplocený areál pro malé psy a štěňata?",
+ "it": "Questa area cani ha un'area recintata separata per cani di piccola taglia e cuccioli?"
+ },
"mappings": [
{
"if": "small_dog=separate",
@@ -203,17 +213,7 @@
"it": "Non ha un'area separata per cuccioli e cani di piccola taglia"
}
}
- ],
- "question": {
- "en": "Does this dog park have a separate fenced in area for small dogs and puppies?",
- "da": "Har denne hundeskov et separat indhegnet område for små hunde og hvalpe (hvalpegård)?",
- "de": "Hat der Hundepark einen separaten Bereich für Hundewelpen und kleine Hunde?",
- "es": "¿Tiene este parque canino un área separada y cercada para perros pequeños y cachorros?",
- "nl": "Heeft deze hondenweide een gescheiden en omheind deel voor puppy's en kleine honden?",
- "ca": "Aquest parc per a gossos té una zona tancada per a gossos petits i cadells?",
- "cs": "Má tento psí park samostatný oplocený areál pro malé psy a štěňata?",
- "it": "Questa area cani ha un'area recintata separata per cani di piccola taglia e cuccioli?"
- }
+ ]
},
{
"id": "dogarea",
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 6bcf79248..8db5eab06 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -155,6 +155,7 @@
"tagRenderings": [
"images",
{
+ "id": "Still in use?",
"question": {
"en": "Is this drinking water spot still operational?",
"nl": "Is deze drinkwaterkraan nog steeds werkende?",
@@ -252,8 +253,7 @@
"cs": "Tato pitná voda je trvale uzavřena"
}
}
- ],
- "id": "Still in use?"
+ ]
},
{
"id": "fee",
@@ -308,17 +308,6 @@
"it": "Che tipo di punto di acqua potabile è questo?",
"cs": "Jaký typ bodu s pitnou vodou to je?"
},
- "multiAnswer": true,
- "invalidValues": {
- "or": [
- {
- "and": [
- "natural=spring",
- "fountain~*"
- ]
- }
- ]
- },
"mappings": [
{
"if": "fountain=bubbler",
@@ -379,9 +368,21 @@
"cs": "Toto je přírodní vřídlo"
}
}
- ]
+ ],
+ "multiAnswer": true,
+ "invalidValues": {
+ "or": [
+ {
+ "and": [
+ "natural=spring",
+ "fountain~*"
+ ]
+ }
+ ]
+ }
},
{
+ "id": "Bottle refill",
"question": {
"en": "How easy is it to fill water bottles?",
"nl": "Hoe gemakkelijk is het om drinkbussen bij te vullen?",
@@ -426,8 +427,7 @@
}
}
],
- "condition": "fountain!=bottle_refill",
- "id": "Bottle refill"
+ "condition": "fountain!=bottle_refill"
},
{
"id": "temperature-cold",
@@ -439,7 +439,6 @@
"it": "Qui è disponibile acqua fredda?",
"cs": "Je tu k dispozici studená voda?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "iced_water=yes",
@@ -501,7 +500,8 @@
"cs": "Je tu k dispozici horká voda"
}
}
- ]
+ ],
+ "multiAnswer": true
},
{
"builtin": "seasonal",
@@ -592,6 +592,15 @@
"it": "Questa fontanella ha un elemento artistico?",
"cs": "Má tato fontánka s pitnou vodou umělecký prvek?"
},
+ "questionHint": {
+ "en": "E.g. it has an integrated statue or other non-trivial, creative work",
+ "nl": "Bijvoorbeeld een standbeeld of ander, niet-triviaal kunstwerk",
+ "de": "Z.B. eine integrierte Statue oder andere künstlerische Werke",
+ "ca": "P. ex. té una estàtua integrada o un altre treball creatiu no trivial",
+ "es": "Por ejemplo, tiene una estatua integrada u otra obra creativa no trivial",
+ "it": "Ad esempio, ha una statua integrata o altra opera creativa non banale",
+ "cs": "Např. má integrovánu sochu nebo jiné netriviální tvůrčí dílo"
+ },
"mappings": [
{
"if": "tourism=artwork",
@@ -637,16 +646,7 @@
},
"hideInAnswer": true
}
- ],
- "questionHint": {
- "en": "E.g. it has an integrated statue or other non-trivial, creative work",
- "nl": "Bijvoorbeeld een standbeeld of ander, niet-triviaal kunstwerk",
- "de": "Z.B. eine integrierte Statue oder andere künstlerische Werke",
- "ca": "P. ex. té una estàtua integrada o un altre treball creatiu no trivial",
- "es": "Por ejemplo, tiene una estatua integrada u otra obra creativa no trivial",
- "it": "Ad esempio, ha una statua integrata o altra opera creativa non banale",
- "cs": "Např. má integrovánu sochu nebo jiné netriviální tvůrčí dílo"
- }
+ ]
},
{
"builtin": "artwork.*artwork-question",
diff --git a/assets/layers/dumpstations/dumpstations.json b/assets/layers/dumpstations/dumpstations.json
index 35e6c056b..97c791d62 100644
--- a/assets/layers/dumpstations/dumpstations.json
+++ b/assets/layers/dumpstations/dumpstations.json
@@ -227,24 +227,7 @@
]
},
{
- "render": {
- "en": "This place charges {charge}",
- "ru": "Это место взимает {charge}",
- "ja": "この場所は{charge} が必要",
- "it": "Questo posto costa {charge}",
- "fr": "Ce site fait payer {charge}",
- "pt_BR": "Este lugar cobra {charge}",
- "de": "Die Gebühr beträgt {charge}",
- "zh_Hant": "這個地方收費 {charge}",
- "nb_NO": "Dette stedet tar {charge}",
- "nl": "Deze loosplaats rekent {charge} aan",
- "es": "Este lugar cuesta {charge}",
- "ca": "Aquest lloc costa {charge}",
- "da": "Dette sted opkræver {charge}",
- "cs": "Toto místo si účtuje {charge}",
- "pl": "To miejsce pobiera opłatę w wysokości {charge}",
- "pt": "Este lugar cobra {charge}"
- },
+ "id": "dumpstations-charge",
"question": {
"en": "How much does this place charge?",
"ru": "Сколько это место взимает?",
@@ -264,6 +247,24 @@
"pl": "Ile kosztuje to miejsce?",
"pt": "Quanto este lugar cobra?"
},
+ "render": {
+ "en": "This place charges {charge}",
+ "ru": "Это место взимает {charge}",
+ "ja": "この場所は{charge} が必要",
+ "it": "Questo posto costa {charge}",
+ "fr": "Ce site fait payer {charge}",
+ "pt_BR": "Este lugar cobra {charge}",
+ "de": "Die Gebühr beträgt {charge}",
+ "zh_Hant": "這個地方收費 {charge}",
+ "nb_NO": "Dette stedet tar {charge}",
+ "nl": "Deze loosplaats rekent {charge} aan",
+ "es": "Este lugar cuesta {charge}",
+ "ca": "Aquest lloc costa {charge}",
+ "da": "Dette sted opkræver {charge}",
+ "cs": "Toto místo si účtuje {charge}",
+ "pl": "To miejsce pobiera opłatę w wysokości {charge}",
+ "pt": "Este lugar cobra {charge}"
+ },
"freeform": {
"key": "charge"
},
@@ -271,8 +272,7 @@
"and": [
"fee=yes"
]
- },
- "id": "dumpstations-charge"
+ }
},
{
"id": "dumpstations-waterpoint",
@@ -594,22 +594,7 @@
]
},
{
- "render": {
- "en": "This station is part of network {network}",
- "ja": "このステーションはネットワーク{network}の一部です",
- "it": "Questa stazione fa parte della rete {network}",
- "ru": "Эта станция - часть сети {network}",
- "fr": "Cette station fait parte d’un réseau {network}",
- "de": "Diese Station gehört zum Verbund/Netzwerk {network}",
- "zh_Hant": "這車站是屬於 {network} 網路的一部分",
- "nl": "Deze loosplaats is deel van het {network} netwerk",
- "es": "Esta estación es parte de la red {network}",
- "da": "Denne station er en del af netværket {network}",
- "ca": "Aquesta estació forma part de la xarxa {network}",
- "cs": "Tato stanice je součástí sítě {network}",
- "pl": "Ta stacja jest częścią sieci {network}",
- "uk": "Ця станція є частиною мережі {network}"
- },
+ "id": "dumpstations-network",
"question": {
"en": "What network is this place a part of? (skip if none)",
"ja": "ここは何のネットワークの一部ですか?(なければスキップ)",
@@ -626,10 +611,25 @@
"pl": "Do jakiej sieci należy to miejsce? (pomiń, jeśli nie ma)",
"uk": "Частиною якої мережі є цей заклад? (пропустіть, якщо немає)"
},
+ "render": {
+ "en": "This station is part of network {network}",
+ "ja": "このステーションはネットワーク{network}の一部です",
+ "it": "Questa stazione fa parte della rete {network}",
+ "ru": "Эта станция - часть сети {network}",
+ "fr": "Cette station fait parte d’un réseau {network}",
+ "de": "Diese Station gehört zum Verbund/Netzwerk {network}",
+ "zh_Hant": "這車站是屬於 {network} 網路的一部分",
+ "nl": "Deze loosplaats is deel van het {network} netwerk",
+ "es": "Esta estación es parte de la red {network}",
+ "da": "Denne station er en del af netværket {network}",
+ "ca": "Aquesta estació forma part de la xarxa {network}",
+ "cs": "Tato stanice je součástí sítě {network}",
+ "pl": "Ta stacja jest częścią sieci {network}",
+ "uk": "Ця станція є частиною мережі {network}"
+ },
"freeform": {
"key": "network"
- },
- "id": "dumpstations-network"
+ }
}
],
"allowMove": {
diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json
index 9d6081d8a..005b2d71c 100644
--- a/assets/layers/elevator/elevator.json
+++ b/assets/layers/elevator/elevator.json
@@ -173,17 +173,6 @@
},
{
"id": "door-width",
- "render": {
- "en": "This elevator's doors have a width of {canonical(door:width)}",
- "fr": "Les portes de cet ascenseur ont une largeur de {canonical(door:width)}",
- "de": "Die Türen des Aufzugs haben eine Breite von {canonical(door:width)}",
- "nl": "De breedte van de liftdeur is {canonical(door:width)}",
- "pl": "Drzwi tej windy mają szerokość {canonical(door:width)}",
- "ca": "Les portes de l'ascensor tenen un amplada de {canonical(door:width)}",
- "cs": "Dveře tohoto výtahu mají šířku {canonical(door:width)}",
- "es": "Las puertas de este ascensor tienen un ancho de {canonical(door:width)}",
- "it": "Le porte di questo ascensore hanno una larghezza di {canonical(door:width)}"
- },
"question": {
"en": "What is the width of this elevator's entrance?",
"fr": "Quelle est la largeur de l'entrée de cet ascenseur ?",
@@ -195,6 +184,17 @@
"es": "¿Cuál es el ancho de la entrada de este ascensor?",
"it": "Qual è la larghezza dell'ingresso di questo ascensore?"
},
+ "render": {
+ "en": "This elevator's doors have a width of {canonical(door:width)}",
+ "fr": "Les portes de cet ascenseur ont une largeur de {canonical(door:width)}",
+ "de": "Die Türen des Aufzugs haben eine Breite von {canonical(door:width)}",
+ "nl": "De breedte van de liftdeur is {canonical(door:width)}",
+ "pl": "Drzwi tej windy mają szerokość {canonical(door:width)}",
+ "ca": "Les portes de l'ascensor tenen un amplada de {canonical(door:width)}",
+ "cs": "Dveře tohoto výtahu mají šířku {canonical(door:width)}",
+ "es": "Las puertas de este ascensor tienen un ancho de {canonical(door:width)}",
+ "it": "Le porte di questo ascensore hanno una larghezza di {canonical(door:width)}"
+ },
"freeform": {
"key": "door:width",
"type": "pfloat"
@@ -247,11 +247,16 @@
},
{
"id": "elevator-width",
- "condition": {
- "or": [
- "shape=",
- "shape=rectangular"
- ]
+ "question": {
+ "en": "What is the width of this elevator?",
+ "fr": "Quelle est la largeur de cet ascenseur ?",
+ "de": "Wie breit ist die Kabine dieses Aufzugs?",
+ "nl": "Wat is de breedte van deze lift?",
+ "pl": "Jaka jest szerokość tej windy?",
+ "ca": "Quina és l'amplada d'aquest ascensor?",
+ "cs": "Jaká je šířka tohoto výtahu?",
+ "es": "¿Cuál es el ancho de este ascensor?",
+ "it": "Qual è la larghezza di questo ascensore?"
},
"render": {
"en": "This elevator has a width of {canonical(width)}",
@@ -264,29 +269,28 @@
"es": "Este ascensor tiene un ancho de {canonical(width)}",
"it": "Questo ascensore ha una larghezza di {canonical(width)}"
},
- "question": {
- "en": "What is the width of this elevator?",
- "fr": "Quelle est la largeur de cet ascenseur ?",
- "de": "Wie breit ist die Kabine dieses Aufzugs?",
- "nl": "Wat is de breedte van deze lift?",
- "pl": "Jaka jest szerokość tej windy?",
- "ca": "Quina és l'amplada d'aquest ascensor?",
- "cs": "Jaká je šířka tohoto výtahu?",
- "es": "¿Cuál es el ancho de este ascensor?",
- "it": "Qual è la larghezza di questo ascensore?"
- },
"freeform": {
"key": "width",
"type": "pfloat"
- }
- },
- {
- "id": "elevator-depth",
+ },
"condition": {
"or": [
"shape=",
"shape=rectangular"
]
+ }
+ },
+ {
+ "id": "elevator-depth",
+ "question": {
+ "en": "What is the depth of this elevator?",
+ "fr": "Quelle est la profondeur de cet ascenseur ?",
+ "de": "Wie tief ist die Kabine dieses Aufzugs?",
+ "nl": "Wat is de diepte van deze lift?",
+ "ca": "Quina és la profunditat de l'ascensor?",
+ "cs": "Jaká je hloubka tohoto výtahu?",
+ "es": "¿Cuál es la profundidad de este ascensor?",
+ "it": "Qual è la profondità di questo ascensore?"
},
"render": {
"en": "This elevator has a depth of {canonical(length)}",
@@ -298,27 +302,27 @@
"es": "Este ascensor tiene una profundidad de {canonical(length)}",
"it": "Questo ascensore ha una profondità di {canonical(length)}"
},
- "question": {
- "en": "What is the depth of this elevator?",
- "fr": "Quelle est la profondeur de cet ascenseur ?",
- "de": "Wie tief ist die Kabine dieses Aufzugs?",
- "nl": "Wat is de diepte van deze lift?",
- "ca": "Quina és la profunditat de l'ascensor?",
- "cs": "Jaká je hloubka tohoto výtahu?",
- "es": "¿Cuál es la profundidad de este ascensor?",
- "it": "Qual è la profondità di questo ascensore?"
- },
"freeform": {
"key": "length",
"type": "pfloat"
+ },
+ "condition": {
+ "or": [
+ "shape=",
+ "shape=rectangular"
+ ]
}
},
{
"id": "elevator-diameter",
- "condition": {
- "or": [
- "shape=circular"
- ]
+ "question": {
+ "en": "What is the diameter of this elevator?",
+ "de": "Was ist der Durchmesser dieses Aufzugs?",
+ "es": "¿Cuál es el diámetro de este ascensor?",
+ "nl": "Wat is de diameter van deze lift?",
+ "ca": "Quin és el diàmetre d'aquest ascensor?",
+ "it": "Qual è il diametro di questo ascensore?",
+ "cs": "Jaký je průměr tohoto výtahu?"
},
"render": {
"en": "This elevator has a diameter of {canonical(diameter)}",
@@ -329,18 +333,14 @@
"it": "Questo ascensore ha un diametro di {canonical(diameter)}",
"cs": "Tento výtah má průměr {canonical(diameter)}"
},
- "question": {
- "en": "What is the diameter of this elevator?",
- "de": "Was ist der Durchmesser dieses Aufzugs?",
- "es": "¿Cuál es el diámetro de este ascensor?",
- "nl": "Wat is de diameter van deze lift?",
- "ca": "Quin és el diàmetre d'aquest ascensor?",
- "it": "Qual è il diametro di questo ascensore?",
- "cs": "Jaký je průměr tohoto výtahu?"
- },
"freeform": {
"key": "diameter",
"type": "pfloat"
+ },
+ "condition": {
+ "or": [
+ "shape=circular"
+ ]
}
},
{
@@ -411,7 +411,6 @@
},
{
"id": "tactile_writing_language",
- "condition": "tactile_writing:braille=yes",
"render": {
"special": {
"type": "language_chooser",
@@ -444,7 +443,8 @@
"it": "Questo ascensore ha la scrittura tattile in {language()}"
}
}
- }
+ },
+ "condition": "tactile_writing:braille=yes"
},
{
"id": "speech_output_available",
@@ -496,7 +496,6 @@
},
{
"id": "speech_output",
- "condition": "speech_output=yes",
"render": {
"special": {
"type": "language_chooser",
@@ -529,7 +528,8 @@
"it": "Questo ascensore ha l'output vocale in {language()}"
}
}
- }
+ },
+ "condition": "speech_output=yes"
},
{
"builtin": "induction-loop",
diff --git a/assets/layers/elongated_coin/elongated_coin.json b/assets/layers/elongated_coin/elongated_coin.json
index 0402edb03..dc057fc2e 100644
--- a/assets/layers/elongated_coin/elongated_coin.json
+++ b/assets/layers/elongated_coin/elongated_coin.json
@@ -94,6 +94,15 @@
"it": "Quanti design sono disponibili?",
"nl": "Hoeveel ontwerpen zijn er beschikbaar?"
},
+ "render": {
+ "en": "This penny press has {coin:design_count} designs available.",
+ "de": "Der Prägeautomat hat {coin:design_count} Motive zur Auswahl.",
+ "es": "Esta prensa de monedas tiene {coin:design_count} diseños disponibles.",
+ "ca": "Esta premsa té {coin:design_count} dissenys disponibles.",
+ "cs": "Tento lis na centy má k dispozici {coin:design_count} vzory.",
+ "it": "Questa macchina schiacciamonete ha {coin:design_count} design disponibili.",
+ "nl": "Deze muntpers heeft {coin:design_count} ontwerpen beschikbaar."
+ },
"freeform": {
"key": "coin:design_count",
"type": "pnat",
@@ -107,15 +116,6 @@
"it": "Numero di design (ad es. 5)"
}
},
- "render": {
- "en": "This penny press has {coin:design_count} designs available.",
- "de": "Der Prägeautomat hat {coin:design_count} Motive zur Auswahl.",
- "es": "Esta prensa de monedas tiene {coin:design_count} diseños disponibles.",
- "ca": "Esta premsa té {coin:design_count} dissenys disponibles.",
- "cs": "Tento lis na centy má k dispozici {coin:design_count} vzory.",
- "it": "Questa macchina schiacciamonete ha {coin:design_count} design disponibili.",
- "nl": "Deze muntpers heeft {coin:design_count} ontwerpen beschikbaar."
- },
"mappings": [
{
"if": "coin:design_count=1",
@@ -246,6 +246,15 @@
"nl": "Welk muntstuk wordt gebruikt voor het persen?",
"it": "Quale moneta viene utilizzata per la pressione?"
},
+ "render": {
+ "en": "This penny press uses a {coin:type} coin for pressing.",
+ "de": "Der Automat prägt {coin:type} Cent Münzen.",
+ "es": "Esta prensa de monedas usa una moneda de {coin:type} para prensar.",
+ "ca": "Esta premsa de cèntims utilitza una moneda de {coin:type} per a premsar.",
+ "cs": "Tento lis na centy používá k lisování minci {coin:type}.",
+ "nl": "Deze muntpers gebruikt een muntstuk van {coin:type} voor het persen.",
+ "it": "Questa macchina schiacciamonete utilizza una moneta da {coin:type} per la pressione."
+ },
"freeform": {
"key": "coin:type",
"type": "string",
@@ -367,26 +376,11 @@
},
"hideInAnswer": "_currency!~.*CHF.*"
}
- ],
- "render": {
- "en": "This penny press uses a {coin:type} coin for pressing.",
- "de": "Der Automat prägt {coin:type} Cent Münzen.",
- "es": "Esta prensa de monedas usa una moneda de {coin:type} para prensar.",
- "ca": "Esta premsa de cèntims utilitza una moneda de {coin:type} per a premsar.",
- "cs": "Tento lis na centy používá k lisování minci {coin:type}.",
- "nl": "Deze muntpers gebruikt een muntstuk van {coin:type} voor het persen.",
- "it": "Questa macchina schiacciamonete utilizza una moneta da {coin:type} per la pressione."
- }
+ ]
},
"website",
{
"id": "charge",
- "condition": {
- "or": [
- "fee=yes",
- "fee="
- ]
- },
"question": {
"en": "How much does it cost to press a penny?",
"de": "Wieviel kostet die Prägung einer Münze?",
@@ -396,6 +390,15 @@
"nl": "Hoe veel kost het om een munt te persen?",
"it": "Quanto costa schiacciare una moneta?"
},
+ "render": {
+ "en": "It costs {charge} to press a penny.",
+ "de": "Die Prägung einer Münze kostet {charge}.",
+ "es": "Cuesta {charge} prensar una moneda.",
+ "ca": "Costa {charge} premsar un cèntim.",
+ "cs": "Ražba mince stojí {charge}.",
+ "nl": "Het kost {charge} om een munt te persen.",
+ "it": "Costa {charge} schiacciare una moneta."
+ },
"freeform": {
"key": "charge",
"placeholder": {
@@ -463,14 +466,11 @@
"hideInAnswer": "_currency!~.*CHF.*"
}
],
- "render": {
- "en": "It costs {charge} to press a penny.",
- "de": "Die Prägung einer Münze kostet {charge}.",
- "es": "Cuesta {charge} prensar una moneda.",
- "ca": "Costa {charge} premsar un cèntim.",
- "cs": "Ražba mince stojí {charge}.",
- "nl": "Het kost {charge} om een munt te persen.",
- "it": "Costa {charge} schiacciare una moneta."
+ "condition": {
+ "or": [
+ "fee=yes",
+ "fee="
+ ]
}
},
"denominations-coins",
diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json
index 1d24bfbcf..f2d65478b 100644
--- a/assets/layers/entrance/entrance.json
+++ b/assets/layers/entrance/entrance.json
@@ -336,6 +336,16 @@
"cs": "Jaký je typ těchto dveří?",
"it": "Qual è il tipo di questa porta?"
},
+ "questionHint": {
+ "en": "Wether or not the door is automated is asked in the next question",
+ "nl": "Of de deur al of niet automatisch werkt, vragen we hierna ",
+ "de": "Ob die Tür automatisiert ist oder nicht, wird in der nächsten Frage gefragt",
+ "es": "Si la puerta es automática o no se pregunta en la siguiente pregunta",
+ "fr": "Le fait que la porte soit automatisée ou non est demandé dans la question suivante",
+ "ca": "A la pregunta següent es pregunta si la porta està automatitzada o no",
+ "cs": "Zda jsou dveře automatizované, se ptáte v další otázce",
+ "it": "Se la porta è automatizzata o meno viene chiesto nella prossima domanda"
+ },
"mappings": [
{
"if": "door=yes",
@@ -417,25 +427,14 @@
},
"hideInAnswer": "entrance="
}
- ],
- "questionHint": {
- "en": "Wether or not the door is automated is asked in the next question",
- "nl": "Of de deur al of niet automatisch werkt, vragen we hierna ",
- "de": "Ob die Tür automatisiert ist oder nicht, wird in der nächsten Frage gefragt",
- "es": "Si la puerta es automática o no se pregunta en la siguiente pregunta",
- "fr": "Le fait que la porte soit automatisée ou non est demandé dans la question suivante",
- "ca": "A la pregunta següent es pregunta si la porta està automatitzada o no",
- "cs": "Zda jsou dveře automatizované, se ptáte v další otázce",
- "it": "Se la porta è automatizzata o meno viene chiesto nella prossima domanda"
- }
+ ]
},
{
+ "id": "automatic_door",
"labels": [
"accessibility"
],
- "id": "automatic_door",
"question": "Is this door automated?",
- "condition": "door!=no",
"mappings": [
{
"if": "automatic_door=yes",
@@ -560,23 +559,14 @@
"it": "Questa porta verrà aperta dal personale quando richiesto"
}
}
- ]
+ ],
+ "condition": "door!=no"
},
{
"id": "width",
"labels": [
"accessibility"
],
- "render": {
- "en": "This door has a width of {canonical(width)}",
- "nl": "Deze deur heeft een breedte van {canonical(width)}",
- "de": "Diese Tür hat eine Durchgangsbreite von {canonical(width)}",
- "es": "Esta puerta tiene un ancho de {canonical(width)}",
- "fr": "Cette porte a une largeur de {canonical(width)} mètre",
- "ca": "Aquesta porta té una amplària de {canonical(width)}",
- "cs": "Tyto dveře mají šířku {canonical(width)}",
- "it": "Questa porta ha una larghezza di {canonical(width)}"
- },
"question": {
"en": "What is the width of this door/entrance?",
"nl": "Wat is de breedte van deze deur/toegang?",
@@ -587,6 +577,16 @@
"cs": "Jaká je šířka těchto dveří/vchodu?",
"it": "Qual è la larghezza di questa porta/ingresso?"
},
+ "render": {
+ "en": "This door has a width of {canonical(width)}",
+ "nl": "Deze deur heeft een breedte van {canonical(width)}",
+ "de": "Diese Tür hat eine Durchgangsbreite von {canonical(width)}",
+ "es": "Esta puerta tiene un ancho de {canonical(width)}",
+ "fr": "Cette porte a une largeur de {canonical(width)} mètre",
+ "ca": "Aquesta porta té una amplària de {canonical(width)}",
+ "cs": "Tyto dveře mají šířku {canonical(width)}",
+ "it": "Questa porta ha una larghezza di {canonical(width)}"
+ },
"freeform": {
"key": "width",
"type": "pfloat",
@@ -690,6 +690,9 @@
"it": "Questa porta ha {ref} come numero di riferimento",
"cs": "Tyto dveře mají {ref} jako referenční číslo"
},
+ "freeform": {
+ "key": "ref"
+ },
"mappings": [
{
"if": "ref=",
@@ -700,10 +703,7 @@
"cs": "Žádné referenční číslo"
}
}
- ],
- "freeform": {
- "key": "ref"
- }
+ ]
}
],
"filter": [
diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index 620bac0d1..61e7de731 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -110,11 +110,6 @@
},
{
"id": "wikipedia-etymology",
- "condition": {
- "and": [
- "name:etymology!=unknown"
- ]
- },
"question": {
"en": "What is the Wikidata-item that this object is named after?",
"nl": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?",
@@ -127,6 +122,17 @@
"ca": "Quin és l'element de Wikidata en honor al qual s'anomena aquest objecte?",
"it": "Qual è l'elemento Wikidata da cui questo oggetto prende il nome?"
},
+ "render": {
+ "en": "Wikipedia article of the name giver
{wikipedia(name:etymology:wikidata):max-height:20rem}",
+ "nl": "Wikipedia-artikel van de naamgever
{wikipedia(name:etymology:wikidata):max-height:20rem}",
+ "de": "Wikipedia Artikel zur Namensherkunft
{wikipedia(name:etymology:wikidata):max-height:20rem}",
+ "fr": "Article Wikipedia de la référence au nom
{wikipedia(name:etymology:wikidata):max-height:20rem}",
+ "ca": " Article de la Viquipèdia del nom donant
{wikipedia(name:etymology:wikidata):max-height:20rem}",
+ "cs": "Článek autora jména na Wikipedii
{wikipedia(name:etymology:wikidata):max-height:20rem}",
+ "da": "Wikipedia-artikel om navnets ophav
{wikipedia(name:etymology:wikidata):max-height:20rem}",
+ "es": "Artículo de Wikipedia del que recibe el nombre
{wikipedia(name:etymology:wikidata):max-height:20rem}",
+ "it": "Articolo di Wikipedia sul donatore del nome
{wikipedia(name:etymology:wikidata):max-height:20rem}"
+ },
"freeform": {
"key": "name:etymology:wikidata",
"type": "wikidata",
@@ -255,16 +261,10 @@
}
]
},
- "render": {
- "en": "Wikipedia article of the name giver
{wikipedia(name:etymology:wikidata):max-height:20rem}",
- "nl": "Wikipedia-artikel van de naamgever
{wikipedia(name:etymology:wikidata):max-height:20rem}",
- "de": "Wikipedia Artikel zur Namensherkunft
{wikipedia(name:etymology:wikidata):max-height:20rem}",
- "fr": "Article Wikipedia de la référence au nom
{wikipedia(name:etymology:wikidata):max-height:20rem}",
- "ca": " Article de la Viquipèdia del nom donant
{wikipedia(name:etymology:wikidata):max-height:20rem}",
- "cs": "Článek autora jména na Wikipedii
{wikipedia(name:etymology:wikidata):max-height:20rem}",
- "da": "Wikipedia-artikel om navnets ophav
{wikipedia(name:etymology:wikidata):max-height:20rem}",
- "es": "Artículo de Wikipedia del que recibe el nombre
{wikipedia(name:etymology:wikidata):max-height:20rem}",
- "it": "Articolo di Wikipedia sul donatore del nome
{wikipedia(name:etymology:wikidata):max-height:20rem}"
+ "condition": {
+ "and": [
+ "name:etymology!=unknown"
+ ]
}
},
{
@@ -295,6 +295,16 @@
"ca": "A que es deu el nom d'aquest objecte?",
"it": "Da cosa prende il nome questo oggetto?"
},
+ "questionHint": {
+ "en": "This might be written on the street name sign",
+ "nl": "Dit staat mogelijks vermeld op het straatnaambordje",
+ "de": "Das könnte auf einem Straßenschild stehen",
+ "fr": "Cela peut être indiqué sur le panneau de la rue",
+ "ca": "Això podria estar escrit al cartell del nom del carrer",
+ "cs": "To může být napsáno na ceduli s názvem ulice",
+ "es": "Esto podría estar escrito en el letrero del nombre de la calle",
+ "it": "Potrebbe essere scritto sul cartello del nome della strada"
+ },
"render": {
"en": "Named after {name:etymology}",
"nl": "Vernoemd naar {name:etymology}",
@@ -332,16 +342,6 @@
"name:etymology~*",
"name:etymology:wikidata="
]
- },
- "questionHint": {
- "en": "This might be written on the street name sign",
- "nl": "Dit staat mogelijks vermeld op het straatnaambordje",
- "de": "Das könnte auf einem Straßenschild stehen",
- "fr": "Cela peut être indiqué sur le panneau de la rue",
- "ca": "Això podria estar escrit al cartell del nom del carrer",
- "cs": "To může být napsáno na ceduli s názvem ulice",
- "es": "Esto podría estar escrito en el letrero del nombre de la calle",
- "it": "Potrebbe essere scritto sul cartello del nome della strada"
}
},
"questions",
@@ -398,7 +398,6 @@
},
{
"id": "wikipedia",
- "#": "Note that this is a _read_only_ option, to prevent people entering a 'wikidata'-link instead of 'name:etymology:wikidata'",
"render": {
"en": "A Wikipedia article about this street exists:
{wikipedia():max-height:25rem}",
"nl": "Een Wikipedia artikel over deze straat bestaat:
{wikipedia():max-height:25rem}",
@@ -411,7 +410,8 @@
"es": "Existe un artículo de Wikipedia sobre esta calle:
{wikipedia():max-height:25rem}",
"it": "Esiste un articolo di Wikipedia su questa strada:
{wikipedia():max-height:25rem}"
},
- "condition": "wikidata~*"
+ "condition": "wikidata~*",
+ "#": "Note that this is a _read_only_ option, to prevent people entering a 'wikidata'-link instead of 'name:etymology:wikidata'"
}
],
"allowMove": false,
diff --git a/assets/layers/extinguisher/extinguisher.json b/assets/layers/extinguisher/extinguisher.json
index d19cef88b..de77de5cd 100644
--- a/assets/layers/extinguisher/extinguisher.json
+++ b/assets/layers/extinguisher/extinguisher.json
@@ -111,6 +111,20 @@
"tagRenderings": [
{
"id": "extinguisher-location",
+ "question": {
+ "en": "Where is it positioned?",
+ "ja": "どこにあるんですか?",
+ "ru": "Где это расположено?",
+ "fr": "Où est-elle positionnée ?",
+ "de": "Wo befindet er sich?",
+ "it": "Dove è posizionato?",
+ "nl": "Op welke locatie staat dit?",
+ "da": "Hvor er den placeret?",
+ "es": "¿Dónde está colocado?",
+ "ca": "On està situat?",
+ "pl": "Gdzie się znajduje?",
+ "cs": "Kde je umístěn?"
+ },
"render": {
"en": "Location: {location}",
"ja": "場所:{location}",
@@ -125,19 +139,8 @@
"pl": "Lokalizacja: {location}",
"cs": "Místo: {location}"
},
- "question": {
- "en": "Where is it positioned?",
- "ja": "どこにあるんですか?",
- "ru": "Где это расположено?",
- "fr": "Où est-elle positionnée ?",
- "de": "Wo befindet er sich?",
- "it": "Dove è posizionato?",
- "nl": "Op welke locatie staat dit?",
- "da": "Hvor er den placeret?",
- "es": "¿Dónde está colocado?",
- "ca": "On està situat?",
- "pl": "Gdzie się znajduje?",
- "cs": "Kde je umístěn?"
+ "freeform": {
+ "key": "location"
},
"mappings": [
{
@@ -182,10 +185,7 @@
"cs": "Nalezeno venku."
}
}
- ],
- "freeform": {
- "key": "location"
- }
+ ]
},
"images"
],
diff --git a/assets/layers/fire_station/fire_station.json b/assets/layers/fire_station/fire_station.json
index 1b4998a78..03c2c16ed 100644
--- a/assets/layers/fire_station/fire_station.json
+++ b/assets/layers/fire_station/fire_station.json
@@ -105,9 +105,6 @@
"tagRenderings": [
{
"id": "station-name",
- "freeform": {
- "key": "name"
- },
"question": {
"en": "What is the name of this fire station?",
"ja": "この消防署の名前は何ですか?",
@@ -132,13 +129,13 @@
"es": "Esta estación se llama {name}.",
"ca": "Aquest parc de bombers es diu {name}.",
"cs": "Tato stanice se jmenuje {name}."
+ },
+ "freeform": {
+ "key": "name"
}
},
{
"id": "station-street",
- "freeform": {
- "key": "addr:street"
- },
"question": {
"en": " What is the street name where the station located?",
"ja": " 救急ステーションの所在地はどこですか?",
@@ -163,6 +160,9 @@
"ca": "Aquesta estació es troba al llarg d'una carretera anomenada {addr:street}.",
"cs": "Tato stanice je podél dálnice s názvem {addr:street}.",
"es": "Esta estación se encuentra en una carretera llamada {addr:street}."
+ },
+ "freeform": {
+ "key": "addr:street"
}
},
{
@@ -180,9 +180,6 @@
"uk": "Де розташована станція? (наприклад, назва району, села чи міста)",
"es": "¿Dónde se encuentra la estación? (ej. nombre del barrio, aldea o ciudad)"
},
- "freeform": {
- "key": "addr:place"
- },
"render": {
"en": "This station is found within {addr:place}.",
"ja": "このステーションは{addr:place}にあります。",
@@ -194,6 +191,9 @@
"ca": "Aquesta estació es troba dins de {addr:place}.",
"cs": "Tato stanice se nachází v {addr:place}.",
"es": "Esta estación se encuentra en {addr:place}."
+ },
+ "freeform": {
+ "key": "addr:place"
}
},
{
diff --git a/assets/layers/fitness_centre/fitness_centre.json b/assets/layers/fitness_centre/fitness_centre.json
index 7ffc4272c..0c7be9742 100644
--- a/assets/layers/fitness_centre/fitness_centre.json
+++ b/assets/layers/fitness_centre/fitness_centre.json
@@ -96,6 +96,15 @@
"es": "¿Cuál es el nombre de este centro de fitness?",
"it": "Qual è il nome di questo centro fitness?"
},
+ "render": {
+ "en": "This fitness centre is called {name}",
+ "de": "Das Fitnessstudio heißt {name}",
+ "nl": "Dit fitness-centrum heet {name}",
+ "ca": "Aquest gimnàs / centre de fitness s'anomena {name}",
+ "cs": "Toto fitness centrum se jmenuje {name}",
+ "es": "Este centro de fitness se llama {name}",
+ "it": "Questo centro fitness si chiama {name}"
+ },
"freeform": {
"key": "name",
"placeholder": {
@@ -122,16 +131,7 @@
"it": "Questo centro fitness non ha un nome"
}
}
- ],
- "render": {
- "en": "This fitness centre is called {name}",
- "de": "Das Fitnessstudio heißt {name}",
- "nl": "Dit fitness-centrum heet {name}",
- "ca": "Aquest gimnàs / centre de fitness s'anomena {name}",
- "cs": "Toto fitness centrum se jmenuje {name}",
- "es": "Este centro de fitness se llama {name}",
- "it": "Questo centro fitness si chiama {name}"
- }
+ ]
},
"images",
"phone",
diff --git a/assets/layers/fitness_station/fitness_station.json b/assets/layers/fitness_station/fitness_station.json
index 7887bfef0..72db0d200 100644
--- a/assets/layers/fitness_station/fitness_station.json
+++ b/assets/layers/fitness_station/fitness_station.json
@@ -108,6 +108,15 @@
"es": "¿Cuál es el nombre de esta estación de fitness?",
"it": "Qual è il nome di questa stazione fitness?"
},
+ "render": {
+ "en": "This fitness station is called {name}",
+ "de": "Die Fitness-Station heißt {name}",
+ "nl": "Dit fitness-toestel heet {name}",
+ "ca": "L'estació de fitness es diu {name}",
+ "cs": "Tato fitness stanice se jmenuje {name}",
+ "es": "Esta estación de fitness se llama {name}",
+ "it": "Questa stazione fitness si chiama {name}"
+ },
"freeform": {
"key": "name",
"placeholder": {
@@ -134,16 +143,7 @@
"it": "Questa stazione fitness non ha un nome"
}
}
- ],
- "render": {
- "en": "This fitness station is called {name}",
- "de": "Die Fitness-Station heißt {name}",
- "nl": "Dit fitness-toestel heet {name}",
- "ca": "L'estació de fitness es diu {name}",
- "cs": "Tato fitness stanice se jmenuje {name}",
- "es": "Esta estación de fitness se llama {name}",
- "it": "Questa stazione fitness si chiama {name}"
- }
+ ]
},
{
"id": "type",
@@ -545,6 +545,15 @@
"es": "¿Quién mantiene esta estación de fitness?",
"it": "Chi mantiene questa stazione fitness?"
},
+ "render": {
+ "en": "The fitness station is maintained by {operator}.",
+ "de": "Die Fitness-Station wird betrieben von {operator}.",
+ "nl": "Dit fitness-toestel wordt beheerd door {operator}",
+ "ca": "{operator} manté l'estació de fitness.",
+ "cs": "Fitness stanici spravuje {operator}.",
+ "es": "La estación de fitness es mantenida por {operator}.",
+ "it": "La stazione fitness è mantenuta da {operator}."
+ },
"freeform": {
"key": "operator",
"placeholder": {
@@ -557,15 +566,6 @@
"it": "Gestore della stazione fitness"
},
"type": "string"
- },
- "render": {
- "en": "The fitness station is maintained by {operator}.",
- "de": "Die Fitness-Station wird betrieben von {operator}.",
- "nl": "Dit fitness-toestel wordt beheerd door {operator}",
- "ca": "{operator} manté l'estació de fitness.",
- "cs": "Fitness stanici spravuje {operator}.",
- "es": "La estación de fitness es mantenida por {operator}.",
- "it": "La stazione fitness è mantenuta da {operator}."
}
},
"opening_hours_24_7"
diff --git a/assets/layers/fixme/fixme.json b/assets/layers/fixme/fixme.json
index e4a6b097f..c8dd4c84a 100644
--- a/assets/layers/fixme/fixme.json
+++ b/assets/layers/fixme/fixme.json
@@ -62,10 +62,6 @@
"tagRenderings": [
{
"id": "fixme",
- "freeform": {
- "key": "fixme",
- "type": "text"
- },
"question": {
"en": "What is wrong with this feature?",
"de": "Was stimmt mit diesem Objekt nicht?",
@@ -75,6 +71,18 @@
"es": "¿Qué está mal con este elemento?",
"it": "Cosa c'è di sbagliato in questa caratteristica?"
},
+ "render": {
+ "en": "Fixme Text: {fixme}",
+ "de": "Fixme Text: {fixme}",
+ "ca": "Text Fixme: {fixme}",
+ "cs": "Text požadavku na opravu (FIXME): {fixme}",
+ "es": "Texto Fixme: {fixme}",
+ "it": "Testo Fixme: {fixme}"
+ },
+ "freeform": {
+ "key": "fixme",
+ "type": "text"
+ },
"mappings": [
{
"if": "fixme=",
@@ -88,19 +96,10 @@
"it": "Questo problema è stato risolto"
}
}
- ],
- "render": {
- "en": "Fixme Text: {fixme}",
- "de": "Fixme Text: {fixme}",
- "ca": "Text Fixme: {fixme}",
- "cs": "Text požadavku na opravu (FIXME): {fixme}",
- "es": "Texto Fixme: {fixme}",
- "it": "Testo Fixme: {fixme}"
- }
+ ]
},
{
"id": "note",
- "condition": "note~*",
"render": {
"en": "Note Text: {note}",
"de": "Notiz Text: {note}",
@@ -110,7 +109,8 @@
"cs": "Text poznámky: {note}",
"es": "Texto Nota: {note}",
"it": "Testo Nota: {note}"
- }
+ },
+ "condition": "note~*"
},
"all_tags"
],
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 9d3c58b9a..f54fd25bf 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -276,6 +276,7 @@
"images",
"reviews",
{
+ "id": "Name",
"question": {
"nl": "Wat is de naam van deze eetgelegenheid?",
"en": "What is the name of this business?",
@@ -300,10 +301,10 @@
},
"freeform": {
"key": "name"
- },
- "id": "Name"
+ }
},
{
+ "id": "Fastfood vs restaurant",
"question": {
"en": "What type of business is this?",
"nl": "Wat voor soort zaak is dit?",
@@ -345,8 +346,7 @@
"it": "Un ristorante, concentrato sulla creazione di un'esperienza piacevole dove si viene serviti al tavolo"
}
}
- ],
- "id": "Fastfood vs restaurant"
+ ]
},
"opening_hours",
"website",
@@ -356,6 +356,7 @@
"level",
"wheelchair-access",
{
+ "id": "Cuisine",
"question": {
"nl": "Welk soort gerechten worden hier geserveerd?",
"en": "What kind of food is served here?",
@@ -660,7 +661,6 @@
}
}
],
- "id": "Cuisine",
"filter": true
},
{
@@ -673,10 +673,10 @@
}
},
{
+ "id": "add-menu-image",
"labels": [
"menu"
],
- "id": "add-menu-image",
"render": {
"special": {
"type": "image_upload",
@@ -740,6 +740,7 @@
}
},
{
+ "id": "takeaway",
"question": {
"nl": "Biedt deze zaak een afhaalmogelijkheid aan?",
"en": "Does this place offer take-away?",
@@ -794,8 +795,7 @@
"it": "Qui non è possibile l'asporto"
}
}
- ],
- "id": "takeaway"
+ ]
},
{
"id": "delivery",
@@ -840,7 +840,6 @@
},
{
"id": "drive-through",
- "condition": "amenity=fast_food",
"question": {
"en": "Does this fast-food restaurant have a drive-through?",
"nl": "Heeft dit fastfoodrestaurant een drive-through?",
@@ -872,11 +871,11 @@
"cs": "Toto rychlé občerstvení nemá drive-through"
}
}
- ]
+ ],
+ "condition": "amenity=fast_food"
},
{
"id": "drive-through-opening_hours",
- "condition": "drive_through=yes",
"question": {
"en": "What are the opening hours of the drive-through?",
"nl": "Wat zijn de openingsuren van de drive-through?",
@@ -885,6 +884,14 @@
"it": "Quali sono gli orari di apertura del drive-through?",
"cs": "Jaké jsou otevírací hodiny drive-through?"
},
+ "render": {
+ "en": "Drive-through opening hours
{opening_hours_table(opening_hours:drive_through)}",
+ "nl": "Openingsuren van de drive-through
{opening_hours_table(opening_hours:drive_through)}",
+ "de": "Öffnungszeiten der Drive-in-Filiale
{opening_hours_table(opening_hours:drive_through)}",
+ "ca": "Horaris d'obertura de la unitat
{opening_hours_table(openinghours:drivethrough)}",
+ "it": "Orari di apertura del drive-through
{opening_hours_table(opening_hours:drive_through)}",
+ "cs": "Otevírací hodiny drive-through
{opening_hours_table(opening_hours:drive_through)}"
+ },
"freeform": {
"key": "opening_hours:drive_through",
"type": "opening_hours"
@@ -902,14 +909,7 @@
}
}
],
- "render": {
- "en": "Drive-through opening hours
{opening_hours_table(opening_hours:drive_through)}",
- "nl": "Openingsuren van de drive-through
{opening_hours_table(opening_hours:drive_through)}",
- "de": "Öffnungszeiten der Drive-in-Filiale
{opening_hours_table(opening_hours:drive_through)}",
- "ca": "Horaris d'obertura de la unitat
{opening_hours_table(openinghours:drivethrough)}",
- "it": "Orari di apertura del drive-through
{opening_hours_table(opening_hours:drive_through)}",
- "cs": "Otevírací hodiny drive-through
{opening_hours_table(opening_hours:drive_through)}"
- }
+ "condition": "drive_through=yes"
},
"child_highchair",
"kids_area",
@@ -925,11 +925,11 @@
}
},
{
+ "id": "friture-vegetarian",
"labels": [
"diets_content",
"hidden"
],
- "id": "friture-vegetarian",
"question": {
"en": "Does this fries shop have vegetarian snacks?",
"nl": "Heeft deze frituur vegetarische snacks?",
diff --git a/assets/layers/food_courts/food_courts.json b/assets/layers/food_courts/food_courts.json
index 720e65fed..0b760795b 100644
--- a/assets/layers/food_courts/food_courts.json
+++ b/assets/layers/food_courts/food_courts.json
@@ -75,6 +75,14 @@
"it": "Qual è il nome di questa area ristorazione?",
"cs": "Jaký je název této restaurační zóny?"
},
+ "render": {
+ "en": "This food court is called {name}.",
+ "de": "Dieser Food Court heißt {name}.",
+ "es": "Esta plaza de comida se llama {name}.",
+ "ca": "Aquest tribunal alimentari es diu {name}.",
+ "it": "Questa area ristorazione si chiama {name}.",
+ "cs": "Název této restaurační zóny je {name}."
+ },
"freeform": {
"key": "name",
"type": "string",
@@ -86,14 +94,6 @@
"it": "Nome dell'area ristorazione",
"cs": "Název restaurační zóny"
}
- },
- "render": {
- "en": "This food court is called {name}.",
- "de": "Dieser Food Court heißt {name}.",
- "es": "Esta plaza de comida se llama {name}.",
- "ca": "Aquest tribunal alimentari es diu {name}.",
- "it": "Questa area ristorazione si chiama {name}.",
- "cs": "Název této restaurační zóny je {name}."
}
},
"reviews",
diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json
index a4bae8bc5..ebd3ebb57 100644
--- a/assets/layers/ghost_bike/ghost_bike.json
+++ b/assets/layers/ghost_bike/ghost_bike.json
@@ -150,6 +150,7 @@
"preset_description",
"images_no_blur",
{
+ "id": "ghost_bike-name",
"question": {
"en": "Whom is remembered by this ghost bike?",
"nl": "Aan wie is deze witte fiets een eerbetoon?",
@@ -160,6 +161,16 @@
"cs": "Na koho vzpomíná toto kolo duchů?",
"es": "¿A quién recuerda esta bicicleta fantasma?"
},
+ "questionHint": {
+ "en": "Please respect privacy - only fill out the name if it is widely published or marked on the cycle. Opt to leave out the family name.",
+ "nl": "Respecteer privacy - voeg enkel een naam toe indien die op de fiets staat of gepubliceerd is. Eventueel voeg je enkel de voornaam toe.",
+ "de": "Bitte respektieren Sie die Privatsphäre - geben Sie den Namen nur an, wenn er weit verbreitet oder auf dem Fahrrad markiert ist. Den Familiennamen können Sie weglassen.",
+ "it": "Si prega di rispettare la privacy - compilare il nome solo se è ampiamente pubblicato o segnato sulla bicicletta. Scegliere di omettere il cognome.",
+ "fr": "Veuillez respecter la vie privée – ajoutez le nom seulement s'il est largement publié ou marqué sur le vélo. Choisissez de ne pas indiquer le nom de famille.",
+ "ca": "Si us plau, respecteu la privadesa: només ompliu el nom si està àmpliament publicat o marcat a la bicicleta. Opta per deixar de banda el cognom.",
+ "cs": "Respektujte prosím soukromí – jméno vyplňte pouze v případě, že je široce publikováno nebo označeno na cyklu. Rozhodněte se vynechat příjmení.",
+ "es": "Respeta la privacidad: solo completa el nombre si se publica ampliamente o está marcado en la bicicleta. Opta por omitir el apellido."
+ },
"render": {
"en": "In remembrance of {subject}",
"nl": "Ter nagedachtenis van {subject}",
@@ -212,20 +223,10 @@
"subject="
]
}
- ],
- "id": "ghost_bike-name",
- "questionHint": {
- "en": "Please respect privacy - only fill out the name if it is widely published or marked on the cycle. Opt to leave out the family name.",
- "nl": "Respecteer privacy - voeg enkel een naam toe indien die op de fiets staat of gepubliceerd is. Eventueel voeg je enkel de voornaam toe.",
- "de": "Bitte respektieren Sie die Privatsphäre - geben Sie den Namen nur an, wenn er weit verbreitet oder auf dem Fahrrad markiert ist. Den Familiennamen können Sie weglassen.",
- "it": "Si prega di rispettare la privacy - compilare il nome solo se è ampiamente pubblicato o segnato sulla bicicletta. Scegliere di omettere il cognome.",
- "fr": "Veuillez respecter la vie privée – ajoutez le nom seulement s'il est largement publié ou marqué sur le vélo. Choisissez de ne pas indiquer le nom de famille.",
- "ca": "Si us plau, respecteu la privadesa: només ompliu el nom si està àmpliament publicat o marcat a la bicicleta. Opta per deixar de banda el cognom.",
- "cs": "Respektujte prosím soukromí – jméno vyplňte pouze v případě, že je široce publikováno nebo označeno na cyklu. Rozhodněte se vynechat příjmení.",
- "es": "Respeta la privacidad: solo completa el nombre si se publica ampliamente o está marcado en la bicicleta. Opta por omitir el apellido."
- }
+ ]
},
{
+ "id": "ghost_bike-source",
"question": {
"en": "On what webpage can one find more info about the ghost bike or the accident?",
"nl": "Op welke website kan men meer informatie vinden over de Witte fiets of over het ongeval?",
@@ -257,10 +258,10 @@
"freeform": {
"type": "url",
"key": "source"
- },
- "id": "ghost_bike-source"
+ }
},
{
+ "id": "ghost_bike-inscription",
"question": {
"en": "What is the inscription on this Ghost bike?",
"nl": "Wat is het opschrift op deze witte fiets?",
@@ -289,10 +290,10 @@
},
"freeform": {
"key": "inscription"
- },
- "id": "ghost_bike-inscription"
+ }
},
{
+ "id": "ghost_bike-start_date",
"question": {
"nl": "Wanneer werd deze witte fiets geplaatst?",
"en": "When was this Ghost bike installed?",
@@ -317,8 +318,7 @@
"freeform": {
"key": "start_date",
"type": "date"
- },
- "id": "ghost_bike-start_date"
+ }
},
{
"id": "wikidata",
diff --git a/assets/layers/ghostsign/ghostsign.json b/assets/layers/ghostsign/ghostsign.json
index 634cf2cae..4d2e215eb 100644
--- a/assets/layers/ghostsign/ghostsign.json
+++ b/assets/layers/ghostsign/ghostsign.json
@@ -89,6 +89,15 @@
"it": "Qual è il testo sull'insegna?",
"cs": "Jaký je text na značce?"
},
+ "render": {
+ "en": "The text on the sign is: {inscription}",
+ "de": "Der Text auf dem Schild ist: {inscription}",
+ "es": "El texto en el letrero es: {inscription}",
+ "uk": "Текст на табличці: {inscription}",
+ "ca": "El text del signe és: {inscription}",
+ "it": "Il testo sull'insegna è: {inscription}",
+ "cs": "Text na značce je: {inscription}"
+ },
"freeform": {
"key": "inscription",
"type": "text",
@@ -101,15 +110,6 @@
"it": "Testo sull'insegna",
"cs": "Text na značce"
}
- },
- "render": {
- "en": "The text on the sign is: {inscription}",
- "de": "Der Text auf dem Schild ist: {inscription}",
- "es": "El texto en el letrero es: {inscription}",
- "uk": "Текст на табличці: {inscription}",
- "ca": "El text del signe és: {inscription}",
- "it": "Il testo sull'insegna è: {inscription}",
- "cs": "Text na značce je: {inscription}"
}
},
{
@@ -122,6 +122,14 @@
"cs": "Pro jaký účel byla tato značka vyrobena?",
"it": "Per quale attività è stata realizzata questa insegna?"
},
+ "render": {
+ "en": "This sign was made for: {brand}",
+ "de": "Dieses Schild wurde gemacht für: {brand}",
+ "es": "Este letrero se hizo para: {brand}",
+ "ca": "El rètol es va fer per a: {brand}",
+ "cs": "Tato cedule byla vyrobena pro: {brand}",
+ "it": "Questa insegna è stata realizzata per: {brand}"
+ },
"freeform": {
"key": "brand",
"type": "string",
@@ -133,14 +141,6 @@
"ca": "Nom comercial",
"cs": "Název firmy"
}
- },
- "render": {
- "en": "This sign was made for: {brand}",
- "de": "Dieses Schild wurde gemacht für: {brand}",
- "es": "Este letrero se hizo para: {brand}",
- "ca": "El rètol es va fer per a: {brand}",
- "cs": "Tato cedule byla vyrobena pro: {brand}",
- "it": "Questa insegna è stata realizzata per: {brand}"
}
}
],
diff --git a/assets/layers/governments/governments.json b/assets/layers/governments/governments.json
index f27987a10..a77a645e0 100644
--- a/assets/layers/governments/governments.json
+++ b/assets/layers/governments/governments.json
@@ -82,6 +82,7 @@
"email",
"website",
{
+ "id": "name",
"question": {
"en": "What is the name of this Governmental Office?",
"de": "Wie lautet der Name dieser Behörde?",
@@ -102,8 +103,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "name"
+ }
}
],
"allowMove": true
diff --git a/assets/layers/grab_rail/grab_rail.json b/assets/layers/grab_rail/grab_rail.json
index 1c1d9e99a..40ef022e0 100644
--- a/assets/layers/grab_rail/grab_rail.json
+++ b/assets/layers/grab_rail/grab_rail.json
@@ -19,7 +19,6 @@
"it": "C'è un maniglione?",
"cs": "Je tu k dispozici madlo?"
},
- "#questionHint": "The questionhint should indicate how 'left' and 'right' are interpreted",
"mappings": [
{
"if": {
@@ -93,7 +92,8 @@
"cs": "Úplně bez madel"
}
}
- ]
+ ],
+ "#questionHint": "The questionhint should indicate how 'left' and 'right' are interpreted"
},
{
"id": "has_grab_rail_behind",
diff --git a/assets/layers/grave/grave.json b/assets/layers/grave/grave.json
index ede339c62..9365537b1 100644
--- a/assets/layers/grave/grave.json
+++ b/assets/layers/grave/grave.json
@@ -81,6 +81,7 @@
"tagRenderings": [
"images",
{
+ "id": "buried:wikidata",
"question": {
"en": "What is the Wikipedia page of the person buried here?",
"de": "Wie lautet die Wikipedia-Seite der Person, die hier begraben ist?",
@@ -89,7 +90,6 @@
"it": "Qual è la pagina Wikipedia della persona sepolta qui?",
"cs": "Která stránka na Wikipedii se věnuje zde pohřbené osobě?"
},
- "id": "buried:wikidata",
"render": {
"en": "{wikipedia(buried:wikidata)}",
"de": "{wikipedia(buried:wikidata)}",
@@ -105,6 +105,7 @@
}
},
{
+ "id": "name",
"question": {
"en": "What is the name of the person buried here?",
"de": "Wie lautet der Name der hier begrabenen Person?",
@@ -113,7 +114,6 @@
"it": "Qual è il nome della persona sepolta qui?",
"cs": "Jaké jméno má osoba zde pohřbená?"
},
- "id": "name",
"render": {
"en": "{name} is buried here",
"de": "{name} ist hier begraben",
diff --git a/assets/layers/guidepost/guidepost.json b/assets/layers/guidepost/guidepost.json
index 921a0eee3..848ff836c 100644
--- a/assets/layers/guidepost/guidepost.json
+++ b/assets/layers/guidepost/guidepost.json
@@ -83,7 +83,6 @@
"it": "Che tipo di percorsi sono mostrati su questo segnavia?",
"cs": "Jaký druh tras ukazuje tento rozcestník?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "bicycle=yes",
@@ -194,7 +193,8 @@
"cs": "Rozcestník ukazuje trasy pro zimní pěší turistiku"
}
}
- ]
+ ],
+ "multiAnswer": true
},
{
"id": "name",
@@ -203,6 +203,11 @@
"it": "Qual è il nome annotato su questo segnavia?",
"cs": "Jaký název je uveden na tomto rozcestníku?"
},
+ "render": {
+ "en": "Name noted on the guidepost: {name}",
+ "it": "Nome annotato sul segnavia: {name}",
+ "cs": "Název uvedený na rozcestníku: {name}"
+ },
"freeform": {
"key": "name",
"type": "string",
@@ -215,11 +220,6 @@
"noname="
]
},
- "render": {
- "en": "Name noted on the guidepost: {name}",
- "it": "Nome annotato sul segnavia: {name}",
- "cs": "Název uvedený na rozcestníku: {name}"
- },
"mappings": [
{
"if": "noname=yes",
@@ -241,6 +241,11 @@
"it": "Qual è il numero di riferimento di questo segnavia?",
"cs": "Jaké je referenční číslo tohoto rozcestníku?"
},
+ "render": {
+ "en": "Reference number of the guidepost: {ref}",
+ "it": "Numero di riferimento del segnavia: {ref}",
+ "cs": "Referenční číslo rozcestníku: {ref}"
+ },
"freeform": {
"key": "ref",
"type": "string",
@@ -253,11 +258,6 @@
"noref="
]
},
- "render": {
- "en": "Reference number of the guidepost: {ref}",
- "it": "Numero di riferimento del segnavia: {ref}",
- "cs": "Referenční číslo rozcestníku: {ref}"
- },
"mappings": [
{
"if": "noref=yes",
@@ -279,6 +279,11 @@
"it": "Qual è l'altitudine annotata su questo segnavia?",
"cs": "Jaká je nadmořská výška uvedená na tomto rozcestníku?"
},
+ "render": {
+ "en": "Elevation noted on the guidepost: {ele} m",
+ "it": "Altitudine annotata sul segnavia: {ele} m",
+ "cs": "Nadmořská výška uvedená na rozcestníku: {ele} m"
+ },
"freeform": {
"key": "ele",
"type": "float",
@@ -291,11 +296,6 @@
"noele="
]
},
- "render": {
- "en": "Elevation noted on the guidepost: {ele} m",
- "it": "Altitudine annotata sul segnavia: {ele} m",
- "cs": "Nadmořská výška uvedená na rozcestníku: {ele} m"
- },
"mappings": [
{
"if": "noele=yes",
diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json
index 603146b60..b39ead1ed 100644
--- a/assets/layers/hackerspace/hackerspace.json
+++ b/assets/layers/hackerspace/hackerspace.json
@@ -221,6 +221,7 @@
]
},
{
+ "id": "hackerspaces-name",
"question": {
"en": "What is the name of this hackerspace?",
"de": "Wie lautet der Name dieses Hackerspace?",
@@ -243,8 +244,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "hackerspaces-name"
+ }
},
"level",
"website",
@@ -593,16 +593,7 @@
]
},
{
- "render": {
- "en": "This hackerspace was founded at {start_date}",
- "de": "Dieser Hackerspace wurde gegründet am {start_date}",
- "zh_Hant": "這駭客空間是 {start_date} 成立的",
- "es": "Este hackerspace fue fundado en {start_date}",
- "nl": "Deze hackerspace is opgericht op {start_date}",
- "ca": "Aquest espai hacker es va fundar el {start_date}",
- "cs": "Tento hackerský prostor byl založen {start_date}",
- "it": "Questo hackerspace è stato fondato il {start_date}"
- },
+ "id": "hackerspaces-start_date",
"question": {
"en": "When was this hackerspace founded?",
"de": "Wann wurde dieser Hackerspace gegründet?",
@@ -613,11 +604,20 @@
"cs": "Kdy byl tento hackerský prostor založen?",
"it": "Quando è stato fondato questo hackerspace?"
},
+ "render": {
+ "en": "This hackerspace was founded at {start_date}",
+ "de": "Dieser Hackerspace wurde gegründet am {start_date}",
+ "zh_Hant": "這駭客空間是 {start_date} 成立的",
+ "es": "Este hackerspace fue fundado en {start_date}",
+ "nl": "Deze hackerspace is opgericht op {start_date}",
+ "ca": "Aquest espai hacker es va fundar el {start_date}",
+ "cs": "Tento hackerský prostor byl založen {start_date}",
+ "it": "Questo hackerspace è stato fondato il {start_date}"
+ },
"freeform": {
"key": "start_date",
"type": "date"
- },
- "id": "hackerspaces-start_date"
+ }
},
"internet-all",
"questions"
diff --git a/assets/layers/historic_aircraft/historic_aircraft.json b/assets/layers/historic_aircraft/historic_aircraft.json
index ea3d34578..4224a25a0 100644
--- a/assets/layers/historic_aircraft/historic_aircraft.json
+++ b/assets/layers/historic_aircraft/historic_aircraft.json
@@ -61,18 +61,18 @@
"tagRenderings": [
"images",
{
+ "id": "model",
"question": {
"en": "What type of model is this aircraft?",
"cs": "O jaký typ (model) letadla se jedná?"
},
- "id": "model",
- "freeform": {
- "key": "model:wikidata",
- "type": "wikidata"
- },
"render": {
"en": "{wikipedia(model:wikidata)}",
"cs": "{wikipedia(model:wikidata)}"
+ },
+ "freeform": {
+ "key": "model:wikidata",
+ "type": "wikidata"
}
},
{
diff --git a/assets/layers/hospital/hospital.json b/assets/layers/hospital/hospital.json
index e4831ad0a..8df458a2f 100644
--- a/assets/layers/hospital/hospital.json
+++ b/assets/layers/hospital/hospital.json
@@ -80,18 +80,6 @@
"tagRenderings": [
{
"id": "name",
- "render": {
- "en": "This hospital is called {name}",
- "ca": "Aquest hospital s'anomena {name}",
- "de": "Der Name des Krankenhauses lautet {name}",
- "nl": "Dit ziekenhuis heet {name}",
- "ru": "Эта больница называется {name}",
- "cs": "Tato nemocnice se jmenuje {name}",
- "pl": "Nazwa tego szpitala to {name}",
- "uk": "Ця лікарня називається {name}",
- "es": "Este hospital se llama {name}",
- "it": "Questo ospedale si chiama {name}"
- },
"question": {
"en": "What is the name of this hospital?",
"de": "Wie lautet der Name des Krankenhauses?",
@@ -104,6 +92,18 @@
"es": "¿Cuál es el nombre de este hospital?",
"it": "Qual è il nome di questo ospedale?"
},
+ "render": {
+ "en": "This hospital is called {name}",
+ "ca": "Aquest hospital s'anomena {name}",
+ "de": "Der Name des Krankenhauses lautet {name}",
+ "nl": "Dit ziekenhuis heet {name}",
+ "ru": "Эта больница называется {name}",
+ "cs": "Tato nemocnice se jmenuje {name}",
+ "pl": "Nazwa tego szpitala to {name}",
+ "uk": "Ця лікарня називається {name}",
+ "es": "Este hospital se llama {name}",
+ "it": "Questo ospedale si chiama {name}"
+ },
"freeform": {
"key": "name"
}
@@ -119,6 +119,14 @@
"es": "¿Esta instalación admite pacientes internados?",
"it": "Questa struttura ammette pazienti ricoverati?"
},
+ "questionHint": {
+ "en": "An inpatient is a patient which stays for multiple days in the facility",
+ "de": "Ein stationärer Patient ist ein Patient, der mehrere Tage in der Einrichtung bleibt",
+ "ca": "Un pacient hospitalitzat és un pacient que roman diversos dies a la instal·lació",
+ "cs": "Hospitalizovaný pacient je pacient, který v zařízení pobývá více dní",
+ "es": "Un paciente internado es un paciente que permanece varios días en la instalación",
+ "it": "Un paziente ricoverato è un paziente che rimane per più giorni nella struttura"
+ },
"mappings": [
{
"if": "amenity=clinic",
@@ -144,15 +152,7 @@
"it": "Questo è un ospedale - i pazienti possono essere ricoverati qui per più giorni"
}
}
- ],
- "questionHint": {
- "en": "An inpatient is a patient which stays for multiple days in the facility",
- "de": "Ein stationärer Patient ist ein Patient, der mehrere Tage in der Einrichtung bleibt",
- "ca": "Un pacient hospitalitzat és un pacient que roman diversos dies a la instal·lació",
- "cs": "Hospitalizovaný pacient je pacient, který v zařízení pobývá více dní",
- "es": "Un paciente internado es un paciente que permanece varios días en la instalación",
- "it": "Un paziente ricoverato è un paziente che rimane per più giorni nella struttura"
- }
+ ]
},
"contact",
"address.address",
@@ -174,10 +174,6 @@
"es": "Este es el horario regular de visitas. Algunas varillas tienen horarios de visita diferentes o pueden permitir visitas en caso de emergencia",
"it": "Questi sono gli orari regolari di visita. Alcuni reparti hanno orari di visita diversi o potrebbero consentire visite in caso di emergenza"
},
- "freeform": {
- "key": "opening_hours:visitors",
- "type": "opening_hours"
- },
"render": {
"before": {
"en": "Opening hours for visitors
Regular visitors are allowed at the following moments: ",
@@ -199,6 +195,10 @@
"type": "opening_hours_table",
"key": "opening_hours:visitors"
}
+ },
+ "freeform": {
+ "key": "opening_hours:visitors",
+ "type": "opening_hours"
}
}
],
diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json
index e273bd8f8..0343e3a7b 100644
--- a/assets/layers/hydrant/hydrant.json
+++ b/assets/layers/hydrant/hydrant.json
@@ -201,9 +201,6 @@
"cs": "O jaký typ hydrantu se jedná?",
"pl": "Jakiego rodzaju jest to hydrant?"
},
- "freeform": {
- "key": "fire_hydrant:type"
- },
"render": {
"en": " Hydrant type: {fire_hydrant:type}",
"ru": " Вид гидранта: {fire_hydrant:type}",
@@ -216,6 +213,9 @@
"ca": " Tipus d'hidrants: {fire_hydrant:type}",
"cs": " Typ hydrantu: {fire_hydrant:type}"
},
+ "freeform": {
+ "key": "fire_hydrant:type"
+ },
"mappings": [
{
"if": {
@@ -405,6 +405,16 @@
"es": "¿Cuál es el diámetro de la tubería de esta boca de incendio?",
"it": "Qual è il diametro del tubo di questo idrante?"
},
+ "render": {
+ "en": "Pipe diameter: {canonical(fire_hydrant:diameter)}",
+ "de": "Rohrdurchmesser: {canonical(fire_hydrant:diameter)}",
+ "nl": "Pijpdiameter:{canonical(fire_hydrant:diameter)}",
+ "ru": "Диаметр трубы: {canonical(fire_hydrant:diameter)}",
+ "ca": "Diàmetre de la canonada: {canonical(fire_hydrant:diameter)}",
+ "cs": "Průměr trubky: {canonical(fire_hydrant:diameter)}",
+ "es": "Diámetro de la tubería: {canonical(fire_hydrant:diameter)}",
+ "it": "Diametro del tubo: {canonical(fire_hydrant:diameter)}"
+ },
"freeform": {
"key": "fire_hydrant:diameter",
"placeholder": {
@@ -419,16 +429,6 @@
"it": "Diametro del tubo"
},
"type": "int"
- },
- "render": {
- "en": "Pipe diameter: {canonical(fire_hydrant:diameter)}",
- "de": "Rohrdurchmesser: {canonical(fire_hydrant:diameter)}",
- "nl": "Pijpdiameter:{canonical(fire_hydrant:diameter)}",
- "ru": "Диаметр трубы: {canonical(fire_hydrant:diameter)}",
- "ca": "Diàmetre de la canonada: {canonical(fire_hydrant:diameter)}",
- "cs": "Průměr trubky: {canonical(fire_hydrant:diameter)}",
- "es": "Diámetro de la tubería: {canonical(fire_hydrant:diameter)}",
- "it": "Diametro del tubo: {canonical(fire_hydrant:diameter)}"
}
},
{
@@ -443,6 +443,15 @@
"es": "¿Cuántos acoplamientos tiene esta boca de incendio?",
"it": "Quanti attacchi ha questo idrante?"
},
+ "render": {
+ "en": "Number of couplings: {couplings}",
+ "de": "Anzahl der Kupplungen: {couplings}",
+ "nl": "Aantal koppelingen: {couplings}",
+ "ca": "Nombre d'acoblaments: {couplings}",
+ "cs": "Počet spojek: {couplings}",
+ "es": "Número de acoplamientos: {couplings}",
+ "it": "Numero di attacchi: {couplings}"
+ },
"freeform": {
"key": "couplings",
"placeholder": {
@@ -455,15 +464,6 @@
"it": "Numero di attacchi"
},
"type": "int"
- },
- "render": {
- "en": "Number of couplings: {couplings}",
- "de": "Anzahl der Kupplungen: {couplings}",
- "nl": "Aantal koppelingen: {couplings}",
- "ca": "Nombre d'acoblaments: {couplings}",
- "cs": "Počet spojek: {couplings}",
- "es": "Número de acoplamientos: {couplings}",
- "it": "Numero di attacchi: {couplings}"
}
},
{
@@ -478,6 +478,16 @@
"es": "¿Qué tipo de acoplamientos tiene esta boca de incendio?",
"it": "Che tipo di attacchi ha questo idrante?"
},
+ "render": {
+ "en": "Couplings: {couplings:type}",
+ "de": "Kupplungen: {couplings:type}",
+ "nl": "Koppelingen:{couplings:type}",
+ "ru": "Соединительные головки: {couplings:type}",
+ "ca": "Acoblaments: {couplings:type}",
+ "cs": "Spojky: {couplings:type}",
+ "es": "Acoplamientos: {couplings:type}",
+ "it": "Attacchi: {couplings:type}"
+ },
"freeform": {
"key": "couplings:type",
"placeholder": {
@@ -541,17 +551,7 @@
}
}
],
- "multiAnswer": true,
- "render": {
- "en": "Couplings: {couplings:type}",
- "de": "Kupplungen: {couplings:type}",
- "nl": "Koppelingen:{couplings:type}",
- "ru": "Соединительные головки: {couplings:type}",
- "ca": "Acoblaments: {couplings:type}",
- "cs": "Spojky: {couplings:type}",
- "es": "Acoplamientos: {couplings:type}",
- "it": "Attacchi: {couplings:type}"
- }
+ "multiAnswer": true
},
{
"id": "hydrant-couplings-diameters",
@@ -565,6 +565,16 @@
"es": "¿Qué diámetro tienen los acoplamientos de esta boca de incendio?",
"it": "Qual è il diametro degli attacchi di questo idrante?"
},
+ "render": {
+ "en": "Coupling diameters: {couplings:diameters}",
+ "de": "Kupplungsdurchmesser: {couplings:diameters}",
+ "nl": "Koppelingdiameters:{couplings:diameters}",
+ "ru": "Диаметр соединительных головок: {couplings:diameters}",
+ "ca": "Diàmetres d'acoblament: {couplings:diameters}",
+ "cs": "Průměry spojek: {couplings:diameters}",
+ "es": "Diámetro de los acoplamientos: {couplings:diameters}",
+ "it": "Diametri degli attacchi: {couplings:diameters}"
+ },
"freeform": {
"key": "couplings:diameters",
"placeholder": {
@@ -577,16 +587,6 @@
"es": "Diámetro de los acoplamientos",
"it": "Diametri degli attacchi"
}
- },
- "render": {
- "en": "Coupling diameters: {couplings:diameters}",
- "de": "Kupplungsdurchmesser: {couplings:diameters}",
- "nl": "Koppelingdiameters:{couplings:diameters}",
- "ru": "Диаметр соединительных головок: {couplings:diameters}",
- "ca": "Diàmetres d'acoblament: {couplings:diameters}",
- "cs": "Průměry spojek: {couplings:diameters}",
- "es": "Diámetro de los acoplamientos: {couplings:diameters}",
- "it": "Diametri degli attacchi: {couplings:diameters}"
}
},
{
@@ -603,6 +603,12 @@
"it": "Questo di solito si trova sull'idrante o su un cartello nelle vicinanze.",
"cs": "Obvykle ho lze najít na hydrantu nebo na blízké značce."
},
+ "render": {
+ "en": "Reference number: {ref}",
+ "nl": "Referentienummer: {ref}",
+ "it": "Numero di riferimento: {ref}",
+ "cs": "Referenční číslo: {ref}"
+ },
"freeform": {
"key": "ref",
"placeholder": {
@@ -612,12 +618,6 @@
"cs": "Referenční číslo hydrantu"
},
"type": "string"
- },
- "render": {
- "en": "Reference number: {ref}",
- "nl": "Referentienummer: {ref}",
- "it": "Numero di riferimento: {ref}",
- "cs": "Referenční číslo: {ref}"
}
},
"images"
diff --git a/assets/layers/ice_cream/ice_cream.json b/assets/layers/ice_cream/ice_cream.json
index 8a3c58c2c..9901c4443 100644
--- a/assets/layers/ice_cream/ice_cream.json
+++ b/assets/layers/ice_cream/ice_cream.json
@@ -110,6 +110,7 @@
"images",
"reviews",
{
+ "id": "icecream_name",
"question": {
"en": "What is the name of this ice cream parlor?",
"nl": "Wat is de naam van dit ijssalon?",
@@ -119,10 +120,6 @@
"cs": "Jaký je název tohoto zmrzlinářství?",
"it": "Qual è il nome di questa gelateria?"
},
- "id": "icecream_name",
- "freeform": {
- "key": "name"
- },
"render": {
"en": "This ice cream parlor is named {name}",
"nl": "Dit ijssalon heet {name}",
@@ -131,6 +128,9 @@
"ca": "Aquesta gelateria es diu {name}",
"cs": "Toto zmrzlinářství má název {name}",
"it": "Questa gelateria si chiama {name}"
+ },
+ "freeform": {
+ "key": "name"
}
},
"opening_hours",
diff --git a/assets/layers/icons/icons.json b/assets/layers/icons/icons.json
index f1d8b28d4..08020cc14 100644
--- a/assets/layers/icons/icons.json
+++ b/assets/layers/icons/icons.json
@@ -26,12 +26,6 @@
"text": "
"
}
},
- "condition": {
- "or": [
- "wikipedia~*",
- "wikidata~*"
- ]
- },
"mappings": [
{
"#": "ignore-image-in-then",
@@ -45,11 +39,16 @@
}
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "wikipedia~*",
+ "wikidata~*"
+ ]
+ }
},
{
"id": "isOpen",
- "#": "Shows a coloured clock if opening hours are parsed. Uses the metatagging, suitable to use as a (badged) overlay",
"mappings": [
{
"if": "_isOpen=yes",
@@ -80,7 +79,8 @@
"then": "circle:#f0f;clock:#fff"
}
],
- "metacondition": "__showTimeSensitiveIcons!=no"
+ "metacondition": "__showTimeSensitiveIcons!=no",
+ "#": "Shows a coloured clock if opening hours are parsed. Uses the metatagging, suitable to use as a (badged) overlay"
},
{
"id": "open_until",
@@ -88,11 +88,10 @@
"defaults",
"in_favourite"
],
- "#": "Titleicon showing e.g. 'open until 17:00'",
+ "render": "{opening_hours_state()}",
"icon": {
"class": "mx-1 flex items-center"
},
- "render": "{opening_hours_state()}",
"condition": {
"or": [
"opening_hours~*",
@@ -125,7 +124,8 @@
]
}
]
- }
+ },
+ "#": "Titleicon showing e.g. 'open until 17:00'"
},
{
"id": "phonelink",
@@ -364,7 +364,6 @@
}
}
},
- "metacondition": "_loggedIn=true",
"mappings": [
{
"if": "id~.*/-.*",
@@ -420,20 +419,21 @@
"id~(node|way|relation)/[0-9]*",
"osm_id~*"
]
- }
+ },
+ "metacondition": "_loggedIn=true"
},
{
"id": "rating",
+ "render": "{rating()}",
"icon": {
"class": "w-20 mx-1 flex items-center"
- },
- "render": "{rating()}"
+ }
},
{
"id": "favourite_icon",
"description": "Only for rendering",
- "condition": "_favourite=yes",
"icon": "circle:white;heart:red",
+ "condition": "_favourite=yes",
"metacondition": "__showTimeSensitiveIcons!=no"
},
{
diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json
index b037caaf8..64f126a07 100644
--- a/assets/layers/indoors/indoors.json
+++ b/assets/layers/indoors/indoors.json
@@ -676,19 +676,6 @@
"ca": "Quanta gent pot, com a màxim, encaixar en aquesta habitació?",
"it": "Quante persone possono stare al massimo in questa stanza?"
},
- "condition": {
- "or": [
- "room=waiting",
- "room=restaurant",
- "room=office",
- "room=nursery",
- "room=conference",
- "room=auditorium",
- "room=chapel",
- "room=bedroom",
- "room=classroom"
- ]
- },
"render": {
"en": "At most {capacity} people fit this room",
"de": "Kapazität für höchstens {capacity} Personen",
@@ -701,6 +688,19 @@
"freeform": {
"key": "capacity",
"type": "pnat"
+ },
+ "condition": {
+ "or": [
+ "room=waiting",
+ "room=restaurant",
+ "room=office",
+ "room=nursery",
+ "room=conference",
+ "room=auditorium",
+ "room=chapel",
+ "room=bedroom",
+ "room=classroom"
+ ]
}
},
{
diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json
index e9b3799a0..06afded4b 100644
--- a/assets/layers/kerbs/kerbs.json
+++ b/assets/layers/kerbs/kerbs.json
@@ -323,6 +323,26 @@
"cs": "Jakou barvu má hmatová dlažba?",
"it": "Qual è il colore della pavimentazione tattile?"
},
+ "render": {
+ "en": "The tactile paving is coloured {tactile_paving:colour}.",
+ "nl": "De voelbare bestrating is {tactile_paving:colour} gekleurd.",
+ "ca": "El paviment podotàctil és de color {tactile_paving:colour}.",
+ "de": "Die taktilen Pflastersteine sind in der Farbe {tactile_paving:colour} gehalten.",
+ "cs": "Hmatová dlažba je {tactile_paving:colour}.",
+ "it": "La pavimentazione tattile è colorata {tactile_paving:colour}."
+ },
+ "freeform": {
+ "key": "tactile_paving:colour",
+ "type": "color",
+ "placeholder": {
+ "en": "Colour of the tactile paving",
+ "nl": "Kleur van de voelbare bestrating",
+ "ca": "Color del paviment podotàctil",
+ "de": "Farbe des taktilen Pflasters",
+ "it": "Colore della pavimentazione tattile",
+ "cs": "Barva hmatové dlažby"
+ }
+ },
"mappings": [
{
"if": "tactile_paving:colour=yellow",
@@ -365,26 +385,6 @@
}
}
],
- "freeform": {
- "key": "tactile_paving:colour",
- "type": "color",
- "placeholder": {
- "en": "Colour of the tactile paving",
- "nl": "Kleur van de voelbare bestrating",
- "ca": "Color del paviment podotàctil",
- "de": "Farbe des taktilen Pflasters",
- "it": "Colore della pavimentazione tattile",
- "cs": "Barva hmatové dlažby"
- }
- },
- "render": {
- "en": "The tactile paving is coloured {tactile_paving:colour}.",
- "nl": "De voelbare bestrating is {tactile_paving:colour} gekleurd.",
- "ca": "El paviment podotàctil és de color {tactile_paving:colour}.",
- "de": "Die taktilen Pflastersteine sind in der Farbe {tactile_paving:colour} gehalten.",
- "cs": "Hmatová dlažba je {tactile_paving:colour}.",
- "it": "La pavimentazione tattile è colorata {tactile_paving:colour}."
- },
"condition": {
"and": [
"tactile_paving!=no",
diff --git a/assets/layers/last_click/last_click.json b/assets/layers/last_click/last_click.json
index 9427b30e4..9c73ee239 100644
--- a/assets/layers/last_click/last_click.json
+++ b/assets/layers/last_click/last_click.json
@@ -192,31 +192,31 @@
"tagRenderings": [
{
"id": "add_new",
- "classes": "max-h-leave-room special-add-new-point flex-1",
- "condition": "has_presets=yes",
"render": {
"*": "{add_new_point()}"
- }
+ },
+ "condition": "has_presets=yes",
+ "classes": "max-h-leave-room special-add-new-point flex-1"
},
{
"id": "add_note",
- "classes": "flex-1",
- "condition": "has_note_layer=yes",
"render": {
"*": "{open_note()}"
- }
+ },
+ "condition": "has_note_layer=yes",
+ "classes": "flex-1"
},
{
"id": "nearby_images",
- "classes": "w-fit self-end",
"render": {
"*": "{nearby_images(,true)}"
- }
+ },
+ "classes": "w-fit self-end"
},
{
"id": "debug",
- "metacondition": "__featureSwitchIsDebugging=true",
- "render": "{all_tags()}"
+ "render": "{all_tags()}",
+ "metacondition": "__featureSwitchIsDebugging=true"
}
],
"filter": [
diff --git a/assets/layers/lighthouse/lighthouse.json b/assets/layers/lighthouse/lighthouse.json
index eebd44449..7551a3847 100644
--- a/assets/layers/lighthouse/lighthouse.json
+++ b/assets/layers/lighthouse/lighthouse.json
@@ -72,14 +72,7 @@
"images",
"wikipedia",
{
- "render": {
- "en": "The height of this lighthouse is {height} metres.",
- "de": "Die Höhe dieses Leuchtturms beträgt {height} Meter.",
- "es": "La altura de este faro es de {height} metros.",
- "ca": "L'alçada d'aquest far és de {height} metres.",
- "cs": "Výška tohoto majáku je {height} metrů.",
- "it": "L'altezza di questo faro è {height} metri."
- },
+ "id": "lighthouse-height",
"question": {
"en": "What is the height of this lighthouse, in metres?",
"de": "Wie hoch ist dieser Leuchtturm in Metern?",
@@ -88,11 +81,18 @@
"cs": "Jaká je výška tohoto majáku, v metrech?",
"it": "Qual è l'altezza di questo faro, in metri?"
},
+ "render": {
+ "en": "The height of this lighthouse is {height} metres.",
+ "de": "Die Höhe dieses Leuchtturms beträgt {height} Meter.",
+ "es": "La altura de este faro es de {height} metros.",
+ "ca": "L'alçada d'aquest far és de {height} metres.",
+ "cs": "Výška tohoto majáku je {height} metrů.",
+ "it": "L'altezza di questo faro è {height} metri."
+ },
"freeform": {
"key": "height",
"type": "pfloat"
- },
- "id": "lighthouse-height"
+ }
}
],
"allowMove": {
diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json
index 6e48df760..ca91ae3e1 100644
--- a/assets/layers/map/map.json
+++ b/assets/layers/map/map.json
@@ -280,6 +280,7 @@
]
},
{
+ "id": "map-map_source",
"labels": [
"map"
],
@@ -294,6 +295,21 @@
"pl": "Na jakich danych bazuje ta mapa?",
"cs": "Na jakých datech je mapa založena?"
},
+ "render": {
+ "en": "This map is based on {map_source}",
+ "nl": "Deze kaart is gebaseerd op {map_source}",
+ "it": "Questa mappa è basata su {map_source}",
+ "ru": "Эта карта основана на {map_source}",
+ "fr": "Cette carte est basée sur {map_source}",
+ "de": "Diese Karte basiert auf {map_source}",
+ "es": "Este mapa se basa en {map_source}",
+ "pl": "Ta mapa bazuje na {map_source}",
+ "ca": "Aquest mapa està basat en {map_source}",
+ "cs": "Tato mapa vychází z {map_source}"
+ },
+ "freeform": {
+ "key": "map_source"
+ },
"mappings": [
{
"if": {
@@ -315,23 +331,7 @@
"cs": "Tato mapa je založena na OpenStreetMap"
}
}
- ],
- "freeform": {
- "key": "map_source"
- },
- "render": {
- "en": "This map is based on {map_source}",
- "nl": "Deze kaart is gebaseerd op {map_source}",
- "it": "Questa mappa è basata su {map_source}",
- "ru": "Эта карта основана на {map_source}",
- "fr": "Cette carte est basée sur {map_source}",
- "de": "Diese Karte basiert auf {map_source}",
- "es": "Este mapa se basa en {map_source}",
- "pl": "Ta mapa bazuje na {map_source}",
- "ca": "Aquest mapa està basat en {map_source}",
- "cs": "Tato mapa vychází z {map_source}"
- },
- "id": "map-map_source"
+ ]
},
{
"id": "map-attribution",
diff --git a/assets/layers/maproulette/maproulette.json b/assets/layers/maproulette/maproulette.json
index 71564e551..4aab5bd9a 100644
--- a/assets/layers/maproulette/maproulette.json
+++ b/assets/layers/maproulette/maproulette.json
@@ -213,10 +213,10 @@
]
},
{
+ "id": "mark_fixed",
"labels": [
"controls"
],
- "id": "mark_fixed",
"render": {
"special": {
"type": "maproulette_set_status",
diff --git a/assets/layers/maxspeed/maxspeed.json b/assets/layers/maxspeed/maxspeed.json
index 271cb5bb1..7981f2f4d 100644
--- a/assets/layers/maxspeed/maxspeed.json
+++ b/assets/layers/maxspeed/maxspeed.json
@@ -122,17 +122,6 @@
"tagRenderings": [
{
"id": "maxspeed-maxspeed",
- "render": {
- "en": "The maximum allowed speed on this road is {canonical(maxspeed)}",
- "de": "Die zulässige Höchstgeschwindigkeit auf dieser Straße beträgt {canonical(maxspeed)}",
- "nl": "De maximum toegestane snelheid op deze weg is {canonical(maxspeed)}",
- "ca": "La velocitat màxima permesa a aquesta via és {canonical(maxspeed)}",
- "fr": "La vitesse maximum autorisée sur cette route est {canonical(maxspeed)}",
- "cs": "Maximální povolená rychlost na této cestě je {canonical(maxspeed)}",
- "pl": "Maksymalna prędkość dopuszczona na tej drodze to {canonical(maxspeed)}",
- "es": "La velocidad máxima permitida en esta carretera es {canonical(maxspeed)}",
- "it": "La velocità massima consentita su questa strada è {canonical(maxspeed)}"
- },
"question": {
"es": "¿Cuál es la velocidad máxima legal a la que se permite conducir en esta carretera?",
"ca": "Quina és la velocitat màxima legal que es permet conduir en aquesta carretera?",
@@ -145,6 +134,17 @@
"ru": "С какой максимальной скоростью разрешено ездить по этой дороге?",
"it": "Qual è la velocità massima legale consentita su questa strada?"
},
+ "render": {
+ "en": "The maximum allowed speed on this road is {canonical(maxspeed)}",
+ "de": "Die zulässige Höchstgeschwindigkeit auf dieser Straße beträgt {canonical(maxspeed)}",
+ "nl": "De maximum toegestane snelheid op deze weg is {canonical(maxspeed)}",
+ "ca": "La velocitat màxima permesa a aquesta via és {canonical(maxspeed)}",
+ "fr": "La vitesse maximum autorisée sur cette route est {canonical(maxspeed)}",
+ "cs": "Maximální povolená rychlost na této cestě je {canonical(maxspeed)}",
+ "pl": "Maksymalna prędkość dopuszczona na tej drodze to {canonical(maxspeed)}",
+ "es": "La velocidad máxima permitida en esta carretera es {canonical(maxspeed)}",
+ "it": "La velocità massima consentita su questa strada è {canonical(maxspeed)}"
+ },
"freeform": {
"key": "maxspeed",
"type": "pnat",
@@ -207,13 +207,6 @@
},
{
"id": "maxspeed-forward",
- "condition": {
- "or": [
- "maxspeed:backward~*",
- "maxspeed:forward~*",
- "_forward_backward=yes"
- ]
- },
"question": {
"en": "What is the maximum allowed speed when travelling {direction_absolute()}?",
"it": "Qual è la velocità massima consentita quando si viaggia {direction_absolute()}?",
@@ -227,17 +220,17 @@
"freeform": {
"key": "maxspeed:forward",
"type": "pnat"
+ },
+ "condition": {
+ "or": [
+ "maxspeed:backward~*",
+ "maxspeed:forward~*",
+ "_forward_backward=yes"
+ ]
}
},
{
"id": "maxspeed-backward",
- "condition": {
- "or": [
- "maxspeed:forward~*",
- "maxspeed:backward~*",
- "_forward_backward=yes"
- ]
- },
"question": {
"en": "What is the maximum allowed speed when travelling {direction_absolute(,180)}?",
"it": "Qual è la velocità massima consentita quando si viaggia {direction_absolute(,180)}?",
@@ -251,6 +244,13 @@
"freeform": {
"key": "maxspeed:backward",
"type": "pnat"
+ },
+ "condition": {
+ "or": [
+ "maxspeed:forward~*",
+ "maxspeed:backward~*",
+ "_forward_backward=yes"
+ ]
}
}
],
diff --git a/assets/layers/memorial/memorial.json b/assets/layers/memorial/memorial.json
index 1bc58a856..12eeb0ec8 100644
--- a/assets/layers/memorial/memorial.json
+++ b/assets/layers/memorial/memorial.json
@@ -146,6 +146,20 @@
"it": "Che tipo di memoriale è questo?",
"uk": "Що це за меморіал?"
},
+ "render": {
+ "en": "This is a {memorial}",
+ "de": "Das ist ein {memorial}",
+ "fr": "C'est un {memorial}",
+ "sl": "To je {memorial}",
+ "ca": "Això és un {memorial}",
+ "es": "Se trata de un {memorial}",
+ "cs": "Toto je {memorial}",
+ "it": "Questo è un {memorial}",
+ "uk": "Це {memorial}"
+ },
+ "freeform": {
+ "key": "memorial"
+ },
"mappings": [
{
"if": "memorial=statue",
@@ -375,20 +389,6 @@
]
}
],
- "render": {
- "en": "This is a {memorial}",
- "de": "Das ist ein {memorial}",
- "fr": "C'est un {memorial}",
- "sl": "To je {memorial}",
- "ca": "Això és un {memorial}",
- "es": "Se trata de un {memorial}",
- "cs": "Toto je {memorial}",
- "it": "Questo è un {memorial}",
- "uk": "Це {memorial}"
- },
- "freeform": {
- "key": "memorial"
- },
"filter": true
},
{
@@ -408,12 +408,6 @@
"es": "¿Cuál es la inscripción de este monumento?",
"it": "Qual è l'iscrizione su questo memoriale?"
},
- "#:condition": "Benches have a separate inscription question",
- "condition": {
- "and": [
- "memorial!=bench"
- ]
- },
"render": {
"en": "The inscription on this memorial reads: {inscription}
",
"ca": "La inscripció d'aquest memorial diu: {inscription}
",
@@ -448,7 +442,13 @@
"inscription="
]
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "memorial!=bench"
+ ]
+ },
+ "#:condition": "Benches have a separate inscription question"
},
{
"id": "memorial-wikidata",
@@ -456,10 +456,6 @@
"memorial-specific",
"memorial-questions"
],
- "freeform": {
- "key": "wikidata",
- "type": "wikidata"
- },
"question": {
"en": "What is the Wikipedia page about this memorial?",
"nl": "Wat is het Wikipedia-artikel over dit gedenkteken?",
@@ -495,6 +491,10 @@
"cs": "Stránka Wikipedie o památníku
",
"it": "Pagina Wikipedia sul memoriale
"
}
+ },
+ "freeform": {
+ "key": "wikidata",
+ "type": "wikidata"
}
},
{
@@ -503,13 +503,6 @@
"memorial-specific",
"memorial-questions"
],
- "freeform": {
- "key": "subject:wikidata",
- "type": "wikidata",
- "helperArgs": [
- "subject;memorial:conflict;name"
- ]
- },
"question": {
"en": "What is the Wikipedia page about the person or event that is remembered here?",
"nl": "Wat is het Wikipedia-artikel over de persoon of de gebeurtenis die herdacht wordt?",
@@ -545,9 +538,17 @@
"cs": "Stránka Wikipedie o události nebo osobě
",
"it": "Pagina Wikipedia sull'evento o la persona ricordata
"
}
+ },
+ "freeform": {
+ "key": "subject:wikidata",
+ "type": "wikidata",
+ "helperArgs": [
+ "subject;memorial:conflict;name"
+ ]
}
},
{
+ "id": "start_date",
"question": {
"en": "When was this memorial installed?",
"nl": "Wanneer werd dit gedenkteken geplaatst?",
@@ -573,8 +574,7 @@
"freeform": {
"key": "start_date",
"type": "date"
- },
- "id": "start_date"
+ }
},
{
"builtin": "bench.bench-questions",
diff --git a/assets/layers/mobility_hub/mobility_hub.json b/assets/layers/mobility_hub/mobility_hub.json
index 7c1cee0bd..3b815944e 100644
--- a/assets/layers/mobility_hub/mobility_hub.json
+++ b/assets/layers/mobility_hub/mobility_hub.json
@@ -135,13 +135,13 @@
"tagRenderings": [
"images",
{
+ "id": "name",
"question": {
"en": "What is the name of this mobility hub?",
"nl": "Wat is de naam van deze mobiliteitshub?",
"it": "Qual è il nome di questo hub di mobilità?",
"cs": "Jaký je název tohoto centra mobility?"
},
- "id": "name",
"render": {
"en": "This mobility hub is called {name}",
"nl": "Deze mobiliteitshub heet {name}",
@@ -174,13 +174,19 @@
]
},
{
+ "id": "network",
"question": {
"en": "To which network does this mobility hub belong to?",
"nl": "Bij welk netwerk hoort deze mobiliteitshub?",
"it": "A quale rete appartiene questo hub di mobilità?",
"cs": "Ke které síti patří toto centrum mobility?"
},
- "id": "network",
+ "render": {
+ "en": "This mobility hub belongs to the network {network}",
+ "nl": "Deze mobiliteitshub hoort bij het netwerk {network}",
+ "it": "Questo hub di mobilità appartiene alla rete {network}",
+ "cs": "Toto centrum mobility patří k síti {network}"
+ },
"freeform": {
"key": "network",
"type": "string",
@@ -195,12 +201,6 @@
"nonetwork="
]
},
- "render": {
- "en": "This mobility hub belongs to the network {network}",
- "nl": "Deze mobiliteitshub hoort bij het netwerk {network}",
- "it": "Questo hub di mobilità appartiene alla rete {network}",
- "cs": "Toto centrum mobility patří k síti {network}"
- },
"mappings": [
{
"if": "nonetwork=yes",
diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json
index a15bfd2dc..d6abf818b 100644
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@@ -113,16 +113,7 @@
"tagRenderings": [
"images",
{
- "render": {
- "en": "Accessin this nature reserve: {access:description}",
- "nl": "De toegankelijkheid van dit gebied is: {access:description}",
- "de": "Zugang zu diesem Naturschutzgebiet: {access:description}",
- "ca": "Accés a aquesta reserva natural: {access:description}",
- "cs": "Přístup do této přírodní rezervace: {access:description}",
- "uk": "Доступ до цього природного заповідника: {access:description}",
- "es": "Acceso a esta reserva natural: {access:description}",
- "it": "Accesso a questa riserva naturale: {access:description}"
- },
+ "id": "Access tag",
"question": {
"en": "Is this nature reserve accessible to the public?",
"nl": "Is dit gebied toegankelijk?",
@@ -133,6 +124,16 @@
"es": "¿Es accesible al público esta reserva natural?",
"it": "Questa riserva naturale è accessibile al pubblico?"
},
+ "render": {
+ "en": "Accessin this nature reserve: {access:description}",
+ "nl": "De toegankelijkheid van dit gebied is: {access:description}",
+ "de": "Zugang zu diesem Naturschutzgebiet: {access:description}",
+ "ca": "Accés a aquesta reserva natural: {access:description}",
+ "cs": "Přístup do této přírodní rezervace: {access:description}",
+ "uk": "Доступ до цього природного заповідника: {access:description}",
+ "es": "Acceso a esta reserva natural: {access:description}",
+ "it": "Accesso a questa riserva naturale: {access:description}"
+ },
"freeform": {
"key": "access:description"
},
@@ -245,19 +246,10 @@
"it": "Accessibile a pagamento"
}
}
- ],
- "id": "Access tag"
+ ]
},
{
- "render": {
- "en": "Operated by {operator}",
- "nl": "Beheer door {operator}",
- "de": "Betrieben von {operator}",
- "es": "Gestionado por {operator}",
- "ca": "Gestionat per {operator}",
- "cs": "Provozuje {operator}",
- "it": "Gestita da {operator}"
- },
+ "id": "Operator tag",
"question": {
"en": "Who operates this area?",
"nl": "Wie beheert dit gebied?",
@@ -267,6 +259,15 @@
"cs": "Kdo provozuje tuto oblast?",
"it": "Chi gestisce quest'area?"
},
+ "render": {
+ "en": "Operated by {operator}",
+ "nl": "Beheer door {operator}",
+ "de": "Betrieben von {operator}",
+ "es": "Gestionado por {operator}",
+ "ca": "Gestionat per {operator}",
+ "cs": "Provozuje {operator}",
+ "it": "Gestita da {operator}"
+ },
"freeform": {
"key": "operator"
},
@@ -323,19 +324,10 @@
},
"icon": "./assets/layers/nature_reserve/ANB.jpg"
}
- ],
- "id": "Operator tag"
+ ]
},
{
- "render": {
- "nl": "Dit gebied heet {name}",
- "en": "This area is named {name}",
- "de": "Dieses Gebiet heißt {name}",
- "es": "Esta área se llama {name}",
- "ca": "Aquesta àrea s'anomena {name}",
- "cs": "Tato oblast se jmenuje {name}",
- "it": "Quest'area si chiama {name}"
- },
+ "id": "Name tag",
"question": {
"nl": "Wat is de naam van dit gebied?",
"en": "What is the name of this area?",
@@ -345,17 +337,21 @@
"cs": "Jaký je název této oblasti?",
"it": "Qual è il nome di quest'area?"
},
+ "render": {
+ "nl": "Dit gebied heet {name}",
+ "en": "This area is named {name}",
+ "de": "Dieses Gebiet heißt {name}",
+ "es": "Esta área se llama {name}",
+ "ca": "Aquesta àrea s'anomena {name}",
+ "cs": "Tato oblast se jmenuje {name}",
+ "it": "Quest'area si chiama {name}"
+ },
"freeform": {
"key": "name",
"addExtraTags": [
"noname="
]
},
- "condition": {
- "and": [
- "name:nl="
- ]
- },
"mappings": [
{
"if": {
@@ -376,9 +372,14 @@
}
}
],
- "id": "Name tag"
+ "condition": {
+ "and": [
+ "name:nl="
+ ]
+ }
},
{
+ "id": "Dogs?",
"question": {
"nl": "Zijn honden toegelaten in dit gebied?",
"en": "Are dogs allowed in this nature reserve?",
@@ -389,13 +390,6 @@
"cs": "Jsou v této přírodní rezervaci povoleni psi?",
"es": "¿Se permiten perros en esta reserva natural?"
},
- "condition": {
- "or": [
- "access=yes",
- "access=permissive",
- "access=guided"
- ]
- },
"mappings": [
{
"if": "dog=leashed",
@@ -437,10 +431,17 @@
}
}
],
- "id": "Dogs?"
+ "condition": {
+ "or": [
+ "access=yes",
+ "access=permissive",
+ "access=guided"
+ ]
+ }
},
"website",
{
+ "id": "Curator",
"question": {
"nl": "Wie is de conservator van dit gebied?",
"en": "Whom is the curator of this nature reserve?",
@@ -451,6 +452,16 @@
"cs": "Kdo je správcem této přírodní rezervace?",
"es": "¿Quién es el conservador de esta reserva natural?"
},
+ "questionHint": {
+ "nl": "Respecteer privacy - geef deze naam enkel als die duidelijk is gepubliceerd",
+ "en": "Respect privacy - only fill out a name if this is widely published",
+ "it": "Rispetta la privacy - inserisci un nome solo se è ampiamente pubblicato",
+ "fr": "À ne remplir seulement que si le nom est diffusé au public",
+ "de": "Respektieren Sie die Privatsphäre. Geben Sie nur dann einen Namen an, wenn dieser allgemein bekannt ist",
+ "ca": "Respecteu la privadesa: només empleneu un nom si es publica àmpliament",
+ "cs": "Respektujte soukromí - jméno vyplňte pouze v případě, že je široce publikováno",
+ "es": "Respeta la privacidad: sólo rellena un nombre si esto se publica ampliamente"
+ },
"render": {
"nl": "{curator} is de beheerder van dit gebied",
"en": "{curator} is the curator of this nature reserve",
@@ -464,20 +475,10 @@
"freeform": {
"key": "curator",
"type": "string"
- },
- "id": "Curator",
- "questionHint": {
- "nl": "Respecteer privacy - geef deze naam enkel als die duidelijk is gepubliceerd",
- "en": "Respect privacy - only fill out a name if this is widely published",
- "it": "Rispetta la privacy - inserisci un nome solo se è ampiamente pubblicato",
- "fr": "À ne remplir seulement que si le nom est diffusé au public",
- "de": "Respektieren Sie die Privatsphäre. Geben Sie nur dann einen Namen an, wenn dieser allgemein bekannt ist",
- "ca": "Respecteu la privadesa: només empleneu un nom si es publica àmpliament",
- "cs": "Respektujte soukromí - jméno vyplňte pouze v případě, že je široce publikováno",
- "es": "Respeta la privacidad: sólo rellena un nombre si esto se publica ampliamente"
}
},
{
+ "id": "Email",
"question": {
"nl": "Waar kan men naartoe emailen voor vragen en meldingen van dit natuurgebied?",
"en": "What email address can one send to with questions and problems with this nature reserve?",
@@ -488,14 +489,6 @@
"cs": "Na jakou e-mailovou adresu lze poslat dotazy a problémy týkající se této přírodní rezervace?",
"es": "¿A qué dirección de correo electrónico se puede enviar preguntas y problemas con esta reserva natural?"
},
- "render": {
- "*": "{email}"
- },
- "freeform": {
- "key": "email",
- "type": "email"
- },
- "id": "Email",
"questionHint": {
"nl": "Respecteer privacy - geef enkel persoonlijke emailadressen als deze elders zijn gepubliceerd",
"en": "Respect privacy - only fill out a personal email address if this is widely published",
@@ -505,9 +498,17 @@
"ca": "Respecteu la privadesa: només ompliu una adreça de correu electrònic personal si es publica àmpliament",
"cs": "Respektujte soukromí - osobní e-mailovou adresu vyplňte pouze v případě, že je široce publikována",
"es": "Respeta la privacidad: sólo rellena una dirección de correo electrónico personal si esto se publica ampliamente"
+ },
+ "render": {
+ "*": "{email}"
+ },
+ "freeform": {
+ "key": "email",
+ "type": "email"
}
},
{
+ "id": "phone",
"question": {
"nl": "Waar kan men naartoe bellen voor vragen en meldingen van dit natuurgebied?",
"en": "What phone number can one call to with questions and problems with this nature reserve?",
@@ -519,14 +520,6 @@
"es": "¿Qué número de teléfono se puede llamar para preguntas y problemas con esta reserva natural?",
"uk": "За яким номером телефону можна звертатися з питаннями та проблемами, пов'язаними з цим заповідником?"
},
- "render": {
- "*": "{phone}"
- },
- "freeform": {
- "key": "phone",
- "type": "phone"
- },
- "id": "phone",
"questionHint": {
"nl": "Respecteer privacy - geef enkel persoonlijke telefoonnummers als deze elders zijn gepubliceerd",
"en": "Respect privacy - only fill out a personal phone number address if this is widely published",
@@ -537,9 +530,17 @@
"cs": "Respektujte soukromí - adresu s osobním telefonním číslem vyplňte pouze v případě, že je široce zveřejněna",
"es": "Respeta la privacidad: sólo rellena una dirección de número de teléfono personal si esto se publica ampliamente",
"uk": "Поважайте приватність - вказуйте особистий номер телефону лише в тому випадку, якщо він є загальнодоступним"
+ },
+ "render": {
+ "*": "{phone}"
+ },
+ "freeform": {
+ "key": "phone",
+ "type": "phone"
}
},
{
+ "id": "Non-editable description",
"render": {
"en": "Extra information: {description}",
"nl": "Extra info: {description}",
@@ -551,10 +552,10 @@
},
"freeform": {
"key": "description"
- },
- "id": "Non-editable description"
+ }
},
{
+ "id": "Editable description",
"question": {
"en": "Is there some extra info?",
"nl": "Is er extra info die je kwijt wil?",
@@ -577,10 +578,10 @@
},
"freeform": {
"key": "description:0"
- },
- "id": "Editable description"
+ }
},
{
+ "id": "Surface area",
"render": {
"en": "Surface area: {_surface:ha}Ha",
"nl": "Totale oppervlakte: {_surface:ha}Ha",
@@ -591,8 +592,7 @@
"ca": "Superfície: {_surface:ha}Ha",
"cs": "Plocha: {_surface:ha}Ha"
},
- "condition": "_surface:ha!=0",
- "id": "Surface area"
+ "condition": "_surface:ha!=0"
},
"wikipedia"
],
diff --git a/assets/layers/nesting_site/nesting_site.json b/assets/layers/nesting_site/nesting_site.json
index 61cb06b7a..308c87778 100644
--- a/assets/layers/nesting_site/nesting_site.json
+++ b/assets/layers/nesting_site/nesting_site.json
@@ -64,10 +64,10 @@
"tagRenderings": [
"images",
{
+ "id": "nest_species",
"question": {
"en": "What species is this nesting site built for?"
},
- "id": "nest_species",
"render": {
"en": "About the nesting species
{wikipedia(species:wikidata)}"
},
@@ -80,10 +80,10 @@
}
},
{
+ "id": "nest_support",
"question": {
"en": "How is this nesting site installed?"
},
- "id": "nest_support",
"mappings": [
{
"if": "support=wall",
diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json
index 62a884e8f..e52028bba 100644
--- a/assets/layers/note/note.json
+++ b/assets/layers/note/note.json
@@ -114,8 +114,8 @@
"tagRenderings": [
{
"id": "conversation",
- "classes": "p-0",
- "render": "{visualize_note_comments()}"
+ "render": "{visualize_note_comments()}",
+ "classes": "p-0"
},
{
"id": "add_image",
diff --git a/assets/layers/nsi_brand/nsi_brand.json b/assets/layers/nsi_brand/nsi_brand.json
index a8a1b50ad..3bfd624e5 100644
--- a/assets/layers/nsi_brand/nsi_brand.json
+++ b/assets/layers/nsi_brand/nsi_brand.json
@@ -7,7 +7,6 @@
"pointRendering": null,
"tagRenderings": [
{
- "strict": true,
"id": "icon",
"mappings": [
{
@@ -224455,7 +224454,8 @@
},
"then": "https://data.mapcomplete.org/nsi//logos/gofuel-1a11f1.png"
}
- ]
+ ],
+ "strict": true
}
],
"filter": [
diff --git a/assets/layers/nsi_operator/nsi_operator.json b/assets/layers/nsi_operator/nsi_operator.json
index a5d0e1d71..aff1eb57b 100644
--- a/assets/layers/nsi_operator/nsi_operator.json
+++ b/assets/layers/nsi_operator/nsi_operator.json
@@ -7,7 +7,6 @@
"pointRendering": null,
"tagRenderings": [
{
- "strict": true,
"id": "icon",
"mappings": [
{
@@ -151034,7 +151033,8 @@
},
"then": "https://data.mapcomplete.org/nsi//logos/departmentofconservation-5df9f2.png"
}
- ]
+ ],
+ "strict": true
}
],
"filter": [
diff --git a/assets/layers/observation_tower/observation_tower.json b/assets/layers/observation_tower/observation_tower.json
index aa4b33eaf..f340403c4 100644
--- a/assets/layers/observation_tower/observation_tower.json
+++ b/assets/layers/observation_tower/observation_tower.json
@@ -82,6 +82,7 @@
"tagRenderings": [
"images",
{
+ "id": "name",
"question": {
"en": "What is the name of this tower?",
"nl": "Heeft deze toren een naam?",
@@ -119,10 +120,10 @@
"it": "Questa torre non ha un nome specifico"
}
}
- ],
- "id": "name"
+ ]
},
{
+ "id": "Height",
"question": {
"en": "What is the height of this tower?",
"nl": "Hoe hoog is deze toren?",
@@ -146,8 +147,7 @@
"freeform": {
"key": "height",
"type": "pfloat"
- },
- "id": "Height"
+ }
},
{
"id": "access",
@@ -190,6 +190,7 @@
]
},
{
+ "id": "Fee",
"question": {
"en": "How much does one have to pay to enter this tower?",
"nl": "Hoeveel moet men betalen om deze toren te bezoeken?",
@@ -236,7 +237,6 @@
}
}
],
- "id": "Fee",
"condition": {
"or": [
"access=yes",
@@ -245,6 +245,7 @@
}
},
{
+ "id": "Payment methods",
"builtin": "payment-options",
"override": {
"condition": {
@@ -253,8 +254,7 @@
"charge~*"
]
}
- },
- "id": "Payment methods"
+ }
},
"website",
{
@@ -269,10 +269,6 @@
"cs": "Kolik jednotlivých schodů musí člověk zdolat, aby se dostal na vrchol této věže?",
"it": "Quanti gradini individuali si devono salire per raggiungere la cima di questa torre?"
},
- "freeform": {
- "key": "step_count",
- "type": "pnat"
- },
"render": {
"en": "This tower has {step_count} steps to reach the top",
"nl": "Deze toren heeft {step_count} traptredes",
@@ -283,6 +279,10 @@
"cs": "Na vrchol této věže vede {step_count} schodů",
"it": "Questa torre ha {step_count} gradini per raggiungere la cima"
},
+ "freeform": {
+ "key": "step_count",
+ "type": "pnat"
+ },
"condition": {
"or": [
"access=yes",
@@ -338,6 +338,7 @@
}
},
{
+ "id": "Operator",
"question": {
"en": "Who maintains this tower?",
"nl": "Wie onderhoudt deze toren?",
@@ -360,8 +361,7 @@
},
"freeform": {
"key": "operator"
- },
- "id": "Operator"
+ }
},
{
"builtin": "wheelchair-access",
diff --git a/assets/layers/osm_community_index/osm_community_index.json b/assets/layers/osm_community_index/osm_community_index.json
index 5fd1687c1..1d3e4d518 100644
--- a/assets/layers/osm_community_index/osm_community_index.json
+++ b/assets/layers/osm_community_index/osm_community_index.json
@@ -67,15 +67,15 @@
"tagRenderings": [
{
"id": "country_name",
- "condition": "level=country",
+ "description": "The name of the country",
"render": "{nameEn} {emojiFlag}",
- "description": "The name of the country"
+ "condition": "level=country"
},
{
"id": "community_links",
+ "description": "Community Links (Discord, meetups, Slack groups, IRC channels, mailing lists etc...)",
"render": "{_community_links}",
- "condition": "_community_links~*",
- "description": "Community Links (Discord, meetups, Slack groups, IRC channels, mailing lists etc...)"
+ "condition": "_community_links~*"
}
],
"filter": [
diff --git a/assets/layers/outdoor_seating/outdoor_seating.json b/assets/layers/outdoor_seating/outdoor_seating.json
index 2f12e0293..d9d9480b5 100644
--- a/assets/layers/outdoor_seating/outdoor_seating.json
+++ b/assets/layers/outdoor_seating/outdoor_seating.json
@@ -115,7 +115,6 @@
"it": "Quest'area di seduta all'aperto è stagionale?",
"cs": "Je toto venkovní posezení sezónní?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "seasonal=no",
@@ -183,7 +182,8 @@
"cs": "Toto venkovní posezení je k dispozici v době sucha."
}
}
- ]
+ ],
+ "multiAnswer": true
},
"opening_hours_24_7",
"website",
diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json
index 33d4f38b8..675d45b83 100644
--- a/assets/layers/parcel_lockers/parcel_lockers.json
+++ b/assets/layers/parcel_lockers/parcel_lockers.json
@@ -117,6 +117,17 @@
"it": "Qual è la marca dell'armadietto per pacchi?",
"uk": "Який бренд шафки для посилок?"
},
+ "render": {
+ "en": "This is a {brand} parcel locker",
+ "de": "Dies ist ein Paketschließfach von {brand}",
+ "nl": "Dit is een {brand} pakketautomaat",
+ "ca": "Açò és una bústia intel·ligent de {brand}",
+ "fr": "C'est un casier à colis {brand}",
+ "pl": "To jest paczkomat marki {brand}",
+ "cs": "To je {brand} schránka na balíky",
+ "es": "Esta es una taquilla de paquetes {brand}",
+ "it": "Questo è un armadietto per pacchi {brand}"
+ },
"freeform": {
"key": "brand",
"placeholder": {
@@ -131,17 +142,6 @@
"cy": "Masnach",
"it": "Marca"
}
- },
- "render": {
- "en": "This is a {brand} parcel locker",
- "de": "Dies ist ein Paketschließfach von {brand}",
- "nl": "Dit is een {brand} pakketautomaat",
- "ca": "Açò és una bústia intel·ligent de {brand}",
- "fr": "C'est un casier à colis {brand}",
- "pl": "To jest paczkomat marki {brand}",
- "cs": "To je {brand} schránka na balíky",
- "es": "Esta es una taquilla de paquetes {brand}",
- "it": "Questo è un armadietto per pacchi {brand}"
}
},
{
@@ -157,6 +157,18 @@
"it": "Chi è l'operatore dell'armadietto per pacchi?",
"uk": "Який оператор поштомату?"
},
+ "render": {
+ "en": "This parcel locker is operated by {operator}",
+ "de": "Dieses Paketschließfach wird von {operator} betrieben",
+ "nl": "Deze pakketautomaat wordt beheerd door {operator}",
+ "ca": "Aquesta bústia intel·ligent la gestiona {operator}",
+ "fr": "Ce casier à colis est exploité par {operator}",
+ "pl": "Ten paczkomat jest obsługiwany przez {operator}",
+ "cs": "Tuto schránku na balíky provozuje {operator}",
+ "es": "Esta taquilla de paquetes es operada por {operator}",
+ "it": "Questo armadietto per pacchi è gestito da {operator}",
+ "uk": "Цей посилкова шафка обслуговується компанією {operator}"
+ },
"freeform": {
"key": "operator",
"type": "string",
@@ -172,18 +184,6 @@
"cy": "Gweithredwr",
"it": "Operatore"
}
- },
- "render": {
- "en": "This parcel locker is operated by {operator}",
- "de": "Dieses Paketschließfach wird von {operator} betrieben",
- "nl": "Deze pakketautomaat wordt beheerd door {operator}",
- "ca": "Aquesta bústia intel·ligent la gestiona {operator}",
- "fr": "Ce casier à colis est exploité par {operator}",
- "pl": "Ten paczkomat jest obsługiwany przez {operator}",
- "cs": "Tuto schránku na balíky provozuje {operator}",
- "es": "Esta taquilla de paquetes es operada por {operator}",
- "it": "Questo armadietto per pacchi è gestito da {operator}",
- "uk": "Цей посилкова шафка обслуговується компанією {operator}"
}
},
"opening_hours_24_7",
@@ -200,6 +200,17 @@
"it": "Qual è il numero/identificativo di riferimento di questo armadietto per pacchi?",
"uk": "Який ідентифікаційний номер цього поштомату?"
},
+ "render": {
+ "en": "This parcel locker has the reference {ref}",
+ "de": "Dieses Paketschließfach hat die Kennnummer {ref}",
+ "nl": "Deze pakketautomaat heeft de referentie {ref}",
+ "ca": "Aquesta bústia intel·ligent té la referència {ref}",
+ "fr": "Ce casier a colis porte la référence {ref}",
+ "cs": "Tato schránka na balíky má referenční číslo {ref}",
+ "es": "Esta taquilla de paquetes tiene la referencia {ref}",
+ "it": "Questo armadietto per pacchi ha il riferimento {ref}",
+ "uk": "Ця посилкова шафка має номер {ref}"
+ },
"freeform": {
"key": "ref",
"type": "string",
@@ -215,17 +226,6 @@
"cy": "Cyfeirnod",
"it": "Riferimento"
}
- },
- "render": {
- "en": "This parcel locker has the reference {ref}",
- "de": "Dieses Paketschließfach hat die Kennnummer {ref}",
- "nl": "Deze pakketautomaat heeft de referentie {ref}",
- "ca": "Aquesta bústia intel·ligent té la referència {ref}",
- "fr": "Ce casier a colis porte la référence {ref}",
- "cs": "Tato schránka na balíky má referenční číslo {ref}",
- "es": "Esta taquilla de paquetes tiene la referencia {ref}",
- "it": "Questo armadietto per pacchi ha il riferimento {ref}",
- "uk": "Ця посилкова шафка має номер {ref}"
}
},
{
diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json
index ab59a4b53..2ddb84f65 100644
--- a/assets/layers/parking/parking.json
+++ b/assets/layers/parking/parking.json
@@ -96,6 +96,18 @@
"level",
{
"id": "parking-type",
+ "question": {
+ "en": "What kind of parking is this?",
+ "nl": "Wat voor parking is dit?",
+ "de": "Was ist das für ein Parkplatz?",
+ "fr": "De quel type de stationnement s'agit-il ?",
+ "ca": "Quin tipus d'aparcament és aquest?",
+ "pl": "Jaki to rodzaj parkingu?",
+ "cs": "Jaký je druh parkování?",
+ "es": "¿Qué tipo de aparcamiento es este?",
+ "uk": "Що це за парковка?",
+ "it": "Che tipo di parcheggio è questo?"
+ },
"mappings": [
{
"if": "parking=surface",
@@ -240,22 +252,32 @@
"it": "Questo è un parcheggio costituito da capannoni"
}
}
- ],
- "question": {
- "en": "What kind of parking is this?",
- "nl": "Wat voor parking is dit?",
- "de": "Was ist das für ein Parkplatz?",
- "fr": "De quel type de stationnement s'agit-il ?",
- "ca": "Quin tipus d'aparcament és aquest?",
- "pl": "Jaki to rodzaj parkingu?",
- "cs": "Jaký je druh parkování?",
- "es": "¿Qué tipo de aparcamiento es este?",
- "uk": "Що це за парковка?",
- "it": "Che tipo di parcheggio è questo?"
- }
+ ]
},
{
"id": "capacity-disabled",
+ "question": {
+ "en": "How many disabled parking spots are there at this parking?",
+ "nl": "Hoeveel parkeerplaatsen voor personen met een beperking zijn er op deze parking?",
+ "de": "Wie viele barrierefreie Stellplätze gibt es auf diesem Parkplatz?",
+ "fr": "Combien y a-t-il de places de stationnement pour personnes à mobilité réduite dans ce parking ?",
+ "ca": "Quantes places d'aparcament per a persones amb mobilitat reduïda hi ha al parking?",
+ "pl": "Jak wiele miejsc parkingowych dla niepełnosprawnych znajduje się na tym parkingu?",
+ "cs": "Kolik je na tomto parkovišti parkovacích míst pro osoby se zdravotním postižením?",
+ "es": "¿Cuántas plazas de aparcamiento para discapacitados hay en este aparcamiento?",
+ "it": "Quanti posti auto per disabili ci sono in questo parcheggio?"
+ },
+ "render": {
+ "en": "There are {capacity:disabled} disabled parking spots",
+ "nl": "Er zijn {capacity:disabled} parkeerplaatsen voor personen met een beperking",
+ "de": "Es gibt {capacity:disabled} barrierefreie Stellplätze",
+ "fr": "Il y a {capacity:disabled} places de stationnement pour personnes à mobilité réduite",
+ "ca": "Hi ha {capacity:disabled} places d'aparcament per a discapacitats",
+ "pl": "Jest {capacity:disabled} miejsc parkingowych dla niepełnosprawnych",
+ "cs": "K dispozici je {capacity:disabled} parkovacích míst pro osoby se zdravotním postižením",
+ "es": "Hay {capacity:disabled} plazas de aparcamiento para discapacitados",
+ "it": "Ci sono {capacity:disabled} posti auto per disabili"
+ },
"freeform": {
"key": "capacity:disabled",
"type": "pnat",
@@ -316,47 +338,10 @@
"it": "Non ci sono posti auto per disabili"
}
}
- ],
- "question": {
- "en": "How many disabled parking spots are there at this parking?",
- "nl": "Hoeveel parkeerplaatsen voor personen met een beperking zijn er op deze parking?",
- "de": "Wie viele barrierefreie Stellplätze gibt es auf diesem Parkplatz?",
- "fr": "Combien y a-t-il de places de stationnement pour personnes à mobilité réduite dans ce parking ?",
- "ca": "Quantes places d'aparcament per a persones amb mobilitat reduïda hi ha al parking?",
- "pl": "Jak wiele miejsc parkingowych dla niepełnosprawnych znajduje się na tym parkingu?",
- "cs": "Kolik je na tomto parkovišti parkovacích míst pro osoby se zdravotním postižením?",
- "es": "¿Cuántas plazas de aparcamiento para discapacitados hay en este aparcamiento?",
- "it": "Quanti posti auto per disabili ci sono in questo parcheggio?"
- },
- "render": {
- "en": "There are {capacity:disabled} disabled parking spots",
- "nl": "Er zijn {capacity:disabled} parkeerplaatsen voor personen met een beperking",
- "de": "Es gibt {capacity:disabled} barrierefreie Stellplätze",
- "fr": "Il y a {capacity:disabled} places de stationnement pour personnes à mobilité réduite",
- "ca": "Hi ha {capacity:disabled} places d'aparcament per a discapacitats",
- "pl": "Jest {capacity:disabled} miejsc parkingowych dla niepełnosprawnych",
- "cs": "K dispozici je {capacity:disabled} parkovacích míst pro osoby se zdravotním postižením",
- "es": "Hay {capacity:disabled} plazas de aparcamiento para discapacitados",
- "it": "Ci sono {capacity:disabled} posti auto per disabili"
- }
+ ]
},
{
"id": "capacity",
- "freeform": {
- "key": "capacity",
- "type": "pnat",
- "placeholder": {
- "en": "Amount of parking spots",
- "nl": "Aantal parkeerplaatsen",
- "de": "Anzahl der Parkplätze",
- "fr": "Nombre de places de stationnement",
- "ca": "Quantitat de places d'aparcament",
- "pl": "Liczba miejsc parkingowych",
- "cs": "Počet parkovacích míst",
- "es": "Cantidad de plazas de aparcamiento",
- "it": "Numero di posti auto"
- }
- },
"question": {
"en": "How many parking spots are there at this parking?",
"nl": "Hoeveel parkeerplaatsen zijn er op deze parking?",
@@ -378,6 +363,21 @@
"cs": "Počet parkovacích míst {capacity}",
"es": "Hay {capacity} plazas de aparcamiento",
"it": "Ci sono {capacity} posti auto"
+ },
+ "freeform": {
+ "key": "capacity",
+ "type": "pnat",
+ "placeholder": {
+ "en": "Amount of parking spots",
+ "nl": "Aantal parkeerplaatsen",
+ "de": "Anzahl der Parkplätze",
+ "fr": "Nombre de places de stationnement",
+ "ca": "Quantitat de places d'aparcament",
+ "pl": "Liczba miejsc parkingowych",
+ "cs": "Počet parkovacích míst",
+ "es": "Cantidad de plazas de aparcamiento",
+ "it": "Numero di posti auto"
+ }
}
},
"maxstay"
diff --git a/assets/layers/parking_ticket_machine/parking_ticket_machine.json b/assets/layers/parking_ticket_machine/parking_ticket_machine.json
index 7cd03fc3f..f3e7a3ecf 100644
--- a/assets/layers/parking_ticket_machine/parking_ticket_machine.json
+++ b/assets/layers/parking_ticket_machine/parking_ticket_machine.json
@@ -92,6 +92,15 @@
"es": "¿Cuál es el número de referencia de esta máquina de tickets de aparcamiento?",
"it": "Qual è il numero di riferimento di questo parcometro?"
},
+ "render": {
+ "en": "This parking ticket machine has the reference number {ref}",
+ "nl": "Deze parkeerkaartautomaat heeft het referentienummer {ref}",
+ "de": "Dieser Parkscheinautomat hat die Referenznummer {ref}",
+ "ca": "Aquesta màquina de tiquets d'aparcament té el número de referència {ref}",
+ "cs": "Tento parkovací automat má referenční číslo {ref}",
+ "es": "Esta máquina de tickets de aparcamiento tiene el número de referencia {ref}",
+ "it": "Questo parcometro ha il numero di riferimento {ref}"
+ },
"freeform": {
"key": "ref",
"type": "string",
@@ -106,15 +115,6 @@
"it": "Numero di riferimento"
}
},
- "render": {
- "en": "This parking ticket machine has the reference number {ref}",
- "nl": "Deze parkeerkaartautomaat heeft het referentienummer {ref}",
- "de": "Dieser Parkscheinautomat hat die Referenznummer {ref}",
- "ca": "Aquesta màquina de tiquets d'aparcament té el número de referència {ref}",
- "cs": "Tento parkovací automat má referenční číslo {ref}",
- "es": "Esta máquina de tickets de aparcamiento tiene el número de referencia {ref}",
- "it": "Questo parcometro ha il numero di riferimento {ref}"
- },
"mappings": [
{
"if": "noref=yes",
diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json
index 39921c1d9..ce58ca334 100644
--- a/assets/layers/pharmacy/pharmacy.json
+++ b/assets/layers/pharmacy/pharmacy.json
@@ -115,20 +115,6 @@
"reviews",
{
"id": "name",
- "freeform": {
- "key": "name",
- "type": "string",
- "placeholder": {
- "en": "Name of the pharmacy",
- "de": "Name der Apotheke",
- "nl": "Naam van de apotheek",
- "fr": "Nom de la pharmacie",
- "ca": "Nom de la farmàcia",
- "cs": "Název lékárny",
- "es": "Nombre de la farmacia",
- "it": "Nome della farmacia"
- }
- },
"question": {
"en": "What is the name of the pharmacy?",
"de": "Wie lautet der Name der Apotheke?",
@@ -153,6 +139,20 @@
"uk": "Ця аптека називається {name}",
"it": "Questa farmacia si chiama {name}"
},
+ "freeform": {
+ "key": "name",
+ "type": "string",
+ "placeholder": {
+ "en": "Name of the pharmacy",
+ "de": "Name der Apotheke",
+ "nl": "Naam van de apotheek",
+ "fr": "Nom de la pharmacie",
+ "ca": "Nom de la farmàcia",
+ "cs": "Název lékárny",
+ "es": "Nombre de la farmacia",
+ "it": "Nome della farmacia"
+ }
+ },
"onSoftDelete": [
"name="
]
diff --git a/assets/layers/physiotherapist/physiotherapist.json b/assets/layers/physiotherapist/physiotherapist.json
index daef7f175..ffae3fb66 100644
--- a/assets/layers/physiotherapist/physiotherapist.json
+++ b/assets/layers/physiotherapist/physiotherapist.json
@@ -77,6 +77,7 @@
"tagRenderings": [
"images",
{
+ "id": "name",
"question": {
"en": "What is the name of this physiotherapists office?",
"nl": "Wat is de naam van deze kinesistenpraktijk?",
@@ -97,8 +98,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "name"
+ }
},
"opening_hours_by_appointment",
"contact",
diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json
index da95cf2db..f041397ba 100644
--- a/assets/layers/picnic_table/picnic_table.json
+++ b/assets/layers/picnic_table/picnic_table.json
@@ -82,6 +82,7 @@
"images",
"level",
{
+ "id": "picnic_table-material",
"question": {
"en": "What material is this picnic table made of?",
"nl": "Van welk materiaal is deze picknicktafel gemaakt?",
@@ -94,7 +95,6 @@
"cs": "Z jakého materiálu je vyroben tento piknikový stůl?",
"uk": "З якого матеріалу виготовлений цей стіл для пікніка?"
},
- "multiAnswer": true,
"render": {
"en": "This picnic table is made of {material}",
"nl": "Deze picknicktafel is gemaakt van {material}",
@@ -165,7 +165,7 @@
}
}
],
- "id": "picnic_table-material"
+ "multiAnswer": true
}
],
"deletion": {
diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json
index 89013b42c..18e15392a 100644
--- a/assets/layers/play_forest/play_forest.json
+++ b/assets/layers/play_forest/play_forest.json
@@ -70,6 +70,7 @@
"tagRenderings": [
"images",
{
+ "id": "play_forest-operator",
"question": "Wie beheert dit gebied?",
"render": "Dit gebied wordt beheerd door {operator}",
"freeform": {
@@ -85,8 +86,7 @@
"if": "operator=Agenstchap Natuur en Bos",
"then": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos"
}
- ],
- "id": "play_forest-operator"
+ ]
},
{
"id": "play_forest-opening_hours",
@@ -103,22 +103,22 @@
]
},
{
+ "id": "play_forest-email",
"question": "Wie kan men emailen indien er problemen zijn met de speelzone?",
"render": "De bevoegde dienst kan bereikt worden via {email}",
"freeform": {
"key": "email",
"type": "email"
- },
- "id": "play_forest-email"
+ }
},
{
+ "id": "play_forest-phone",
"question": "Wie kan men bellen indien er problemen zijn met de speelzone?",
"render": "De bevoegde dienst kan getelefoneerd worden via {phone}",
"freeform": {
"key": "phone",
"type": "phone"
- },
- "id": "play_forest-phone"
+ }
},
"questions",
{
diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json
index 7f05c87ac..56f9fd7f0 100644
--- a/assets/layers/playground/playground.json
+++ b/assets/layers/playground/playground.json
@@ -143,6 +143,7 @@
"images",
"reviews",
{
+ "id": "fee",
"question": {
"en": "Does one have to pay to use this playground?",
"nl": "Moet men betalen om deze speeltuin te gebruiken?",
@@ -153,7 +154,6 @@
"cs": "Musí se platit za použití tohoto hřiště?",
"it": "Si deve pagare per utilizzare questo parco giochi?"
},
- "id": "fee",
"mappings": [
{
"if": "fee=no",
@@ -186,6 +186,7 @@
"filter": true
},
{
+ "id": "playground-surface",
"question": {
"nl": "Wat is de ondergrond van deze speeltuin?",
"en": "Which is the surface of this playground?",
@@ -197,6 +198,17 @@
"uk": "Яка поверхня цього дитячого майданчика?",
"es": "¿Cuál es la superficie de este parque infantil?"
},
+ "questionHint": {
+ "nl": "Indien er verschillende ondergronden zijn, neem de meest voorkomende",
+ "en": "If there are multiple, select the most occuring one",
+ "it": "Se ce ne sono multiple, seleziona quella più presente",
+ "de": "Wenn es mehrere gibt, wähle den am häufigsten vorkommende aus",
+ "fr": "Pour plusieurs matières, sélectionner la principale",
+ "ca": "Si n'hi ha múltiples, selecciona la més predominant",
+ "cs": "Pokud jich je více, vyberte nejčastěji se vyskytující",
+ "uk": "Якщо їх декілька, виберіть найпоширеніший",
+ "es": "Si hay varias, selecciona la que más se repita"
+ },
"render": {
"nl": "De ondergrond is {surface}",
"en": "The surface is {surface}",
@@ -374,25 +386,13 @@
"it": "La superficie è ghiaia fine (meno di 2 cm per pietra)"
}
}
- ],
- "id": "playground-surface",
- "questionHint": {
- "nl": "Indien er verschillende ondergronden zijn, neem de meest voorkomende",
- "en": "If there are multiple, select the most occuring one",
- "it": "Se ce ne sono multiple, seleziona quella più presente",
- "de": "Wenn es mehrere gibt, wähle den am häufigsten vorkommende aus",
- "fr": "Pour plusieurs matières, sélectionner la principale",
- "ca": "Si n'hi ha múltiples, selecciona la més predominant",
- "cs": "Pokud jich je více, vyberte nejčastěji se vyskytující",
- "uk": "Якщо їх декілька, виберіть найпоширеніший",
- "es": "Si hay varias, selecciona la que más se repita"
- }
+ ]
},
{
+ "id": "playground-lit",
"labels": [
"extra"
],
- "id": "playground-lit",
"question": {
"nl": "Is deze speeltuin 's nachts verlicht?",
"en": "Is this playground lit at night?",
@@ -439,20 +439,10 @@
]
},
{
+ "id": "playground-min_age",
"labels": [
"extra"
],
- "render": {
- "nl": "Toegankelijk vanaf {min_age} jaar oud",
- "en": "Accessible to kids older than {min_age} years",
- "it": "Accessibile a bambini di età superiore a {min_age} anni",
- "ru": "Доступно для детей старше {min_age} лет",
- "fr": "Accessible aux enfants de plus de {min_age} ans",
- "de": "Zugang nur für Kinder ab {min_age} Jahren",
- "es": "Accesible a niños mayores de {min_age} años",
- "ca": "Accessible a nens menors de {min_age} anys",
- "cs": "Přístupné dětem starším {min_age} let"
- },
"question": {
"nl": "Wat is de minimale leeftijd om op deze speeltuin te mogen?",
"en": "What is the minimum age required to access this playground?",
@@ -464,16 +454,37 @@
"cs": "Jaký je minimální věk pro vstup na toto hřiště?",
"es": "¿Cuál es la edad mínima requerida para acceder a este parque infantil?"
},
+ "render": {
+ "nl": "Toegankelijk vanaf {min_age} jaar oud",
+ "en": "Accessible to kids older than {min_age} years",
+ "it": "Accessibile a bambini di età superiore a {min_age} anni",
+ "ru": "Доступно для детей старше {min_age} лет",
+ "fr": "Accessible aux enfants de plus de {min_age} ans",
+ "de": "Zugang nur für Kinder ab {min_age} Jahren",
+ "es": "Accesible a niños mayores de {min_age} años",
+ "ca": "Accessible a nens menors de {min_age} anys",
+ "cs": "Přístupné dětem starším {min_age} let"
+ },
"freeform": {
"key": "min_age",
"type": "nat"
- },
- "id": "playground-min_age"
+ }
},
{
+ "id": "playground-max_age",
"labels": [
"extra"
],
+ "question": {
+ "nl": "Wat is de maximaal toegestane leeftijd voor deze speeltuin?",
+ "en": "What is the maximum age allowed to access this playground?",
+ "it": "Qual è l'età massima consentita per accedere a questo parco giochi?",
+ "fr": "Quel est l’âge maximum autorisé pour utiliser l’aire de jeu ?",
+ "de": "Bis zu welchem Alter dürfen Kinder auf dem Spielplatz spielen?",
+ "ca": "Quina és l'edat màxima permesa per accedir al parc infantil?",
+ "cs": "Jaký je maximální věk pro vstup na toto hřiště?",
+ "es": "¿Cuál es la edad máxima permitida para acceder a este parque infantil?"
+ },
"render": {
"nl": "Toegankelijk tot {max_age}",
"en": "Accessible to kids of at most {max_age}",
@@ -485,23 +496,13 @@
"ca": "Accessible per a nens de com a màxim {max_age}",
"cs": "Přístupné pro děti maximálně {max_age}"
},
- "question": {
- "nl": "Wat is de maximaal toegestane leeftijd voor deze speeltuin?",
- "en": "What is the maximum age allowed to access this playground?",
- "it": "Qual è l'età massima consentita per accedere a questo parco giochi?",
- "fr": "Quel est l’âge maximum autorisé pour utiliser l’aire de jeu ?",
- "de": "Bis zu welchem Alter dürfen Kinder auf dem Spielplatz spielen?",
- "ca": "Quina és l'edat màxima permesa per accedir al parc infantil?",
- "cs": "Jaký je maximální věk pro vstup na toto hřiště?",
- "es": "¿Cuál es la edad máxima permitida para acceder a este parque infantil?"
- },
"freeform": {
"key": "max_age",
"type": "pnat"
- },
- "id": "playground-max_age"
+ }
},
{
+ "id": "playground-operator",
"question": {
"nl": "Wie beheert deze speeltuin?",
"en": "Who operates this playground?",
@@ -524,8 +525,7 @@
},
"freeform": {
"key": "operator"
- },
- "id": "playground-operator"
+ }
},
{
"id": "playground-access",
@@ -634,6 +634,7 @@
},
"website",
{
+ "id": "playground-email",
"question": {
"nl": "Wie kan men emailen indien er problemen zijn met de speeltuin?",
"en": "What is the email address of the playground maintainer?",
@@ -661,10 +662,10 @@
"freeform": {
"key": "email",
"type": "email"
- },
- "id": "playground-email"
+ }
},
{
+ "id": "playground-phone",
"question": {
"nl": "Wie kan men bellen indien er problemen zijn met de speeltuin?",
"en": "What is the phone number of the playground maintainer?",
@@ -693,8 +694,7 @@
"freeform": {
"key": "phone",
"type": "phone"
- },
- "id": "playground-phone"
+ }
},
{
"id": "Playground-wheelchair",
@@ -759,11 +759,7 @@
]
},
{
- "freeform": {
- "key": "opening_hours",
- "type": "opening_hours"
- },
- "render": "{opening_hours_table(opening_hours)}",
+ "id": "playground-opening_hours",
"question": {
"nl": "Op welke uren is deze speeltuin toegankelijk?",
"en": "When is this playground accessible?",
@@ -776,6 +772,11 @@
"pl": "Kiedy dostępny jest ten plac zabaw?",
"es": "¿Cuándo es accesible este parque infantil?"
},
+ "render": "{opening_hours_table(opening_hours)}",
+ "freeform": {
+ "key": "opening_hours",
+ "type": "opening_hours"
+ },
"mappings": [
{
"if": "opening_hours=sunrise-sunset",
@@ -807,8 +808,7 @@
"pl": "Dostępny zawsze"
}
}
- ],
- "id": "playground-opening_hours"
+ ]
},
"check_date",
"questions",
diff --git a/assets/layers/playground_equipment/playground_equipment.json b/assets/layers/playground_equipment/playground_equipment.json
index 2527c3f54..a9f845375 100644
--- a/assets/layers/playground_equipment/playground_equipment.json
+++ b/assets/layers/playground_equipment/playground_equipment.json
@@ -81,6 +81,16 @@
"tagRenderings": [
"images",
{
+ "id": "type",
+ "question": {
+ "en": "What kind of device is this?",
+ "nl": "Wat voor speeltoestel is dit?",
+ "de": "Was ist das für ein Gerät?",
+ "es": "¿Qué tipo de elemento es este?",
+ "ca": "Quin tipus d'element és aquest?",
+ "it": "Che tipo di dispositivo è questo?",
+ "cs": "Jaký druh zařízení to je?"
+ },
"render": {
"en": "This is a {playground}",
"de": "Das ist ein {playground}",
@@ -89,7 +99,6 @@
"it": "Questo è un {playground}",
"cs": "Toto je {playground}"
},
- "id": "type",
"freeform": {
"key": "playground",
"placeholder": {
@@ -104,16 +113,6 @@
"fixme=Freeform input used"
]
},
- "question": {
- "en": "What kind of device is this?",
- "nl": "Wat voor speeltoestel is dit?",
- "de": "Was ist das für ein Gerät?",
- "es": "¿Qué tipo de elemento es este?",
- "ca": "Quin tipus d'element és aquest?",
- "it": "Che tipo di dispositivo è questo?",
- "cs": "Jaký druh zařízení to je?"
- },
- "invalidValues": "playground=yes",
"mappings": [
{
"if": "playground=swing",
@@ -483,7 +482,8 @@
"class": "large"
}
}
- ]
+ ],
+ "invalidValues": "playground=yes"
},
{
"builtin": "wheelchair-access",
diff --git a/assets/layers/police/police.json b/assets/layers/police/police.json
index 736562a54..b04a81cfb 100644
--- a/assets/layers/police/police.json
+++ b/assets/layers/police/police.json
@@ -170,6 +170,7 @@
"images",
"reviews",
{
+ "id": "police_name",
"question": {
"en": "What is the name of this police facility?",
"de": "Wie lautet der Name der Polizeieinrichtung?",
@@ -178,7 +179,6 @@
"cs": "Jaký je název tohoto policejního zařízení?",
"it": "Qual è il nome di questa struttura di polizia?"
},
- "id": "police_name",
"render": {
"en": "{name}",
"de": "{name}",
@@ -196,6 +196,7 @@
"contact",
"opening_hours",
{
+ "id": "4_z2nrdhy6tyyh4fd",
"question": {
"en": "Does this police office have detention facilities?",
"de": "Verfügt die Polizeidienststelle über Gewahrsamsräume?",
@@ -204,9 +205,6 @@
"cs": "Má tato policejní služebna zařízení pro zadržování lidí?",
"it": "Questo ufficio di polizia ha strutture di detenzione?"
},
- "filter": true,
- "id": "4_z2nrdhy6tyyh4fd",
- "condition": "amenity=police",
"mappings": [
{
"if": "detention=yes",
@@ -231,7 +229,9 @@
"it": "Questo ufficio di polizia non ha celle per trattenere le persone"
}
}
- ]
+ ],
+ "condition": "amenity=police",
+ "filter": true
}
],
"deletion": true,
diff --git a/assets/layers/police_call_box/police_call_box.json b/assets/layers/police_call_box/police_call_box.json
index 966b08bc8..571559cfe 100644
--- a/assets/layers/police_call_box/police_call_box.json
+++ b/assets/layers/police_call_box/police_call_box.json
@@ -53,10 +53,16 @@
"tagRenderings": [
"images",
{
+ "id": "police_box_style",
"question": {
"en": "What is the style of this box?"
},
- "id": "police_box_style",
+ "render": {
+ "en": "Another style of box, by {architect}."
+ },
+ "freeform": {
+ "key": "architect"
+ },
"mappings": [
{
"if": "architect=Ebenezer MacRae",
@@ -85,41 +91,35 @@
"roof:levels=0"
]
}
- ],
- "freeform": {
- "key": "architect"
- },
- "render": {
- "en": "Another style of box, by {architect}."
- }
+ ]
},
{
+ "id": "building_colour",
"question": {
"en": "What is the colour of this box?"
},
- "id": "building_colour",
- "freeform": {
- "key": "building:colour",
- "type": "color"
- },
"questionHint": {
"en": "Excluding the roof"
},
"render": {
"en": "The box is {building:colour}."
+ },
+ "freeform": {
+ "key": "building:colour",
+ "type": "color"
}
},
{
+ "id": "roof_colour",
"question": {
"en": "What colour is its roof?"
},
- "id": "roof_colour",
+ "render": {
+ "en": "Its roof is {roof:colour}."
+ },
"freeform": {
"key": "roof:colour",
"type": "color"
- },
- "render": {
- "en": "Its roof is {roof:colour}."
}
}
],
diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json
index ef6e82e8e..459f0b49a 100644
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@@ -181,8 +181,6 @@
"es": "¿Es un socio postal?",
"it": "Questo è un partner postale?"
},
- "#condition": "If it is a post office, it'll won't be a post partner...",
- "condition": "amenity!=post_office",
"mappings": [
{
"if": "post_office=post_partner",
@@ -210,11 +208,12 @@
"was:post_office=post_partner"
]
}
- ]
+ ],
+ "condition": "amenity!=post_office",
+ "#condition": "If it is a post office, it'll won't be a post partner..."
},
{
"id": "post_offic_brand",
- "condition": "amenity=post_office",
"question": {
"en": "To which brand does this post office belong?",
"de": "Zu welcher Marke gehört die Poststelle?",
@@ -242,18 +241,11 @@
"it": "Marchio dell'ufficio postale",
"cs": "Značka pošty"
}
- }
+ },
+ "condition": "amenity=post_office"
},
{
"id": "partner-brand",
- "render": {
- "en": "This location offers services for {post_office:brand}",
- "de": "Dieser Standort bietet Dienstleistungen für {post_office:brand} an",
- "cs": "Toto místo nabízí služby pro {post_office:brand}",
- "es": "Este lugar ofrece servicios para {post_office:brand}",
- "ca": "Aquesta ubicació ofereix serveis per a {post_office:brand}",
- "it": "Questa sede offre servizi per {post_office:brand}"
- },
"question": {
"en": "For which brand does this location offer services?",
"de": "Für welche Marke bietet dieser Standort Dienstleistungen an?",
@@ -262,12 +254,18 @@
"es": "¿Para qué marca ofrece servicios este lugar?",
"it": "Per quale marchio questa sede offre servizi?"
},
- "condition": "post_office=post_partner",
+ "render": {
+ "en": "This location offers services for {post_office:brand}",
+ "de": "Dieser Standort bietet Dienstleistungen für {post_office:brand} an",
+ "cs": "Toto místo nabízí služby pro {post_office:brand}",
+ "es": "Este lugar ofrece servicios para {post_office:brand}",
+ "ca": "Aquesta ubicació ofereix serveis per a {post_office:brand}",
+ "it": "Questa sede offre servizi per {post_office:brand}"
+ },
"freeform": {
"key": "post_office:brand",
"type": "string"
},
- "multiAnswer": true,
"mappings": [
{
"if": "post_office:brand=DHL",
@@ -381,19 +379,12 @@
},
"hideInAnswer": "_country!=be"
}
- ]
+ ],
+ "condition": "post_office=post_partner",
+ "multiAnswer": true
},
{
"id": "letter-from",
- "render": {
- "en": "You can post letters with these companies: {post_office:letter_from}",
- "de": "Mit diesen Unternehmen können Sie Briefe aufgeben: {post_office:letter_from}",
- "nl": "Je kan brieven posten met de volgende bedrijven: {post_office:letter_from}",
- "ca": "Podeu enviar cartes amb aquestes empreses: {post_office:letter_from}",
- "cs": "U těchto společností můžete zasílat dopisy: {post_office:letter_from}",
- "es": "Puedes echar cartas con estas empresas: {post_office:letter_from}",
- "it": "Puoi spedire lettere con queste aziende: {post_office:letter_from}"
- },
"question": {
"en": "Can you post a letter here?",
"de": "Können Sie hier einen Brief aufgeben?",
@@ -403,6 +394,15 @@
"es": "¿Puedes echar una carta aquí?",
"it": "Puoi spedire una lettera qui?"
},
+ "render": {
+ "en": "You can post letters with these companies: {post_office:letter_from}",
+ "de": "Mit diesen Unternehmen können Sie Briefe aufgeben: {post_office:letter_from}",
+ "nl": "Je kan brieven posten met de volgende bedrijven: {post_office:letter_from}",
+ "ca": "Podeu enviar cartes amb aquestes empreses: {post_office:letter_from}",
+ "cs": "U těchto společností můžete zasílat dopisy: {post_office:letter_from}",
+ "es": "Puedes echar cartas con estas empresas: {post_office:letter_from}",
+ "it": "Puoi spedire lettere con queste aziende: {post_office:letter_from}"
+ },
"freeform": {
"key": "post_office:letter_from",
"type": "string"
@@ -436,15 +436,6 @@
},
{
"id": "parcel-from",
- "render": {
- "en": "You can post parcels with these companies: {post_office:parcel_from}",
- "de": "Sie können Pakete mit diesen Unternehmen versenden: {post_office:parcel_from}",
- "nl": "Je kan pakketten versturen met deze bedrijven: {post_office:parcel_from}",
- "ca": "Podeu enviar paquets amb aquestes empreses: {post_office:parcel_from}",
- "cs": "U těchto společností můžete posílat balíky: {post_office:parcel_from}",
- "es": "Puedes enviar paquetes con estas empresas: {post_office:parcel_from}",
- "it": "Puoi spedire pacchi con queste aziende: {post_office:parcel_from}"
- },
"question": {
"en": "Can you send a parcel here?",
"de": "Können Sie hier Pakete versenden?",
@@ -455,6 +446,15 @@
"es": "¿Puedes enviar un paquete aquí?",
"it": "Puoi spedire un pacco qui?"
},
+ "render": {
+ "en": "You can post parcels with these companies: {post_office:parcel_from}",
+ "de": "Sie können Pakete mit diesen Unternehmen versenden: {post_office:parcel_from}",
+ "nl": "Je kan pakketten versturen met deze bedrijven: {post_office:parcel_from}",
+ "ca": "Podeu enviar paquets amb aquestes empreses: {post_office:parcel_from}",
+ "cs": "U těchto společností můžete posílat balíky: {post_office:parcel_from}",
+ "es": "Puedes enviar paquetes con estas empresas: {post_office:parcel_from}",
+ "it": "Puoi spedire pacchi con queste aziende: {post_office:parcel_from}"
+ },
"freeform": {
"key": "post_office:parcel_from",
"type": "string"
@@ -490,14 +490,6 @@
},
{
"id": "parcel-pickup",
- "render": {
- "en": "You can pick up parcels from these companies: {post_office:parcel_pickup}",
- "de": "Sie können Pakete von diesen Unternehmen abholen: {post_office:parcel_pickup}",
- "ca": "Podeu recollir paquets d'aquestes empreses: {post_office:parcel_pickup}",
- "cs": "Můžete si zde vyzvednout zásilky těchto společností: {post_office:parcel_pickup}",
- "es": "Puedes recoger paquetes de estas empresas: {post_office:parcel_pickup}",
- "it": "Puoi ritirare pacchi da queste aziende: {post_office:parcel_pickup}"
- },
"question": {
"en": "Can you pick up missed parcels here?",
"de": "Können Sie hier verpasste Pakete abholen?",
@@ -506,6 +498,14 @@
"es": "¿Puedes recoger paquetes perdidos aquí?",
"it": "Puoi ritirare pacchi non consegnati qui?"
},
+ "render": {
+ "en": "You can pick up parcels from these companies: {post_office:parcel_pickup}",
+ "de": "Sie können Pakete von diesen Unternehmen abholen: {post_office:parcel_pickup}",
+ "ca": "Podeu recollir paquets d'aquestes empreses: {post_office:parcel_pickup}",
+ "cs": "Můžete si zde vyzvednout zásilky těchto společností: {post_office:parcel_pickup}",
+ "es": "Puedes recoger paquetes de estas empresas: {post_office:parcel_pickup}",
+ "it": "Puoi ritirare pacchi da queste aziende: {post_office:parcel_pickup}"
+ },
"freeform": {
"key": "post_office:parcel_pickup",
"type": "string"
@@ -538,14 +538,6 @@
},
{
"id": "parcel-to",
- "render": {
- "en": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}",
- "de": "Mit diesen Unternehmen können Sie Pakete zur Abholung hierher senden: {post_office:parcel_to}",
- "ca": "Podeu enviar paquets aquí per recollir-los amb aquestes empreses: {post_office:parcel_to}",
- "es": "Puedes enviar paquetes aquí para su recogida con estas empresas: {post_office:parcel_to}",
- "it": "Puoi inviare pacchi qui per il ritiro con queste aziende: {post_office:parcel_to}",
- "cs": "Můžete sem posílat balíky k vyzvednutí s těmito firmami: {post_office:parcel_to}"
- },
"question": {
"en": "Can you send parcels to here for pickup?",
"de": "Können Sie Pakete zur Abholung hierher schicken?",
@@ -555,6 +547,14 @@
"it": "Puoi inviare pacchi qui per il ritiro?",
"cs": "Můžete sem posílat balíky k vyzvednutí?"
},
+ "render": {
+ "en": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}",
+ "de": "Mit diesen Unternehmen können Sie Pakete zur Abholung hierher senden: {post_office:parcel_to}",
+ "ca": "Podeu enviar paquets aquí per recollir-los amb aquestes empreses: {post_office:parcel_to}",
+ "es": "Puedes enviar paquetes aquí para su recogida con estas empresas: {post_office:parcel_to}",
+ "it": "Puoi inviare pacchi qui per il ritiro con queste aziende: {post_office:parcel_to}",
+ "cs": "Můžete sem posílat balíky k vyzvednutí s těmito firmami: {post_office:parcel_to}"
+ },
"freeform": {
"key": "post_office:parcel_to",
"type": "string"
@@ -587,15 +587,6 @@
},
{
"id": "stamps",
- "render": {
- "en": "You can buy stamps from companies: {post_office:stamps}",
- "de": "Sie können Briefmarken folgender Unternehmen kaufen: {post_office:stamps}",
- "nl": "Je kan hier postzegels kopen van de volgende bedrijven: {post_office:stamps}",
- "cs": "Známky si můžete zakoupit u firem: {post_office:stamps}",
- "es": "Puedes comprar sellos de las empresas: {post_office:stamps}",
- "ca": "Podeu comprar segells a empreses: {post_office:stamps}",
- "it": "Puoi comprare francobolli da aziende: {post_office:stamps}"
- },
"question": {
"en": "Can you buy stamps here?",
"de": "Kann man hier Briefmarken kaufen?",
@@ -605,6 +596,15 @@
"es": "¿Puedes comprar sellos aquí?",
"it": "Puoi comprare francobolli qui?"
},
+ "render": {
+ "en": "You can buy stamps from companies: {post_office:stamps}",
+ "de": "Sie können Briefmarken folgender Unternehmen kaufen: {post_office:stamps}",
+ "nl": "Je kan hier postzegels kopen van de volgende bedrijven: {post_office:stamps}",
+ "cs": "Známky si můžete zakoupit u firem: {post_office:stamps}",
+ "es": "Puedes comprar sellos de las empresas: {post_office:stamps}",
+ "ca": "Podeu comprar segells a empreses: {post_office:stamps}",
+ "it": "Puoi comprare francobolli da aziende: {post_office:stamps}"
+ },
"freeform": {
"key": "post_office:stamps",
"type": "string"
diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index 4e80b7964..71da30fce 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -132,20 +132,7 @@
"tagRenderings": [
"images",
{
- "render": {
- "en": "The name of this bookcase is {name}",
- "nl": "De naam van dit boekenruilkastje is {name}",
- "de": "Der Name des Bücherschranks lautet {name}",
- "fr": "Le nom de cette microbibliothèque est {name}",
- "ru": "Название книжного шкафа — {name}",
- "it": "Il nome di questa libreria pubblica è {name}",
- "hu": "Ennek a könyvespolcnak a neve: {name}",
- "ca": "El nom d'aquesta prestatgeria és {name}",
- "cs": "Název této knihobudky je {name}",
- "es": "El nombre de este librero es {name}",
- "da": "Navnet på dette bogbytteskab er {name}",
- "uk": "Назва цієї книжкової шафи — {name}"
- },
+ "id": "public_bookcase-name",
"question": {
"en": "What is the name of this public bookcase?",
"nl": "Wat is de naam van dit boekenruilkastje?",
@@ -160,6 +147,20 @@
"da": "Hvad er navnet på dette bogbytteskab?",
"uk": "Як називається ця публічна книжкова шафа?"
},
+ "render": {
+ "en": "The name of this bookcase is {name}",
+ "nl": "De naam van dit boekenruilkastje is {name}",
+ "de": "Der Name des Bücherschranks lautet {name}",
+ "fr": "Le nom de cette microbibliothèque est {name}",
+ "ru": "Название книжного шкафа — {name}",
+ "it": "Il nome di questa libreria pubblica è {name}",
+ "hu": "Ennek a könyvespolcnak a neve: {name}",
+ "ca": "El nom d'aquesta prestatgeria és {name}",
+ "cs": "Název této knihobudky je {name}",
+ "es": "El nombre de este librero es {name}",
+ "da": "Navnet på dette bogbytteskab er {name}",
+ "uk": "Назва цієї книжкової шафи — {name}"
+ },
"freeform": {
"key": "name",
"inline": true
@@ -187,24 +188,10 @@
"uk": "Ця книжкова шафа не має назви"
}
}
- ],
- "id": "public_bookcase-name"
+ ]
},
{
- "render": {
- "en": "{capacity} books fit in this bookcase",
- "nl": "Er passen {capacity} boeken",
- "de": "In den Bücherschrank passen ca. {capacity} Bücher",
- "fr": "{capacity} livres peuvent entrer dans cette microbibliothèque",
- "it": "{capacity} libri entrano in questa libreria pubblica",
- "ru": "{capacity} книг помещается в этот книжный шкаф",
- "hu": "Ezen a könyvespolcon {capacity} könyv fér el",
- "ca": "Caben {capacity} llibres en aquesta prestatgeria",
- "cs": "{capacity} knih se vejde do této knihobudky",
- "es": "En este librero caben {capacity} libros",
- "da": "Der kan være {capacity} i dette bogbytteskab",
- "uk": "У цю книжкову шафу вміщається {capacity} книг"
- },
+ "id": "public_bookcase-capacity",
"question": {
"en": "How many books fit into this public bookcase?",
"nl": "Hoeveel boeken passen er in dit boekenruilkastje?",
@@ -219,12 +206,25 @@
"da": "Hvor mange bøger er der plads til i dette bogbytteskab?",
"uk": "Скільки книг вміщається в цю публічну книжкову шафу?"
},
+ "render": {
+ "en": "{capacity} books fit in this bookcase",
+ "nl": "Er passen {capacity} boeken",
+ "de": "In den Bücherschrank passen ca. {capacity} Bücher",
+ "fr": "{capacity} livres peuvent entrer dans cette microbibliothèque",
+ "it": "{capacity} libri entrano in questa libreria pubblica",
+ "ru": "{capacity} книг помещается в этот книжный шкаф",
+ "hu": "Ezen a könyvespolcon {capacity} könyv fér el",
+ "ca": "Caben {capacity} llibres en aquesta prestatgeria",
+ "cs": "{capacity} knih se vejde do této knihobudky",
+ "es": "En este librero caben {capacity} libros",
+ "da": "Der kan være {capacity} i dette bogbytteskab",
+ "uk": "У цю книжкову шафу вміщається {capacity} книг"
+ },
"freeform": {
"key": "capacity",
"type": "nat",
"inline": true
- },
- "id": "public_bookcase-capacity"
+ }
},
{
"id": "bookcase-booktypes",
@@ -257,7 +257,6 @@
"fixme=Freeform tag `books` used, to be doublechecked"
]
},
- "multiAnswer": true,
"mappings": [
{
"if": "books=children",
@@ -291,7 +290,8 @@
"da": "Mest bøger for voksne"
}
}
- ]
+ ],
+ "multiAnswer": true
},
{
"id": "bookcase-is-indoors",
@@ -374,7 +374,6 @@
"es": "¿Es este librero público de libre acceso?",
"da": "Er dette bogbytteskab frit tilgængeligt?"
},
- "condition": "indoor=yes",
"mappings": [
{
"then": {
@@ -407,9 +406,11 @@
},
"if": "access=customers"
}
- ]
+ ],
+ "condition": "indoor=yes"
},
{
+ "id": "public_bookcase-operator",
"question": {
"en": "Who maintains this public bookcase?",
"nl": "Wie is verantwoordelijk voor dit boekenruilkastje?",
@@ -437,8 +438,7 @@
"freeform": {
"type": "string",
"key": "operator"
- },
- "id": "public_bookcase-operator"
+ }
},
{
"id": "public_bookcase-brand",
@@ -468,7 +468,6 @@
"uk": "Ця публічна книжкова шафа є частиною {brand}",
"da": "Dette bogbytteskab er en del af {brand}"
},
- "condition": "ref=",
"freeform": {
"key": "brand",
"placeholder": {
@@ -505,20 +504,11 @@
"brand="
]
}
- ]
+ ],
+ "condition": "ref="
},
{
- "render": {
- "en": "The reference number of this public bookcase within {brand} is {ref}",
- "nl": "Het referentienummer binnen {brand} is {ref}",
- "de": "Die Referenznummer dieses öffentlichen Bücherschranks innerhalb {brand} lautet {ref}",
- "fr": "Cette microbibliothèque du réseau {brand} possède le numéro {ref}",
- "it": "Il numero di riferimento di questa libreria pubblica all'interno di {brand} è {ref}",
- "hu": "A(z) {brand} márkanéven belül ennek a nyilvános könyvespolcnak az azonosító száma: {ref}",
- "cs": "Referenční číslo této veřejné knihobudky v rámci {brand} je {ref}",
- "es": "El número de referencia de este librero público dentro de {brand} es {ref}",
- "ca": "El número de referència d'aquesta prestatgeria pública a {brand} és {ref}"
- },
+ "id": "public_bookcase-ref",
"question": {
"en": "What is the reference number of this public bookcase?",
"nl": "Wat is het referentienummer van dit boekenruilkastje?",
@@ -531,7 +521,17 @@
"es": "¿Cuál es el número de referencia de este librero público?",
"da": "Hvad er referencenummeret for dette bogbytteskab?"
},
- "condition": "brand~*",
+ "render": {
+ "en": "The reference number of this public bookcase within {brand} is {ref}",
+ "nl": "Het referentienummer binnen {brand} is {ref}",
+ "de": "Die Referenznummer dieses öffentlichen Bücherschranks innerhalb {brand} lautet {ref}",
+ "fr": "Cette microbibliothèque du réseau {brand} possède le numéro {ref}",
+ "it": "Il numero di riferimento di questa libreria pubblica all'interno di {brand} è {ref}",
+ "hu": "A(z) {brand} márkanéven belül ennek a nyilvános könyvespolcnak az azonosító száma: {ref}",
+ "cs": "Referenční číslo této veřejné knihobudky v rámci {brand} je {ref}",
+ "es": "El número de referencia de este librero público dentro de {brand} es {ref}",
+ "ca": "El número de referència d'aquesta prestatgeria pública a {brand} és {ref}"
+ },
"freeform": {
"key": "ref"
},
@@ -559,9 +559,10 @@
}
}
],
- "id": "public_bookcase-ref"
+ "condition": "brand~*"
},
{
+ "id": "public_bookcase-start_date",
"question": {
"en": "When was this public bookcase installed?",
"nl": "Op welke dag werd dit boekenruilkastje geinstalleerd?",
@@ -591,10 +592,24 @@
"freeform": {
"key": "start_date",
"type": "date"
- },
- "id": "public_bookcase-start_date"
+ }
},
{
+ "id": "public_bookcase-website",
+ "question": {
+ "en": "Is there a website with more information about this public bookcase?",
+ "nl": "Is er een website over dit boekenruilkastje?",
+ "de": "Auf welcher Webseite findet man Informationen zu diesem Bücherschrank?",
+ "fr": "Y a-t-il un site web avec plus d'informations sur cette microbibliothèque ?",
+ "it": "C'è un sito web con maggiori informazioni su questa libreria pubblica?",
+ "ru": "Есть ли веб-сайт с более подробной информацией об этом общественном книжном шкафе?",
+ "hu": "Van-e olyan weboldal, ahol további információ található erről a nyilvános könyvespolcról?",
+ "ca": "Hi ha algun lloc web amb més informació sobre aquesta prestatgeria pública?",
+ "cs": "Existuje webová stránka s dalšími informacemi o této veřejné knihobudce?",
+ "es": "¿Hay un sitio web con más información sobre este librero público?",
+ "uk": "Чи є веб-сайт із додатковою інформацією про цю публічну книжкову шафу?",
+ "da": "Findes der et websted med mere information om dette bogbytteskab?"
+ },
"render": {
"special": {
"type": "link",
@@ -615,25 +630,10 @@
}
}
},
- "question": {
- "en": "Is there a website with more information about this public bookcase?",
- "nl": "Is er een website over dit boekenruilkastje?",
- "de": "Auf welcher Webseite findet man Informationen zu diesem Bücherschrank?",
- "fr": "Y a-t-il un site web avec plus d'informations sur cette microbibliothèque ?",
- "it": "C'è un sito web con maggiori informazioni su questa libreria pubblica?",
- "ru": "Есть ли веб-сайт с более подробной информацией об этом общественном книжном шкафе?",
- "hu": "Van-e olyan weboldal, ahol további információ található erről a nyilvános könyvespolcról?",
- "ca": "Hi ha algun lloc web amb més informació sobre aquesta prestatgeria pública?",
- "cs": "Existuje webová stránka s dalšími informacemi o této veřejné knihobudce?",
- "es": "¿Hay un sitio web con más información sobre este librero público?",
- "uk": "Чи є веб-сайт із додатковою інформацією про цю публічну книжкову шафу?",
- "da": "Findes der et websted med mere information om dette bogbytteskab?"
- },
"freeform": {
"key": "website",
"type": "url"
- },
- "id": "public_bookcase-website"
+ }
}
],
"filter": [
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 2a880f931..124159afe 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -50,9 +50,6 @@
{
"id": "wikipedia",
"description": "Shows a wikipedia box with the corresponding wikipedia article; the wikidata-item link can be changed by a contributor",
- "render": {
- "*": "{wikipedia():max-height:25rem}"
- },
"question": {
"en": "What is the corresponding Wikidata entity?",
"nl": "Welk Wikidata-item komt overeen met dit object?",
@@ -74,6 +71,13 @@
"id": "Apa entitas Wikidata yang sesuai?",
"cs": "Jaká je odpovídající entita Wikidata?"
},
+ "render": {
+ "*": "{wikipedia():max-height:25rem}"
+ },
+ "freeform": {
+ "key": "wikidata",
+ "type": "wikidata"
+ },
"mappings": [
{
"if": "wikipedia~*",
@@ -108,11 +112,7 @@
},
"hideInAnswer": true
}
- ],
- "freeform": {
- "key": "wikidata",
- "type": "wikidata"
- }
+ ]
},
{
"id": "reviews",
@@ -170,6 +170,13 @@
}
},
"icon": "./assets/layers/questions/phone.svg",
+ "freeform": {
+ "key": "phone",
+ "type": "phone",
+ "addExtraTags": [
+ "contact:phone="
+ ]
+ },
"mappings": [
{
"if": "contact:phone~*",
@@ -184,13 +191,6 @@
"icon": "./assets/layers/questions/phone.svg"
}
],
- "freeform": {
- "key": "phone",
- "type": "phone",
- "addExtraTags": [
- "contact:phone="
- ]
- },
"editButtonAriaLabel": {
"en": "Edit phone number",
"nl": "Pas telefoonnummer aan",
@@ -216,14 +216,14 @@
"ca": "Què és l'identificador de Mastodon de {title()}?",
"it": "Qual è l'handle Mastodon di {title()}?"
},
- "freeform": {
- "key": "contact:mastodon",
- "type": "fediverse"
- },
"render": {
"*": "{fediverse_link(contact:mastodon)}"
},
"icon": "./assets/svg/mastodon.svg",
+ "freeform": {
+ "key": "contact:mastodon",
+ "type": "fediverse"
+ },
"onSoftDelete": [
"contact:mastodon=",
"mastodon="
@@ -240,10 +240,6 @@
"it": "Qual è la pagina Facebook di {title()}?",
"cs": "Jaký je název facebookové stránky {title()}?"
},
- "freeform": {
- "key": "contact:facebook",
- "type": "url"
- },
"render": {
"special": {
"type": "link",
@@ -266,6 +262,10 @@
"cs": "O Facebooku je známo, že poškozuje duševní zdraví, manipuluje veřejným míněním a vyvolává nenávist. Zkuste používat zdravější alternativy
"
}
},
+ "freeform": {
+ "key": "contact:facebook",
+ "type": "url"
+ },
"onSoftDelete": [
"contact:facebook="
]
@@ -284,10 +284,6 @@
},
{
"id": "email",
- "render": {
- "*": "{email}"
- },
- "icon": "./assets/svg/envelope.svg",
"labels": [
"contact"
],
@@ -317,6 +313,17 @@
"cs": "Jaká je e-mailová adresa {title()}?",
"uk": "Яка електронна адреса {title()}?"
},
+ "render": {
+ "*": "{email}"
+ },
+ "icon": "./assets/svg/envelope.svg",
+ "freeform": {
+ "key": "email",
+ "type": "email",
+ "addExtraTags": [
+ "contact:email="
+ ]
+ },
"mappings": [
{
"if": "contact:email~*",
@@ -331,13 +338,6 @@
"hideInAnswer": true
}
],
- "freeform": {
- "key": "email",
- "type": "email",
- "addExtraTags": [
- "contact:email="
- ]
- },
"editButtonAriaLabel": {
"en": "Edit email address",
"nl": "Pas emailadres aan",
@@ -357,7 +357,6 @@
"labels": [
"contact"
],
- "icon": "./assets/layers/icons/website.svg",
"question": {
"en": "What is the website of {title()}?",
"nl": "Wat is de website van {title()}?",
@@ -387,6 +386,7 @@
"render": {
"*": "{website}"
},
+ "icon": "./assets/layers/icons/website.svg",
"freeform": {
"key": "website",
"type": "url",
@@ -741,13 +741,6 @@
"da": "Er der stadig noget relevant, du ikke kunne give i de foregående spørgsmål? Tilføj det her.",
"cs": "Je ještě něco relevantního, co jste nemohli uvést v předchozích otázkách? Přidejte to sem."
},
- "render": {
- "*": "{description}"
- },
- "freeform": {
- "key": "description",
- "type": "text"
- },
"questionHint": {
"nl": "Herhaal geen antwoorden die je reeds gaf",
"fr": "Ne répétez pas des réponses déjà données",
@@ -770,9 +763,27 @@
"fil": "Huwag ulitin ang mga nai-saad na",
"da": "Gentag ikke allerede nævnte fakta",
"cs": "Neopakujte již uvedená fakta"
+ },
+ "render": {
+ "*": "{description}"
+ },
+ "freeform": {
+ "key": "description",
+ "type": "text"
}
},
{
+ "id": "fixme",
+ "question": {
+ "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",
+ "fr": "Y a-t-il quelque chose qui ne va pas dans la manière dont ça a été cartographié, et que vous n'avez pas pu réparer ici ? (laisser une note pour les experts d'OpenStreetMap)",
+ "it": "C'è qualcosa di sbagliato nel modo in cui è mappato, che non sei riuscito a correggere qui? (lascia una nota agli esperti di OpenStreetMap)",
+ "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlasse eine Notiz für OpenStreetMap-Experten)",
+ "sl": "Ali je kaj narobe s tem vnosom na zemljevid, in tega niste mogli sami popraviti tu? (pustite opombo OpenStreetMap strokovnjakom)",
+ "es": "¿Hay algo mal en cómo está mapeado esto, que no hayas podido arreglar aquí? (deja una nota para los expertos de OpenStreetMap)",
+ "ca": "Hi ha alguna cosa malament en la manera de com està mapejat això, que no heu pogut solucionar aquí? (deixeu una nota als experts d'OpenStreetMap)",
+ "cs": "Je na tom, jak je to zmapováno, něco v nepořádku, co jste zde nedokázali opravit? (zanechte poznámku odborníkům na OpenStreetMap)"
+ },
"render": {
"en": "Extra information for OpenStreetMap experts: {fixme}",
"nl": "Extra informatie voor OpenStreetMap experts: {fixme}",
@@ -786,21 +797,10 @@
"pl": "Więcej informacji dla doświadczonych użytkowników OpenStreetMap: {fixme}",
"cs": "Další informace pro experty OpenStreetMap: {fixme}"
},
- "question": {
- "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",
- "fr": "Y a-t-il quelque chose qui ne va pas dans la manière dont ça a été cartographié, et que vous n'avez pas pu réparer ici ? (laisser une note pour les experts d'OpenStreetMap)",
- "it": "C'è qualcosa di sbagliato nel modo in cui è mappato, che non sei riuscito a correggere qui? (lascia una nota agli esperti di OpenStreetMap)",
- "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlasse eine Notiz für OpenStreetMap-Experten)",
- "sl": "Ali je kaj narobe s tem vnosom na zemljevid, in tega niste mogli sami popraviti tu? (pustite opombo OpenStreetMap strokovnjakom)",
- "es": "¿Hay algo mal en cómo está mapeado esto, que no hayas podido arreglar aquí? (deja una nota para los expertos de OpenStreetMap)",
- "ca": "Hi ha alguna cosa malament en la manera de com està mapejat això, que no heu pogut solucionar aquí? (deixeu una nota als experts d'OpenStreetMap)",
- "cs": "Je na tom, jak je to zmapováno, něco v nepořádku, co jste zde nedokázali opravit? (zanechte poznámku odborníkům na OpenStreetMap)"
- },
"freeform": {
"key": "fixme",
"type": "text"
- },
- "id": "fixme"
+ }
},
{
"id": "opening_hours",
@@ -964,7 +964,6 @@
},
{
"id": "service:electricity",
- "#": "service:socket describes if a pub, restaurant or café offers electricity to their customers.",
"question": {
"en": "Does this amenity have electrical outlets, available to customers when they are inside?",
"nl": "Zijn er stekkers beschikbaar voor klanten die binnen zitten?",
@@ -1074,6 +1073,7 @@
"if": "service:electricity=no"
}
],
+ "#": "service:socket describes if a pub, restaurant or café offers electricity to their customers.",
"onSoftDelete": [
"service:electricity="
]
@@ -1105,7 +1105,6 @@
"cs": "Jaké platební metody jsou zde přijímány?",
"uk": "Які способи оплати тут приймаються?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "payment:cash=yes",
@@ -1185,6 +1184,7 @@
"filters.accepts_cash",
"filters.accepts_cards"
],
+ "multiAnswer": true,
"onSoftDelete": [
"payment:cash=",
"payment:cards=",
@@ -1351,22 +1351,6 @@
},
{
"id": "denominations-coins",
- "condition": {
- "and": [
- {
- "or": [
- "payment:coins=yes",
- "payment:cash=yes"
- ]
- },
- {
- "or": [
- "_currency~.*EUR.*",
- "_currency~.*CHF.*"
- ]
- }
- ]
- },
"question": {
"en": "What coins can you use to pay here?",
"de": "Mit welchen Münzen kann man hier bezahlen?",
@@ -1379,7 +1363,6 @@
"cs": "Jakými mincemi zde lze platit?",
"it": "Quali monete puoi usare per pagare qui?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "payment:coins:denominations=0.01 EUR",
@@ -1622,17 +1605,11 @@
"hideInAnswer": "_currency!~.*CHF.*"
}
],
- "onSoftDelete": [
- "payment:coins:denominations="
- ]
- },
- {
- "id": "denominations-notes",
"condition": {
"and": [
{
"or": [
- "payment:notes=yes",
+ "payment:coins=yes",
"payment:cash=yes"
]
},
@@ -1644,6 +1621,13 @@
}
]
},
+ "multiAnswer": true,
+ "onSoftDelete": [
+ "payment:coins:denominations="
+ ]
+ },
+ {
+ "id": "denominations-notes",
"question": {
"en": "what notes can you use to pay here?",
"nl": "Met welke bankbiljetten kan je hier betalen?",
@@ -1655,7 +1639,6 @@
"fr": "quels billets pouvez vous utiliser pour payer ici ?",
"it": "Quali banconote puoi usare per pagare qui?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "payment:notes:denominations=5 EUR",
@@ -1854,6 +1837,23 @@
"hideInAnswer": "_currency!~.*CHF.*"
}
],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "payment:notes=yes",
+ "payment:cash=yes"
+ ]
+ },
+ {
+ "or": [
+ "_currency~.*EUR.*",
+ "_currency~.*CHF.*"
+ ]
+ }
+ ]
+ },
+ "multiAnswer": true,
"onSoftDelete": [
"payment:notes:denominations="
]
@@ -1912,11 +1912,6 @@
"labels": [
"level"
],
- "condition": {
- "and": [
- "repeat_on~*"
- ]
- },
"render": {
"en": "Multiple, identical objects can be found on floors {repeat_on}.",
"nl": "Er zijn verschillende, identieke objecten op verdiepingen {repeat_on}.",
@@ -1925,6 +1920,11 @@
"es": "Se pueden encontrar varios objetos idénticos en las plantas {repeat_on}.",
"ca": "Es poden trobar múltiples objectes idèntics a les plantes {repeat_on}.",
"it": "Oggetti multipli e identici possono essere trovati ai piani {repeat_on}."
+ },
+ "condition": {
+ "and": [
+ "repeat_on~*"
+ ]
}
},
{
@@ -1932,11 +1932,6 @@
"labels": [
"level"
],
- "condition": {
- "and": [
- "repeat_on="
- ]
- },
"question": {
"nl": "Op welke verdieping bevindt dit punt zich?",
"en": "On what level is this feature located?",
@@ -2127,6 +2122,11 @@
}
}
],
+ "condition": {
+ "and": [
+ "repeat_on="
+ ]
+ },
"onSoftDelete": [
"level="
]
@@ -2148,12 +2148,6 @@
"pl": "Czy w {title()} wolno palić?",
"it": "Fumare è permesso presso {title()}?"
},
- "#condition": "Based on https://en.wikipedia.org/wiki/List_of_smoking_bans",
- "condition": {
- "and": [
- "_country!~al|be"
- ]
- },
"mappings": [
{
"if": "smoking=yes",
@@ -2219,6 +2213,12 @@
}
}
],
+ "condition": {
+ "and": [
+ "_country!~al|be"
+ ]
+ },
+ "#condition": "Based on https://en.wikipedia.org/wiki/List_of_smoking_bans",
"onSoftDelete": [
"smoking="
]
@@ -2429,12 +2429,6 @@
"labels": [
"internet-all"
],
- "condition": {
- "and": [
- "internet_access!=no",
- "internet_access!="
- ]
- },
"question": {
"en": "Is there a fee for internet access?",
"nl": "Zijn er kosten voor internettoegang?",
@@ -2508,6 +2502,12 @@
}
}
],
+ "condition": {
+ "and": [
+ "internet_access!=no",
+ "internet_access!="
+ ]
+ },
"onSoftDelete": [
"internet=",
"internet_access:fee=",
@@ -2519,11 +2519,6 @@
"labels": [
"internet-all"
],
- "condition": {
- "and": [
- "internet_access~.*wlan.*"
- ]
- },
"question": {
"en": "What is the network name for the wireless internet access?",
"nl": "Wat is de netwerknaam voor de draadloze internettoegang?",
@@ -2539,6 +2534,22 @@
"pl": "Jaka jest nazwa sieci dla bezprzewodowego dostępu do Internetu?",
"it": "Qual è il nome della rete per l'accesso a internet wireless?"
},
+ "render": {
+ "en": "The network name is {internet_access:ssid}",
+ "nl": "De netwerknaam is {internet_access:ssid}",
+ "de": "Der Netzwerkname lautet {internet_access:ssid}",
+ "pt": "O nome da rede é {internet_access:ssid}",
+ "da": "Netværksnavnet er {internet_access:ssid}",
+ "id": "Nama jaringan ini adalah {internet_access:ssid}",
+ "cs": "Název sítě je {internet_access:ssid}",
+ "nb_NO": "Nettverksnavnet er {internet_access:ssid}",
+ "es": "El nombre de la red es {internet_access:ssid}",
+ "fr": "Le nom du réseau est {internet_access:ssid}",
+ "ca": "El nom de la xarxa és {internet_access:ssid}",
+ "pl": "Nazwa sieci to {internet_access:ssid}",
+ "uk": "Назва мережі: {internet_access:ssid}",
+ "it": "Il nome della rete è {internet_access:ssid}"
+ },
"freeform": {
"key": "internet_access:ssid",
"type": "string",
@@ -2566,21 +2577,10 @@
"hideInAnswer": "_country!=de"
}
],
- "render": {
- "en": "The network name is {internet_access:ssid}",
- "nl": "De netwerknaam is {internet_access:ssid}",
- "de": "Der Netzwerkname lautet {internet_access:ssid}",
- "pt": "O nome da rede é {internet_access:ssid}",
- "da": "Netværksnavnet er {internet_access:ssid}",
- "id": "Nama jaringan ini adalah {internet_access:ssid}",
- "cs": "Název sítě je {internet_access:ssid}",
- "nb_NO": "Nettverksnavnet er {internet_access:ssid}",
- "es": "El nombre de la red es {internet_access:ssid}",
- "fr": "Le nom du réseau est {internet_access:ssid}",
- "ca": "El nom de la xarxa és {internet_access:ssid}",
- "pl": "Nazwa sieci to {internet_access:ssid}",
- "uk": "Назва мережі: {internet_access:ssid}",
- "it": "Il nome della rete è {internet_access:ssid}"
+ "condition": {
+ "and": [
+ "internet_access~.*wlan.*"
+ ]
},
"onSoftDelete": [
"internet=",
@@ -2681,10 +2681,6 @@
"ca": "Quan es va inspeccionar per última vegada aquest objecte?",
"it": "Quando è stato rilevato l'ultima volta questo oggetto?"
},
- "freeform": {
- "key": "survey:date",
- "type": "date"
- },
"render": {
"en": "This object was last surveyed on {survey:date}",
"de": "Dieses Objekt wurde zuletzt geprüft am {survey:date}",
@@ -2693,6 +2689,10 @@
"ca": "Aquest objecte va ser inspeccionat per darrera vegada el {survey:date}",
"it": "Questo oggetto è stato rilevato l'ultima volta il {survey:date}"
},
+ "freeform": {
+ "key": "survey:date",
+ "type": "date"
+ },
"mappings": [
{
"if": "survey:date:={_now:date}",
@@ -2719,10 +2719,6 @@
"es": "¿Cuándo se revisó este objeto por última vez?",
"it": "Quando è stato controllato l'ultima volta questo oggetto?"
},
- "freeform": {
- "key": "check_date",
- "type": "date"
- },
"render": {
"en": "This object was last checked on {check_date}",
"de": "Dieses Objekt wurde zuletzt kontrolliert am {check_date}",
@@ -2733,6 +2729,10 @@
"es": "Este objeto se revisó por última vez el {check_date}",
"it": "Questo oggetto è stato controllato l'ultima volta il {check_date}"
},
+ "freeform": {
+ "key": "check_date",
+ "type": "date"
+ },
"mappings": [
{
"if": "check_date:={_now:date}",
@@ -2756,7 +2756,6 @@
"ignore_docs"
],
"description": "This element shows a 'thank you' that the contributor has recently created this element",
- "classes": "rounded-xl thanks",
"mappings": [
{
"if": "id~*",
@@ -2796,7 +2795,8 @@
]
}
]
- }
+ },
+ "classes": "rounded-xl thanks"
},
{
"id": "nearby_images",
@@ -2819,10 +2819,10 @@
},
{
"id": "split_button",
- "#": "Added by syntactic sugar, no label needed",
"render": {
"*": "{split_button()}"
- }
+ },
+ "#": "Added by syntactic sugar, no label needed"
},
{
"id": "favourite_status",
@@ -2840,7 +2840,6 @@
"added_by_default",
"ignore_docs"
],
- "metacondition": "_supports_sharing=yes",
"render": {
"special": {
"type": "share_link",
@@ -2855,7 +2854,8 @@
"it": "Condividi questa posizione"
}
}
- }
+ },
+ "metacondition": "_supports_sharing=yes"
},
{
"id": "qr_code",
@@ -2863,7 +2863,6 @@
"added_by_default",
"ignore_docs"
],
- "classes": "flex items-center gap-x-2",
"render": {
"special": {
"type": "qr_code",
@@ -2881,7 +2880,8 @@
"it": "Scansiona questo codice per aprire questa posizione su un altro dispositivo"
}
}
- }
+ },
+ "classes": "flex items-center gap-x-2"
},
{
"id": "last_edit",
@@ -2890,20 +2890,6 @@
"ignore_docs"
],
"description": "Gives some metainfo about the last edit and who did edit it - rendering only",
- "condition": {
- "and": [
- "_last_edit:contributor~*",
- "_last_edit:changeset~*"
- ]
- },
- "metacondition": {
- "or": [
- "__featureSwitchIsTesting=true",
- "__featureSwitchIsDebugging=true",
- "mapcomplete-show_debug=yes",
- "_csCount>=10"
- ]
- },
"render": {
"special": {
"type": "link",
@@ -2922,6 +2908,20 @@
},
"class": "subtle font-small"
}
+ },
+ "condition": {
+ "and": [
+ "_last_edit:contributor~*",
+ "_last_edit:changeset~*"
+ ]
+ },
+ "metacondition": {
+ "or": [
+ "__featureSwitchIsTesting=true",
+ "__featureSwitchIsDebugging=true",
+ "mapcomplete-show_debug=yes",
+ "_csCount>=10"
+ ]
}
},
{
@@ -2930,13 +2930,6 @@
"added_by_default_top",
"ignore_docs"
],
- "condition": {
- "and": [
- "_backend~*",
- "_last_edit:passed_time>=300"
- ]
- },
- "metacondition": "__featureSwitchEnableLogin=true",
"render": {
"special": {
"type": "if_nothing_known",
@@ -2951,7 +2944,14 @@
},
"cssClasses": "subtle m-4 italic flex items-center justify-center"
}
- }
+ },
+ "condition": {
+ "and": [
+ "_backend~*",
+ "_last_edit:passed_time>=300"
+ ]
+ },
+ "metacondition": "__featureSwitchEnableLogin=true"
},
{
"id": "seasonal",
@@ -3212,10 +3212,6 @@
"it": "Qual è il tempo massimo che si è autorizzati a rimanere qui?",
"cs": "Jaký je maximální čas, který tu lze strávit?"
},
- "freeform": {
- "key": "maxstay",
- "type": "pfloat"
- },
"render": {
"en": "One can stay at most {canonical(maxstay)}",
"nl": "Je mag hier maximaal {canonical(maxstay)} blijven",
@@ -3224,6 +3220,10 @@
"it": "Si può rimanere al massimo {canonical(maxstay)}",
"cs": "Lze tu zůstat nejvýše {canonical(maxstay)}"
},
+ "freeform": {
+ "key": "maxstay",
+ "type": "pfloat"
+ },
"mappings": [
{
"if": "maxstay=unlimited",
@@ -3390,13 +3390,13 @@
"question": {
"en": "Is there a high chair (also known as booster chair) for toddlers available here?"
},
+ "render": {
+ "en": "{highchair} highchairs are available"
+ },
"freeform": {
"key": "highchair",
"type": "nat"
},
- "render": {
- "en": "{highchair} highchairs are available"
- },
"mappings": [
{
"if": "highchair=no",
diff --git a/assets/layers/railway_platforms/railway_platforms.json b/assets/layers/railway_platforms/railway_platforms.json
index d72db08f6..0e9dab92b 100644
--- a/assets/layers/railway_platforms/railway_platforms.json
+++ b/assets/layers/railway_platforms/railway_platforms.json
@@ -98,6 +98,17 @@
"es": "¿Cuál es el número de este andén?",
"it": "Qual è il numero di questo binario?"
},
+ "render": {
+ "en": "Platform {ref}",
+ "de": "Bahnsteig {ref}",
+ "nl": "Perron {ref}",
+ "fr": "Quai {ref}",
+ "ca": "Andana {ref}",
+ "cs": "Nástupiště {ref}",
+ "pl": "Peron {ref}",
+ "es": "Andén {ref}",
+ "it": "Binario {ref}"
+ },
"freeform": {
"key": "ref",
"type": "string",
@@ -112,17 +123,6 @@
"es": "Número de andén",
"it": "Numero del binario"
}
- },
- "render": {
- "en": "Platform {ref}",
- "de": "Bahnsteig {ref}",
- "nl": "Perron {ref}",
- "fr": "Quai {ref}",
- "ca": "Andana {ref}",
- "cs": "Nástupiště {ref}",
- "pl": "Peron {ref}",
- "es": "Andén {ref}",
- "it": "Binario {ref}"
}
},
"level"
diff --git a/assets/layers/reception_desk/reception_desk.json b/assets/layers/reception_desk/reception_desk.json
index ed850a974..d98b5478a 100644
--- a/assets/layers/reception_desk/reception_desk.json
+++ b/assets/layers/reception_desk/reception_desk.json
@@ -83,6 +83,17 @@
"es": "¿Cuál es la altura del mostrador de recepción? ",
"it": "Qual è l'altezza del bancone della reception? "
},
+ "questionHint": {
+ "en": "This is measured from the floor to the lowest usable part of the desk",
+ "fr": "Ceci est mesuré du sol à la partie utilisable la plus basse du bureau",
+ "de": "Gemessen vom Boden bis zur untersten nutzbaren Stelle des Tisches",
+ "ca": "Es mesura des del terra fins a la part més baixa utilitzable de l'escriptori",
+ "pl": "Jest to mierzone od podłogi do najniższej użytecznej części biurka",
+ "cs": "Měří se od podlahy po nejnižší použitelnou část stolu",
+ "es": "Esto se mide desde el suelo hasta la parte más baja utilizable del mostrador",
+ "uk": "Вимірюється від підлоги до найнижчої використовуваної частини столу",
+ "it": "Questa è misurata dal pavimento alla parte utilizzabile più bassa del bancone"
+ },
"render": {
"en": "The height of the desk is {canonical(desk:height)}",
"fr": "La hauteur du bureau est {canonical(desk:height)}",
@@ -96,17 +107,6 @@
"freeform": {
"key": "desk:height",
"type": "pfloat"
- },
- "questionHint": {
- "en": "This is measured from the floor to the lowest usable part of the desk",
- "fr": "Ceci est mesuré du sol à la partie utilisable la plus basse du bureau",
- "de": "Gemessen vom Boden bis zur untersten nutzbaren Stelle des Tisches",
- "ca": "Es mesura des del terra fins a la part més baixa utilitzable de l'escriptori",
- "pl": "Jest to mierzone od podłogi do najniższej użytecznej części biurka",
- "cs": "Měří se od podlahy po nejnižší použitelnou část stolu",
- "es": "Esto se mide desde el suelo hasta la parte más baja utilizable del mostrador",
- "uk": "Вимірюється від підлоги до найнижчої використовуваної частини столу",
- "it": "Questa è misurata dal pavimento alla parte utilizzabile più bassa del bancone"
}
},
"induction-loop"
diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index 9e0289835..52758d5c6 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -771,7 +771,6 @@
"fr": "Où ce conteneur est-il situé ?",
"cs": "Kde se tento kontejner nachází?"
},
- "condition": "recycling_type=container",
"mappings": [
{
"if": "location=underground",
@@ -814,7 +813,8 @@
"uk": "Цей контейнер розташований на відкритому повітрі"
}
}
- ]
+ ],
+ "condition": "recycling_type=container"
},
{
"id": "recycling-accepts",
@@ -829,7 +829,6 @@
"cs": "Co se zde dá recyklovat?",
"uk": "Що тут можна переробити?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "recycling:batteries=yes",
@@ -1325,20 +1324,11 @@
"class": "medium"
}
}
- ]
+ ],
+ "multiAnswer": true
},
{
"id": "operator",
- "render": {
- "en": "This recycling facility is operated by {operator}",
- "nl": "Deze recyclingfaciliteit wordt beheerd door {operator}",
- "de": "Die Recyclingeinrichtung wird betrieben von {operator}",
- "es": "Esta instalación de reciclaje está operada por {operator}",
- "it": "Questa struttura di riciclaggio è gestita da {operator}",
- "ca": "Aquesta infraestuctura de reciclatge està operada per {operator}",
- "fr": "Ce point de recyclage est géré par {operator}",
- "cs": "Toto recyklační zařízení provozuje {operator}"
- },
"question": {
"en": "What company operates this recycling facility?",
"nl": "Wat is de beheerder van deze recyclingfaciliteit?",
@@ -1349,6 +1339,16 @@
"fr": "Quelle entreprise gère ce point de recyclage ?",
"cs": "Jaká společnost provozuje toto recyklační zařízení?"
},
+ "render": {
+ "en": "This recycling facility is operated by {operator}",
+ "nl": "Deze recyclingfaciliteit wordt beheerd door {operator}",
+ "de": "Die Recyclingeinrichtung wird betrieben von {operator}",
+ "es": "Esta instalación de reciclaje está operada por {operator}",
+ "it": "Questa struttura di riciclaggio è gestita da {operator}",
+ "ca": "Aquesta infraestuctura de reciclatge està operada per {operator}",
+ "fr": "Ce point de recyclage est géré par {operator}",
+ "cs": "Toto recyklační zařízení provozuje {operator}"
+ },
"freeform": {
"key": "operator",
"type": "string"
@@ -1392,6 +1392,20 @@
"es": "¿Quién puede usar esta instalación de reciclaje?",
"it": "Chi può utilizzare questa struttura di riciclaggio?"
},
+ "render": {
+ "en": "This recycling facility can be used by {access}",
+ "nl": "Deze recyclingfaciliteit kan gebruikt worden door {access}",
+ "de": "Diese Recyclinganlage kann von {access} genutzt werden",
+ "ca": "Aquesta instal·lació de reciclatge la pot utilitzar {access}",
+ "fr": "Ce point de recyclage peut être utilisé par {access}",
+ "cs": "Toto recyklační zařízení mohou využívat {access}",
+ "es": "Esta instalación de reciclaje puede ser usada por {access}",
+ "it": "Questa struttura di riciclaggio può essere utilizzata da {access}"
+ },
+ "freeform": {
+ "key": "access",
+ "type": "string"
+ },
"mappings": [
{
"if": "access=yes",
@@ -1432,31 +1446,22 @@
"it": "Questa struttura di riciclaggio è solo per uso privato"
}
}
- ],
- "freeform": {
- "key": "access",
- "type": "string"
- },
- "render": {
- "en": "This recycling facility can be used by {access}",
- "nl": "Deze recyclingfaciliteit kan gebruikt worden door {access}",
- "de": "Diese Recyclinganlage kann von {access} genutzt werden",
- "ca": "Aquesta instal·lació de reciclatge la pot utilitzar {access}",
- "fr": "Ce point de recyclage peut être utilisé par {access}",
- "cs": "Toto recyklační zařízení mohou využívat {access}",
- "es": "Esta instalación de reciclaje puede ser usada por {access}",
- "it": "Questa struttura di riciclaggio può essere utilizzata da {access}"
- }
+ ]
},
{
"id": "colour",
- "condition": "recycling_type=container",
"question": {
"en": "What color is this recycling container?",
"nl": "Welke kleur heeft deze recyclingcontainer?",
"it": "Di che colore è questo contenitore per il riciclaggio?",
"cs": "Jakou barvu má tento recyklační kontejner?"
},
+ "render": {
+ "en": "This recycling container is {colour}",
+ "nl": "Deze recyclingcontainer is {colour}",
+ "it": "Questo contenitore per il riciclaggio è {colour}",
+ "cs": "Tento recyklační kontejner je {colour}"
+ },
"freeform": {
"key": "colour",
"type": "color",
@@ -1532,12 +1537,7 @@
}
}
],
- "render": {
- "en": "This recycling container is {colour}",
- "nl": "Deze recyclingcontainer is {colour}",
- "it": "Questo contenitore per il riciclaggio è {colour}",
- "cs": "Tento recyklační kontejner je {colour}"
- }
+ "condition": "recycling_type=container"
},
"survey_date"
],
diff --git a/assets/layers/route_marker/route_marker.json b/assets/layers/route_marker/route_marker.json
index 925a9a399..00eb11b3b 100644
--- a/assets/layers/route_marker/route_marker.json
+++ b/assets/layers/route_marker/route_marker.json
@@ -83,7 +83,6 @@
"ca": "Per a quin tipus de ruta és aquest marcador?",
"it": "Per che tipo di percorso è questo segnavia?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "bicycle=yes",
@@ -145,7 +144,8 @@
"it": "Questo è un segnavia per un percorso sciistico."
}
}
- ]
+ ],
+ "multiAnswer": true
}
],
"deletion": true,
diff --git a/assets/layers/sauna_at_leisure/sauna_at_leisure.json b/assets/layers/sauna_at_leisure/sauna_at_leisure.json
index 8ae463d2d..6d5862132 100644
--- a/assets/layers/sauna_at_leisure/sauna_at_leisure.json
+++ b/assets/layers/sauna_at_leisure/sauna_at_leisure.json
@@ -88,17 +88,6 @@
},
{
"id": "sauna-picture",
- "condition": {
- "and": [
- {
- "or": [
- "sauna=yes",
- "leisure=sauna",
- "beauty=sauna"
- ]
- }
- ]
- },
"labels": [
"sauna_expanded",
"sauna_grouped",
@@ -112,18 +101,29 @@
"en": "Add a picture of the sauna"
}
}
+ },
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "sauna=yes",
+ "leisure=sauna",
+ "beauty=sauna"
+ ]
+ }
+ ]
}
},
{
- "question": {
- "en": "Does {title()} have a sauna?"
- },
"id": "has_sauna",
"labels": [
"sauna_grouped",
"at_leisure_only",
"hidden"
],
+ "question": {
+ "en": "Does {title()} have a sauna?"
+ },
"mappings": [
{
"if": "sauna=yes",
@@ -146,15 +146,6 @@
"sauna_grouped",
"hidden"
],
- "condition": {
- "and": [
- {
- "or": [
- "sauna=yes"
- ]
- }
- ]
- },
"question": {
"en": "Is this sauna publicly accessible?",
"de": "Ist die Sauna öffentlich zugänglich?"
@@ -218,7 +209,16 @@
},
"hideInAnswer": true
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "sauna=yes"
+ ]
+ }
+ ]
+ }
},
{
"id": "charge_cost_rewritten",
diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json
index e6b32172e..3a8684356 100644
--- a/assets/layers/school/school.json
+++ b/assets/layers/school/school.json
@@ -138,18 +138,7 @@
"tagRenderings": [
"images",
{
- "render": {
- "en": "This school is named {name}",
- "nl": "Deze school heet {name}",
- "de": "Diese Schule heißt {name}",
- "fr": "Cet établissement scolaire s'appelle {name}",
- "ca": "L'escola s'anomena {name}",
- "pl": "Ta szkoła nazywa się {name}",
- "cs": "Tato škola se jmenuje {name}",
- "es": "Esta escuela se llama {name}",
- "uk": "Ця школа називається {name}",
- "it": "Questa scuola si chiama {name}"
- },
+ "id": "school-name",
"question": {
"en": "What is the name of this school?",
"nl": "Wat is de naam van deze school?",
@@ -162,10 +151,21 @@
"uk": "Як називається ця школа?",
"it": "Qual è il nome di questa scuola?"
},
+ "render": {
+ "en": "This school is named {name}",
+ "nl": "Deze school heet {name}",
+ "de": "Diese Schule heißt {name}",
+ "fr": "Cet établissement scolaire s'appelle {name}",
+ "ca": "L'escola s'anomena {name}",
+ "pl": "Ta szkoła nazywa się {name}",
+ "cs": "Tato škola se jmenuje {name}",
+ "es": "Esta escuela se llama {name}",
+ "uk": "Ця школа називається {name}",
+ "it": "Questa scuola si chiama {name}"
+ },
"freeform": {
"key": "name"
- },
- "id": "school-name"
+ }
},
"contact",
"address.address",
@@ -200,7 +200,6 @@
},
{
"id": "education-level-belgium",
- "condition": "_country=be",
"question": {
"en": "What level of education is given on this school?",
"nl": "Wat is het onderwijsniveau van deze school?",
@@ -323,6 +322,7 @@
}
}
],
+ "condition": "_country=be",
"multiAnswer": true
},
{
@@ -426,25 +426,6 @@
"cs": "Pro co tato škola žáky vyučuje?",
"it": "Per cosa prepara questa scuola gli alunni?"
},
- "condition": {
- "and": [
- {
- "or": [
- "school~i~(.+;)?upper_secondary(;.+)?",
- "school~i~(.+;)?secondary(;.+)?"
- ]
- },
- {
- "or": [
- "school:special_needs=no",
- "school:special_needs=",
- "school:special_needs=limited"
- ]
- }
- ]
- },
- "multiAnswer": true,
- "filter": true,
"mappings": [
{
"if": "school:orientation=academic",
@@ -479,7 +460,26 @@
"it": "Prepara per un lavoro"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "school~i~(.+;)?upper_secondary(;.+)?",
+ "school~i~(.+;)?secondary(;.+)?"
+ ]
+ },
+ {
+ "or": [
+ "school:special_needs=no",
+ "school:special_needs=",
+ "school:special_needs=limited"
+ ]
+ }
+ ]
+ },
+ "filter": true,
+ "multiAnswer": true
},
{
"id": "orientation_belgium_special_needs",
@@ -491,23 +491,6 @@
"cs": "Pro co tato škola žáky učí?",
"it": "Per cosa prepara questa scuola gli alunni?"
},
- "condition": {
- "and": [
- {
- "or": [
- "school~i~(.+;)?upper_secondary(;.+)?",
- "school~i~(.+;)?secondary(;.+)?"
- ]
- },
- {
- "or": [
- "school:special_needs=yes",
- "school:special_needs=only"
- ]
- }
- ]
- },
- "multiAnswer": true,
"mappings": [
{
"if": "school:orientation=care_institution",
@@ -553,7 +536,24 @@
"it": "Tipo di formazione 4: prepara per un lavoro o per continuare gli studi"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "school~i~(.+;)?upper_secondary(;.+)?",
+ "school~i~(.+;)?secondary(;.+)?"
+ ]
+ },
+ {
+ "or": [
+ "school:special_needs=yes",
+ "school:special_needs=only"
+ ]
+ }
+ ]
+ },
+ "multiAnswer": true
},
{
"id": "gender",
@@ -632,6 +632,17 @@
"ca": "Quina teoria educativa s'aplica en aquesta escola?",
"it": "Quale teoria educativa viene applicata in questa scuola?"
},
+ "render": {
+ "en": "This school uses {pedagogy}",
+ "de": "Diese Schule benutzt {pedagogy}",
+ "es": "Esta escuela utiliza {pedagogy}",
+ "cs": "Tato škola používá {pedagogy}",
+ "ca": "Aquesta escola utilitza {pedagogy}",
+ "it": "Questa scuola utilizza {pedagogy}"
+ },
+ "freeform": {
+ "key": "pedagogy"
+ },
"mappings": [
{
"if": "pedagogy=mainstream",
@@ -732,28 +743,10 @@
"it": "Questa scuola utilizza il sistema Sudbury"
}
}
- ],
- "render": {
- "en": "This school uses {pedagogy}",
- "de": "Diese Schule benutzt {pedagogy}",
- "es": "Esta escuela utiliza {pedagogy}",
- "cs": "Tato škola používá {pedagogy}",
- "ca": "Aquesta escola utilitza {pedagogy}",
- "it": "Questa scuola utilizza {pedagogy}"
- },
- "freeform": {
- "key": "pedagogy"
- }
+ ]
},
{
"id": "special_needs_categories_be",
- "condition": {
- "and": [
- "_country=be",
- "school:special_needs!~no",
- "school:special_needs!="
- ]
- },
"question": {
"en": "What type of special needs are given here?",
"nl": "Welke soorten zorg voor buitengewone leerlingen is hier beschikbaar?",
@@ -762,7 +755,6 @@
"cs": "Pro jaký druh zvláštních potřeb je to zde připraveno?",
"it": "Che tipo di bisogni speciali vengono forniti qui?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "special_needs:intellectual_disability=yes",
@@ -861,7 +853,15 @@
"it": "Per studenti con disturbi dell'apprendimento (offerta di base)"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "_country=be",
+ "school:special_needs!~no",
+ "school:special_needs!="
+ ]
+ },
+ "multiAnswer": true
},
{
"id": "school-language",
@@ -923,7 +923,6 @@
"cs": "Musejí žáci nosit uniformu nebo dodržovat požadavky na oblečení?",
"it": "Gli alunni devono indossare un'uniforme o rispettare un codice di abbigliamento?"
},
- "multiAnswer": true,
"render": {
"en": "{dress_code}",
"ca": "{dress_code}",
@@ -933,16 +932,6 @@
"freeform": {
"key": "dress_code"
},
- "invalidValues": {
- "or": [
- {
- "and": [
- "dress_code~(^|.*;)uniform(.*|$)",
- "dress_code~(^|.*;)(casual|obligated_colour)(.*|$)"
- ]
- }
- ]
- },
"mappings": [
{
"if": "dress_code=uniform",
@@ -1014,7 +1003,18 @@
"it": "La pancia deve essere coperta dagli abiti"
}
}
- ]
+ ],
+ "multiAnswer": true,
+ "invalidValues": {
+ "or": [
+ {
+ "and": [
+ "dress_code~(^|.*;)uniform(.*|$)",
+ "dress_code~(^|.*;)(casual|obligated_colour)(.*|$)"
+ ]
+ }
+ ]
+ }
},
"wikipedia"
],
diff --git a/assets/layers/scouting_group/scouting_group.json b/assets/layers/scouting_group/scouting_group.json
index 32e7447e9..d975dca53 100644
--- a/assets/layers/scouting_group/scouting_group.json
+++ b/assets/layers/scouting_group/scouting_group.json
@@ -69,6 +69,7 @@
],
"tagRenderings": [
{
+ "id": "name",
"question": {
"de": "Was ist der Stammesname?",
"en": "What is the name of this group?",
@@ -86,10 +87,10 @@
},
"freeform": {
"key": "name"
- },
- "id": "name"
+ }
},
{
+ "id": "association",
"question": {
"de": "Zu welchem Verband/Bund gehört {name}",
"en": "To which scout association does {name} belong?",
@@ -108,28 +109,27 @@
},
"freeform": {
"key": "brand"
- },
- "id": "association"
+ }
},
"contact",
{
- "render": {
- "en": "This group was founded at {start_date}",
- "de": "Dieser Stamm wurde gegründet am {start_date}",
- "it": "Questo gruppo è stato fondato il {start_date}",
- "cs": "Tato skupina byla založena {start_date}"
- },
+ "id": "start_date",
"question": {
"en": "When was this group founded?",
"de": "Wann wurde dieser Stamm gegründet?",
"it": "Quando è stato fondato questo gruppo?",
"cs": "Kdy byla tato skupina založena?"
},
+ "render": {
+ "en": "This group was founded at {start_date}",
+ "de": "Dieser Stamm wurde gegründet am {start_date}",
+ "it": "Questo gruppo è stato fondato il {start_date}",
+ "cs": "Tato skupina byla založena {start_date}"
+ },
"freeform": {
"key": "start_date",
"type": "date"
- },
- "id": "start_date"
+ }
},
"questions",
"mastodon"
diff --git a/assets/layers/shelter/shelter.json b/assets/layers/shelter/shelter.json
index 547703c33..7e71b0447 100644
--- a/assets/layers/shelter/shelter.json
+++ b/assets/layers/shelter/shelter.json
@@ -57,6 +57,29 @@
"images",
{
"id": "shelter-type",
+ "question": {
+ "en": "What kind of shelter is this?",
+ "de": "Um welche Art von Unterstand handelt es sich?",
+ "nl": "Wat voor schuilplaats is dit?",
+ "ca": "Quin tipus de refugi és aquest?",
+ "cs": "Co je to za přístřešek?",
+ "uk": "Що це за притулок?",
+ "es": "¿Qué tipo de refugio es este?",
+ "it": "Che tipo di riparo è questo?"
+ },
+ "render": {
+ "en": "Shelter type: {shelter_type}",
+ "de": "Art des Unterstands: {shelter_type}",
+ "cs": "Typ přístřešku: {shelter_type}",
+ "uk": "Тип притулку: {shelter_type}",
+ "es": "Tipo de refugio: {shelter_type}",
+ "ca": "Tipus de refugi: {shelter_type}",
+ "it": "Tipo di riparo: {shelter_type}"
+ },
+ "freeform": {
+ "key": "shelter_type",
+ "type": "string"
+ },
"mappings": [
{
"if": "shelter_type=public_transport",
@@ -136,30 +159,7 @@
"if": "shelter_type=basic_hut",
"then": "This is a basic hut, providing basic shelter and sleeping facilities."
}
- ],
- "question": {
- "en": "What kind of shelter is this?",
- "de": "Um welche Art von Unterstand handelt es sich?",
- "nl": "Wat voor schuilplaats is dit?",
- "ca": "Quin tipus de refugi és aquest?",
- "cs": "Co je to za přístřešek?",
- "uk": "Що це за притулок?",
- "es": "¿Qué tipo de refugio es este?",
- "it": "Che tipo di riparo è questo?"
- },
- "render": {
- "en": "Shelter type: {shelter_type}",
- "de": "Art des Unterstands: {shelter_type}",
- "cs": "Typ přístřešku: {shelter_type}",
- "uk": "Тип притулку: {shelter_type}",
- "es": "Tipo de refugio: {shelter_type}",
- "ca": "Tipus de refugi: {shelter_type}",
- "it": "Tipo di riparo: {shelter_type}"
- },
- "freeform": {
- "key": "shelter_type",
- "type": "string"
- }
+ ]
}
],
"allowMove": {
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 913584a78..af96e4b1d 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -244,6 +244,7 @@
"images",
"reviews",
{
+ "id": "shops-name",
"question": {
"en": "What is the name of this shop?",
"fr": "Qu'est-ce que le nom de ce magasin ?",
@@ -270,8 +271,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "shops-name"
+ }
},
{
"builtin": "id_presets.shop_types",
@@ -367,11 +367,9 @@
},
{
"id": "beauty_shop_type",
- "condition": "shop=beauty",
"question": {
"en": "What type of beauty shop is this?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "beauty=nails",
@@ -427,7 +425,9 @@
"en": "Offers pedicure services"
}
}
- ]
+ ],
+ "condition": "shop=beauty",
+ "multiAnswer": true
},
{
"id": "brand",
@@ -512,13 +512,6 @@
"level",
{
"id": "copyshop-print-sizes",
- "condition": {
- "or": [
- "shop~.*copyshop.*",
- "shop~.*stationery.*",
- "service:print=yes"
- ]
- },
"question": {
"en": "What paper formats does this shop offer?",
"de": "Welche Papierformate bietet das Geschäft an?",
@@ -529,7 +522,6 @@
"es": "¿Qué formatos de papel ofrece esta tienda?",
"it": "Quali formati di carta offre questo negozio?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "service:print:A4=yes",
@@ -601,10 +593,7 @@
},
"ifnot": "service:print:A0=no"
}
- ]
- },
- {
- "id": "copyshop-binding",
+ ],
"condition": {
"or": [
"shop~.*copyshop.*",
@@ -612,6 +601,10 @@
"service:print=yes"
]
},
+ "multiAnswer": true
+ },
+ {
+ "id": "copyshop-binding",
"question": {
"en": "Does this shop offer a binding service?",
"de": "Bietet dieser Laden einen Bindeservice an?",
@@ -651,15 +644,20 @@
"it": "Questo negozio rilega libri"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "shop~.*copyshop.*",
+ "shop~.*stationery.*",
+ "service:print=yes"
+ ]
+ }
},
{
"id": "copyshop-binding-types",
- "condition": "service:binding=yes",
"question": {
"en": "What types of binding are offered here?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "service:binding:comb=yes",
@@ -695,18 +693,12 @@
"en": "This shop offers thermal binding"
}
}
- ]
+ ],
+ "condition": "service:binding=yes",
+ "multiAnswer": true
},
{
"id": "optometrist_service",
- "#": "Quite often, opticians also sell hearing aids and vice versa. They often also have a certified optometrist or audiologist",
- "condition": {
- "or": [
- "shop=optician",
- "shop=hearing_aid",
- "shop=medical_supply"
- ]
- },
"question": {
"en": "Are medical services available here?",
"nl": "Zijn hier medische services beschikbaar?",
@@ -715,7 +707,6 @@
"it": "Sono disponibili servizi medici qui?",
"cs": "Jsou zde k dispozici lékařské služby?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "healthcare=optometrist",
@@ -741,7 +732,16 @@
"cs": "Tento obchod nabízí testování sluchu certifikovaným audiologem"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "shop=optician",
+ "shop=hearing_aid",
+ "shop=medical_supply"
+ ]
+ },
+ "#": "Quite often, opticians also sell hearing aids and vice versa. They often also have a certified optometrist or audiologist",
+ "multiAnswer": true
},
{
"id": "key_cutter",
@@ -817,12 +817,10 @@
},
{
"id": "hairdresser-targetgroup",
- "multiAnswer": true,
"question": {
"en": "In what target groups does this hairdresser specialize?",
"cs": "Na jakou cílovou skupinu se toto kadeřnictví specializuje?"
},
- "condition": "shop=hairdresser",
"mappings": [
{
"if": "male=yes",
@@ -848,7 +846,9 @@
"cs": "Specializuje se na stříhání dětských vlasů."
}
}
- ]
+ ],
+ "condition": "shop=hairdresser",
+ "multiAnswer": true
},
{
"builtin": "reservation",
@@ -878,17 +878,6 @@
"cs": "Prodává tento obchod jízdní kola?",
"uk": "Чи продає цей магазин велосипеди?"
},
- "condition": {
- "#": "Yes, DIY-stores sometimes sell bikes! E.g.: https://www.hubo.be/nl/zoekresultaten/?q=fiets",
- "or": [
- "service:bicycle:retail~*",
- "shop=outdoor",
- "shop=sport",
- "shop=sports",
- "shop=diy",
- "shop=doityourself"
- ]
- },
"mappings": [
{
"if": "service:bicycle:retail=yes",
@@ -918,19 +907,21 @@
"it": "Questo negozio non vende biciclette nuove"
}
}
- ]
+ ],
+ "condition": {
+ "#": "Yes, DIY-stores sometimes sell bikes! E.g.: https://www.hubo.be/nl/zoekresultaten/?q=fiets",
+ "or": [
+ "service:bicycle:retail~*",
+ "shop=outdoor",
+ "shop=sport",
+ "shop=sports",
+ "shop=diy",
+ "shop=doityourself"
+ ]
+ }
},
{
"id": "bike_second_hand",
- "condition": {
- "or": [
- "service:bicycle:second_hand~*",
- "shop=bicycle",
- "shop=charity",
- "shop=second_hand",
- "shop=bicycle_repair"
- ]
- },
"question": {
"en": "Does this shop sell second-hand bikes?",
"nl": "Verkoopt deze winkel tweedehands fietsen?",
@@ -998,23 +989,19 @@
"uk": "Цей магазин продає лише вживані велосипеди"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "service:bicycle:second_hand~*",
+ "shop=bicycle",
+ "shop=charity",
+ "shop=second_hand",
+ "shop=bicycle_repair"
+ ]
+ }
},
{
"id": "repairs_bikes",
- "condition": {
- "#": "We don't check for shop=bicycle_repair as they imply whether or not bikes are sold",
- "or": [
- "service:bicycle:repair~*",
- "shop=sport",
- "shop=sports",
- "shop=outdoor",
- "shop=bicycle",
- "service:bicycle:retail=yes",
- "service:bicycle:second_hand=yes",
- "service:bicycle:second_hand=only"
- ]
- },
"question": {
"en": "Does this shop repair bikes?",
"nl": "Herstelt deze winkel fietsen?",
@@ -1108,22 +1095,23 @@
"uk": "Ця майстерня ремонтує велосипеди лише певної марки"
}
}
- ]
- },
- {
- "#": "Remark: we steal the 'bicycle_rental' questions from the other layer. They'll get the condition of their source automatically!",
- "id": "bicycle_rental",
+ ],
"condition": {
+ "#": "We don't check for shop=bicycle_repair as they imply whether or not bikes are sold",
"or": [
- "service:bicycle:rental~*",
- "shop=bicycle",
+ "service:bicycle:repair~*",
"shop=sport",
"shop=sports",
- "shop=bicycle_repair",
"shop=outdoor",
- "shop=rental"
+ "shop=bicycle",
+ "service:bicycle:retail=yes",
+ "service:bicycle:second_hand=yes",
+ "service:bicycle:second_hand=only"
]
- },
+ }
+ },
+ {
+ "id": "bicycle_rental",
"question": {
"en": "Does this shop rent out bikes?",
"nl": "Verhuurt deze winkel fietsen?",
@@ -1188,7 +1176,19 @@
"uk": "Цей магазин не дає велосипеди напрокат"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "service:bicycle:rental~*",
+ "shop=bicycle",
+ "shop=sport",
+ "shop=sports",
+ "shop=bicycle_repair",
+ "shop=outdoor",
+ "shop=rental"
+ ]
+ },
+ "#": "Remark: we steal the 'bicycle_rental' questions from the other layer. They'll get the condition of their source automatically!"
},
{
"builtin": "bicycle_rental.*bicycle_rental",
@@ -1220,15 +1220,6 @@
"ca": "Aquesta botiga ofereix una manxa perquè la utilitzi qualsevol?",
"cs": "Nabízí tento obchod pumpu na kolo k použití pro kohokoli?"
},
- "condition": {
- "or": [
- "service:bicycle:pump~*",
- "shop=bicycle",
- "shop=bicycle_repair",
- "service:bicycle:retail=yes",
- "service:bicycle:.+~~yes"
- ]
- },
"mappings": [
{
"if": "service:bicycle:pump=yes",
@@ -1276,18 +1267,19 @@
"cs": "K dispozici je pumpa na jízdní kola, je zobrazena jako samostatný bod"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "service:bicycle:pump~*",
+ "shop=bicycle",
+ "shop=bicycle_repair",
+ "service:bicycle:retail=yes",
+ "service:bicycle:.+~~yes"
+ ]
+ }
},
{
"id": "bike_repair_tools",
- "condition": {
- "or": [
- "service:bicycle:diy~*",
- "shop=bicycle",
- "shop=bicycle_repair",
- "service:bicycle:repair~yes|only"
- ]
- },
"question": {
"en": "Are there tools here to repair your own bike?",
"nl": "Biedt deze winkel gereedschap aan om je fiets zelf te herstellen?",
@@ -1347,18 +1339,18 @@
"cs": "Nářadí pro opravy svépomocí je k dispozici pouze v případě, že jste si kolo koupili/pronajali v prodejně"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "service:bicycle:diy~*",
+ "shop=bicycle",
+ "shop=bicycle_repair",
+ "service:bicycle:repair~yes|only"
+ ]
+ }
},
{
"id": "bike_wash",
- "condition": {
- "or": [
- "service:bicycle:cleaning~*",
- "shop=bicycle",
- "shop=bicycle_repair",
- "service:bicycle:.*~~yes|only"
- ]
- },
"question": {
"en": "Are bicycles washed here?",
"nl": "Biedt deze winkel een fietsschoonmaak aan?",
@@ -1416,18 +1408,24 @@
"cs": "Tento obchod nenabízí čištění jízdních kol"
}
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "service:bicycle:cleaning~*",
+ "shop=bicycle",
+ "shop=bicycle_repair",
+ "service:bicycle:.*~~yes|only"
+ ]
+ }
},
{
"builtin": "bike_cleaning.bike_cleaning-service_bicycle_cleaning_charge"
},
{
"id": "erotic_shop_fetish",
- "condition": "shop=erotic",
"labels": [
"nsfw"
],
- "multiAnswer": true,
"question": {
"en": "Does this shop offer fetish gear?",
"de": "Bietet dieser Laden Fetischkleidung an?",
@@ -1509,7 +1507,9 @@
"zh_Hant": "這間店提供角色扮演制服，例如護士服、軍服、警察、學生妹、法國女佣、…"
}
}
- ]
+ ],
+ "condition": "shop=erotic",
+ "multiAnswer": true
},
"internet-all",
{
diff --git a/assets/layers/shower/shower.json b/assets/layers/shower/shower.json
index 4b5467a6b..df77a2310 100644
--- a/assets/layers/shower/shower.json
+++ b/assets/layers/shower/shower.json
@@ -181,7 +181,6 @@
},
{
"id": "charge",
- "condition": "fee=yes",
"question": {
"en": "How much does it cost to use this shower?",
"de": "Wie viel kostet es, diese Dusche zu nutzen?",
@@ -191,6 +190,15 @@
"es": "¿Cuánto cuesta usar esta ducha?",
"it": "Quanto costa utilizzare questa doccia?"
},
+ "render": {
+ "en": "It costs {charge} to use this shower",
+ "de": "Es kostet {charge} um diese Dusche zu nutzen",
+ "ca": "Costa {charge} utilitzar aquesta dutxa",
+ "fr": "Le prix de cette douche est {charge}",
+ "cs": "Použití této sprchy stojí {charge}",
+ "es": "Cuesta {charge} usar esta ducha",
+ "it": "Costa {charge} utilizzare questa doccia"
+ },
"freeform": {
"key": "charge",
"type": "string",
@@ -204,15 +212,7 @@
"it": "es. 1.50 EUR"
}
},
- "render": {
- "en": "It costs {charge} to use this shower",
- "de": "Es kostet {charge} um diese Dusche zu nutzen",
- "ca": "Costa {charge} utilitzar aquesta dutxa",
- "fr": "Le prix de cette douche est {charge}",
- "cs": "Použití této sprchy stojí {charge}",
- "es": "Cuesta {charge} usar esta ducha",
- "it": "Costa {charge} utilizzare questa doccia"
- }
+ "condition": "fee=yes"
},
"opening_hours",
{
diff --git a/assets/layers/ski_piste/ski_piste.json b/assets/layers/ski_piste/ski_piste.json
index 43909bee2..0a645ea88 100644
--- a/assets/layers/ski_piste/ski_piste.json
+++ b/assets/layers/ski_piste/ski_piste.json
@@ -93,6 +93,7 @@
"tagRenderings": [
"images",
{
+ "id": "piste_difficulty",
"question": {
"en": "What is the difficulty of this piste?",
"de": "Was ist der Schwierigkeitsgrad der Piste?",
@@ -102,8 +103,6 @@
"ca": "Quina és la dificultat d'aquesta pista?",
"it": "Qual è la difficoltà di questa pista?"
},
- "id": "piste_difficulty",
- "condition": "piste:type!=connection",
"mappings": [
{
"if": "piste:difficulty=novice",
@@ -177,7 +176,8 @@
"it": "Fuoripista"
}
}
- ]
+ ],
+ "condition": "piste:type!=connection"
},
{
"id": "length",
diff --git a/assets/layers/slow_roads/slow_roads.json b/assets/layers/slow_roads/slow_roads.json
index 577e2f342..3a0639db9 100644
--- a/assets/layers/slow_roads/slow_roads.json
+++ b/assets/layers/slow_roads/slow_roads.json
@@ -226,6 +226,7 @@
]
},
{
+ "id": "slow_roads-surface",
"question": {
"en": "What surface does this road have?",
"nl": "Wat is de wegverharding van dit pad?",
@@ -375,8 +376,7 @@
},
"hideInAnswer": true
}
- ],
- "id": "slow_roads-surface"
+ ]
},
{
"id": "slow_road_is_lit",
diff --git a/assets/layers/souvenir_coin/souvenir_coin.json b/assets/layers/souvenir_coin/souvenir_coin.json
index dd595de01..9f4d9f887 100644
--- a/assets/layers/souvenir_coin/souvenir_coin.json
+++ b/assets/layers/souvenir_coin/souvenir_coin.json
@@ -96,8 +96,8 @@
"images",
"opening_hours_24_7",
{
- "builtin": "elongated_coin.designs",
"id": "designs",
+ "builtin": "elongated_coin.designs",
"override": {
"render": {
"en": "This machine has {coin:design_count} designs available",
@@ -163,6 +163,7 @@
"payment-options-split",
"website",
{
+ "id": "charge",
"question": {
"en": "How much does a souvenir coin cost?",
"de": "Wie viel kostet eine Souvenirmünze?",
@@ -172,7 +173,6 @@
"cs": "Kolik stojí upomínková mince?",
"it": "Quanto costa una moneta souvenir?"
},
- "id": "charge",
"render": {
"en": "A souvenir coins costs {charge}",
"de": "Eine Souvenirmünze kostet {charge}",
@@ -212,6 +212,7 @@
},
"denominations-coins",
{
+ "id": "indoor",
"question": {
"en": "Is this machine located indoors?",
"de": "Ist diese Maschine im Innenbereich?",
@@ -221,7 +222,6 @@
"it": "Questa macchina si trova all'interno?",
"cs": "Je tento automat je umístěn uvnitř?"
},
- "id": "indoor",
"mappings": [
{
"if": "indoor=yes",
diff --git a/assets/layers/souvenir_note/souvenir_note.json b/assets/layers/souvenir_note/souvenir_note.json
index 19fc3282f..ec2aa07d4 100644
--- a/assets/layers/souvenir_note/souvenir_note.json
+++ b/assets/layers/souvenir_note/souvenir_note.json
@@ -106,6 +106,15 @@
"it": "Quanti design sono disponibili?",
"cs": "Kolik designů je v tomto automatu k dispozici?"
},
+ "render": {
+ "en": "This machine has {note:design_count} designs available.",
+ "de": "Diese Maschine verfügt über {note:design_count} Designs.",
+ "es": "Esta máquina tiene {note:design_count} diseños disponibles.",
+ "nl": "Deze machine heeft {note:design_count} ontwerpen beschikbaar.",
+ "ca": "Aquesta màquina té disponibles {note:design_count}.",
+ "it": "Questa macchina ha {note:design_count} design disponibili.",
+ "cs": "V tomto automatu je k dispozici {note:design_count} designů."
+ },
"freeform": {
"key": "note:design_count",
"type": "pnat",
@@ -119,15 +128,6 @@
"it": "Numero di design (es. 5)"
}
},
- "render": {
- "en": "This machine has {note:design_count} designs available.",
- "de": "Diese Maschine verfügt über {note:design_count} Designs.",
- "es": "Esta máquina tiene {note:design_count} diseños disponibles.",
- "nl": "Deze machine heeft {note:design_count} ontwerpen beschikbaar.",
- "ca": "Aquesta màquina té disponibles {note:design_count}.",
- "it": "Questa macchina ha {note:design_count} design disponibili.",
- "cs": "V tomto automatu je k dispozici {note:design_count} designů."
- },
"mappings": [
{
"if": "note:design_count=1",
@@ -182,6 +182,7 @@
"payment-options-split",
"website",
{
+ "id": "charge",
"question": {
"en": "How much does a souvenir note cost?",
"de": "Wie viel kostet eine Souvenirnote?",
@@ -191,7 +192,6 @@
"it": "Quanto costa una banconota souvenir?",
"cs": "Kolik stojí upomínková bankovka?"
},
- "id": "charge",
"render": {
"en": "A souvenir note costs {charge}",
"de": "Eine Souvenirnote kostet {charge}",
@@ -244,6 +244,7 @@
},
"denominations-coins",
{
+ "id": "indoor",
"question": {
"en": "Is this machine located indoors?",
"de": "Ist diese Maschine im Innenbereich?",
@@ -253,7 +254,6 @@
"it": "Questa macchina si trova all'interno?",
"cs": "Je tento automat je umístěn uvnitř?"
},
- "id": "indoor",
"mappings": [
{
"if": "indoor=yes",
diff --git a/assets/layers/speed_camera/speed_camera.json b/assets/layers/speed_camera/speed_camera.json
index c435dd099..c782d5cbc 100644
--- a/assets/layers/speed_camera/speed_camera.json
+++ b/assets/layers/speed_camera/speed_camera.json
@@ -84,6 +84,16 @@
"cs": "Jaká je maximální povolená rychlost na tomto rychlostním radaru?",
"it": "Qual è la velocità massima consentita a questo autovelox?"
},
+ "render": {
+ "en": "The maximum speed allowed is {canonical(maxspeed)}",
+ "de": "Die zulässige Höchstgeschwindigkeit beträgt {canonical(maxspeed)}",
+ "nl": "De maximum toegestane snelheid is {canonical(maxspeed)}",
+ "es": "La velocidad máxima permitida es {canonical(maxspeed)}",
+ "fr": "La vitesse maximale autorisée est {canonical(maxspeed)}",
+ "ca": "La velocitat màxima permesa és {canonical(maxspeed)}",
+ "cs": "Maximální povolená rychlost je {canonical(maxspeed)}",
+ "it": "La velocità massima consentita è {canonical(maxspeed)}"
+ },
"freeform": {
"key": "maxspeed",
"type": "pnat",
@@ -97,16 +107,6 @@
"cs": "Maximální povolená rychlost",
"it": "Velocità massima consentita"
}
- },
- "render": {
- "en": "The maximum speed allowed is {canonical(maxspeed)}",
- "de": "Die zulässige Höchstgeschwindigkeit beträgt {canonical(maxspeed)}",
- "nl": "De maximum toegestane snelheid is {canonical(maxspeed)}",
- "es": "La velocidad máxima permitida es {canonical(maxspeed)}",
- "fr": "La vitesse maximale autorisée est {canonical(maxspeed)}",
- "ca": "La velocitat màxima permesa és {canonical(maxspeed)}",
- "cs": "Maximální povolená rychlost je {canonical(maxspeed)}",
- "it": "La velocità massima consentita è {canonical(maxspeed)}"
}
},
{
@@ -123,6 +123,7 @@
"condition": "ref~*"
},
{
+ "id": "camera_direction",
"question": {
"en": "In which geographical direction does this camera film?",
"nl": "In welke geografische richting filmt deze camera?",
@@ -151,8 +152,7 @@
"freeform": {
"key": "direction",
"type": "direction"
- },
- "id": "camera_direction"
+ }
}
],
"allowMove": {
diff --git a/assets/layers/speed_display/speed_display.json b/assets/layers/speed_display/speed_display.json
index d5aa4ff1c..fe83b3d6d 100644
--- a/assets/layers/speed_display/speed_display.json
+++ b/assets/layers/speed_display/speed_display.json
@@ -76,6 +76,16 @@
"ca": "Quina és la velocitat màxima permesa a aquest radar pedagògic?",
"it": "Qual è la velocità massima consentita a questo display di velocità?"
},
+ "render": {
+ "en": "The maximum speed allowed at this speed display is {canonical(maxspeed)}",
+ "de": "Die zulässige Höchstgeschwindigkeit bei dieser Geschwindigkeitsanzeige ist {canonical(maxspeed)}",
+ "ca": "La velocitat màxima permesa a aquest radar pedagògic és {canonical(maxspeed)}",
+ "nl": "De maximum toegestane snelheid bij dit snelheidsdisplay is {canonical(maxspeed)}",
+ "fr": "La vitesse maximale autorisée au niveau de ce radar pédagogique est {canonical(maxspeed)}",
+ "cs": "Maximální povolená rychlost na tomto ukazateli rychlosti je {canonical(maxspeed)}",
+ "es": "La velocidad máxima permitida en esta pantalla de velocidad es {canonical(maxspeed)}",
+ "it": "La velocità massima consentita a questo display di velocità è {canonical(maxspeed)}"
+ },
"freeform": {
"key": "maxspeed",
"type": "pnat",
@@ -89,16 +99,6 @@
"ca": "Velocitat permesa al radar pedagògic",
"it": "Velocità consentita al display di velocità"
}
- },
- "render": {
- "en": "The maximum speed allowed at this speed display is {canonical(maxspeed)}",
- "de": "Die zulässige Höchstgeschwindigkeit bei dieser Geschwindigkeitsanzeige ist {canonical(maxspeed)}",
- "ca": "La velocitat màxima permesa a aquest radar pedagògic és {canonical(maxspeed)}",
- "nl": "De maximum toegestane snelheid bij dit snelheidsdisplay is {canonical(maxspeed)}",
- "fr": "La vitesse maximale autorisée au niveau de ce radar pédagogique est {canonical(maxspeed)}",
- "cs": "Maximální povolená rychlost na tomto ukazateli rychlosti je {canonical(maxspeed)}",
- "es": "La velocidad máxima permitida en esta pantalla de velocidad es {canonical(maxspeed)}",
- "it": "La velocità massima consentita a questo display di velocità è {canonical(maxspeed)}"
}
},
{
@@ -113,6 +113,16 @@
"es": "¿Cuál es el texto en esta pantalla de velocidad?",
"it": "Qual è il testo su questo display di velocità?"
},
+ "render": {
+ "en": "The text on this speed display is {inscription}",
+ "de": "Der Text auf dieser Geschwindigkeitsanzeige ist {inscription}",
+ "nl": "De tekst op dit snelheidsdisplay is {inscription}",
+ "ca": "El text a aquest radar pedagogic és {inscription}",
+ "cs": "Text na tomto ukazateli rychlosti je {inscription}",
+ "uk": "Текст на цьому дисплеї швидкості має вигляд {inscription}",
+ "es": "El texto en esta pantalla de velocidad es {inscription}",
+ "it": "Il testo su questo display di velocità è {inscription}"
+ },
"freeform": {
"key": "inscription",
"type": "string",
@@ -126,16 +136,6 @@
"es": "Texto en la pantalla de velocidad (ej. 'Su velocidad')",
"it": "Testo sul display di velocità (es. 'La tua velocità')"
}
- },
- "render": {
- "en": "The text on this speed display is {inscription}",
- "de": "Der Text auf dieser Geschwindigkeitsanzeige ist {inscription}",
- "nl": "De tekst op dit snelheidsdisplay is {inscription}",
- "ca": "El text a aquest radar pedagogic és {inscription}",
- "cs": "Text na tomto ukazateli rychlosti je {inscription}",
- "uk": "Текст на цьому дисплеї швидкості має вигляд {inscription}",
- "es": "El texto en esta pantalla de velocidad es {inscription}",
- "it": "Il testo su questo display di velocità è {inscription}"
}
}
],
diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json
index 14597be0c..bb859a96c 100644
--- a/assets/layers/sport_pitch/sport_pitch.json
+++ b/assets/layers/sport_pitch/sport_pitch.json
@@ -201,6 +201,18 @@
"tagRenderings": [
"images",
{
+ "id": "sport_pitch-sport",
+ "question": {
+ "nl": "Welke sporten kan men hier beoefenen?",
+ "fr": "À quel sport peut-on jouer ici ?",
+ "en": "Which sport can be played here?",
+ "it": "Quale sport si può praticare qui?",
+ "de": "Welche Sportarten können hier gespielt werden?",
+ "es": "¿Qué deporte se puede practicar aquí?",
+ "ca": "Quin esport es pot practicar aquí?",
+ "cs": "Jaký sport se zde dá provozovat?",
+ "uk": "Яким видом спорту тут можна займатися?"
+ },
"render": {
"nl": "Hier kan men {sport} beoefenen",
"fr": "Ici on joue au {sport}",
@@ -214,18 +226,6 @@
"freeform": {
"key": "sport"
},
- "question": {
- "nl": "Welke sporten kan men hier beoefenen?",
- "fr": "À quel sport peut-on jouer ici ?",
- "en": "Which sport can be played here?",
- "it": "Quale sport si può praticare qui?",
- "de": "Welche Sportarten können hier gespielt werden?",
- "es": "¿Qué deporte se puede practicar aquí?",
- "ca": "Quin esport es pot practicar aquí?",
- "cs": "Jaký sport se zde dá provozovat?",
- "uk": "Яким видом спорту тут можна займатися?"
- },
- "multiAnswer": true,
"mappings": [
{
"if": {
@@ -375,8 +375,8 @@
}
}
],
- "id": "sport_pitch-sport",
- "filter": true
+ "filter": true,
+ "multiAnswer": true
},
{
"id": "basketball-hoops",
@@ -438,6 +438,7 @@
"condition": "sport~(^|.*;)basketball(;.*|$)"
},
{
+ "id": "sport_pitch-surface",
"question": {
"nl": "Wat is de ondergrond van dit sportveld?",
"fr": "De quelle surface est fait ce terrain de sport ?",
@@ -567,8 +568,7 @@
"cs": "Povrch této dráhy je tartan, syntetický, mírně pružný, porézní povrch"
}
}
- ],
- "id": "sport_pitch-surface"
+ ]
},
{
"id": "sport-pitch-access",
@@ -669,13 +669,6 @@
"ca": "Hi ha que sol·licitar cita per a utilitzar la pista?",
"cs": "Je nutné se na toto sportovní hřiště objednat?"
},
- "condition": {
- "and": [
- "access!=public",
- "access!=private",
- "access!=members"
- ]
- },
"mappings": [
{
"if": "reservation=required",
@@ -732,9 +725,17 @@
"cs": "Sjednání schůzky není možné"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "access!=public",
+ "access!=private",
+ "access!=members"
+ ]
+ }
},
{
+ "id": "sport_pitch-phone",
"question": {
"nl": "Wat is het telefoonnummer van de bevoegde dienst of uitbater?",
"fr": "Quel est le numéro de téléphone du gérant ?",
@@ -746,14 +747,14 @@
"cs": "Jaké je telefonní číslo provozovatele?",
"uk": "Який номер телефону оператора?"
},
+ "render": "{phone}",
"freeform": {
"key": "phone",
"type": "phone"
- },
- "render": "{phone}",
- "id": "sport_pitch-phone"
+ }
},
{
+ "id": "sport_pitch-email",
"question": {
"nl": "Wat is het email-adres van de bevoegde dienst of uitbater?",
"fr": "Quelle est l'adresse courriel du gérant ?",
@@ -765,14 +766,14 @@
"cs": "Jaká je e-mailová adresa provozovatele?",
"uk": "Яка електронна адреса оператора?"
},
+ "render": "{email}",
"freeform": {
"key": "email",
"type": "email"
- },
- "render": "{email}",
- "id": "sport_pitch-email"
+ }
},
{
+ "id": "sport_pitch-opening_hours",
"question": {
"nl": "Wanneer is dit sportveld toegankelijk?",
"fr": "Quand ce terrain est-il accessible ?",
@@ -818,8 +819,7 @@
}
}
],
- "condition": "access~*",
- "id": "sport_pitch-opening_hours"
+ "condition": "access~*"
},
"questions",
{
diff --git a/assets/layers/sports_centre/sports_centre.json b/assets/layers/sports_centre/sports_centre.json
index 795ec5d5e..b73822034 100644
--- a/assets/layers/sports_centre/sports_centre.json
+++ b/assets/layers/sports_centre/sports_centre.json
@@ -90,8 +90,24 @@
"email",
"wheelchair-access",
{
- "multiAnswer": true,
"id": "sport_centre-sport",
+ "question": {
+ "en": "What sports are played at this venue?",
+ "de": "Welche Sportarten werden hier ausgeübt?",
+ "ca": "Quins esports es practiquen en aquest recinte?",
+ "it": "Quali sport si praticano in questa struttura?",
+ "cs": "Jaké sporty se provozují na tomto sportovišti?"
+ },
+ "render": {
+ "en": "Sports played here: {sport}",
+ "de": "Hier werden folgende Sportarten ausgeübt: {sport}",
+ "ca": "Esports practicats aquí: {sport}",
+ "it": "Sport praticati qui: {sport}",
+ "cs": "Zde provozované sporty: {sport}"
+ },
+ "freeform": {
+ "key": "sport"
+ },
"mappings": [
{
"if": "sport=9pin",
@@ -1429,23 +1445,7 @@
}
}
],
- "render": {
- "en": "Sports played here: {sport}",
- "de": "Hier werden folgende Sportarten ausgeübt: {sport}",
- "ca": "Esports practicats aquí: {sport}",
- "it": "Sport praticati qui: {sport}",
- "cs": "Zde provozované sporty: {sport}"
- },
- "freeform": {
- "key": "sport"
- },
- "question": {
- "en": "What sports are played at this venue?",
- "de": "Welche Sportarten werden hier ausgeübt?",
- "ca": "Quins esports es practiquen en aquest recinte?",
- "it": "Quali sport si praticano in questa struttura?",
- "cs": "Jaké sporty se provozují na tomto sportovišti?"
- }
+ "multiAnswer": true
},
"sauna_at_leisure.sauna_grouped"
],
diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json
index dac201fc4..f88a837fe 100644
--- a/assets/layers/stairs/stairs.json
+++ b/assets/layers/stairs/stairs.json
@@ -166,6 +166,14 @@
},
{
"id": "conveying",
+ "question": {
+ "en": "Is this an escalator?",
+ "nl": "Is dit een roltrap?",
+ "de": "Ist das eine Rolltreppe?",
+ "ca": "És una escala mecànica?",
+ "cs": "Jedná se o eskalátor?",
+ "it": "Questa è una scala mobile?"
+ },
"mappings": [
{
"if": "conveying=yes",
@@ -235,15 +243,7 @@
},
"hideInAnswer": true
}
- ],
- "question": {
- "en": "Is this an escalator?",
- "nl": "Is dit een roltrap?",
- "de": "Ist das eine Rolltreppe?",
- "ca": "És una escala mecànica?",
- "cs": "Jedná se o eskalátor?",
- "it": "Questa è una scala mobile?"
- }
+ ]
},
{
"id": "handrail",
@@ -289,12 +289,6 @@
},
{
"id": "tactile_writing",
- "condition": {
- "and": [
- "handrail=yes",
- "conveying!=yes"
- ]
- },
"question": {
"en": "Do these stairs have tactile writing on the handrail?",
"de": "Hat die Treppe eine taktile Schrift am Handlauf?",
@@ -329,11 +323,16 @@
"it": "Non c'è una scrittura tattile sul corrimano"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "handrail=yes",
+ "conveying!=yes"
+ ]
+ }
},
{
"id": "tactile_writing_language",
- "condition": "tactile_writing=yes",
"render": {
"special": {
"type": "language_chooser",
@@ -366,7 +365,8 @@
"it": "Queste scale hanno una scrittura tattile in {language()}"
}
}
- }
+ },
+ "condition": "tactile_writing=yes"
},
{
"id": "ramp",
@@ -379,7 +379,6 @@
"es": "¿Hay una rampa en estas escaleras?",
"it": "C'è una rampa a queste scale?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "ramp:bicycle=yes",
@@ -447,10 +446,20 @@
}
}
],
- "condition": "conveying!=yes"
+ "condition": "conveying!=yes",
+ "multiAnswer": true
},
{
"id": "incline",
+ "question": {
+ "en": "What is the incline of these stairs?",
+ "ca": "Quina és la inclinació d'aquestes escales?",
+ "de": "Welche Steigung hat die Treppe?",
+ "id": "Berapa kemiringan tangga ini?",
+ "es": "¿Cuál es la inclinación de estas escaleras?",
+ "it": "Qual è l'inclinazione di queste scale?",
+ "cs": "Jaký je sklon těchto schodů?"
+ },
"render": {
"en": "These stairs have an incline of {incline}",
"ca": "Aquestes escales tenen una inclinació de {incline}",
@@ -464,15 +473,6 @@
"key": "incline",
"type": "slope"
},
- "question": {
- "en": "What is the incline of these stairs?",
- "ca": "Quina és la inclinació d'aquestes escales?",
- "de": "Welche Steigung hat die Treppe?",
- "id": "Berapa kemiringan tangga ini?",
- "es": "¿Cuál es la inclinación de estas escaleras?",
- "it": "Qual è l'inclinazione di queste scale?",
- "cs": "Jaký je sklon těchto schodů?"
- },
"mappings": [
{
"if": "incline=up",
diff --git a/assets/layers/street_lamps/street_lamps.json b/assets/layers/street_lamps/street_lamps.json
index 123f7a1f6..3a611e2e2 100644
--- a/assets/layers/street_lamps/street_lamps.json
+++ b/assets/layers/street_lamps/street_lamps.json
@@ -115,16 +115,9 @@
},
{
"id": "ref",
- "render": {
- "en": "This street lamp has the reference number {ref}",
- "nl": "Deze straatlantaarn heeft het nummer {ref}",
- "de": "Diese Straßenlaterne hat die Referenznummer {ref}",
- "es": "Esta farola tiene el número de referencia {ref}",
- "ca": "Aquest fanal té el número de referència {ref}",
- "cs": "Tato pouliční lampa má referenční číslo {ref}",
- "uk": "Цей вуличний ліхтар має ідентифікаційний номер {ref}",
- "it": "Questo lampione stradale ha il numero di riferimento {ref}"
- },
+ "labels": [
+ "street_lamp_question"
+ ],
"question": {
"en": "What is the reference number of this street lamp?",
"nl": "Wat is het nummer van deze straatlantaarn?",
@@ -135,15 +128,25 @@
"uk": "Який ідентифікаційний номер цього вуличного ліхтаря?",
"it": "Qual è il numero di riferimento di questo lampione stradale?"
},
+ "render": {
+ "en": "This street lamp has the reference number {ref}",
+ "nl": "Deze straatlantaarn heeft het nummer {ref}",
+ "de": "Diese Straßenlaterne hat die Referenznummer {ref}",
+ "es": "Esta farola tiene el número de referencia {ref}",
+ "ca": "Aquest fanal té el número de referència {ref}",
+ "cs": "Tato pouliční lampa má referenční číslo {ref}",
+ "uk": "Цей вуличний ліхтар має ідентифікаційний номер {ref}",
+ "it": "Questo lampione stradale ha il numero di riferimento {ref}"
+ },
"freeform": {
"key": "ref"
- },
- "labels": [
- "street_lamp_question"
- ]
+ }
},
{
"id": "support",
+ "labels": [
+ "street_lamp_question"
+ ],
"question": {
"en": "How is this street lamp mounted?",
"nl": "Hoe is deze straatlantaarn gemonteerd?",
@@ -239,13 +242,13 @@
}
}
],
- "condition": "man_made!=utility_pole",
- "labels": [
- "street_lamp_question"
- ]
+ "condition": "man_made!=utility_pole"
},
{
"id": "lamp_mount",
+ "labels": [
+ "street_lamp_question"
+ ],
"question": {
"en": "How is this lamp mounted to the pole?",
"nl": "Hoe zit deze lantaarn aan de paal?",
@@ -255,12 +258,6 @@
"cs": "Jak se tato lampa montuje na sloup?",
"it": "Come è montato questo lampione sul palo?"
},
- "condition": {
- "and": [
- "support=pole",
- "man_made!=utility_pole"
- ]
- },
"mappings": [
{
"if": "lamp_mount=straight_mast",
@@ -287,12 +284,18 @@
}
}
],
- "labels": [
- "street_lamp_question"
- ]
+ "condition": {
+ "and": [
+ "support=pole",
+ "man_made!=utility_pole"
+ ]
+ }
},
{
"id": "method",
+ "labels": [
+ "street_lamp_question"
+ ],
"question": {
"en": "What kind of lighting does this lamp use?",
"nl": "Wat voor verlichting gebruikt deze lantaarn?",
@@ -448,13 +451,13 @@
"it": "Questo lampione è illuminato a gas"
}
}
- ],
- "labels": [
- "street_lamp_question"
]
},
{
"id": "colour",
+ "labels": [
+ "street_lamp_question"
+ ],
"question": {
"en": "What colour light does this lamp emit?",
"nl": "Wat voor kleur licht geeft deze lantaarn?",
@@ -514,22 +517,13 @@
"it": "Questo lampione emette luce arancione"
}
}
- ],
- "labels": [
- "street_lamp_question"
]
},
{
"id": "count",
- "render": {
- "en": "This lamp has {light:count} fixtures",
- "nl": "Deze lantaarn heeft {light:count} lampen",
- "de": "Diese Straßenlaterne hat {light:count} Leuchten",
- "ca": "Aquesta làmpada té {light:count} aparells",
- "cs": "Tato lampa má {light:count} světel",
- "es": "Esta lámpara tiene {light:count} accesorios",
- "it": "Questo lampione ha {light:count} apparecchi"
- },
+ "labels": [
+ "street_lamp_question"
+ ],
"question": {
"en": "How many fixtures does this light have?",
"nl": "Hoeveel lampen heeft deze lantaarn?",
@@ -539,7 +533,15 @@
"es": "¿Cuántos accesorios tiene esta luz?",
"it": "Quanti apparecchi ha questo lampione?"
},
- "condition": "support=pole",
+ "render": {
+ "en": "This lamp has {light:count} fixtures",
+ "nl": "Deze lantaarn heeft {light:count} lampen",
+ "de": "Diese Straßenlaterne hat {light:count} Leuchten",
+ "ca": "Aquesta làmpada té {light:count} aparells",
+ "cs": "Tato lampa má {light:count} světel",
+ "es": "Esta lámpara tiene {light:count} accesorios",
+ "it": "Questo lampione ha {light:count} apparecchi"
+ },
"freeform": {
"key": "light:count",
"type": "pnat"
@@ -570,12 +572,13 @@
}
}
],
- "labels": [
- "street_lamp_question"
- ]
+ "condition": "support=pole"
},
{
"id": "lit",
+ "labels": [
+ "street_lamp_question"
+ ],
"question": {
"en": "When is this lamp lit?",
"nl": "Wanneer is deze lantaarn verlicht?",
@@ -634,22 +637,13 @@
"it": "Questo lampione si accende su richiesta (ad es. con un pulsante)"
}
}
- ],
- "labels": [
- "street_lamp_question"
]
},
{
"id": "direction",
- "render": {
- "en": "This lamp points towards {light:direction}",
- "nl": "Deze lantaarn is gericht naar {light:direction}",
- "de": "Diese Straßenlaterne leuchtet in Richtung {light:direction}",
- "es": "Esta lámpara apunta hacia {light:direction}",
- "ca": "Aquest fanal apunta cap a {light:direction}",
- "cs": "Tato lampa ukazuje směrem {light:direction}",
- "it": "Questo lampione punta verso {light:direction}"
- },
+ "labels": [
+ "street_lamp_question"
+ ],
"question": {
"en": "Where does this lamp point to?",
"nl": "Waar is deze lamp heengericht?",
@@ -659,14 +653,20 @@
"cs": "Kam tato lampa ukazuje?",
"it": "Verso dove punta questo lampione?"
},
- "condition": "light:count=1",
+ "render": {
+ "en": "This lamp points towards {light:direction}",
+ "nl": "Deze lantaarn is gericht naar {light:direction}",
+ "de": "Diese Straßenlaterne leuchtet in Richtung {light:direction}",
+ "es": "Esta lámpara apunta hacia {light:direction}",
+ "ca": "Aquest fanal apunta cap a {light:direction}",
+ "cs": "Tato lampa ukazuje směrem {light:direction}",
+ "it": "Questo lampione punta verso {light:direction}"
+ },
"freeform": {
"key": "light:direction",
"type": "direction"
},
- "labels": [
- "street_lamp_question"
- ]
+ "condition": "light:count=1"
}
],
"deletion": {},
diff --git a/assets/layers/stripclub/stripclub.json b/assets/layers/stripclub/stripclub.json
index 6b28c1552..9ccc4ad40 100644
--- a/assets/layers/stripclub/stripclub.json
+++ b/assets/layers/stripclub/stripclub.json
@@ -78,12 +78,7 @@
"images",
"reviews",
{
- "multiAnswer": false,
"id": "name",
- "freeform": {
- "inline": false,
- "key": "name"
- },
"question": {
"en": "What is the name of this stripclub?",
"de": "Wie lautet der Name des Stripclubs?",
@@ -99,7 +94,12 @@
"ca": "Aquest club de striptease s'anomena {name}",
"it": "Questo stripclub si chiama {name}",
"cs": "Tento striptýzový klub má název {name}"
- }
+ },
+ "freeform": {
+ "inline": false,
+ "key": "name"
+ },
+ "multiAnswer": false
},
"opening_hours",
"contact"
diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json
index bd9e1d55c..97d4582b8 100644
--- a/assets/layers/surveillance_camera/surveillance_camera.json
+++ b/assets/layers/surveillance_camera/surveillance_camera.json
@@ -283,6 +283,7 @@
]
},
{
+ "id": "Camera type: fixed; panning; dome",
"question": {
"en": "What kind of camera is this?",
"nl": "Wat voor soort camera is dit?",
@@ -356,10 +357,10 @@
"cs": "Domovní zvonek, který lze spouštět kdykoli vzdáleně nebo detekcí pohybu. Jsou to typicky chytré zvonky připojené k Internetu. Typické značky jsou Ring, Google Nest, Eufy…"
}
}
- ],
- "id": "Camera type: fixed; panning; dome"
+ ]
},
{
+ "id": "camera_direction",
"question": {
"en": "In which geographical direction does this camera film?",
"nl": "In welke geografische richting filmt deze camera?",
@@ -384,19 +385,6 @@
"cs": "Snímané oblasti podle směru kompasu {camera:direction}",
"sl": "Snema v smeri kompasa {camera:direction}"
},
- "condition": {
- "or": [
- "camera:direction~*",
- "direction~*",
- "camera:type!=dome",
- {
- "and": [
- "camera:type=dome",
- "camera:mount=wall"
- ]
- }
- ]
- },
"freeform": {
"key": "camera:direction",
"type": "direction"
@@ -424,12 +412,22 @@
"hideInAnswer": true
}
],
- "id": "camera_direction"
+ "condition": {
+ "or": [
+ "camera:direction~*",
+ "direction~*",
+ "camera:type!=dome",
+ {
+ "and": [
+ "camera:type=dome",
+ "camera:mount=wall"
+ ]
+ }
+ ]
+ }
},
{
- "freeform": {
- "key": "operator"
- },
+ "id": "Operator",
"question": {
"en": "Who operates this CCTV?",
"nl": "Wie beheert deze bewakingscamera?",
@@ -453,9 +451,12 @@
"pt": "Operado por {operator}",
"sl": "Upravlja jo {operator}"
},
- "id": "Operator"
+ "freeform": {
+ "key": "operator"
+ }
},
{
+ "id": "Surveillance type: public, outdoor, indoor",
"question": {
"en": "What kind of surveillance is this camera?",
"nl": "Wat soort bewaking wordt hier uitgevoerd?",
@@ -518,10 +519,10 @@
"sl": "Nadzoruje zasebno notranjo površino, npr. trgovino, zasebno podzemno parkirišče…"
}
}
- ],
- "id": "Surveillance type: public, outdoor, indoor"
+ ]
},
{
+ "id": "camera_is_indoor",
"question": {
"en": "Is this camera located inside or outside?",
"nl": "Bevindt de camera zich binnen of buiten?",
@@ -530,12 +531,6 @@
"it": "Questa telecamera si trova all'interno o all'esterno?",
"cs": "Je tato kamera umístěna uvnitř nebo venku?"
},
- "condition": {
- "and": [
- "surveillance!=outdoor",
- "surveillance!=indoor"
- ]
- },
"mappings": [
{
"if": "indoor=yes",
@@ -586,9 +581,15 @@
"hideInAnswer": true
}
],
- "id": "camera_is_indoor"
+ "condition": {
+ "and": [
+ "surveillance!=outdoor",
+ "surveillance!=indoor"
+ ]
+ }
},
{
+ "id": "Level",
"question": {
"en": "On which level is this camera located?",
"nl": "Op welke verdieping bevindt deze camera zich?",
@@ -632,10 +633,10 @@
]
}
]
- },
- "id": "Level"
+ }
},
{
+ "id": "Surveillance:zone",
"question": {
"en": "What exactly is surveilled here?",
"nl": "Wat wordt hier precies bewaakt?",
@@ -648,9 +649,6 @@
"cs": "Co přesně se zde sleduje?",
"sl": "Kaj točno je nadzorovano tu?"
},
- "freeform": {
- "key": "surveillance:zone"
- },
"render": {
"en": "Surveills a {surveillance:zone}",
"nl": "Bewaakt een {surveillance:zone}",
@@ -663,6 +661,9 @@
"cs": "Sleduje {surveillance:zone}",
"sl": "Nadzoruje {surveillance:zone}"
},
+ "freeform": {
+ "key": "surveillance:zone"
+ },
"mappings": [
{
"if": {
@@ -778,10 +779,10 @@
"sl": "Nadzoruje trgovino"
}
}
- ],
- "id": "Surveillance:zone"
+ ]
},
{
+ "id": "camera:mount",
"question": {
"en": "How is this camera placed?",
"nl": "Hoe is deze camera geplaatst?",
@@ -886,8 +887,7 @@
"sl": "Ta kamera je nameščena na drevo"
}
}
- ],
- "id": "camera:mount"
+ ]
}
],
"deletion": true,
diff --git a/assets/layers/tactile_map/tactile_map.json b/assets/layers/tactile_map/tactile_map.json
index 9215aa52d..1a07be8a8 100644
--- a/assets/layers/tactile_map/tactile_map.json
+++ b/assets/layers/tactile_map/tactile_map.json
@@ -75,6 +75,13 @@
"it": "Cosa mostra questa mappa tattile?",
"cs": "Co tato hmatová mapa ukazuje?"
},
+ "render": {
+ "en": "Description: {blind:description:en}.",
+ "de": "Beschreibung: {blind:description:en}.",
+ "ca": "Descripció: {blind:description:en}.",
+ "cs": "Popis: {blind:description:en}.",
+ "it": "Descrizione: {blind:description:en}."
+ },
"freeform": {
"key": "blind:description:en",
"placeholder": {
@@ -84,13 +91,6 @@
"it": "es. Mappa tattile del centro città",
"cs": "např. hmatová mapa centra města"
}
- },
- "render": {
- "en": "Description: {blind:description:en}.",
- "de": "Beschreibung: {blind:description:en}.",
- "ca": "Descripció: {blind:description:en}.",
- "cs": "Popis: {blind:description:en}.",
- "it": "Descrizione: {blind:description:en}."
}
},
{
@@ -127,7 +127,6 @@
},
{
"id": "braille_languages",
- "condition": "braille=yes",
"render": {
"special": {
"type": "language_chooser",
@@ -154,7 +153,8 @@
"cs": "Tato mapa má text v Braillově písmu v {language}"
}
}
- }
+ },
+ "condition": "braille=yes"
},
{
"id": "embossed_letters",
@@ -190,7 +190,6 @@
},
{
"id": "embossed_letters_languages",
- "condition": "embossed_letters=yes",
"render": {
"special": {
"type": "language_chooser",
@@ -217,7 +216,8 @@
"cs": "Tato mapa má texty s vystouplými písmeny v {language}"
}
}
- }
+ },
+ "condition": "embossed_letters=yes"
},
"website"
],
diff --git a/assets/layers/tactile_model/tactile_model.json b/assets/layers/tactile_model/tactile_model.json
index f4752c8c3..7da942ad1 100644
--- a/assets/layers/tactile_model/tactile_model.json
+++ b/assets/layers/tactile_model/tactile_model.json
@@ -68,12 +68,12 @@
"en": "What is depicted by this model?",
"cs": "Co vyobrazuje tento model?"
},
+ "render": {
+ "*": "{wikipedia(subject:wikidata)}"
+ },
"freeform": {
"key": "subject:wikidata",
"type": "wikidata"
- },
- "render": {
- "*": "{wikipedia(subject:wikidata)}"
}
},
{
@@ -110,7 +110,6 @@
},
{
"id": "braille_languages",
- "condition": "braille=yes",
"render": {
"special": {
"type": "language_chooser",
@@ -137,7 +136,8 @@
"cs": "Tento model má popis v Braillově písmu v {language}"
}
}
- }
+ },
+ "condition": "braille=yes"
},
{
"id": "embossed_letters",
@@ -177,7 +177,6 @@
},
{
"id": "embossed_letters_languages",
- "condition": "embossed_letters=yes",
"render": {
"special": {
"type": "language_chooser",
@@ -204,7 +203,8 @@
"cs": "Tento model má text vystouplými písmeny v {language}"
}
}
- }
+ },
+ "condition": "embossed_letters=yes"
},
{
"id": "scale",
@@ -215,6 +215,13 @@
"it": "Qual è la scala del modello?",
"cs": "Jaké je měřítko modelu?"
},
+ "render": {
+ "en": "The scale of this model is {scale}.",
+ "de": "Der Maßstab dieses Modells ist {scale}.",
+ "ca": "L'escala d'aquest model és {scale}.",
+ "it": "La scala di questo modello è {scale}.",
+ "cs": "Tento model má měřítko {scale}."
+ },
"freeform": {
"key": "scale",
"placeholder": {
@@ -224,13 +231,6 @@
"it": "es. 1:1000",
"cs": "např. 1:1000"
}
- },
- "render": {
- "en": "The scale of this model is {scale}.",
- "de": "Der Maßstab dieses Modells ist {scale}.",
- "ca": "L'escala d'aquest model és {scale}.",
- "it": "La scala di questo modello è {scale}.",
- "cs": "Tento model má měřítko {scale}."
}
},
{
@@ -242,6 +242,13 @@
"it": "Cosa mostra questo modello tattile?",
"cs": "Co tento hmatový model ukazuje?"
},
+ "render": {
+ "en": "Description: {blind:description:en}.",
+ "de": "Beschreibung: {blind:description:en}.",
+ "ca": "Descripció: {blind:description:en}.",
+ "it": "Descrizione: {blind:description:en}.",
+ "cs": "Popis: {blind:description:en}."
+ },
"freeform": {
"key": "blind:description:en",
"placeholder": {
@@ -251,13 +258,6 @@
"it": "es. Modello tattile del centro città",
"cs": "např. hmatový model centra města"
}
- },
- "render": {
- "en": "Description: {blind:description:en}.",
- "de": "Beschreibung: {blind:description:en}.",
- "ca": "Descripció: {blind:description:en}.",
- "it": "Descrizione: {blind:description:en}.",
- "cs": "Popis: {blind:description:en}."
}
},
"website"
diff --git a/assets/layers/tertiary_education/tertiary_education.json b/assets/layers/tertiary_education/tertiary_education.json
index 5904d7a0a..b839788d3 100644
--- a/assets/layers/tertiary_education/tertiary_education.json
+++ b/assets/layers/tertiary_education/tertiary_education.json
@@ -207,7 +207,6 @@
"es": "¿Qué nivel de educación se imparte aquí?",
"it": "Che livello di istruzione viene impartito qui?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "isced:2011:level=bachelor",
@@ -251,7 +250,8 @@
}
}
],
- "condition": "amenity=university"
+ "condition": "amenity=university",
+ "multiAnswer": true
},
{
"id": "school-questions",
diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json
index a2ed70b8a..18daf5aa5 100644
--- a/assets/layers/ticket_validator/ticket_validator.json
+++ b/assets/layers/ticket_validator/ticket_validator.json
@@ -78,7 +78,6 @@
"level",
{
"id": "barrier",
- "condition": "barrier~*",
"render": {
"en": "This ticket validator is part of a barrier of type {barrier}",
"de": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}",
@@ -101,7 +100,8 @@
"it": "Questo validatore di biglietti fa parte di un tornello"
}
}
- ]
+ ],
+ "condition": "barrier~*"
},
{
"id": "validator-operator",
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 11f21eafe..3516221e3 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -224,6 +224,11 @@
}
},
{
+ "id": "toilet-access",
+ "labels": [
+ "relevant-questions",
+ "amenity-no-prefix"
+ ],
"question": {
"en": "Are these toilets publicly accessible?",
"de": "Ist die Toilette öffentlich zugänglich?",
@@ -324,12 +329,7 @@
"uk": "Доступний, але для входу потрібно попросити ключ"
}
}
- ],
- "labels": [
- "relevant-questions",
- "amenity-no-prefix"
- ],
- "id": "toilet-access"
+ ]
},
{
"id": "toilets-fee",
@@ -337,11 +337,6 @@
"relevant-questions",
"amenity-no-prefix"
],
- "condition": {
- "and": [
- "access!=no"
- ]
- },
"question": {
"en": "Are these toilets free to use?",
"de": "Können diese Toiletten kostenlos benutzt werden?",
@@ -389,9 +384,15 @@
"uk": "Безкоштовне використання"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "access!=no"
+ ]
+ }
},
{
+ "id": "toilet-charge",
"labels": [
"relevant-questions",
"amenity-no-prefix"
@@ -422,11 +423,6 @@
"cs": "Poplatek je {charge}",
"sl": "Plačilo je {charge}"
},
- "condition": {
- "and": [
- "fee=yes"
- ]
- },
"freeform": {
"key": "charge",
"type": "string",
@@ -440,7 +436,11 @@
"it": "es. 0.50 EUR"
}
},
- "id": "toilet-charge"
+ "condition": {
+ "and": [
+ "fee=yes"
+ ]
+ }
},
{
"builtin": "payment-options-split",
@@ -603,11 +603,6 @@
]
},
{
- "condition": {
- "and": [
- "toilets:position!=urinal"
- ]
- },
"id": "gender_segregated",
"labels": [
"relevant-questions",
@@ -657,7 +652,12 @@
"it": "Non c'è un'area separata e segnalata per uomini e donne"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "toilets:position!=urinal"
+ ]
+ }
},
{
"id": "menstrual_products",
@@ -751,16 +751,6 @@
"it": "Dove si trovano i prodotti mestruali gratuiti?",
"cs": "Kde jsou umístěny menstruační produkty zdarma?"
},
- "condition": {
- "and": [
- {
- "or": [
- "toilets:menstrual_products=limited",
- "toilets:menstrual_products:location~*"
- ]
- }
- ]
- },
"render": {
"en": "The menstrual products are located in {toilets:menstrual_products:location}",
"nl": "De menstruatieproducten bevinden zich in {toilets:menstrual_products:location}",
@@ -815,11 +805,20 @@
"cs": "Menstruační produkty zdarma jsou umístěny na toaletě pro osoby na vozíku"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ "toilets:menstrual_products=limited",
+ "toilets:menstrual_products:location~*"
+ ]
+ }
+ ]
+ }
},
{
"id": "toilets-changing-table",
- "#labels": "Very weird case: we transfer this as is to the 'amenity'-layer",
"labels": [
"relevant-questions",
"no-prefix",
@@ -866,9 +865,11 @@
"cs": "Přebalovací pult není k dispozici"
}
}
- ]
+ ],
+ "#labels": "Very weird case: we transfer this as is to the 'amenity'-layer"
},
{
+ "id": "toilet-changing_table:location",
"labels": [
"relevant-questions",
"no-prefix",
@@ -897,11 +898,6 @@
"ca": "Hi ha un canviador a {changing_table:location}",
"cs": "Přebalovací pult se nachází v {changing_table:location}"
},
- "condition": {
- "and": [
- "changing_table=yes"
- ]
- },
"freeform": {
"key": "changing_table:location",
"inline": true
@@ -963,8 +959,12 @@
}
}
],
- "multiAnswer": true,
- "id": "toilet-changing_table:location"
+ "condition": {
+ "and": [
+ "changing_table=yes"
+ ]
+ },
+ "multiAnswer": true
},
{
"id": "toilet-supervised",
@@ -1080,12 +1080,12 @@
}
},
{
+ "id": "toilet-handwashing",
"labels": [
"relevant-questions",
"prefixed",
"amenity-prefixed"
],
- "id": "toilet-handwashing",
"question": {
"en": "Do these toilets have a sink to wash your hands?",
"nl": "Hebben deze toiletten een lavabo om de handen te wassen?",
@@ -1174,7 +1174,6 @@
"it": "Questi bagni hanno un dispositivo per asciugare le mani?",
"cs": "Mají tyto toalety zařízení k sušení rukou?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "toilets:hands_drying=electric_hand_dryer",
@@ -1226,7 +1225,8 @@
"and": [
"toilets:handwashing=yes"
]
- }
+ },
+ "multiAnswer": true
},
{
"builtin": "description",
@@ -1322,23 +1322,6 @@
},
{
"id": "wheelchair-picture-carousel",
- "condition": {
- "and": [
- {
- "#": "NOT on designated",
- "or": [
- {
- "#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
- "and": [
- "wheelchair=yes",
- "amenity=toilets"
- ]
- },
- "toilets:wheelchair=yes"
- ]
- }
- ]
- },
"labels": [
"wheelchair",
"hidden",
@@ -1351,10 +1334,7 @@
"type": "image_carousel",
"image_key": "toilets:wheelchair:panoramax;toilets:wheelchair:image;toilets:wheelchair:mapillary"
}
- }
- },
- {
- "id": "wheelchair-picture",
+ },
"condition": {
"and": [
{
@@ -1371,7 +1351,10 @@
]
}
]
- },
+ }
+ },
+ {
+ "id": "wheelchair-picture",
"labels": [
"wheelchair",
"hidden",
@@ -1390,6 +1373,23 @@
"cs": "Přidat obrázek toalety přístupné na vozíku"
}
}
+ },
+ "condition": {
+ "and": [
+ {
+ "#": "NOT on designated",
+ "or": [
+ {
+ "#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
+ "and": [
+ "wheelchair=yes",
+ "amenity=toilets"
+ ]
+ },
+ "toilets:wheelchair=yes"
+ ]
+ }
+ ]
}
},
{
@@ -1440,36 +1440,6 @@
},
{
"id": "toilet-wheelchair-access",
- "question": {
- "en": "Is the wheelchair-accessible toilet locked?",
- "nl": "Is de rolstoeltoegankelijke toilet op slot?",
- "it": "Il bagno accessibile in sedia a rotelle è chiuso a chiave?",
- "cs": "Je tato toaleta pro osoby na vozíku uzamčena?"
- },
- "condition": {
- "and": [
- {
- "or": [
- {
- "#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
- "and": [
- "wheelchair=yes",
- "amenity=toilets"
- ]
- },
- "toilets:wheelchair=yes"
- ]
- },
- {
- "or": [
- "access=yes",
- "access=public",
- "access=customers",
- "access="
- ]
- }
- ]
- },
"labels": [
"hidden",
"wheelchair",
@@ -1477,6 +1447,12 @@
"prefixed",
"amenity-prefixed"
],
+ "question": {
+ "en": "Is the wheelchair-accessible toilet locked?",
+ "nl": "Is de rolstoeltoegankelijke toilet op slot?",
+ "it": "Il bagno accessibile in sedia a rotelle è chiuso a chiave?",
+ "cs": "Je tato toaleta pro osoby na vozíku uzamčena?"
+ },
"mappings": [
{
"if": "toilets:wheelchair:access=yes",
@@ -1551,7 +1527,31 @@
"cs": "Pro přístup na tuto toaletu lze použít EuroKey"
}
}
- ]
+ ],
+ "condition": {
+ "and": [
+ {
+ "or": [
+ {
+ "#": "Only trigger this if it is a proper toilet, not a toilet_at_amenity",
+ "and": [
+ "wheelchair=yes",
+ "amenity=toilets"
+ ]
+ },
+ "toilets:wheelchair=yes"
+ ]
+ },
+ {
+ "or": [
+ "access=yes",
+ "access=public",
+ "access=customers",
+ "access="
+ ]
+ }
+ ]
+ }
},
{
"builtin": "grab_rail.has_grab_rail_lr",
@@ -1648,21 +1648,6 @@
},
{
"id": "wheelchair-door-width",
- "condition": {
- "and": [
- {
- "or": [
- {
- "and": [
- "amenity=toilet",
- "wheelchair~yes|designated"
- ]
- },
- "toilets:wheelchair=designated"
- ]
- }
- ]
- },
"labels": [
"relevant-questions",
"wheelchair",
@@ -1708,6 +1693,21 @@
"warnAbove": 2,
"max": 4
}
+ },
+ "condition": {
+ "and": [
+ {
+ "or": [
+ {
+ "and": [
+ "amenity=toilet",
+ "wheelchair~yes|designated"
+ ]
+ },
+ "toilets:wheelchair=designated"
+ ]
+ }
+ ]
}
},
{
diff --git a/assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json b/assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json
index 5cb796aff..bc63ef1d6 100644
--- a/assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json
+++ b/assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json
@@ -36,13 +36,13 @@
"all",
"hidden"
],
- "icon": "./assets/layers/toilet/toilets.svg",
"render": {
"en": "Toilet information",
"nl": "Informatie over de toiletten",
"it": "Informazioni sui bagni",
"cs": "Informace o toaletách"
},
+ "icon": "./assets/layers/toilet/toilets.svg",
"mappings": [
{
"if": "toilets=no",
diff --git a/assets/layers/tool_library/tool_library.json b/assets/layers/tool_library/tool_library.json
index 2c51effc9..71932bab7 100644
--- a/assets/layers/tool_library/tool_library.json
+++ b/assets/layers/tool_library/tool_library.json
@@ -100,6 +100,7 @@
"facebook",
"opening_hours_by_appointment",
{
+ "id": "membership",
"question": {
"en": "Is a membership required to borrow tools here?",
"de": "Ist eine Mitgliedschaft erforderlich, um hier Werkzeuge auszuleihen?",
@@ -108,7 +109,6 @@
"it": "È richiesto un abbonamento per prendere in prestito gli attrezzi qui?",
"cs": "Je k půjčování nářadí potřeba být členem?"
},
- "id": "membership",
"mappings": [
{
"then": {
@@ -146,6 +146,7 @@
]
},
{
+ "id": "membership_charge",
"question": {
"en": "How much does a membership cost?",
"de": "Wie viel kostet eine Mitgliedschaft?",
@@ -154,7 +155,6 @@
"cs": "Kolik stojí členství?",
"it": "Quanto costa un abbonamento?"
},
- "id": "membership_charge",
"questionHint": {
"en": "There might be many formulas. In case of doubt, pick the most common one",
"de": "Es gibt möglicherweise viele Modelle. Im Zweifelsfall wähle das häufigste",
@@ -163,11 +163,6 @@
"it": "Potrebbero esserci molte formule. In caso di dubbio, scegli quella più comune",
"cs": "Může být mnoho vzorců. Máte-li pochybnosti, vyberte ten nejběžnější"
},
- "freeform": {
- "key": "charge:membership",
- "type": "currency"
- },
- "condition": "membership=required",
"render": {
"en": "A membership costs {charge:membership}",
"de": "Eine Mitgliedschaft kostet {charge:membership}",
@@ -175,9 +170,15 @@
"ca": "Una filiació costa {charge:membership}",
"it": "Un abbonamento costa {charge:membership}",
"cs": "Členství stojí {charge:membership}"
- }
+ },
+ "freeform": {
+ "key": "charge:membership",
+ "type": "currency"
+ },
+ "condition": "membership=required"
},
{
+ "id": "fee",
"question": {
"en": "Is a fee asked to borrow tools?",
"de": "Wird eine Gebühr erhoben, um Werkzeuge auszuleihen?",
@@ -186,7 +187,14 @@
"it": "Viene richiesta una tariffa per prendere in prestito gli attrezzi?",
"cs": "Je při půjčování nářadí požadován poplatek?"
},
- "id": "fee",
+ "questionHint": {
+ "en": "If a membership is required, we assume that the membership is already paid for.",
+ "de": "Wenn eine Mitgliedschaft erforderlich ist, gehen wir davon aus, dass die Mitgliedschaft bereits bezahlt ist.",
+ "es": "Si se requiere una membresía, asumimos que la membresía ya está pagada.",
+ "ca": "Si es requereix una pertinença, assumim que la pertinença ja està pagada.",
+ "it": "Se è richiesto un abbonamento, assumiamo che l'abbonamento sia già stato pagato.",
+ "cs": "Je-li vyžadováno členství, předpokládáme, že už za něj bylo zaplaceno."
+ },
"mappings": [
{
"if": {
@@ -239,15 +247,7 @@
"cs": "Při půjčování lze dát dar"
}
}
- ],
- "questionHint": {
- "en": "If a membership is required, we assume that the membership is already paid for.",
- "de": "Wenn eine Mitgliedschaft erforderlich ist, gehen wir davon aus, dass die Mitgliedschaft bereits bezahlt ist.",
- "es": "Si se requiere una membresía, asumimos que la membresía ya está pagada.",
- "ca": "Si es requereix una pertinença, assumim que la pertinença ja està pagada.",
- "it": "Se è richiesto un abbonamento, assumiamo che l'abbonamento sia già stato pagato.",
- "cs": "Je-li vyžadováno členství, předpokládáme, že už za něj bylo zaplaceno."
- }
+ ]
}
],
"deletion": true,
diff --git a/assets/layers/tourism_accomodation/tourism_accomodation.json b/assets/layers/tourism_accomodation/tourism_accomodation.json
index 7e32981e3..11d35b95d 100644
--- a/assets/layers/tourism_accomodation/tourism_accomodation.json
+++ b/assets/layers/tourism_accomodation/tourism_accomodation.json
@@ -360,11 +360,7 @@
},
"{preset_type_select()}",
{
- "condition": {
- "and": [
- "tourism=hostel"
- ]
- },
+ "id": "group_only",
"question": {
"de": "Ist diese Unterkunft ausschließlich für Gruppen?",
"en": "Is this hostel exclusively for groups?",
@@ -402,7 +398,11 @@
}
}
],
- "id": "group_only"
+ "condition": {
+ "and": [
+ "tourism=hostel"
+ ]
+ }
},
"brand",
"contact",
diff --git a/assets/layers/trail/trail.json b/assets/layers/trail/trail.json
index b4eb27be2..df7bd333d 100644
--- a/assets/layers/trail/trail.json
+++ b/assets/layers/trail/trail.json
@@ -118,6 +118,7 @@
}
},
{
+ "id": "Name",
"question": {
"en": "What is the name of this trail?",
"nl": "Wat is de naam van deze wandeling?",
@@ -138,19 +139,10 @@
},
"freeform": {
"key": "name"
- },
- "id": "Name"
+ }
},
{
- "render": {
- "en": "This trail is maintained by {operator}",
- "nl": "Beheer door {operator}",
- "de": "Dieser Weg wird von {operator} gepflegt",
- "es": "Este sendero es mantenido por {operator}",
- "ca": "{operator} manté aquest camí",
- "it": "Questo sentiero è mantenuto da {operator}",
- "cs": "Tuto stezku udržuje {operator}"
- },
+ "id": "Operator tag",
"question": {
"en": "Who maintains this trail?",
"nl": "Wie beheert deze wandeltocht?",
@@ -160,6 +152,15 @@
"it": "Chi mantiene questo sentiero?",
"cs": "Kdo udržuje tuto stezku?"
},
+ "render": {
+ "en": "This trail is maintained by {operator}",
+ "nl": "Beheer door {operator}",
+ "de": "Dieser Weg wird von {operator} gepflegt",
+ "es": "Este sendero es mantenido por {operator}",
+ "ca": "{operator} manté aquest camí",
+ "it": "Questo sentiero è mantenuto da {operator}",
+ "cs": "Tuto stezku udržuje {operator}"
+ },
"freeform": {
"key": "operator"
},
@@ -205,10 +206,10 @@
"class": "small"
}
}
- ],
- "id": "Operator tag"
+ ]
},
{
+ "id": "Color",
"question": {
"en": "What is the reference colour of this trail?",
"nl": "Welke kleur heeft deze wandeling?",
@@ -288,10 +289,10 @@
"it": "Sentiero giallo"
}
}
- ],
- "id": "Color"
+ ]
},
{
+ "id": "Wheelchair access",
"question": {
"en": "Is this trail wheelchair accessible?",
"nl": "Is deze wandeling toegankelijk met de rolstoel?",
@@ -326,10 +327,10 @@
},
"if": "wheelchair=no"
}
- ],
- "id": "Wheelchair access"
+ ]
},
{
+ "id": "pushchair access",
"question": {
"en": "Is this trail accessible with a pushchair?",
"nl": "Is deze wandeltocht toegankelijk met de buggy?",
@@ -364,8 +365,7 @@
},
"if": "pushchair=no"
}
- ],
- "id": "pushchair access"
+ ]
}
],
"allowMove": false
diff --git a/assets/layers/transit_routes/transit_routes.json b/assets/layers/transit_routes/transit_routes.json
index 9a272e3b3..c756272cb 100644
--- a/assets/layers/transit_routes/transit_routes.json
+++ b/assets/layers/transit_routes/transit_routes.json
@@ -89,12 +89,6 @@
"tagRenderings": [
{
"id": "name",
- "freeform": {
- "key": "name",
- "type": "string",
- "placeholder": "Bus XX: From => Via => To"
- },
- "render": "{name}",
"question": {
"en": "What is the name for this bus line? (i.e. Bus XX: From => Via => To)",
"de": "Wie lautet der Name der Buslinie? (z.B. Bus XX: Von => Über => Nach)",
@@ -103,14 +97,25 @@
"es": "¿Cuál es el nombre de esta línea de autobús? (es decir, Autobús XX: Desde => Vía => Hasta)",
"ca": "Quin és el nom d'aquesta línia d'autobús? (és a dir, Bus XX: De : Via ) A)",
"it": "Qual è il nome di questa linea di autobus? (es. Bus XX: Da => Via => A)"
+ },
+ "render": "{name}",
+ "freeform": {
+ "key": "name",
+ "type": "string",
+ "placeholder": "Bus XX: From => Via => To"
}
},
{
"id": "from",
- "freeform": {
- "key": "from",
- "type": "string",
- "placeholder": "City, Stop Name"
+ "question": {
+ "en": "What is the starting point for this bus line?",
+ "de": "Wo ist der Startpunkt dieser Buslinie?",
+ "nl": "Wat is het beginpunt van deze buslijn?",
+ "da": "Hvad er udgangspunktet for denne buslinje?",
+ "ca": "Quin és el punt inicial d'aquesta línea d'autobús?",
+ "cs": "Jaký je výchozí bod této autobusové linky?",
+ "es": "¿Cuál es el punto de partida de esta línea de autobús?",
+ "it": "Qual è il punto di partenza di questa linea di autobus?"
},
"render": {
"en": "This bus line begins at {from}",
@@ -124,23 +129,24 @@
"it": "Questa linea di autobus inizia a {from}",
"uk": "Ця автобусна лінія починається в {from}"
},
- "question": {
- "en": "What is the starting point for this bus line?",
- "de": "Wo ist der Startpunkt dieser Buslinie?",
- "nl": "Wat is het beginpunt van deze buslijn?",
- "da": "Hvad er udgangspunktet for denne buslinje?",
- "ca": "Quin és el punt inicial d'aquesta línea d'autobús?",
- "cs": "Jaký je výchozí bod této autobusové linky?",
- "es": "¿Cuál es el punto de partida de esta línea de autobús?",
- "it": "Qual è il punto di partenza di questa linea di autobus?"
+ "freeform": {
+ "key": "from",
+ "type": "string",
+ "placeholder": "City, Stop Name"
}
},
{
"id": "via",
- "freeform": {
- "key": "via",
- "type": "string",
- "placeholder": "City, Stop Name"
+ "question": {
+ "en": "What is the via point for this bus line?",
+ "de": "Über welchen Zwischenhalt fährt die Buslinie?",
+ "nl": "Via welk punt gaat deze buslijn?",
+ "cs": "Jaký je průjezdní bod této autobusové linky?",
+ "ru": "Где находится конечный пункт этого автобусного маршрута?",
+ "es": "¿Cuál es el punto intermedio de esta línea de autobús?",
+ "ca": "Quin és el punt de pas d'aquesta línia d'autobusos?",
+ "it": "Qual è il punto intermedio di questa linea di autobus?",
+ "uk": "Яка кінцева зупинка цієї автобусної лінії?"
},
"render": {
"en": "This bus line goes via {via}",
@@ -153,24 +159,23 @@
"es": "Esta línea de autobús pasa por {via}",
"it": "Questa linea di autobus passa per {via}"
},
- "question": {
- "en": "What is the via point for this bus line?",
- "de": "Über welchen Zwischenhalt fährt die Buslinie?",
- "nl": "Via welk punt gaat deze buslijn?",
- "cs": "Jaký je průjezdní bod této autobusové linky?",
- "ru": "Где находится конечный пункт этого автобусного маршрута?",
- "es": "¿Cuál es el punto intermedio de esta línea de autobús?",
- "ca": "Quin és el punt de pas d'aquesta línia d'autobusos?",
- "it": "Qual è il punto intermedio di questa linea di autobus?",
- "uk": "Яка кінцева зупинка цієї автобусної лінії?"
+ "freeform": {
+ "key": "via",
+ "type": "string",
+ "placeholder": "City, Stop Name"
}
},
{
"id": "to",
- "freeform": {
- "key": "to",
- "type": "string",
- "placeholder": "City, Stop Name"
+ "question": {
+ "en": "What is the ending point for this bus line?",
+ "de": "Wo ist der Endpunkt der Buslinie?",
+ "nl": "Wat is het eindpunt van deze buslijn?",
+ "da": "Hvad er endestationen for denne buslinje?",
+ "ca": "Quin és el punt final d'aquesta línea d'autobús?",
+ "cs": "Jaký je konečný bod této autobusové linky?",
+ "es": "¿Cuál es el punto final de esta línea de autobús?",
+ "it": "Qual è il punto di arrivo di questa linea di autobus?"
},
"render": {
"en": "This bus line ends at {to}",
@@ -184,22 +189,23 @@
"it": "Questa linea di autobus termina a {to}",
"uk": "Ця автобусна лінія закінчується в {to}"
},
- "question": {
- "en": "What is the ending point for this bus line?",
- "de": "Wo ist der Endpunkt der Buslinie?",
- "nl": "Wat is het eindpunt van deze buslijn?",
- "da": "Hvad er endestationen for denne buslinje?",
- "ca": "Quin és el punt final d'aquesta línea d'autobús?",
- "cs": "Jaký je konečný bod této autobusové linky?",
- "es": "¿Cuál es el punto final de esta línea de autobús?",
- "it": "Qual è il punto di arrivo di questa linea di autobus?"
+ "freeform": {
+ "key": "to",
+ "type": "string",
+ "placeholder": "City, Stop Name"
}
},
{
"id": "colour",
- "freeform": {
- "key": "colour",
- "type": "color"
+ "question": {
+ "en": "What is the colour for this bus line?",
+ "de": "Welche Farbe hat diese Buslinie?",
+ "nl": "Wat is de kleur van deze buslijn?",
+ "da": "Hvad er farven på denne buslinje?",
+ "ca": "Quin és el color d'aquest línia d'autobús?",
+ "cs": "Jakou barvu má tato autobusová linka?",
+ "es": "¿Cuál es el color de esta línea de autobús?",
+ "it": "Qual è il colore di questa linea di autobus?"
},
"render": {
"en": "This bus line has the color {colour}",
@@ -211,22 +217,22 @@
"es": "Esta línea de autobús tiene el color {colour}",
"it": "Questa linea di autobus ha il colore {colour}"
},
- "question": {
- "en": "What is the colour for this bus line?",
- "de": "Welche Farbe hat diese Buslinie?",
- "nl": "Wat is de kleur van deze buslijn?",
- "da": "Hvad er farven på denne buslinje?",
- "ca": "Quin és el color d'aquest línia d'autobús?",
- "cs": "Jakou barvu má tato autobusová linka?",
- "es": "¿Cuál es el color de esta línea de autobús?",
- "it": "Qual è il colore di questa linea di autobus?"
+ "freeform": {
+ "key": "colour",
+ "type": "color"
}
},
{
"id": "network",
- "freeform": {
- "key": "network",
- "type": "string"
+ "question": {
+ "en": "What network does this bus line belong to?",
+ "de": "Zu welchem Verkehrsverbund gehört die Buslinie?",
+ "nl": "Bij welk netwerk hoort deze buslijn?",
+ "da": "Hvilket netværk tilhører denne buslinje?",
+ "ca": "A quina xarxa pertany aquesta línea d'autobús?",
+ "cs": "Do jaké sítě tato autobusová linka patří?",
+ "es": "¿A qué red pertenece esta línea de autobús?",
+ "it": "A quale rete appartiene questa linea di autobus?"
},
"render": {
"en": "This bus line is part of the {network} network",
@@ -239,22 +245,22 @@
"uk": "Ця автобусна лінія є частиною {network} мережі",
"it": "Questa linea di autobus fa parte della rete {network}"
},
- "question": {
- "en": "What network does this bus line belong to?",
- "de": "Zu welchem Verkehrsverbund gehört die Buslinie?",
- "nl": "Bij welk netwerk hoort deze buslijn?",
- "da": "Hvilket netværk tilhører denne buslinje?",
- "ca": "A quina xarxa pertany aquesta línea d'autobús?",
- "cs": "Do jaké sítě tato autobusová linka patří?",
- "es": "¿A qué red pertenece esta línea de autobús?",
- "it": "A quale rete appartiene questa linea di autobus?"
+ "freeform": {
+ "key": "network",
+ "type": "string"
}
},
{
"id": "operator",
- "freeform": {
- "key": "operator",
- "type": "string"
+ "question": {
+ "en": "What company operates this bus line?",
+ "de": "Welches Unternehmen betreibt die Buslinie?",
+ "nl": "Welk bedrijf exploiteert deze buslijn?",
+ "da": "Hvilket selskab driver denne buslinje?",
+ "ca": "Quina companyia opera aquesta línia d'autobús?",
+ "cs": "Jaká společnost provozuje tuto autobusovou linku?",
+ "es": "¿Qué compañía opera esta línea de autobús?",
+ "it": "Quale azienda gestisce questa linea di autobus?"
},
"render": {
"en": "This bus line is operated by {operator}",
@@ -268,15 +274,9 @@
"it": "Questa linea di autobus è gestita da {operator}",
"uk": "Ця автобусна лінія обслуговується {operator}"
},
- "question": {
- "en": "What company operates this bus line?",
- "de": "Welches Unternehmen betreibt die Buslinie?",
- "nl": "Welk bedrijf exploiteert deze buslijn?",
- "da": "Hvilket selskab driver denne buslinje?",
- "ca": "Quina companyia opera aquesta línia d'autobús?",
- "cs": "Jaká společnost provozuje tuto autobusovou linku?",
- "es": "¿Qué compañía opera esta línea de autobús?",
- "it": "Quale azienda gestisce questa linea di autobus?"
+ "freeform": {
+ "key": "operator",
+ "type": "string"
}
}
],
diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json
index e49acd867..db18221df 100644
--- a/assets/layers/transit_stops/transit_stops.json
+++ b/assets/layers/transit_stops/transit_stops.json
@@ -75,6 +75,16 @@
"tagRenderings": [
{
"id": "stop_name",
+ "question": {
+ "en": "What is the name of this stop?",
+ "de": "Wie lautet der Name der Haltestelle?",
+ "da": "Hvad er navnet på dette stop?",
+ "nl": "Wat is de naam van deze halte?",
+ "ca": "Quin és el nom d'aquesta parada?",
+ "cs": "Jak se tato zastávka jmenuje?",
+ "es": "¿Cuál es el nombre de esta parada?",
+ "it": "Qual è il nome di questa fermata?"
+ },
"render": {
"en": "This stop is called {name}",
"de": "Der Name der Haltestelle lautet {name}",
@@ -122,21 +132,23 @@
"it": "Questa fermata non ha un nome"
}
}
- ],
- "question": {
- "en": "What is the name of this stop?",
- "de": "Wie lautet der Name der Haltestelle?",
- "da": "Hvad er navnet på dette stop?",
- "nl": "Wat is de naam van deze halte?",
- "ca": "Quin és el nom d'aquesta parada?",
- "cs": "Jak se tato zastávka jmenuje?",
- "es": "¿Cuál es el nombre de esta parada?",
- "it": "Qual è il nome di questa fermata?"
- }
+ ]
},
"images",
{
"id": "shelter",
+ "question": {
+ "en": "Does this stop have a shelter?",
+ "de": "Hat die Haltestelle einen Unterstand?",
+ "da": "Har dette stop et ly?",
+ "nl": "Heeft deze halte een schuilplaats?",
+ "ca": "Aquesta parada té una coberta?",
+ "fr": "Cet arrêt a-t-il un abri ?",
+ "cs": "Má tato zastávka přístřešek?",
+ "es": "¿Tiene esta parada un refugio?",
+ "uk": "Чи є на цій зупинці укриття?",
+ "it": "Questa fermata ha una pensilina?"
+ },
"mappings": [
{
"if": "shelter=yes",
@@ -181,22 +193,22 @@
},
"hideInAnswer": true
}
- ],
- "question": {
- "en": "Does this stop have a shelter?",
- "de": "Hat die Haltestelle einen Unterstand?",
- "da": "Har dette stop et ly?",
- "nl": "Heeft deze halte een schuilplaats?",
- "ca": "Aquesta parada té una coberta?",
- "fr": "Cet arrêt a-t-il un abri ?",
- "cs": "Má tato zastávka přístřešek?",
- "es": "¿Tiene esta parada un refugio?",
- "uk": "Чи є на цій зупинці укриття?",
- "it": "Questa fermata ha una pensilina?"
- }
+ ]
},
{
"id": "bench",
+ "question": {
+ "en": "Does this stop have a bench?",
+ "de": "Gibt es an der Haltestelle eine Sitzbank?",
+ "da": "Har dette stop en bænk?",
+ "nl": "Heeft deze halte een zitbank?",
+ "ca": "Aquesta parada té un banc?",
+ "fr": "Est-ce que cet arrêt a un banc ?",
+ "cs": "Má tato zastávka lavičku?",
+ "es": "¿Tiene esta parada un banco?",
+ "uk": "Чи є на цій зупинці лавка?",
+ "it": "Questa fermata ha una panchina?"
+ },
"mappings": [
{
"if": "bench=yes",
@@ -241,22 +253,21 @@
},
"hideInAnswer": true
}
- ],
- "question": {
- "en": "Does this stop have a bench?",
- "de": "Gibt es an der Haltestelle eine Sitzbank?",
- "da": "Har dette stop en bænk?",
- "nl": "Heeft deze halte een zitbank?",
- "ca": "Aquesta parada té un banc?",
- "fr": "Est-ce que cet arrêt a un banc ?",
- "cs": "Má tato zastávka lavičku?",
- "es": "¿Tiene esta parada un banco?",
- "uk": "Чи є на цій зупинці лавка?",
- "it": "Questa fermata ha una panchina?"
- }
+ ]
},
{
"id": "bin",
+ "question": {
+ "en": "Does this stop have a bin?",
+ "de": "Hat die Haltestelle einen Mülleimer?",
+ "da": "Har dette stop en skraldespand?",
+ "nl": "Heeft deze halte een vuilnisbak?",
+ "ca": "Aquesta parada té una paperera?",
+ "cs": "Má tato zastávka koš?",
+ "es": "¿Tiene esta parada una papelera?",
+ "it": "Questa fermata ha un cestino?",
+ "uk": "Чи є на цій зупинці сміттєвий бак?"
+ },
"mappings": [
{
"if": "bin=yes",
@@ -299,22 +310,21 @@
},
"hideInAnswer": true
}
- ],
- "question": {
- "en": "Does this stop have a bin?",
- "de": "Hat die Haltestelle einen Mülleimer?",
- "da": "Har dette stop en skraldespand?",
- "nl": "Heeft deze halte een vuilnisbak?",
- "ca": "Aquesta parada té una paperera?",
- "cs": "Má tato zastávka koš?",
- "es": "¿Tiene esta parada una papelera?",
- "it": "Questa fermata ha un cestino?",
- "uk": "Чи є на цій зупинці сміттєвий бак?"
- }
+ ]
},
"wheelchair-access",
{
"id": "tactile_paving",
+ "question": {
+ "en": "Does this stop have tactile paving?",
+ "de": "Hat die Haltestelle hat ein taktiles Pflaster?",
+ "ca": "Aquesta parada té una superfície podotàctil?",
+ "nl": "Heeft deze halte een geleidelijn?",
+ "fr": "Cet arrêt a-t-il une surface podotactile ?",
+ "cs": "Má tato zastávka hmatovou dlažbu?",
+ "es": "¿Tiene esta parada pavimento táctil?",
+ "it": "Questa fermata ha una pavimentazione tattile?"
+ },
"mappings": [
{
"if": "tactile_paving=yes",
@@ -342,20 +352,20 @@
"it": "Questa fermata non ha una pavimentazione tattile"
}
}
- ],
- "question": {
- "en": "Does this stop have tactile paving?",
- "de": "Hat die Haltestelle hat ein taktiles Pflaster?",
- "ca": "Aquesta parada té una superfície podotàctil?",
- "nl": "Heeft deze halte een geleidelijn?",
- "fr": "Cet arrêt a-t-il une surface podotactile ?",
- "cs": "Má tato zastávka hmatovou dlažbu?",
- "es": "¿Tiene esta parada pavimento táctil?",
- "it": "Questa fermata ha una pavimentazione tattile?"
- }
+ ]
},
{
"id": "lit",
+ "question": {
+ "en": "Is this stop lit?",
+ "de": "Ist die Haltestelle beleuchtet?",
+ "nl": "Is deze halte verlicht?",
+ "ca": "Aquesta parada té il·luminació?",
+ "fr": "Cet arrêt est-il éclairé ?",
+ "cs": "Je tato zastávka osvětlena?",
+ "es": "¿Está iluminada esta parada?",
+ "it": "Questa fermata è illuminata?"
+ },
"mappings": [
{
"if": "lit=yes",
@@ -384,17 +394,7 @@
"it": "Questa fermata non è illuminata"
}
}
- ],
- "question": {
- "en": "Is this stop lit?",
- "de": "Ist die Haltestelle beleuchtet?",
- "nl": "Is deze halte verlicht?",
- "ca": "Aquesta parada té il·luminació?",
- "fr": "Cet arrêt est-il éclairé ?",
- "cs": "Je tato zastávka osvětlena?",
- "es": "¿Está iluminada esta parada?",
- "it": "Questa fermata è illuminata?"
- }
+ ]
},
{
"id": "departures_board",
@@ -477,6 +477,7 @@
]
},
{
+ "id": "contained_routes",
"render": {
"en": "{_contained_routes_count} routes stop at this stop
",
"de": "{_contained_routes_count} Linien halten an der Haltestelle
",
@@ -487,8 +488,7 @@
"es": "{_contained_routes_count} rutas paran en esta parada
",
"it": "{_contained_routes_count} linee si fermano a questa fermata
"
},
- "condition": "_contained_routes~*",
- "id": "contained_routes"
+ "condition": "_contained_routes~*"
}
],
"filter": [
diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json
index 1de36676e..97a933c68 100644
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@@ -284,7 +284,6 @@
},
{
"id": "tree-wikipedia",
- "#": "If this tree has a wikipedia article, show it. People can _only_ set the species though!",
"render": {
"*": "{wikipedia()}"
},
@@ -293,7 +292,8 @@
"wikipedia~*",
"wikidata~*"
]
- }
+ },
+ "#": "If this tree has a wikipedia article, show it. People can _only_ set the species though!"
},
{
"id": "circumference",
@@ -309,6 +309,18 @@
"cs": "Jaký je obvod kmene stromu?",
"it": "Qual è la circonferenza del tronco dell'albero?"
},
+ "questionHint": {
+ "en": "This is measured at a height of 1.30m",
+ "de": "Dies wird in einer Höhe von 1,30 m gemessen",
+ "fr": "La mesure est effectuée à 1.30m de hauteur",
+ "nl": "Dit wordt 1.30m boven de grond gemeten",
+ "es": "Esto se mide a una altura de 1.30 m",
+ "ca": "Es mesura a una alçada d'1,30 m",
+ "pt_BR": "Isso é medido a uma altura de 1,30m",
+ "cs": "Měří se ve výšce 1,30 m",
+ "pt": "Isto é medido a uma altura de 1,30m",
+ "it": "Questa è misurata ad un'altezza di 1,30m"
+ },
"render": {
"en": "The tree trunk has a circumference of {circumference} meter",
"de": "Der Baumstamm hat einen Umfang von {circumference} Meter",
@@ -325,18 +337,6 @@
"key": "circumference",
"inline": true,
"type": "pfloat"
- },
- "questionHint": {
- "en": "This is measured at a height of 1.30m",
- "de": "Dies wird in einer Höhe von 1,30 m gemessen",
- "fr": "La mesure est effectuée à 1.30m de hauteur",
- "nl": "Dit wordt 1.30m boven de grond gemeten",
- "es": "Esto se mide a una altura de 1.30 m",
- "ca": "Es mesura a una alçada d'1,30 m",
- "pt_BR": "Isso é medido a uma altura de 1,30m",
- "cs": "Měří se ve výšce 1,30 m",
- "pt": "Isto é medido a uma altura de 1,30m",
- "it": "Questa è misurata ad un'altezza di 1,30m"
}
},
{
@@ -353,11 +353,6 @@
"es": "¿Cuál es la altura de este árbol?",
"it": "Qual è l'altezza di questo albero?"
},
- "freeform": {
- "key": "height",
- "type": "pfloat",
- "inline": true
- },
"render": {
"en": "This tree is {height} meter high",
"de": "Dieser Baum ist {height} Meter hoch",
@@ -369,6 +364,11 @@
"ca": "Aquest arbre té {height} metres d'altura",
"cs": "Tento strom je {height} metr vysoký",
"it": "Questo albero è alto {height} metri"
+ },
+ "freeform": {
+ "key": "height",
+ "type": "pfloat",
+ "inline": true
}
},
{
@@ -713,6 +713,21 @@
}
},
{
+ "id": "tree_node-name",
+ "question": {
+ "nl": "Heeft de boom een naam?",
+ "en": "Does the tree have a name?",
+ "it": "L'albero ha un nome?",
+ "fr": "L'arbre a-t-il un nom ?",
+ "ru": "Есть ли у этого дерева название?",
+ "de": "Hat der Baum einen Namen?",
+ "es": "¿Tiene el árbol un nombre?",
+ "id": "Apakah pohon ini memiliki nama?",
+ "da": "Har træet et navn?",
+ "pt": "A árvore tem nome?",
+ "ca": "Té nom aquest arbre?",
+ "cs": "Má strom nějaké jméno?"
+ },
"render": {
"nl": "Naam: {name}",
"en": "Name: {name}",
@@ -728,20 +743,6 @@
"ca": "Nom : {name}",
"cs": "Jméno: {name}"
},
- "question": {
- "nl": "Heeft de boom een naam?",
- "en": "Does the tree have a name?",
- "it": "L'albero ha un nome?",
- "fr": "L'arbre a-t-il un nom ?",
- "ru": "Есть ли у этого дерева название?",
- "de": "Hat der Baum einen Namen?",
- "es": "¿Tiene el árbol un nombre?",
- "id": "Apakah pohon ini memiliki nama?",
- "da": "Har træet et navn?",
- "pt": "A árvore tem nome?",
- "ca": "Té nom aquest arbre?",
- "cs": "Má strom nějaké jméno?"
- },
"freeform": {
"key": "name",
"addExtraTags": [
@@ -778,8 +779,7 @@
"denotation=natural_monument",
"name~*"
]
- },
- "id": "tree_node-name"
+ }
},
{
"id": "tree-heritage",
@@ -914,18 +914,7 @@
}
},
{
- "render": {
- "nl": "![\"\"/](\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\")
Onroerend Erfgoed-ID: {ref:OnroerendErfgoed}",
- "en": " Onroerend Erfgoed ID: {ref:OnroerendErfgoed}",
- "it": " ID Onroerend Erfgoed: {ref:OnroerendErfgoed}",
- "ru": " Onroerend Erfgoed ID: {ref:OnroerendErfgoed}",
- "fr": " Identifiant Onroerend Erfgoed : {ref:OnroerendErfgoed}",
- "de": " Onroerend Erfgoed Kennung: {ref:OnroerendErfgoed}",
- "da": " Onroerend Erfgoed ID: {ref:OnroerendErfgoed}",
- "ca": "Identifiació Onroerend Erfgoed: {ref:OnroerendErfgoed}",
- "cs": " Onroerend Erfgoed ID: {ref:OnroerendErfgoed}",
- "es": " ID de Onroerend Erfgoed: {ref:OnroerendErfgoed}"
- },
+ "id": "tree_node-ref:OnroerendErfgoed",
"question": {
"nl": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?",
"en": "What is the ID issued by Onroerend Erfgoed Flanders?",
@@ -938,6 +927,18 @@
"ca": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?",
"cs": "Jaké je ID vydané společností Onroerend Erfgoed Flanders?"
},
+ "render": {
+ "nl": " Onroerend Erfgoed-ID: {ref:OnroerendErfgoed}",
+ "en": " Onroerend Erfgoed ID: {ref:OnroerendErfgoed}",
+ "it": " ID Onroerend Erfgoed: {ref:OnroerendErfgoed}",
+ "ru": " Onroerend Erfgoed ID: {ref:OnroerendErfgoed}",
+ "fr": " Identifiant Onroerend Erfgoed : {ref:OnroerendErfgoed}",
+ "de": " Onroerend Erfgoed Kennung: {ref:OnroerendErfgoed}",
+ "da": " Onroerend Erfgoed ID: {ref:OnroerendErfgoed}",
+ "ca": "Identifiació Onroerend Erfgoed: {ref:OnroerendErfgoed}",
+ "cs": " Onroerend Erfgoed ID: {ref:OnroerendErfgoed}",
+ "es": " ID de Onroerend Erfgoed: {ref:OnroerendErfgoed}"
+ },
"freeform": {
"key": "ref:OnroerendErfgoed",
"type": "nat"
@@ -947,22 +948,10 @@
"heritage=4",
"heritage:operator=OnroerendErfgoed"
]
- },
- "id": "tree_node-ref:OnroerendErfgoed"
+ }
},
{
- "render": {
- "nl": "![\"\"/](\"./assets/svg/wikidata.svg\")
Wikidata: {wikidata}",
- "en": " Wikidata: {wikidata}",
- "it": " Wikidata: {wikidata}",
- "ru": " Wikidata: {wikidata}",
- "fr": " Wikidata : {wikidata}",
- "de": " Wikidata: {wikidata}",
- "es": " Wikidata: {wikidata}",
- "da": " Wikidata: {wikidata}",
- "ca": "Wikidata{wikidata}",
- "cs": " Wikidata: {wikidata}"
- },
+ "id": "tree_node-wikidata",
"question": {
"nl": "Wat is het Wikidata-ID van deze boom?",
"en": "What is the Wikidata ID for this tree?",
@@ -975,6 +964,18 @@
"ca": "Quin és l'identificador de Wikidata d'aquest arbre?",
"cs": "Jaké je ID Wikidata pro tento strom?"
},
+ "render": {
+ "nl": " Wikidata: {wikidata}",
+ "en": " Wikidata: {wikidata}",
+ "it": " Wikidata: {wikidata}",
+ "ru": " Wikidata: {wikidata}",
+ "fr": " Wikidata : {wikidata}",
+ "de": " Wikidata: {wikidata}",
+ "es": " Wikidata: {wikidata}",
+ "da": " Wikidata: {wikidata}",
+ "ca": "Wikidata{wikidata}",
+ "cs": " Wikidata: {wikidata}"
+ },
"freeform": {
"key": "wikidata",
"type": "wikidata"
@@ -985,8 +986,7 @@
"denotation=natural_monument",
"wikidata~*"
]
- },
- "id": "tree_node-wikidata"
+ }
}
],
"deletion": {
diff --git a/assets/layers/trolley_bay/trolley_bay.json b/assets/layers/trolley_bay/trolley_bay.json
index a64e0ae79..004f316a5 100644
--- a/assets/layers/trolley_bay/trolley_bay.json
+++ b/assets/layers/trolley_bay/trolley_bay.json
@@ -137,12 +137,6 @@
},
{
"id": "denominations",
- "condition": {
- "and": [
- "trolley:deposit=yes",
- "_currency~.*EUR.*"
- ]
- },
"question": {
"en": "What coins are accepted for the deposit?",
"de": "Welche Münzen werden für die Pfandgebühr akzeptiert?",
@@ -151,7 +145,6 @@
"it": "Quali monete sono accettate per il deposito?",
"cs": "Jaké mince jsou přijímány jako záloha?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "trolley:deposit:denominations=0.50 EUR",
@@ -204,7 +197,14 @@
},
"hideInAnswer": "_currency!~.*EUR.*"
}
- ]
+ ],
+ "condition": {
+ "and": [
+ "trolley:deposit=yes",
+ "_currency~.*EUR.*"
+ ]
+ },
+ "multiAnswer": true
},
{
"id": "cart_types",
@@ -216,7 +216,6 @@
"it": "Che tipo di carrelli speciali sono disponibili?",
"cs": "Jako druhy speciálních vozíků jsou k dispozici?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "trolley:magnifier=yes",
@@ -290,7 +289,8 @@
"cs": "Jsou k dispozici svislé vozíky pro zboží ve formě desek"
}
}
- ]
+ ],
+ "multiAnswer": true
},
{
"id": "indoor"
diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json
index fc0de744c..99bc6b0c2 100644
--- a/assets/layers/usersettings/usersettings.json
+++ b/assets/layers/usersettings/usersettings.json
@@ -60,10 +60,10 @@
"labels": [
"hidden"
],
- "icon": "user_circle",
"render": {
"*": "{_name}
"
},
+ "icon": "user_circle",
"mappings": [
{
"if": "_img!=",
@@ -120,7 +120,6 @@
"profile-content",
"hidden"
],
- "condition": "_description!=",
"render": {
"special": {
"type": "link",
@@ -145,6 +144,7 @@
}
}
},
+ "condition": "_description!=",
"metacondition": "_uid~*"
},
{
@@ -447,13 +447,6 @@
},
{
"id": "background-layer-readonly",
- "condition": {
- "and": [
- "_theme:backgroundLayer~*",
- "mapcomplete-preferred-background-layer~*",
- "_theme:backgroundLayer!:={mapcomplete-preferred-background-layer}"
- ]
- },
"render": {
"en": "This thematic map has a predefined background layer set. Your default theme setting does not apply",
"ca": "Aquest mapa temàtic té un conjunt de capes de fons predefinides. La configuració predeterminada del tema no s'aplica",
@@ -465,6 +458,13 @@
"es": "Este mapa temático tiene una capa de fondo predefinida. Tu configuración de tema predeterminada no se aplica",
"it": "Questa mappa tematica ha un livello di sfondo predefinito impostato. La tua impostazione predefinita del tema non si applica"
},
+ "condition": {
+ "and": [
+ "_theme:backgroundLayer~*",
+ "mapcomplete-preferred-background-layer~*",
+ "_theme:backgroundLayer!:={mapcomplete-preferred-background-layer}"
+ ]
+ },
"metacondition": "_uid~*"
},
{
@@ -491,7 +491,6 @@
"it": "Per impostare uno sfondo specifico come predefinito, selezionalo prima nel menu degli sfondi dopo di che apparirà qui.",
"cs": "Pro nastavení určitého pozadí jako výchozího ho nejdřív vyberte v nabídce pro pozadí, následně se objeví tady."
},
- "condition": "_theme:backgroundLayer=",
"mappings": [
{
"if": "mapcomplete-preferred-background-layer=default",
@@ -605,11 +604,11 @@
"hideInAnswer": true
}
],
+ "condition": "_theme:backgroundLayer=",
"metacondition": "_uid~*"
},
{
"id": "override_layer_sync_selection",
- "#": "Overrides 'layer.syncSelection",
"question": {
"en": "When disabling/enabling a layer in the filter menu, should this be remembered between visits?"
},
@@ -650,7 +649,8 @@
},
"hideInAnswer": "_loggedIn=false"
}
- ]
+ ],
+ "#": "Overrides 'layer.syncSelection"
},
{
"id": "show_crosshair",
@@ -1358,7 +1358,6 @@
},
{
"id": "mangrove-keys",
- "classes": "link-no-underline low-interaction p-2",
"render": {
"special": {
"type": "link",
@@ -1390,11 +1389,11 @@
"es": "Cualquier persona que posea este archivo puede hacer revisiones con tu identidad",
"it": "Chiunque possieda questo file può fare recensioni con la tua identità"
}
- }
+ },
+ "classes": "link-no-underline low-interaction p-2"
},
{
"id": "mangrove-key-import",
- "classes": "low-interaction p-2",
"render": {
"special": {
"type": "import_mangrove_key",
@@ -1423,25 +1422,23 @@
"cs": "Nahrání soukromého klíče vymaže váš aktuální soukromý klíč. Pokud jste s ním dříve vkládali recenze, nejdřív si aktuální klíč stáhněte k sobě",
"fr": "Charger une clé privée écrasera votre clé privée actuelle. Si vous avez réalisé des vérifications avec votre clé privée actuelle, téléchargez la d'abord"
}
- }
+ },
+ "classes": "low-interaction p-2"
},
{
"id": "translations-title",
- "label": [
- "translations"
- ],
"render": {
"en": "Translating MapComplete
",
"de": "MapComplete übersetzen
",
"ca": "Traduint MapComplete
",
"cs": "Překládání MapComplete
",
"it": "Traduzione di MapComplete
"
- }
- },
- {
+ },
"label": [
"translations"
- ],
+ ]
+ },
+ {
"id": "translation-mode",
"question": {
"en": "Do you want to help translating MapComplete?",
@@ -1511,12 +1508,12 @@
}
}
],
- "#force-save-button": "yes"
- },
- {
"label": [
"translations"
],
+ "#force-save-button": "yes"
+ },
+ {
"id": "translation-help",
"mappings": [
{
@@ -1543,12 +1540,12 @@
},
"icon": "./assets/svg/translate.svg"
}
+ ],
+ "label": [
+ "translations"
]
},
{
- "label": [
- "translations"
- ],
"id": "translation-completeness",
"render": {
"ca": "Les traduccions de {_theme} en {_language} tenen un {_translation_percentage}%: {_translation_translated_count} cadenes de {_translation_total} estan traduïdes",
@@ -1566,13 +1563,6 @@
"uk": "Переклади {_theme} {_language} становлять {_translation_percentage}%: {_translation_translated_count} рядків із {_translation_total} перекладено",
"it": "Le traduzioni per {_theme} in {_language} sono al {_translation_percentage}%: {_translation_translated_count} stringhe su {_translation_total} sono tradotte"
},
- "condition": {
- "or": [
- "mapcomplete-translation-mode=yes",
- "mapcomplete-translation-mode=true",
- "mapcomplete-translation-mode=mobile"
- ]
- },
"mappings": [
{
"if": "_translation_percentage=100",
@@ -1589,13 +1579,27 @@
"it": "Completamente tradotto"
}
}
+ ],
+ "condition": {
+ "or": [
+ "mapcomplete-translation-mode=yes",
+ "mapcomplete-translation-mode=true",
+ "mapcomplete-translation-mode=mobile"
+ ]
+ },
+ "label": [
+ "translations"
]
},
{
"id": "translation-links",
- "label": [
- "translations"
- ],
+ "render": {
+ "special": {
+ "type": "multi",
+ "key": "_translation_links",
+ "tagrendering": "Translate entries of {id}"
+ }
+ },
"condition": {
"and": [
"_translation_links~*",
@@ -1607,13 +1611,9 @@
}
]
},
- "render": {
- "special": {
- "type": "multi",
- "key": "_translation_links",
- "tagrendering": "Translate entries of {id}"
- }
- }
+ "label": [
+ "translations"
+ ]
},
{
"id": "share-login-title",
@@ -1697,7 +1697,6 @@
},
{
"id": "clear_cache",
- "classes": "low-interaction p-2",
"render": {
"special": {
"type": "clear_caches",
@@ -1721,7 +1720,8 @@
"it": "La cancellazione delle cache eliminerà i dati e il codice scaricati localmente. Rimarrai connesso e le tue impostazioni saranno conservate. Nessun dato dovrebbe essere perso",
"cs": "Vymazání cache smaže data a kód, které byly staženy na místní zařízení. Zůstanete přihlášeni a vaše nastavení budou zachována. Žádná data se neztratí"
}
- }
+ },
+ "classes": "low-interaction p-2"
},
{
"id": "pending_changes",
@@ -1798,14 +1798,14 @@
},
{
"id": "gps_accordeon",
- "condition": "mapcomplete-show_debug=yes",
"render": {
"special": {
"type": "group",
"header": "debug-gps-title",
"labels": "debug-gps"
}
- }
+ },
+ "condition": "mapcomplete-show_debug=yes"
},
{
"id": "debug-gps-title",
@@ -1825,52 +1825,52 @@
"labels": [
"hidden"
],
- "condition": "mapcomplete-show_debug=yes",
- "render": "{gps_all_tags()}"
+ "render": "{gps_all_tags()}",
+ "condition": "mapcomplete-show_debug=yes"
},
{
"id": "debug_accordeon",
- "condition": "mapcomplete-show_debug=yes",
"render": {
"special": {
"type": "group",
"header": "debug_accordeon_title",
"labels": "debug"
}
- }
+ },
+ "condition": "mapcomplete-show_debug=yes"
},
{
"id": "debug_accordeon_title",
"labels": [
"hidden"
],
- "condition": "mapcomplete-show_debug=yes",
"render": {
"en": "Debug information",
"ca": "Informació de depuració",
"de": "Fehlerbehebungsinformationen",
"it": "Informazioni di debug",
"cs": "Ladicí informace"
- }
+ },
+ "condition": "mapcomplete-show_debug=yes"
},
{
"id": "debug",
"labels": [
"hidden"
],
- "condition": "mapcomplete-show_debug=yes",
- "render": "{all_tags()}"
+ "render": "{all_tags()}",
+ "condition": "mapcomplete-show_debug=yes"
},
{
"id": "debug_storage_accordeon",
- "condition": "mapcomplete-show_debug=yes",
"render": {
"special": {
"type": "group",
"header": "debug_storage_accordeon_title",
"labels": "debug_storage"
}
- }
+ },
+ "condition": "mapcomplete-show_debug=yes"
},
{
"id": "debug_storage_accordeon_title",
diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index 93c74c87d..e237571be 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -400,12 +400,6 @@
"uk": "Що продає цей автомат?",
"it": "Cosa vende questo distributore automatico?"
},
- "freeform": {
- "key": "vending",
- "addExtraTags": [
- "fixme=A mapcomplete user used the text field to set the 'vending'-tag, which is probably incorrect (e.g. might be in the local language, use upercase, ...)"
- ]
- },
"render": {
"en": "This vending machine sells {vending}",
"nl": "Deze verkoopautomaat verkoopt {vending}",
@@ -417,6 +411,12 @@
"uk": "Цей торговий автомат продає {vending}",
"it": "Questo distributore automatico vende {vending}"
},
+ "freeform": {
+ "key": "vending",
+ "addExtraTags": [
+ "fixme=A mapcomplete user used the text field to set the 'vending'-tag, which is probably incorrect (e.g. might be in the local language, use upercase, ...)"
+ ]
+ },
"mappings": [
{
"if": "vending=drinks",
@@ -844,6 +844,7 @@
"multiAnswer": true
},
{
+ "id": "bicycle_tube_vending_machine-brand",
"question": {
"en": "Which brand of tubes are sold here?",
"ca": "Quines marques de cambres d'aire es venen aquí?",
@@ -855,10 +856,6 @@
"pt": "Quais marcas de câmara de ar são vendidas aqui?",
"it": "Quale marca di camere d'aria viene venduta qui?"
},
- "condition": "vending~.*bicycle_tube.*",
- "freeform": {
- "key": "brand"
- },
"render": {
"en": "{brand} tubes are sold here",
"ca": "Aquí es venen cambres d'aire {brand}",
@@ -870,6 +867,9 @@
"pt": "câmaras de ar {brand} são vendidas aqui",
"it": "Qui vengono vendute camere d'aria {brand}"
},
+ "freeform": {
+ "key": "brand"
+ },
"mappings": [
{
"if": "brand=Continental",
@@ -900,8 +900,8 @@
}
}
],
- "multiAnswer": true,
- "id": "bicycle_tube_vending_machine-brand"
+ "condition": "vending~.*bicycle_tube.*",
+ "multiAnswer": true
},
"opening_hours_24_7",
"payment-options-split",
@@ -920,6 +920,17 @@
"uk": "Хто керує цим автоматом?",
"it": "Chi gestisce questo distributore automatico?"
},
+ "render": {
+ "en": "This vending machine is operated by {operator}",
+ "nl": "Deze verkoopautomaat wordt beheerd door {operator}",
+ "de": "Dieser Verkaufsautomat wird betrieben von {operator}",
+ "fr": "Ce distributeur est exploité par {operator}",
+ "ca": "{operator} gestiona aquesta màquina expenedora",
+ "cs": "Tento prodejní automat provozuje {operator}",
+ "es": "Esta máquina expendedora es operada por {operator}",
+ "uk": "Цим торговим автоматом керує {operator}",
+ "it": "Questo distributore automatico è gestito da {operator}"
+ },
"freeform": {
"key": "operator",
"placeholder": {
@@ -932,17 +943,6 @@
"es": "Nombre del operador",
"it": "Nome dell'operatore"
}
- },
- "render": {
- "en": "This vending machine is operated by {operator}",
- "nl": "Deze verkoopautomaat wordt beheerd door {operator}",
- "de": "Dieser Verkaufsautomat wird betrieben von {operator}",
- "fr": "Ce distributeur est exploité par {operator}",
- "ca": "{operator} gestiona aquesta màquina expenedora",
- "cs": "Tento prodejní automat provozuje {operator}",
- "es": "Esta máquina expendedora es operada por {operator}",
- "uk": "Цим торговим автоматом керує {operator}",
- "it": "Questo distributore automatico è gestito da {operator}"
}
},
{
diff --git a/assets/layers/veterinary/veterinary.json b/assets/layers/veterinary/veterinary.json
index 7f51a90c1..59eb0b2ca 100644
--- a/assets/layers/veterinary/veterinary.json
+++ b/assets/layers/veterinary/veterinary.json
@@ -116,6 +116,7 @@
"phone",
"opening_hours",
{
+ "id": "vetName",
"question": {
"en": "What is the name of this veterinarian?",
"da": "Hvad hedder denne dyrlæ?",
@@ -140,8 +141,7 @@
},
"freeform": {
"key": "name"
- },
- "id": "vetName"
+ }
}
],
"allowMove": true
diff --git a/assets/layers/viewpoint/viewpoint.json b/assets/layers/viewpoint/viewpoint.json
index b600e81b3..e3e707fb4 100644
--- a/assets/layers/viewpoint/viewpoint.json
+++ b/assets/layers/viewpoint/viewpoint.json
@@ -87,6 +87,7 @@
"tagRenderings": [
"images",
{
+ "id": "viewpoint-description",
"question": {
"en": "Do you want to add a description?",
"nl": "Zijn er bijzonderheden die je wilt toevoegen?",
@@ -103,8 +104,7 @@
"render": "{description}",
"freeform": {
"key": "description"
- },
- "id": "viewpoint-description"
+ }
}
],
"allowMove": {
diff --git a/assets/layers/visitor_information_centre/visitor_information_centre.json b/assets/layers/visitor_information_centre/visitor_information_centre.json
index 0ce3eb328..dfe1dafad 100644
--- a/assets/layers/visitor_information_centre/visitor_information_centre.json
+++ b/assets/layers/visitor_information_centre/visitor_information_centre.json
@@ -68,11 +68,11 @@
"question": {
"en": "What is the name of this visitors centre?"
},
- "freeform": {
- "key": "name"
- },
"render": {
"en": "This visitors centre is called {name}"
+ },
+ "freeform": {
+ "key": "name"
}
},
"contact",
diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json
index 66804fd96..ced4f6de9 100644
--- a/assets/layers/waste_basket/waste_basket.json
+++ b/assets/layers/waste_basket/waste_basket.json
@@ -107,7 +107,6 @@
"cs": "Jaký druh koše na odpad je to?",
"es": "¿Qué tipo de contenedor de basura es este?"
},
- "multiAnswer": true,
"mappings": [
{
"if": "waste=",
@@ -250,7 +249,8 @@
"es": "Un contenedor para papel"
}
}
- ]
+ ],
+ "multiAnswer": true
},
{
"id": "dispensing_dog_bags",
@@ -266,13 +266,6 @@
"cs": "Má tento odpadkový koš zásobník na sáčky na psí exkrementy?",
"es": "¿Este contenedor tiene un dispensador de bolsas para excrementos de perro?"
},
- "condition": {
- "or": [
- "waste~i~.*dog_excrement.*",
- "waste~i~.*trash.*",
- "waste="
- ]
- },
"mappings": [
{
"if": {
@@ -330,7 +323,14 @@
},
"hideInAnswer": true
}
- ]
+ ],
+ "condition": {
+ "or": [
+ "waste~i~.*dog_excrement.*",
+ "waste~i~.*trash.*",
+ "waste="
+ ]
+ }
}
],
"filter": [
diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json
index 522171fc3..6c3900aa4 100644
--- a/assets/layers/waste_disposal/waste_disposal.json
+++ b/assets/layers/waste_disposal/waste_disposal.json
@@ -145,19 +145,6 @@
},
{
"id": "access",
- "render": {
- "en": "Access: {access}",
- "nl": "Toegankelijk voor {access}",
- "de": "Zugang: {access}",
- "it": "Accesso: {access}",
- "id": "Akses: {access}",
- "da": "Adgang: {access}",
- "ca": "Accés: {access}",
- "cs": "Přístup: {access}",
- "zh_Hant": "存取：{access}",
- "uk": "Доступ: {access}",
- "es": "Acceso: {access}"
- },
"question": {
"en": "Who can use this waste disposal bin?",
"nl": "Wie mag deze afvalcontainer gebruiken?",
@@ -172,6 +159,19 @@
"uk": "Хто може користуватися цим сміттєвим баком?",
"es": "¿Quién puede usar este contenedor de residuos?"
},
+ "render": {
+ "en": "Access: {access}",
+ "nl": "Toegankelijk voor {access}",
+ "de": "Zugang: {access}",
+ "it": "Accesso: {access}",
+ "id": "Akses: {access}",
+ "da": "Adgang: {access}",
+ "ca": "Accés: {access}",
+ "cs": "Přístup: {access}",
+ "zh_Hant": "存取：{access}",
+ "uk": "Доступ: {access}",
+ "es": "Acceso: {access}"
+ },
"freeform": {
"key": "access",
"type": "string"
diff --git a/assets/layers/wayside_shrine/wayside_shrine.json b/assets/layers/wayside_shrine/wayside_shrine.json
index 59421c338..499c2f733 100644
--- a/assets/layers/wayside_shrine/wayside_shrine.json
+++ b/assets/layers/wayside_shrine/wayside_shrine.json
@@ -181,15 +181,20 @@
"tagRenderings": [
"images_no_blur",
{
+ "id": "shrine_name",
+ "labels": [
+ "shrine_questions"
+ ],
"question": {
"en": "What's the name of this {title()}?",
"it": "Qual è il nome di questo {title()}?",
"cs": "Jaký je název {title()}?"
},
- "id": "shrine_name",
- "labels": [
- "shrine_questions"
- ],
+ "render": {
+ "en": "The name of this {title()} is {name}",
+ "it": "Il nome di questo {title()} è {name}",
+ "cs": "Název {title()} je {name}"
+ },
"freeform": {
"key": "name",
"type": "string",
@@ -197,11 +202,6 @@
"noname="
]
},
- "render": {
- "en": "The name of this {title()} is {name}",
- "it": "Il nome di questo {title()} è {name}",
- "cs": "Název {title()} je {name}"
- },
"mappings": [
{
"if": "noname=yes",
@@ -257,15 +257,24 @@
]
},
{
+ "id": "religion",
+ "labels": [
+ "shrine_questions"
+ ],
"question": {
"en": "To which religion is this shrine dedicated?",
"it": "A quale religione è dedicato questo santuario?",
"cs": "Jakému náboženství je tato kaplička věnována?"
},
- "id": "religion",
- "labels": [
- "shrine_questions"
- ],
+ "render": {
+ "en": "This shrine is {religion}",
+ "it": "Questo santuario è {religion}",
+ "cs": "Tato kaplička je {religion}"
+ },
+ "freeform": {
+ "key": "religion",
+ "type": "string"
+ },
"mappings": [
{
"if": "religion=christian",
@@ -356,36 +365,30 @@
}
}
],
- "multiAnswer": false,
- "freeform": {
- "key": "religion",
- "type": "string"
- },
- "render": {
- "en": "This shrine is {religion}",
- "it": "Questo santuario è {religion}",
- "cs": "Tato kaplička je {religion}"
- },
"condition": {
"and": [
"historic!=wayside_cross"
]
- }
+ },
+ "multiAnswer": false
},
{
+ "id": "denomination_christian",
+ "labels": [
+ "shrine_questions"
+ ],
"question": {
"en": "What's the Christian denomination of this {title()}?",
"it": "Qual è la denominazione cristiana di questo {title()}?",
"cs": "Jaká je křesťanská denominace tohoto {title()}?"
},
- "id": "denomination_christian",
- "labels": [
- "shrine_questions"
- ],
- "condition": {
- "and": [
- "religion=christian"
- ]
+ "render": {
+ "en": "The religious denomination is {denomination}",
+ "it": "La denominazione religiosa è {denomination}",
+ "cs": "Náboženská denominace je {denomination}"
+ },
+ "freeform": {
+ "key": "denomination"
},
"mappings": [
{
@@ -469,17 +472,31 @@
}
}
],
- "render": {
- "en": "The religious denomination is {denomination}",
- "it": "La denominazione religiosa è {denomination}",
- "cs": "Náboženská denominace je {denomination}"
+ "condition": {
+ "and": [
+ "religion=christian"
+ ]
},
- "multiAnswer": false,
- "freeform": {
- "key": "denomination"
- }
+ "multiAnswer": false
},
{
+ "id": "denomination_muslim",
+ "labels": [
+ "shrine_questions"
+ ],
+ "question": {
+ "en": "What's the Muslim denomination of this shrine?",
+ "it": "Qual è la denominazione musulmana di questo santuario?",
+ "cs": "Jaká je muslimská denominace této kapličky?"
+ },
+ "render": {
+ "en": "The religious subdenomination is {denomination}",
+ "it": "La sottodenominazione religiosa è {denomination}",
+ "cs": "Náboženská subdenominace je {denomination}"
+ },
+ "freeform": {
+ "key": "denomination"
+ },
"mappings": [
{
"if": "denomination=shia",
@@ -506,31 +523,31 @@
}
}
],
- "id": "denomination_muslim",
+ "condition": {
+ "and": [
+ "religion=muslim"
+ ]
+ },
+ "multiAnswer": true
+ },
+ {
+ "id": "denomination_jewish",
"labels": [
"shrine_questions"
],
- "multiAnswer": true,
- "freeform": {
- "key": "denomination"
+ "question": {
+ "en": "What's the Jewish denomination of this shrine?",
+ "it": "Qual è la denominazione ebraica di questo santuario?",
+ "cs": "Jaká je židovská denominace této kapličky?"
},
"render": {
"en": "The religious subdenomination is {denomination}",
"it": "La sottodenominazione religiosa è {denomination}",
"cs": "Náboženská subdenominace je {denomination}"
},
- "question": {
- "en": "What's the Muslim denomination of this shrine?",
- "it": "Qual è la denominazione musulmana di questo santuario?",
- "cs": "Jaká je muslimská denominace této kapličky?"
+ "freeform": {
+ "key": "denomination"
},
- "condition": {
- "and": [
- "religion=muslim"
- ]
- }
- },
- {
"mappings": [
{
"if": "denomination=conservative",
@@ -565,40 +582,23 @@
}
}
],
- "id": "denomination_jewish",
- "labels": [
- "shrine_questions"
- ],
- "multiAnswer": true,
- "freeform": {
- "key": "denomination"
- },
- "render": {
- "en": "The religious subdenomination is {denomination}",
- "it": "La sottodenominazione religiosa è {denomination}",
- "cs": "Náboženská subdenominace je {denomination}"
- },
- "question": {
- "en": "What's the Jewish denomination of this shrine?",
- "it": "Qual è la denominazione ebraica di questo santuario?",
- "cs": "Jaká je židovská denominace této kapličky?"
- },
"condition": {
"and": [
"religion=jewish"
]
- }
+ },
+ "multiAnswer": true
},
{
+ "id": "denomination_other",
+ "labels": [
+ "shrine_questions"
+ ],
"question": {
"en": "What's the denomination of this shrine?",
"it": "Qual è la denominazione di questo santuario?",
"cs": "Jaká je denominace této kapličky?"
},
- "id": "denomination_other",
- "labels": [
- "shrine_questions"
- ],
"render": {
"en": "The denomination of this shrine is {denomination}",
"it": "La denominazione di questo santuario è {denomination}",
@@ -623,7 +623,13 @@
"it": "Chi è raffigurato?",
"cs": "Kdo je vyobrazen?"
},
- "multiAnswer": true,
+ "render": {
+ "*": "{wikipedia(subject:wikidata)}"
+ },
+ "freeform": {
+ "key": "subject:wikidata",
+ "type": "wikidata"
+ },
"mappings": [
{
"if": "subject:wikidata=Q345",
@@ -670,13 +676,7 @@
}
}
],
- "render": {
- "*": "{wikipedia(subject:wikidata)}"
- },
- "freeform": {
- "key": "subject:wikidata",
- "type": "wikidata"
- }
+ "multiAnswer": true
},
"level"
],
diff --git a/assets/layers/windturbine/windturbine.json b/assets/layers/windturbine/windturbine.json
index ef9687bc4..4124927b7 100644
--- a/assets/layers/windturbine/windturbine.json
+++ b/assets/layers/windturbine/windturbine.json
@@ -117,20 +117,6 @@
"tagRenderings": [
{
"id": "turbine-output",
- "render": {
- "en": "The power output of this wind turbine is {generator:output:electricity}.",
- "fr": "La puissance générée par cette éolienne est de {generator:output:electricity}.",
- "it": "La potenza di questa turbina eolica è di {generator:output:electricity}.",
- "zh_Hant": "這個風機的電力輸出是 {generator:output:electricity}。",
- "id": "Output daya dari turbin angin ini adalah {generator:output:electricity}.",
- "hu": "A szélerőmű teljesítménye: {generator:output:electricity}.",
- "de": "Das Windrad erzeugt {generator:output:electricity} Strom.",
- "nl": "Deze windturbine genereert {generator:output:electricity}",
- "da": "Denne vindmølle har en effekt på {generator:output:electricity}.",
- "ca": "La potència de sortida d'aquest aerogenerador és {generator:output:electricity}.",
- "cs": "Výkon této větrné turbíny je {generator:output:electricity}.",
- "es": "La potencia de este aerogenerador es de {generator:output:electricity}."
- },
"question": {
"en": "What is the power output of this wind turbine? (e.g. 2.3 MW)",
"fr": "Quel est la puissance générée par cette éolienne (p.ex. 2,3 MW) ?",
@@ -146,6 +132,20 @@
"pl": "Jaka jest moc wyjściowa tej turbiny wiatrowej? (np. 2,3 MW)",
"es": "¿Cuál es la potencia de este aerogenerador? (por ejemplo, 2.3 MW)"
},
+ "render": {
+ "en": "The power output of this wind turbine is {generator:output:electricity}.",
+ "fr": "La puissance générée par cette éolienne est de {generator:output:electricity}.",
+ "it": "La potenza di questa turbina eolica è di {generator:output:electricity}.",
+ "zh_Hant": "這個風機的電力輸出是 {generator:output:electricity}。",
+ "id": "Output daya dari turbin angin ini adalah {generator:output:electricity}.",
+ "hu": "A szélerőmű teljesítménye: {generator:output:electricity}.",
+ "de": "Das Windrad erzeugt {generator:output:electricity} Strom.",
+ "nl": "Deze windturbine genereert {generator:output:electricity}",
+ "da": "Denne vindmølle har en effekt på {generator:output:electricity}.",
+ "ca": "La potència de sortida d'aquest aerogenerador és {generator:output:electricity}.",
+ "cs": "Výkon této větrné turbíny je {generator:output:electricity}.",
+ "es": "La potencia de este aerogenerador es de {generator:output:electricity}."
+ },
"freeform": {
"key": "generator:output:electricity",
"type": "pfloat"
@@ -153,20 +153,6 @@
},
{
"id": "turbine-operator",
- "render": {
- "en": "This wind turbine is operated by {operator}.",
- "fr": "Cette éolienne est opérée par {operator}.",
- "it": "Questa turbina eolica è gestita da {operator}.",
- "zh_Hant": "這個風機營業商是 {operator}。",
- "id": "Turbin angin ini dioperasikan oleh {operator}.",
- "hu": "Ennek a szélerőműnek az üzemeltetője: {operator}.",
- "de": "Die Windturbine wird betrieben von {operator}.",
- "da": "Denne vindmølle drives af {operator}.",
- "nl": "Deze windturbine wordt beheerd door {operator}.",
- "ca": "{operator} gestiona aquest aerogenerador.",
- "cs": "Tuto větrnou turbínu provozuje {operator}.",
- "es": "Este aerogenerador es operado por {operator}."
- },
"question": {
"en": "Who operates this wind turbine?",
"fr": "Qui est l’exploitant de cette éolienne ?",
@@ -182,25 +168,26 @@
"pl": "Kto obsługuje tę turbinę wiatrową?",
"es": "¿Quién opera este aerogenerador?"
},
+ "render": {
+ "en": "This wind turbine is operated by {operator}.",
+ "fr": "Cette éolienne est opérée par {operator}.",
+ "it": "Questa turbina eolica è gestita da {operator}.",
+ "zh_Hant": "這個風機營業商是 {operator}。",
+ "id": "Turbin angin ini dioperasikan oleh {operator}.",
+ "hu": "Ennek a szélerőműnek az üzemeltetője: {operator}.",
+ "de": "Die Windturbine wird betrieben von {operator}.",
+ "da": "Denne vindmølle drives af {operator}.",
+ "nl": "Deze windturbine wordt beheerd door {operator}.",
+ "ca": "{operator} gestiona aquest aerogenerador.",
+ "cs": "Tuto větrnou turbínu provozuje {operator}.",
+ "es": "Este aerogenerador es operado por {operator}."
+ },
"freeform": {
"key": "operator"
}
},
{
"id": "turbine-height",
- "render": {
- "en": "The total height (including rotor radius) of this wind turbine is {height} metres.",
- "fr": "La hauteur totale, incluant les pales, est de {height} mètres.",
- "it": "L'altezza totale (incluso il raggio del rotore) di questa turbina eolica è di {height} metri.",
- "zh_Hant": "這風機的總高度 (包括風葉直徑) 是 {height} 公尺。",
- "hu": "A szélerőmű teljes (rotor sugarával együtt számított) magassága: {height} méter.",
- "de": "Die Gesamthöhe dieses Windrads beträgt (einschließlich Rotorradius) {height} Meter.",
- "da": "Den samlede højde (inklusive rotorradius) for denne vindmølle er {height} meter.",
- "nl": "De totale hoogte (inclusief rotor-radius) van deze windturbine is {height} meter",
- "ca": "L'alçada total (inclòs el radi del rotor) d'aquest aerogenerador és de {height} metres.",
- "cs": "Celková výška (včetně poloměru rotoru) této větrné turbíny je {height} metrů.",
- "es": "La altura total (incluido el radio del rotor) de este aerogenerador es de {height} metros."
- },
"question": {
"en": "What is the total height of this wind turbine (including rotor radius), in metres?",
"fr": "Quelle est la hauteur totale de l’éolienne en mètres, pales incluses ?",
@@ -214,6 +201,19 @@
"cs": "Jaká je celková výška této větrné elektrárny (včetně poloměru rotoru) v metrech?",
"es": "¿Cuál es la altura total de este aerogenerador (incluido el radio del rotor), en metros?"
},
+ "render": {
+ "en": "The total height (including rotor radius) of this wind turbine is {height} metres.",
+ "fr": "La hauteur totale, incluant les pales, est de {height} mètres.",
+ "it": "L'altezza totale (incluso il raggio del rotore) di questa turbina eolica è di {height} metri.",
+ "zh_Hant": "這風機的總高度 (包括風葉直徑) 是 {height} 公尺。",
+ "hu": "A szélerőmű teljes (rotor sugarával együtt számított) magassága: {height} méter.",
+ "de": "Die Gesamthöhe dieses Windrads beträgt (einschließlich Rotorradius) {height} Meter.",
+ "da": "Den samlede højde (inklusive rotorradius) for denne vindmølle er {height} meter.",
+ "nl": "De totale hoogte (inclusief rotor-radius) van deze windturbine is {height} meter",
+ "ca": "L'alçada total (inclòs el radi del rotor) d'aquest aerogenerador és de {height} metres.",
+ "cs": "Celková výška (včetně poloměru rotoru) této větrné turbíny je {height} metrů.",
+ "es": "La altura total (incluido el radio del rotor) de este aerogenerador es de {height} metros."
+ },
"freeform": {
"key": "height",
"type": "pfloat"
@@ -221,19 +221,6 @@
},
{
"id": "turbine-diameter",
- "render": {
- "en": "The rotor diameter of this wind turbine is {rotor:diameter} metres.",
- "fr": "Le diamètre du rotor est de {rotor:diameter} mètres.",
- "it": "Il diametro del rotore di questa turbina eolica è di {rotor:diameter} metri.",
- "zh_Hant": "這個風力渦輪機的風葉直徑是 {rotor:diameter} 公尺。",
- "hu": "A szélturbina rotorátmérője: {rotor:diameter} méter.",
- "de": "Der Rotordurchmesser der Windturbine ist {rotor:diameter} Meter.",
- "nl": "De rotordiameter van deze windturbine is {rotor:diameter} meter.",
- "da": "Rotordiameteren på denne vindmølle er {rotor:diameter} meter.",
- "ca": "El diàmetre del rotor d'aquest aerogenerador és de {rotor:diameter} metres.",
- "cs": "Průměr rotoru této větrné turbíny je {rotor:diameter} metrů.",
- "es": "El diámetro del rotor de este aerogenerador es de {rotor:diameter} metros."
- },
"question": {
"en": "What is the rotor diameter of this wind turbine, in metres?",
"fr": "Quel est le diamètre du rotor en mètres ?",
@@ -247,6 +234,19 @@
"cs": "Jaký je průměr rotoru této větrné turbíny v metrech?",
"es": "¿Cuál es el diámetro del rotor de este aerogenerador, en metros?"
},
+ "render": {
+ "en": "The rotor diameter of this wind turbine is {rotor:diameter} metres.",
+ "fr": "Le diamètre du rotor est de {rotor:diameter} mètres.",
+ "it": "Il diametro del rotore di questa turbina eolica è di {rotor:diameter} metri.",
+ "zh_Hant": "這個風力渦輪機的風葉直徑是 {rotor:diameter} 公尺。",
+ "hu": "A szélturbina rotorátmérője: {rotor:diameter} méter.",
+ "de": "Der Rotordurchmesser der Windturbine ist {rotor:diameter} Meter.",
+ "nl": "De rotordiameter van deze windturbine is {rotor:diameter} meter.",
+ "da": "Rotordiameteren på denne vindmølle er {rotor:diameter} meter.",
+ "ca": "El diàmetre del rotor d'aquest aerogenerador és de {rotor:diameter} metres.",
+ "cs": "Průměr rotoru této větrné turbíny je {rotor:diameter} metrů.",
+ "es": "El diámetro del rotor de este aerogenerador es de {rotor:diameter} metros."
+ },
"freeform": {
"key": "rotor:diameter",
"type": "float"
@@ -254,20 +254,6 @@
},
{
"id": "turbine-start-date",
- "render": {
- "en": "This wind turbine went into operation on/in {start_date}.",
- "fr": "L’éolienne est active depuis {start_date}.",
- "it": "Questa turbina eolica è entrata in funzione il/nel {start_date}.",
- "zh_Hant": "這個風機從 {start_date} 開始運轉。",
- "id": "Turbin angin ini mulai beroperasi pada/dalam {start_date}.",
- "hu": "A szélerőmű üzembe helyezése: {start_date}.",
- "de": "Das Windrad wurde am {start_date} in Betrieb genommen.",
- "nl": "Deze windturbine werd op {start_date} in gebruik genomen",
- "da": "Denne vindturbine blev sat i drift den/i {start_date}.",
- "ca": "Aquest aerogenerador va entrar en funcionament el dia {start_date}.",
- "cs": "Tato větrná turbína byla uvedena do provozu dne/v {start_date}.",
- "es": "Este aerogenerador entró en funcionamiento el/en {start_date}."
- },
"question": {
"en": "When did this wind turbine go into operation?",
"fr": "Depuis quand l’éolienne est-elle en fonctionnement ?",
@@ -283,12 +269,37 @@
"pl": "Kiedy ta turbina wiatrowa została uruchomiona?",
"es": "¿Cuándo entró en funcionamiento este aerogenerador?"
},
+ "render": {
+ "en": "This wind turbine went into operation on/in {start_date}.",
+ "fr": "L’éolienne est active depuis {start_date}.",
+ "it": "Questa turbina eolica è entrata in funzione il/nel {start_date}.",
+ "zh_Hant": "這個風機從 {start_date} 開始運轉。",
+ "id": "Turbin angin ini mulai beroperasi pada/dalam {start_date}.",
+ "hu": "A szélerőmű üzembe helyezése: {start_date}.",
+ "de": "Das Windrad wurde am {start_date} in Betrieb genommen.",
+ "nl": "Deze windturbine werd op {start_date} in gebruik genomen",
+ "da": "Denne vindturbine blev sat i drift den/i {start_date}.",
+ "ca": "Aquest aerogenerador va entrar en funcionament el dia {start_date}.",
+ "cs": "Tato větrná turbína byla uvedena do provozu dne/v {start_date}.",
+ "es": "Este aerogenerador entró en funcionamiento el/en {start_date}."
+ },
"freeform": {
"key": "start_date",
"type": "date"
}
},
{
+ "id": "windturbine-fixme",
+ "question": {
+ "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",
+ "nl": "Is er iets mis met de informatie over deze windturbine dat je hier niet opgelost kreeg? (laat hier een berichtje achter voor OpenStreetMap experts)",
+ "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlassen Sie eine Nachricht an OpenStreetMap-Experten)",
+ "ca": "Hi ha alguna cosa malament en la manera que està mapejat això que no heu pogut solucionar aquí? (deixeu una nota als experts d'OpenStreetMap)",
+ "cs": "Je něco špatně s tím, jak je to mapováno, a vy jste to zde nedokázali opravit? (zanechte poznámku odborníkům na OpenStreetMap)",
+ "pl": "Czy jest coś nie tak z mapowaniem tego, czego nie mogłeś tutaj naprawić? (zostaw wiadomość ekspertom OpenStreetMap)",
+ "es": "¿Hay algo mal en cómo está mapeado esto, que no pudiste solucionar aquí? (deja una nota para los expertos de OpenStreetMap)",
+ "it": "C'è qualcosa di sbagliato in come è mappata, che non sei riuscito a correggere qui? (lascia una nota agli esperti di OpenStreetMap)"
+ },
"render": {
"en": "Extra information for OpenStreetMap experts: {fixme}",
"nl": "Extra informatie voor OpenStreetMap experts: {fixme}",
@@ -302,21 +313,10 @@
"cs": "Další informace pro odborníky na OpenStreetMap: {fixme}",
"zh_Hant": "為 OpenStreetMap 專家提供的額外資訊：{fixme}"
},
- "question": {
- "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",
- "nl": "Is er iets mis met de informatie over deze windturbine dat je hier niet opgelost kreeg? (laat hier een berichtje achter voor OpenStreetMap experts)",
- "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlassen Sie eine Nachricht an OpenStreetMap-Experten)",
- "ca": "Hi ha alguna cosa malament en la manera que està mapejat això que no heu pogut solucionar aquí? (deixeu una nota als experts d'OpenStreetMap)",
- "cs": "Je něco špatně s tím, jak je to mapováno, a vy jste to zde nedokázali opravit? (zanechte poznámku odborníkům na OpenStreetMap)",
- "pl": "Czy jest coś nie tak z mapowaniem tego, czego nie mogłeś tutaj naprawić? (zostaw wiadomość ekspertom OpenStreetMap)",
- "es": "¿Hay algo mal en cómo está mapeado esto, que no pudiste solucionar aquí? (deja una nota para los expertos de OpenStreetMap)",
- "it": "C'è qualcosa di sbagliato in come è mappata, che non sei riuscito a correggere qui? (lascia una nota agli esperti di OpenStreetMap)"
- },
"freeform": {
"key": "fixme",
"type": "text"
- },
- "id": "windturbine-fixme"
+ }
},
"images"
],