From 12bac29d121cdd35d06c1a765bd35b97666338b7 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Sun, 30 Oct 2022 20:49:08 +0100
Subject: [PATCH] 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 7cd3029468..3fa0a4d4be 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 49d08c20f1..34049d6e6c 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 e979070778..e7602a1598 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 4bfc683de3..4084b141ad 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 96b9449920..e6f0964169 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 ab539745ea..167fba4a21 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}"