From 57f5066a51239d81bb75cb16685f9fc9ebe3beb9 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:19:54 +0100 Subject: [PATCH 1/9] Use standard opening_hours, phone, email & website --- assets/layers/bike_cafe/bike_cafe.json | 108 +++++-------------------- langs/layers/da.json | 14 +--- langs/layers/de.json | 14 +--- langs/layers/en.json | 14 +--- langs/layers/es.json | 11 +-- langs/layers/fr.json | 14 +--- langs/layers/gl.json | 11 +-- langs/layers/it.json | 14 +--- langs/layers/nl.json | 14 +--- langs/layers/pt.json | 14 +--- langs/layers/pt_BR.json | 14 +--- langs/layers/ru.json | 14 +--- langs/layers/zh_Hans.json | 14 +--- langs/layers/zh_Hant.json | 14 +--- 14 files changed, 33 insertions(+), 251 deletions(-) diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json index a92b67723..7b80b281b 100644 --- a/assets/layers/bike_cafe/bike_cafe.json +++ b/assets/layers/bike_cafe/bike_cafe.json @@ -266,94 +266,26 @@ } ] }, + "website", + "phone", + "email", { - "question": { - "en": "What is the website of {name}?", - "nl": "Wat is de website van {name}?", - "fr": "Quel est le site web de {name} ?", - "gl": "Cal é a páxina web de {name}?", - "de": "Wie lautet die Webseite von {name}?", - "it": "Qual è il sito web di {name}?", - "ru": "Какой сайт у {name}?", - "zh_Hans": "{name}的网站是什么？", - "zh_Hant": "{name} 的網站是？", - "pt_BR": "Qual o website de {name}?", - "pt": "Qual o website de {name}?", - "da": "Hvad er webstedet for {name}?", - "es": "¿Cual es el sitio web de {name}?" - }, - "render": "{website}", - "freeform": { - "key": "website" - }, - "id": "bike_cafe-website" - }, - { - "question": { - "en": "What is the phone number of {name}?", - "nl": "Wat is het telefoonnummer van {name}?", - "fr": "Quel est le numéro de téléphone de {name} ?", - "gl": "Cal é o número de teléfono de {name}?", - "de": "Wie lautet die Telefonnummer von {name}?", - "it": "Qual è il numero di telefono di {name}?", - "ru": "Какой номер телефона у {name}?", - "zh_Hans": "{name}的电话号码是什么？", - "zh_Hant": "{name} 的電話號碼是？", - "pt_BR": "Qual o número de telefone de {name}?", - "pt": "Qual é o número de telefone de {name}?", - "es": "¿Cual es el número de teléfono de {name}?", - "da": "Hvad er telefonnummeret til {name}?" - }, - "render": "{phone}", - "freeform": { - "key": "phone", - "type": "phone" - }, - "id": "bike_cafe-phone" - }, - { - "question": { - "en": "What is the email address of {name}?", - "nl": "Wat is het email-adres van {name}?", - "fr": "Quelle est l'adresse électronique de {name} ?", - "gl": "Cal é o enderezo de correo electrónico de {name}?", - "de": "Wie lautet die E-Mail-Adresse von {name}?", - "it": "Qual è l’indirizzo email di {name}?", - "ru": "Какой адрес электронной почты у {name}?", - "zh_Hans": "{name}的电子邮箱是什么？", - "zh_Hant": "{name} 的電子郵件地址是？", - "pt_BR": "Qual o endereço de email de {name}?", - "pt": "Qual o endereço de email de {name}?", - "es": "¿Cual es la dirección de correo electrónico de {name}?", - "da": "Hvad er e-mailadressen på {name}?" - }, - "render": "{email}", - "freeform": { - "key": "email", - "type": "email" - }, - "id": "bike_cafe-email" - }, - { - "question": { - "en": "When it this bike café opened?", - "nl": "Wanneer is dit fietscafé geopend?", - "fr": "Quand ce Café vélo est-t-il ouvert ?", - "it": "Quando è aperto questo caffè in bici?", - "zh_Hans": "这家自行车咖啡什么时候开门营业？", - "zh_Hant": "何時這個單車咖啡廳營運？", - "ru": "Каков режим работы этого велосипедного кафе?", - "pt_BR": "Quando este café de bicicleta abre?", - "de": "Wann ist dieses Fahrradcafé geöffnet?", - "pt": "Quando este café de bicicleta abre?", - "da": "Hvornår er denne cykelcafé åbent?" - }, - "render": "{opening_hours_table(opening_hours)}", - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "id": "bike_cafe-opening_hours" + "builtin": "opening_hours", + "override": { + "question": { + "en": "When it this bike café opened?", + "nl": "Wanneer is dit fietscafé geopend?", + "fr": "Quand ce Café vélo est-t-il ouvert ?", + "it": "Quando è aperto questo caffè in bici?", + "zh_Hans": "这家自行车咖啡什么时候开门营业？", + "zh_Hant": "何時這個單車咖啡廳營運？", + "ru": "Каков режим работы этого велосипедного кафе?", + "pt_BR": "Quando este café de bicicleta abre?", + "de": "Wann ist dieses Fahrradcafé geöffnet?", + "pt": "Quando este café de bicicleta abre?", + "da": "Hvornår er denne cykelcafé åbent?" + } + } } ], "presets": [ @@ -407,4 +339,4 @@ "da": "En cykelcafé er en café rettet mod cyklister, for eksempel med tjenester som en pumpe, med masser af cykelrelateret dekoration, o.s.v", "fr": "Un vélo café est un café à destination des cyclistes avec, par exemple, des services tels qu’une pompe, et de nombreuses décorations liées aux vélos, etc." } -} \ No newline at end of file +} diff --git a/langs/layers/da.json b/langs/layers/da.json index 6b9e50470..e8289eb0d 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -577,19 +577,10 @@ }, "question": "Tilbyder denne cykelcafé en cykelpumpe til brug for alle?" }, - "bike_cafe-email": { - "question": "Hvad er e-mailadressen på {name}?" - }, "bike_cafe-name": { "question": "Hvad hedder denne cykelcafé?", "render": "Denne cykelcafé hedder {name}" }, - "bike_cafe-opening_hours": { - "question": "Hvornår er denne cykelcafé åbent?" - }, - "bike_cafe-phone": { - "question": "Hvad er telefonnummeret til {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -611,9 +602,6 @@ } }, "question": "Er der værktøj her til at reparere din egen cykel?" - }, - "bike_cafe-website": { - "question": "Hvad er webstedet for {name}?" } }, "title": { @@ -3052,4 +3040,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/de.json b/langs/layers/de.json index b1ceca276..0cab45d52 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -594,19 +594,10 @@ }, "question": "Hat das Fahrrad-Café eine Fahrradpumpe, die von jedem benutzt werden kann?" }, - "bike_cafe-email": { - "question": "Wie lautet die E-Mail-Adresse von {name}?" - }, "bike_cafe-name": { "question": "Wie heißt das Fahrrad-Café?", "render": "Das Fahrrad-Café heißt {name}" }, - "bike_cafe-opening_hours": { - "question": "Wann ist dieses Fahrradcafé geöffnet?" - }, - "bike_cafe-phone": { - "question": "Wie lautet die Telefonnummer von {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -628,9 +619,6 @@ } }, "question": "Gibt es hier Werkzeug, um das eigene Fahrrad zu reparieren?" - }, - "bike_cafe-website": { - "question": "Wie lautet die Webseite von {name}?" } }, "title": { @@ -7507,4 +7495,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/en.json b/langs/layers/en.json index d4f2582d4..7eab351bf 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -594,19 +594,10 @@ }, "question": "Does this bike cafe offer a bike pump for use by anyone?" }, - "bike_cafe-email": { - "question": "What is the email address of {name}?" - }, "bike_cafe-name": { "question": "What is the name of this bike cafe?", "render": "This bike cafe is called {name}" }, - "bike_cafe-opening_hours": { - "question": "When it this bike café opened?" - }, - "bike_cafe-phone": { - "question": "What is the phone number of {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -628,9 +619,6 @@ } }, "question": "Are there tools here to repair your own bike?" - }, - "bike_cafe-website": { - "question": "What is the website of {name}?" } }, "title": { @@ -8035,4 +8023,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/es.json b/langs/layers/es.json index b177321f9..9dbce139c 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -549,17 +549,8 @@ }, "bike_cafe": { "tagRenderings": { - "bike_cafe-email": { - "question": "¿Cual es la dirección de correo electrónico de {name}?" - }, - "bike_cafe-phone": { - "question": "¿Cual es el número de teléfono de {name}?" - }, "bike_cafe-repair-tools": { "question": "¿Hay herramientas para reparar su propia bicicleta?" - }, - "bike_cafe-website": { - "question": "¿Cual es el sitio web de {name}?" } } }, @@ -4095,4 +4086,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/fr.json b/langs/layers/fr.json index fadc44ddc..271504773 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -583,19 +583,10 @@ }, "question": "Est-ce que ce Café vélo propose une pompe en libre accès ?" }, - "bike_cafe-email": { - "question": "Quelle est l'adresse électronique de {name} ?" - }, "bike_cafe-name": { "question": "Quel est le nom de ce Café vélo ?", "render": "Ce Café vélo s'appelle {name}" }, - "bike_cafe-opening_hours": { - "question": "Quand ce Café vélo est-t-il ouvert ?" - }, - "bike_cafe-phone": { - "question": "Quel est le numéro de téléphone de {name} ?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -617,9 +608,6 @@ } }, "question": "Est-ce qu'il y a des outils pour réparer soi-même son vélo ?" - }, - "bike_cafe-website": { - "question": "Quel est le site web de {name} ?" } }, "title": { @@ -4538,4 +4526,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/gl.json b/langs/layers/gl.json index 21102de26..920efe0be 100644 --- a/langs/layers/gl.json +++ b/langs/layers/gl.json @@ -33,16 +33,10 @@ }, "question": "Este café de ciclistas ofrece unha bomba de ar para que calquera persoa poida usala?" }, - "bike_cafe-email": { - "question": "Cal é o enderezo de correo electrónico de {name}?" - }, "bike_cafe-name": { "question": "Cal é o nome deste café de ciclistas?", "render": "Este café de ciclistas chámase {name}" }, - "bike_cafe-phone": { - "question": "Cal é o número de teléfono de {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -64,9 +58,6 @@ } }, "question": "Hai ferramentas aquí para arranxar a túa propia bicicleta?" - }, - "bike_cafe-website": { - "question": "Cal é a páxina web de {name}?" } }, "title": { @@ -396,4 +387,4 @@ "render": "Bicicleta pantasma" } } -} \ No newline at end of file +} diff --git a/langs/layers/it.json b/langs/layers/it.json index 40caaa48e..7567cfc5c 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -325,19 +325,10 @@ }, "question": "Questo caffè in bici offre una pompa per bici che chiunque può utilizzare?" }, - "bike_cafe-email": { - "question": "Qual è l’indirizzo email di {name}?" - }, "bike_cafe-name": { "question": "Qual è il nome di questo caffè in bici?", "render": "Questo caffè in bici è chiamato {name}" }, - "bike_cafe-opening_hours": { - "question": "Quando è aperto questo caffè in bici?" - }, - "bike_cafe-phone": { - "question": "Qual è il numero di telefono di {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -359,9 +350,6 @@ } }, "question": "Ci sono degli strumenti per riparare la propria bicicletta?" - }, - "bike_cafe-website": { - "question": "Qual è il sito web di {name}?" } }, "title": { @@ -2724,4 +2712,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 91f4145f2..abb93ad08 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -594,19 +594,10 @@ }, "question": "Biedt dit fietscafé een fietspomp aan voor iedereen?" }, - "bike_cafe-email": { - "question": "Wat is het email-adres van {name}?" - }, "bike_cafe-name": { "question": "Wat is de naam van dit fietscafé?", "render": "Dit fietscafé heet {name}" }, - "bike_cafe-opening_hours": { - "question": "Wanneer is dit fietscafé geopend?" - }, - "bike_cafe-phone": { - "question": "Wat is het telefoonnummer van {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -628,9 +619,6 @@ } }, "question": "Biedt dit fietscafé gereedschap aan om je fiets zelf te herstellen?" - }, - "bike_cafe-website": { - "question": "Wat is de website van {name}?" } }, "title": { @@ -7534,4 +7522,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/pt.json b/langs/layers/pt.json index ce4a5dde3..cf359a74f 100644 --- a/langs/layers/pt.json +++ b/langs/layers/pt.json @@ -261,19 +261,10 @@ } }, "tagRenderings": { - "bike_cafe-email": { - "question": "Qual o endereço de email de {name}?" - }, "bike_cafe-name": { "question": "Qual o nome deste café de bicicleta?", "render": "Este café de bicicleta se chama {name}" }, - "bike_cafe-opening_hours": { - "question": "Quando este café de bicicleta abre?" - }, - "bike_cafe-phone": { - "question": "Qual é o número de telefone de {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -295,9 +286,6 @@ } }, "question": "Há ferramentas aqui para consertar a sua própria bicicleta?" - }, - "bike_cafe-website": { - "question": "Qual o website de {name}?" } }, "title": { @@ -576,4 +564,4 @@ "render": "Bicicleta fantasma" } } -} \ No newline at end of file +} diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json index 239a87a43..80909df8e 100644 --- a/langs/layers/pt_BR.json +++ b/langs/layers/pt_BR.json @@ -203,19 +203,10 @@ } }, "tagRenderings": { - "bike_cafe-email": { - "question": "Qual o endereço de email de {name}?" - }, "bike_cafe-name": { "question": "Qual o nome deste café de bicicleta?", "render": "Este café de bicicleta se chama {name}" }, - "bike_cafe-opening_hours": { - "question": "Quando este café de bicicleta abre?" - }, - "bike_cafe-phone": { - "question": "Qual o número de telefone de {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -237,9 +228,6 @@ } }, "question": "Há ferramentas aqui para consertar sua bicicleta?" - }, - "bike_cafe-website": { - "question": "Qual o website de {name}?" } }, "title": { @@ -530,4 +518,4 @@ "render": "Bicicleta fantasma" } } -} \ No newline at end of file +} diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 9934eed70..6e199449c 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -353,19 +353,10 @@ }, "question": "Есть ли в этом велосипедном кафе велосипедный насос для всеобщего использования?" }, - "bike_cafe-email": { - "question": "Какой адрес электронной почты у {name}?" - }, "bike_cafe-name": { "question": "Как называется это байк-кафе?", "render": "Это велосипедное кафе называется {name}" }, - "bike_cafe-opening_hours": { - "question": "Каков режим работы этого велосипедного кафе?" - }, - "bike_cafe-phone": { - "question": "Какой номер телефона у {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -387,9 +378,6 @@ } }, "question": "Есть ли здесь инструменты для починки вашего велосипеда?" - }, - "bike_cafe-website": { - "question": "Какой сайт у {name}?" } }, "title": { @@ -1753,4 +1741,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/zh_Hans.json b/langs/layers/zh_Hans.json index 03119678c..f1e2f8da4 100644 --- a/langs/layers/zh_Hans.json +++ b/langs/layers/zh_Hans.json @@ -191,19 +191,10 @@ }, "question": "这家自行车咖啡为每个使用者提供打气筒吗？" }, - "bike_cafe-email": { - "question": "{name}的电子邮箱是什么？" - }, "bike_cafe-name": { "question": "这个自行车咖啡的名字是什么？", "render": "这家自行车咖啡叫做 {name}" }, - "bike_cafe-opening_hours": { - "question": "这家自行车咖啡什么时候开门营业？" - }, - "bike_cafe-phone": { - "question": "{name}的电话号码是什么？" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -225,9 +216,6 @@ } }, "question": "这里有供你修车用的工具吗？" - }, - "bike_cafe-website": { - "question": "{name}的网站是什么？" } }, "title": { @@ -239,4 +227,4 @@ "render": "自行车咖啡" } } -} \ No newline at end of file +} diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json index c3307a521..a9468245f 100644 --- a/langs/layers/zh_Hant.json +++ b/langs/layers/zh_Hant.json @@ -292,19 +292,10 @@ }, "question": "這個單車咖啡廳有提供給任何人都能使用的單車打氣甬嗎？" }, - "bike_cafe-email": { - "question": "{name} 的電子郵件地址是？" - }, "bike_cafe-name": { "question": "這個單車咖啡廳的名稱是？", "render": "這個單車咖啡廳叫做 {name}" }, - "bike_cafe-opening_hours": { - "question": "何時這個單車咖啡廳營運？" - }, - "bike_cafe-phone": { - "question": "{name} 的電話號碼是？" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -326,9 +317,6 @@ } }, "question": "這裡是否有工具修理你的單車嗎？" - }, - "bike_cafe-website": { - "question": "{name} 的網站是？" } }, "title": { @@ -663,4 +651,4 @@ } } } -} \ No newline at end of file +} From de3a78b9983824d6433bcb3ee77272fd31ce1ccb Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:20:11 +0100 Subject: [PATCH 2/9] 24/7 mapping in parcel_lockers --- assets/layers/parcel_lockers/parcel_lockers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json index d2b0a70ae..d6745620b 100644 --- a/assets/layers/parcel_lockers/parcel_lockers.json +++ b/assets/layers/parcel_lockers/parcel_lockers.json @@ -155,7 +155,7 @@ "nl": "Deze pakketautomaat wordt beheerd door {operator}" } }, - "opening_hours", + "opening_hours_24_7", { "id": "ref", "question": { @@ -256,4 +256,4 @@ ] } ] -} \ No newline at end of file +} From 40b53687ac374a99f91ca1818686942c5944e205 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:29:17 +0100 Subject: [PATCH 3/9] Change opening_hours rendering --- .../bike_repair_station.json | 47 +++++-------------- langs/layers/ca.json | 9 +--- langs/layers/da.json | 8 ---- langs/layers/de.json | 8 ---- langs/layers/en.json | 8 ---- langs/layers/es.json | 8 ---- langs/layers/fr.json | 8 ---- langs/layers/it.json | 8 ---- langs/layers/nl.json | 8 ---- langs/layers/pt.json | 7 --- langs/layers/pt_BR.json | 7 --- langs/layers/ru.json | 8 ---- 12 files changed, 14 insertions(+), 120 deletions(-) diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json index 127c3beb5..b91443e02 100644 --- a/assets/layers/bike_repair_station/bike_repair_station.json +++ b/assets/layers/bike_repair_station/bike_repair_station.json @@ -281,40 +281,19 @@ "id": "Operational status" }, { - "question": { - "nl": "Wanneer is dit fietsherstelpunt open?", - "en": "When is this bicycle repair point open?", - "fr": "Quand ce point de réparation de vélo est-il ouvert ?", - "it": "Quando è aperto questo punto riparazione bici?", - "de": "Wann ist die Fahrradreparaturstation geöffnet?", - "ru": "Когда работает эта точка обслуживания велосипедов?", - "es": "¿Cuándo está abierto este punto de reparación de bicicletas?", - "da": "Hvornår er dette cykelreparationssted åbent?" - }, - "render": "{opening_hours_table()}", - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "mappings": [ - { - "if": "opening_hours=24/7", - "then": { - "nl": "Dag en nacht open", - "en": "Always open", - "fr": "Ouvert en permanence", - "it": "Sempre aperto", - "de": "Die Station ist durchgehend geöffnet", - "ru": "Всегда открыто", - "pt_BR": "Sempre aberto", - "pt": "Sempre aberto", - "ca": "Sempre obert", - "es": "Siempre abierto", - "da": "Altid åben" - } + "builtin": "opening_hours_24_7", + "override": { + "question": { + "nl": "Wanneer is dit fietsherstelpunt open?", + "en": "When is this bicycle repair point open?", + "fr": "Quand ce point de réparation de vélo est-il ouvert ?", + "it": "Quando è aperto questo punto riparazione bici?", + "de": "Wann ist die Fahrradreparaturstation geöffnet?", + "ru": "Когда работает эта точка обслуживания велосипедов?", + "es": "¿Cuándo está abierto este punto de reparación de bicicletas?", + "da": "Hvornår er dette cykelreparationssted åbent?" } - ], - "id": "bike_repair_station-opening_hours" + } }, { "id": "access", @@ -979,4 +958,4 @@ "da": "Et lag med cykelpumper og cykelreværktøjsstativer", "fr": "Une couche montrant les pompes à vélo et les centres de réparation" } -} \ No newline at end of file +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 1c6adb430..dff2505aa 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -264,13 +264,6 @@ "then": "Bomba elèctrica" } } - }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Sempre obert" - } - } } }, "title": { @@ -1116,4 +1109,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/layers/da.json b/langs/layers/da.json index e8289eb0d..1e40dcf8a 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -878,14 +878,6 @@ }, "question": "Har pumpen trykindikator eller manometer?" }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Altid åben" - } - }, - "question": "Hvornår er dette cykelreparationssted åbent?" - }, "bike_repair_station-operator": { "question": "Hvem vedligeholder denne cykluspumpe?", "render": "Vedligeholdt af {operator}" diff --git a/langs/layers/de.json b/langs/layers/de.json index 0cab45d52..cde580448 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -895,14 +895,6 @@ }, "question": "Verfügt die Pumpe über einen Druckanzeiger oder ein Manometer?" }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Die Station ist durchgehend geöffnet" - } - }, - "question": "Wann ist die Fahrradreparaturstation geöffnet?" - }, "bike_repair_station-operator": { "question": "Wer betreibt die Reparaturstation?", "render": "Gewartet von {operator}" diff --git a/langs/layers/en.json b/langs/layers/en.json index 7eab351bf..bd9059310 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -895,14 +895,6 @@ }, "question": "Does the pump have a pressure indicator or manometer?" }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Always open" - } - }, - "question": "When is this bicycle repair point open?" - }, "bike_repair_station-operator": { "question": "Who maintains this cycle pump?", "render": "Maintained by {operator}" diff --git a/langs/layers/es.json b/langs/layers/es.json index 9dbce139c..bf98c53bc 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -804,14 +804,6 @@ }, "question": "¿La bomba tiene un indicador de presión o manómetro?" }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Siempre abierto" - } - }, - "question": "¿Cuándo está abierto este punto de reparación de bicicletas?" - }, "bike_repair_station-operator": { "question": "¿Quién mantiene esta bomba para bicicletas?", "render": "Mantenido por {operator}" diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 271504773..9e8bf15a3 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -884,14 +884,6 @@ }, "question": "Est-ce que la pompe à un manomètre integré ?" }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Ouvert en permanence" - } - }, - "question": "Quand ce point de réparation de vélo est-il ouvert ?" - }, "bike_repair_station-operator": { "question": "Qui maintient cette pompe à vélo ?", "render": "Mantenue par {operator}" diff --git a/langs/layers/it.json b/langs/layers/it.json index 7567cfc5c..9c49cbeec 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -573,14 +573,6 @@ }, "question": "Questa pompa ha l’indicatore della pressione o il manometro?" }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Sempre aperto" - } - }, - "question": "Quando è aperto questo punto riparazione bici?" - }, "bike_repair_station-operator": { "question": "Chi gestisce questa pompa per bici?", "render": "Manutenuta da {operator}" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index abb93ad08..a9c6c2458 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -895,14 +895,6 @@ }, "question": "Heeft deze pomp een luchtdrukmeter?" }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Dag en nacht open" - } - }, - "question": "Wanneer is dit fietsherstelpunt open?" - }, "bike_repair_station-operator": { "question": "Wie beheert deze fietspomp?", "render": "Beheer door {operator}" diff --git a/langs/layers/pt.json b/langs/layers/pt.json index cf359a74f..c00ac3940 100644 --- a/langs/layers/pt.json +++ b/langs/layers/pt.json @@ -458,13 +458,6 @@ } } }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Sempre aberto" - } - } - }, "bike_repair_station-operator": { "question": "Quem faz a manutenção desta bomba de ciclo?", "render": "Mantida por {operator}" diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json index 80909df8e..478c37cb8 100644 --- a/langs/layers/pt_BR.json +++ b/langs/layers/pt_BR.json @@ -402,13 +402,6 @@ } } }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Sempre aberto" - } - } - }, "bike_repair_station-operator": { "question": "Quem faz a manutenção desta bomba de ciclo?", "render": "Mantida por {operator}" diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 6e199449c..005fcae6f 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -504,14 +504,6 @@ } } }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Всегда открыто" - } - }, - "question": "Когда работает эта точка обслуживания велосипедов?" - }, "bike_repair_station-valves": { "mappings": { "0": { From ed8b097437bbff6f4ca8e47091c4764dec33b039 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:33:25 +0100 Subject: [PATCH 4/9] Opening hours mapping charging stations --- .../charging_station/charging_station.json | 36 ++++++------------- .../charging_station.protojson | 25 ++++--------- 2 files changed, 18 insertions(+), 43 deletions(-) diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 83178d190..ca3429044 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -3767,31 +3767,17 @@ } }, { - "id": "OH", - "render": "{opening_hours_table(opening_hours)}", - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "question": { - "en": "When is this charging station opened?", - "nl": "Wanneer is dit oplaadpunt beschikbaar??", - "da": "Hvornår er denne ladestation åben?", - "de": "Wann ist diese Ladestation geöffnet?", - "es": "¿Cuándo abre esta estación de carga?" - }, - "mappings": [ - { - "if": "opening_hours=24/7", - "then": { - "en": "24/7 opened (including holidays)", - "nl": "24/7 open - ook tijdens vakanties", - "da": "Åbent døgnet rundt (også på helligdage)", - "de": "Die Station ist durchgehend geöffnet (einschließlich Feiertage)", - "es": "Abre 24/7 (incluidos días festivos)" - } + "builtin": "opening_hours_24_7", + "override": { + "question": { + "en": "When is this charging station opened?", + "nl": "Wanneer is dit oplaadpunt beschikbaar??", + "da": "Hvornår er denne ladestation åben?", + "de": "Wann ist diese Ladestation geöffnet?", + "es": "¿Cuándo abre esta estación de carga?" } - ] + }, + "id": "OH" }, { "id": "fee", @@ -5030,4 +5016,4 @@ }, "neededChangesets": 10 } -} \ No newline at end of file +} diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson index ad748caa2..22639c8fd 100644 --- a/assets/layers/charging_station/charging_station.protojson +++ b/assets/layers/charging_station/charging_station.protojson @@ -197,25 +197,14 @@ "id": "$$$" }, { - "id": "OH", - "render": "{opening_hours_table(opening_hours)}", - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "question": { - "en": "When is this charging station opened?", - "nl": "Wanneer is dit oplaadpunt beschikbaar??" - }, - "mappings": [ - { - "if": "opening_hours=24/7", - "then": { - "en": "24/7 opened (including holidays)", - "nl": "24/7 open - ook tijdens vakanties" - } + "builtin": "opening_hours_24_7", + "override": { + "question": { + "en": "When is this charging station opened?", + "nl": "Wanneer is dit oplaadpunt beschikbaar??" } - ] + }, + "id": "OH" }, { "id": "fee", From 29af0cadc79a2643a4dd9480aa124c783a20e3fb Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:37:40 +0100 Subject: [PATCH 5/9] Change defibrillator opening hours --- .../layers/defibrillator/defibrillator.json | 53 +++++-------------- langs/layers/ca.json | 3 -- langs/layers/de.json | 9 ---- langs/layers/en.json | 9 ---- langs/layers/es.json | 9 ---- langs/layers/fr.json | 9 ---- langs/layers/it.json | 9 ---- langs/layers/nl.json | 9 ---- langs/layers/ru.json | 4 -- langs/layers/sl.json | 11 +--- 10 files changed, 14 insertions(+), 111 deletions(-) diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index 9702c15cd..64688c0c3 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -505,46 +505,19 @@ "id": "defibrillator-phone" }, { - "render": { - "en": "{opening_hours_table(opening_hours)}", - "nl": "{opening_hours_table(opening_hours)}", - "fr": "{opening_hours_table(opening_hours)}", - "it": "{opening_hours_table(opening_hours)}", - "ru": "{opening_hours_table(opening_hours)}", - "de": "{opening_hours_table(opening_hours)}", - "sl": "{opening_hours_table(opening_hours)}", - "ca": "{opening_hours_table(opening_hours)}", - "es": "{opening_hours_table(opening_hours)}" - }, - "question": { - "en": "At what times is this defibrillator available?", - "nl": "Wanneer is deze defibrillator beschikbaar?", - "fr": "À quels horaires ce défibrillateur est-il accessible ?", - "it": "In quali orari è disponibile questo defibrillatore?", - "ru": "В какое время доступен этот дефибриллятор?", - "de": "Zu welchen Zeiten ist der Defibrillator verfügbar?", - "sl": "Ob katerih urah je ta defibrilator na voljo?", - "es": "¿A qué horas está disponible este desfibrilador?" - }, - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "mappings": [ - { - "if": "opening_hours=24/7", - "then": { - "en": "24/7 opened (including holidays)", - "nl": "24/7 open (inclusief feestdagen)", - "fr": "Ouvert 24/7 (jours feriés inclus)", - "it": "Aperto 24/7 (festivi inclusi)", - "de": "24/7 geöffnet (auch an Feiertagen)", - "sl": "Na voljo 24/7 (tudi za praznike)", - "es": "Abierto 24/7 (incluyendo festivos)" - } + "builtin": "opening_hours_24_7", + "override": { + "question": { + "en": "At what times is this defibrillator available?", + "nl": "Wanneer is deze defibrillator beschikbaar?", + "fr": "À quels horaires ce défibrillateur est-il accessible ?", + "it": "In quali orari è disponibile questo defibrillatore?", + "ru": "В какое время доступен этот дефибриллятор?", + "de": "Zu welchen Zeiten ist der Defibrillator verfügbar?", + "sl": "Ob katerih urah je ta defibrilator na voljo?", + "es": "¿A qué horas está disponible este desfibrilador?" } - ], - "id": "defibrillator-opening_hours" + } }, { "render": { @@ -678,4 +651,4 @@ "has_image", "open_now" ] -} \ No newline at end of file +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index dff2505aa..78a4278cb 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -571,9 +571,6 @@ "question": "A quina planta està el desfibril·lador localitzat?", "render": "Aquest desfibril·lador és a la planta {level}" }, - "defibrillator-opening_hours": { - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-survey:date": { "mappings": { "0": { diff --git a/langs/layers/de.json b/langs/layers/de.json index cde580448..fbfc97a80 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -3189,15 +3189,6 @@ "question": "Auf welcher Etage befindet sich der Defibrillator?", "render": "Dieser Defibrallator befindet sich im {level}. Stockwerk" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "24/7 geöffnet (auch an Feiertagen)" - } - }, - "question": "Zu welchen Zeiten ist der Defibrillator verfügbar?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Wie lautet die Telefonnummer für Fragen zu diesem Defibrillator?", "render": "Telefonnummer für Fragen zu diesem Defibrillator: {phone}" diff --git a/langs/layers/en.json b/langs/layers/en.json index bd9059310..2e494565e 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3239,15 +3239,6 @@ "question": "On which floor is this defibrillator located?", "render": "This defibrillator is on floor {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "24/7 opened (including holidays)" - } - }, - "question": "At what times is this defibrillator available?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "What is the phone number for questions about this defibrillator?", "render": "Telephone for questions about this defibrillator: {phone}" diff --git a/langs/layers/es.json b/langs/layers/es.json index bf98c53bc..4b2daff51 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -2028,15 +2028,6 @@ "question": "¿En qué planta se encuentra el defibrilador localizado?", "render": "El desfibrilador se encuentra en la planta {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "Abierto 24/7 (incluyendo festivos)" - } - }, - "question": "¿A qué horas está disponible este desfibrilador?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "¿Cual es el número de teléfono para preguntas sobre este desfibrilador?" }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 9e8bf15a3..ee823cd1a 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2086,15 +2086,6 @@ "question": "À quel étage est situé ce défibrillateur ?", "render": "Ce défibrillateur est à l'étage {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "Ouvert 24/7 (jours feriés inclus)" - } - }, - "question": "À quels horaires ce défibrillateur est-il accessible ?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Quel est le numéro de téléphone pour questions sur le défibrillateur ?", "render": "Numéro de téléphone pour questions sur le défibrillateur : {phone}" diff --git a/langs/layers/it.json b/langs/layers/it.json index 9c49cbeec..96b944992 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -1122,15 +1122,6 @@ "question": "A che piano si trova questo defibrillatore?", "render": "Questo defibrillatore è al piano {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "Aperto 24/7 (festivi inclusi)" - } - }, - "question": "In quali orari è disponibile questo defibrillatore?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Qual è il numero di telefono per le domande riguardanti questo defibrillatore?", "render": "Numero di telefono per le domande su questo defibrillatore:{phone}" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index a9c6c2458..6b62db5f4 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3186,15 +3186,6 @@ "question": "Op welke verdieping bevindt deze defibrillator zich?", "render": "De defibrillator bevindt zicht op verdieping {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "24/7 open (inclusief feestdagen)" - } - }, - "question": "Wanneer is deze defibrillator beschikbaar?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Wat is het telefoonnummer voor vragen over deze defibrillator", "render": "Telefoonnummer voor vragen over deze defibrillator: {phone}" diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 005fcae6f..a393874d7 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -849,10 +849,6 @@ "defibrillator-fixme": { "render": "Дополнительная информация для экспертов OpenStreetMap: {fixme}" }, - "defibrillator-opening_hours": { - "question": "В какое время доступен этот дефибриллятор?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-survey:date": { "mappings": { "0": { diff --git a/langs/layers/sl.json b/langs/layers/sl.json index cea248a3e..b0d755a9e 100644 --- a/langs/layers/sl.json +++ b/langs/layers/sl.json @@ -96,15 +96,6 @@ "question": "V katerem nadstropju je defibrilator?", "render": "Ta defibrilator je v {level}. nadstropju" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "Na voljo 24/7 (tudi za praznike)" - } - }, - "question": "Ob katerih urah je ta defibrilator na voljo?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Kakšna je telefonska številka za vprašanja o tem defibrilatorju?", "render": "Telefonska številka za vprašanja o tem defibrilatorju: {phone}" @@ -127,4 +118,4 @@ "render": "Defibrilator" } } -} \ No newline at end of file +} From 95fb6cd970e8535478cdc596c868468c16be0089 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:41:54 +0100 Subject: [PATCH 6/9] Change opening_hours mapping for hackerspace --- assets/layers/hackerspace/hackerspace.json | 49 +++++----------------- langs/layers/ca.json | 10 ----- langs/layers/de.json | 9 ---- langs/layers/en.json | 9 ---- langs/layers/es.json | 9 ---- langs/layers/nl.json | 9 ---- langs/layers/ru.json | 10 ----- langs/layers/zh_Hant.json | 9 ---- 8 files changed, 10 insertions(+), 104 deletions(-) diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json index 13f36639b..cdde9698c 100644 --- a/assets/layers/hackerspace/hackerspace.json +++ b/assets/layers/hackerspace/hackerspace.json @@ -110,45 +110,16 @@ "email", "phone", { - "question": { - "en": "When is this hackerspace opened?", - "de": "Wann hat dieser Hackerspace geöffnet?", - "zh_Hant": "這個駭客空間的營業時間？", - "es": "¿Cuándo está abierto este espacio hacker?", - "nl": "Wanneer is deze hackerspace geopend?" - }, - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "render": { - "en": "{opening_hours_table()}", - "de": "{opening_hours_table()}", - "ru": "{opening_hours_table()}", - "zh_Hant": "{opening_hours_table()}", - "ca": "{opening_hours_table()}", - "es": "{opening_hours_table()}", - "nl": "{opening_hours_table()}" - }, - "mappings": [ - { - "if": { - "and": [ - "opening_hours=24/7" - ] - }, - "then": { - "en": "Opened 24/7", - "de": "durchgehend geöffnet", - "ru": "Открыто 24/7", - "zh_Hant": "24/7 營業", - "ca": "Obert 24/7", - "es": "Abierto 24/7", - "nl": "24/7 geopend" - } + "builtin": "opening_hours_24_7", + "override": { + "question": { + "en": "When is this hackerspace opened?", + "de": "Wann hat dieser Hackerspace geöffnet?", + "zh_Hant": "這個駭客空間的營業時間？", + "es": "¿Cuándo está abierto este espacio hacker?", + "nl": "Wanneer is deze hackerspace geopend?" } - ], - "id": "hackerspaces-opening_hours" + } }, { "id": "available_devices", @@ -375,4 +346,4 @@ } } ] -} \ No newline at end of file +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 78a4278cb..59a516574 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -651,16 +651,6 @@ } }, "hackerspace": { - "tagRenderings": { - "hackerspaces-opening_hours": { - "mappings": { - "0": { - "then": "Obert 24/7" - } - }, - "render": "{opening_hours_table()}" - } - }, "title": { "mappings": { "0": { diff --git a/langs/layers/de.json b/langs/layers/de.json index fbfc97a80..49d08c20f 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -4097,15 +4097,6 @@ "question": "Wie lautet der Name dieses Hackerspace?", "render": "Dieser Hackerspace heißt {name}" }, - "hackerspaces-opening_hours": { - "mappings": { - "0": { - "then": "durchgehend geöffnet" - } - }, - "question": "Wann hat dieser Hackerspace geöffnet?", - "render": "{opening_hours_table()}" - }, "hackerspaces-start_date": { "question": "Wann wurde dieser Hackerspace gegründet?", "render": "Dieser Hackerspace wurde gegründet am {start_date}" diff --git a/langs/layers/en.json b/langs/layers/en.json index 2e494565e..e97907077 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4296,15 +4296,6 @@ "question": "What is the name of this hackerspace?", "render": "This hackerspace is named {name}" }, - "hackerspaces-opening_hours": { - "mappings": { - "0": { - "then": "Opened 24/7" - } - }, - "question": "When is this hackerspace opened?", - "render": "{opening_hours_table()}" - }, "hackerspaces-start_date": { "question": "When was this hackerspace founded?", "render": "This hackerspace was founded at {start_date}" diff --git a/langs/layers/es.json b/langs/layers/es.json index 4b2daff51..4bfc683de 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -2535,15 +2535,6 @@ "question": "¿Cual es el nombre de este espacio hacker?", "render": "Este espacio hacker se llama {name}" }, - "hackerspaces-opening_hours": { - "mappings": { - "0": { - "then": "Abierto 24/7" - } - }, - "question": "¿Cuándo está abierto este espacio hacker?", - "render": "{opening_hours_table()}" - }, "hackerspaces-start_date": { "question": "¿Cuándo se fundó este espacio hacker?", "render": "Este espacio hacker se fundó el {start_date}" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 6b62db5f4..ab539745e 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4103,15 +4103,6 @@ "question": "Wat is de naam van deze hackerspace?", "render": "Deze hackerspace heet {name}" }, - "hackerspaces-opening_hours": { - "mappings": { - "0": { - "then": "24/7 geopend" - } - }, - "question": "Wanneer is deze hackerspace geopend?", - "render": "{opening_hours_table()}" - }, "hackerspaces-start_date": { "question": "Wanneer is deze hackerspace opgericht?", "render": "Deze hackerspace is opgericht op {start_date}" diff --git a/langs/layers/ru.json b/langs/layers/ru.json index a393874d7..5438d6ba4 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -981,16 +981,6 @@ "title": "Хакерспейс" } }, - "tagRenderings": { - "hackerspaces-opening_hours": { - "mappings": { - "0": { - "then": "Открыто 24/7" - } - }, - "render": "{opening_hours_table()}" - } - }, "title": { "mappings": { "0": { diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json index a9468245f..0f308f070 100644 --- a/langs/layers/zh_Hant.json +++ b/langs/layers/zh_Hant.json @@ -508,15 +508,6 @@ "question": "這個駭客空間的名稱是？", "render": "這個駭客空間叫 {name}" }, - "hackerspaces-opening_hours": { - "mappings": { - "0": { - "then": "24/7 營業" - } - }, - "question": "這個駭客空間的營業時間？", - "render": "{opening_hours_table()}" - }, "hackerspaces-start_date": { "question": "這個駭客空間何時成立的？", "render": "這駭客空間是 {start_date} 成立的" From 12bac29d121cdd35d06c1a765bd35b97666338b7 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:49:08 +0100 Subject: [PATCH 7/9] Opening_hours for recyling --- assets/layers/recycling/recycling.json | 36 +++++++------------------- langs/layers/de.json | 8 ------ langs/layers/en.json | 8 ------ langs/layers/es.json | 8 ------ langs/layers/it.json | 8 ------ langs/layers/nl.json | 8 ------ 6 files changed, 10 insertions(+), 66 deletions(-) diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index 7cd302946..3fa0a4d4b 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -961,32 +961,16 @@ } }, { - "id": "opening_hours", - "render": "{opening_hours_table()}", - "question": { - "en": "What are the opening hours of this recycling facility?", - "nl": "Wat zijn de openingstijden van deze recyclingfaciliteit?", - "de": "Wie sind die Öffnungszeiten dieser Recyclinganlage?", - "es": "¿A qué horas abre esta facilidad de reciclado?", - "it": "Quali sono gli orari di apertura di questo impianto di raccolta e riciclo?" - }, - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "mappings": [ - { - "if": "opening_hours=24/7", - "then": { - "en": "24/7", - "nl": "24/7", - "ca": "24/7", - "de": "24/7", - "es": "24/7", - "it": "24/7" - } + "builtin": "opening_hours_24_7", + "override": { + "question": { + "en": "What are the opening hours of this recycling facility?", + "nl": "Wat zijn de openingstijden van deze recyclingfaciliteit?", + "de": "Wie sind die Öffnungszeiten dieser Recyclinganlage?", + "es": "¿A qué horas abre esta facilidad de reciclado?", + "it": "Quali sono gli orari di apertura di questo impianto di raccolta e riciclo?" } - ] + } } ], "filter": [ @@ -1189,4 +1173,4 @@ "enableRelocation": false, "enableImproveAccuracy": true } -} \ No newline at end of file +} diff --git a/langs/layers/de.json b/langs/layers/de.json index 49d08c20f..34049d6e6 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5746,14 +5746,6 @@ }, "question": "Wo befindet sich dieser Container?" }, - "opening_hours": { - "mappings": { - "0": { - "then": "24/7" - } - }, - "question": "Wie sind die Öffnungszeiten dieser Recyclinganlage?" - }, "operator": { "question": "Welches Unternehmen betreibt diese Recyclinganlage?", "render": "Diese Recyclinganlage wird betrieben von {operator}" diff --git a/langs/layers/en.json b/langs/layers/en.json index e97907077..e7602a159 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -6109,14 +6109,6 @@ }, "question": "Where is this container located?" }, - "opening_hours": { - "mappings": { - "0": { - "then": "24/7" - } - }, - "question": "What are the opening hours of this recycling facility?" - }, "operator": { "question": "What company operates this recycling facility?", "render": "This recycling facility is operated by {operator}" diff --git a/langs/layers/es.json b/langs/layers/es.json index 4bfc683de..4084b141a 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -3219,14 +3219,6 @@ }, "question": "¿Dónde se sitúa este contenedor?" }, - "opening_hours": { - "mappings": { - "0": { - "then": "24/7" - } - }, - "question": "¿A qué horas abre esta facilidad de reciclado?" - }, "operator": { "question": "¿Que empresa opera esta facilidad de reciclado?", "render": "Esta infraestructura de reciclado la opera {operator}" diff --git a/langs/layers/it.json b/langs/layers/it.json index 96b944992..e6f096416 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -1811,14 +1811,6 @@ }, "question": "Dove si trova questo contenitore?" }, - "opening_hours": { - "mappings": { - "0": { - "then": "24/7" - } - }, - "question": "Quali sono gli orari di apertura di questo impianto di raccolta e riciclo?" - }, "operator": { "question": "Quale azienda gestisce questo impianto di raccolta e riciclo?", "render": "Questa struttura di raccola e riciclo è gestita da {operator}" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index ab539745e..167fba4a2 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -5735,14 +5735,6 @@ }, "question": "Waar bevindt deze container zich?" }, - "opening_hours": { - "mappings": { - "0": { - "then": "24/7" - } - }, - "question": "Wat zijn de openingstijden van deze recyclingfaciliteit?" - }, "operator": { "question": "Wat is de beheerder van deze recyclingfaciliteit?", "render": "Deze recyclingfaciliteit wordt beheerd door {operator}" From 44c14c0d91fb5bea53ac39824144d9bd3519e333 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:51:58 +0100 Subject: [PATCH 8/9] Add presets to pharmacy (#1121) --- assets/layers/pharmacy/pharmacy.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json index cfe4edd87..a3f58452b 100644 --- a/assets/layers/pharmacy/pharmacy.json +++ b/assets/layers/pharmacy/pharmacy.json @@ -153,5 +153,16 @@ ] }, "open_now" + ], + "presets": [ + { + "tags": [ + "amenity=pharmacy" + ], + "title": { + "en": "a pharmacy", + "nl": "een apotheek" + } + } ] -} \ No newline at end of file +} From b711f980cedec0c8ed09e35c1d84cb5f67e64863 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sun, 30 Oct 2022 20:56:16 +0100 Subject: [PATCH 9/9] Remove old translations --- langs/layers/da.json | 8 -------- langs/layers/de.json | 8 -------- langs/layers/en.json | 8 -------- langs/layers/es.json | 8 -------- langs/layers/nl.json | 8 -------- 5 files changed, 40 deletions(-) diff --git a/langs/layers/da.json b/langs/layers/da.json index 1e40dcf8a..2fdff8bec 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -1499,14 +1499,6 @@ "question": "Er denne ladestation en del af et netværk?", "render": "En del af netværket {network}" }, - "OH": { - "mappings": { - "0": { - "then": "Åbent døgnet rundt (også på helligdage)" - } - }, - "question": "Hvornår er denne ladestation åben?" - }, "Operational status": { "mappings": { "0": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 34049d6e6..421357ba9 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -1522,14 +1522,6 @@ "question": "Ist diese Ladestation Teil eines Netzwerks?", "render": "Teil des Netzwerks {network}" }, - "OH": { - "mappings": { - "0": { - "then": "Die Station ist durchgehend geöffnet (einschließlich Feiertage)" - } - }, - "question": "Wann ist diese Ladestation geöffnet?" - }, "Operational status": { "mappings": { "0": { diff --git a/langs/layers/en.json b/langs/layers/en.json index e7602a159..1acb817fd 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -1522,14 +1522,6 @@ "question": "Is this charging station part of a network?", "render": "Part of the network {network}" }, - "OH": { - "mappings": { - "0": { - "then": "24/7 opened (including holidays)" - } - }, - "question": "When is this charging station opened?" - }, "Operational status": { "mappings": { "0": { diff --git a/langs/layers/es.json b/langs/layers/es.json index 4084b141a..27b2caff5 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -1378,14 +1378,6 @@ "question": "¿Esta estación de carga forma parte de una red?", "render": "Parte de la red {network}" }, - "OH": { - "mappings": { - "0": { - "then": "Abre 24/7 (incluidos días festivos)" - } - }, - "question": "¿Cuándo abre esta estación de carga?" - }, "Operational status": { "mappings": { "0": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 167fba4a2..e282d9db3 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1531,14 +1531,6 @@ "question": "Is dit oplaadpunt deel van een groter netwerk?", "render": "Maakt deel uit van het {network}-netwerk" }, - "OH": { - "mappings": { - "0": { - "then": "24/7 open - ook tijdens vakanties" - } - }, - "question": "Wanneer is dit oplaadpunt beschikbaar??" - }, "Operational status": { "mappings": { "0": {