Merge branch 'master' into develop

This commit is contained in:
Pieter Vander Vennet 2021-11-08 00:46:07 +01:00
commit 78c689b7e8
87 changed files with 14161 additions and 1351 deletions

View file

@ -228,6 +228,166 @@
],
"id": "toilet-access"
},
{
"question": {
"en": "Are these toilets publicly accessible?",
"de": "Sind diese Toiletten öffentlich zugänglich?",
"fr": "Ces toilettes sont-elles accessibles au public ?",
"nl": "Zijn deze toiletten publiek toegankelijk?",
"it": "Questi servizi igienici sono aperti al pubblico?",
"ru": "Есть ли свободный доступ к этим туалетам?"
},
"render": {
"en": "Access is {access}",
"de": "Zugang ist {access}",
"fr": "L'accès est {access}",
"nl": "Toegankelijkheid is {access}",
"it": "L'accesso è {access}"
},
"freeform": {
"key": "access",
"addExtraTags": [
"fixme=the tag access was filled out by the user and might need refinement"
]
},
"mappings": [
{
"if": "access=yes",
"then": {
"en": "Public access",
"de": "Öffentlicher Zugang",
"fr": "Accès publique",
"nl": "Publiek toegankelijk",
"it": "Accesso pubblico",
"ru": "Свободный доступ"
}
},
{
"if": "access=customers",
"then": {
"en": "Only access to customers",
"de": "Nur Zugang für Kunden",
"fr": "Accès réservé aux clients",
"nl": "Enkel toegang voor klanten",
"it": "Accesso riservato ai clienti e alle clienti"
}
},
{
"if": "access=no",
"then": {
"en": "Not accessible",
"de": "Nicht zugänglich",
"fr": "Toilettes privées",
"nl": "Niet toegankelijk",
"ru": "Недоступно",
"it": "Non accessibile"
}
},
{
"if": "access=key",
"then": {
"en": "Accessible, but one has to ask a key to enter",
"de": "Zugänglich, aber man muss einen Schlüssel für die Eingabe verlangen",
"fr": "Accessible, mais vous devez demander la clé",
"nl": "Toegankelijk na het vragen van de sleutel",
"it": "Accessibile, ma occorre chiedere una chiave per accedere"
}
},
{
"if": "access=public",
"then": {
"en": "Public access",
"de": "Öffentlicher Zugang",
"fr": "Accès publique",
"nl": "Publiek toegankelijk",
"it": "Accesso pubblico",
"ru": "Свободный доступ"
},
"hideInAnswer": true
}
],
"id": "toilet-access"
},
{
"question": {
"en": "Are these toilets publicly accessible?",
"de": "Sind diese Toiletten öffentlich zugänglich?",
"fr": "Ces toilettes sont-elles accessibles au public ?",
"nl": "Zijn deze toiletten publiek toegankelijk?",
"it": "Questi servizi igienici sono aperti al pubblico?",
"ru": "Есть ли свободный доступ к этим туалетам?"
},
"render": {
"en": "Access is {access}",
"de": "Zugang ist {access}",
"fr": "L'accès est {access}",
"nl": "Toegankelijkheid is {access}",
"it": "L'accesso è {access}"
},
"freeform": {
"key": "access",
"addExtraTags": [
"fixme=the tag access was filled out by the user and might need refinement"
]
},
"mappings": [
{
"if": "access=yes",
"then": {
"en": "Public access",
"de": "Öffentlicher Zugang",
"fr": "Accès publique",
"nl": "Publiek toegankelijk",
"it": "Accesso pubblico",
"ru": "Свободный доступ"
}
},
{
"if": "access=customers",
"then": {
"en": "Only access to customers",
"de": "Nur Zugang für Kunden",
"fr": "Accès réservé aux clients",
"nl": "Enkel toegang voor klanten",
"it": "Accesso riservato ai clienti e alle clienti"
}
},
{
"if": "access=no",
"then": {
"en": "Not accessible",
"de": "Nicht zugänglich",
"fr": "Toilettes privées",
"nl": "Niet toegankelijk",
"ru": "Недоступно",
"it": "Non accessibile"
}
},
{
"if": "access=key",
"then": {
"en": "Accessible, but one has to ask a key to enter",
"de": "Zugänglich, aber man muss einen Schlüssel für die Eingabe verlangen",
"fr": "Accessible, mais vous devez demander la clé",
"nl": "Toegankelijk na het vragen van de sleutel",
"it": "Accessibile, ma occorre chiedere una chiave per accedere"
}
},
{
"if": "access=public",
"then": {
"en": "Public access",
"de": "Öffentlicher Zugang",
"fr": "Accès publique",
"nl": "Publiek toegankelijk",
"it": "Accesso pubblico",
"ru": "Свободный доступ"
},
"hideInAnswer": true
}
],
"id": "toilet-access"
},
{
"id": "toilets-fee",
"question": {
@ -285,31 +445,6 @@
},
"id": "toilet-charge"
},
{
"builtin": "payment-options",
"override": {
"condition": "fee=yes"
}
},
{
"id": "Opening-hours",
"question": {
"en": "When are these toilets opened?",
"nl": "Wanneer zijn deze toiletten open?"
},
"render": "{opening_hours_table()}",
"freeform": {
"key": "opening_hours",
"type": "opening_hours"
},
"mappings": [{
"if": "opening_hours=24/7",
"then": {
"en": "Opened 24/7",
"nl": "Altijd open"
}
}]
},
{
"id": "toilets-wheelchair",
"question": {
@ -521,7 +656,7 @@
"id": "toilet-has-paper",
"question": {
"en": "Does one have to bring their own toilet paper to this toilet?",
"nl": "Moet je je eigen toiletpapier meenemen naar deze toilet?",
"nl": "Moet je je eigen toiletpappier meenemen naar deze toilet?",
"de": "Muss man für diese Toilette sein eigenes Toilettenpapier mitbringen?"
},
"mappings": [
@ -540,14 +675,23 @@
"de": "Für diese Toilette müssen Sie Ihr eigenes Toilettenpapier mitbringen"
}
}
],
"condition": {
"#": "Urinals normally don't have toilet paper",
"and": ["toilets:position!=urinal"]
}
]
}
],
"filter": [
{
"id": "wheelchair",
"options": [
{
"question": {
"en": "Wheelchair accessible",
"nl": "Rolstoel toegankelijk",
"de": "Rollstuhlgerecht"
},
"osmTags": "wheelchair=yes"
}
]
},
{
"id": "wheelchair",
"options": [
@ -592,18 +736,6 @@
}
}
]
},
{
"id": "is_open",
"options": [{
"question": {
"nl": "Nu geopened",
"en": "Opened now"
},
"osmTags": {
"or": ["opening_hours=","_isOpen=yes"]
}
}]
}
],
"deletion": {
@ -639,10 +771,6 @@
}
]
},
"iconBadges": [{
"if": "opening_hours~*",
"then": "isOpen"
}],
"location": [
"point"
]