From 0fe850ffd56a3cd9deb30ecea7f4ebd972b5f238 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Mon, 17 Oct 2022 21:44:03 +0200
Subject: [PATCH] Changed opening_hours mapping, updated filters

---
 assets/layers/toilet/toilet.json              | 24 ++-----------------
 .../toilet_at_amenity/toilet_at_amenity.json  | 22 +----------------
 assets/tagRenderings/questions.json           | 19 +++++++++------
 3 files changed, 15 insertions(+), 50 deletions(-)

diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 203d366e9f..8646c448d6 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -237,7 +237,7 @@
       }
     },
     {
-      "builtin": "opening_hours",
+      "builtin": "opening_hours_24_7",
       "override": {
         "condition": "access!=no",
         "question": {
@@ -629,27 +629,7 @@
         }
       ]
     },
-    {
-      "id": "is_open",
-      "options": [
-        {
-          "question": {
-            "nl": "Nu geopened",
-            "en": "Opened now",
-            "de": "Derzeit geöffnet",
-            "es": "Abierto ahora",
-            "fr": "Ouvert maintenant",
-            "da": "Åbnet nu"
-          },
-          "osmTags": {
-            "or": [
-              "opening_hours=",
-              "_isOpen=yes"
-            ]
-          }
-        }
-      ]
-    }
+    "open_now"
   ],
   "deletion": {
     "softDeletionTags": {
diff --git a/assets/layers/toilet_at_amenity/toilet_at_amenity.json b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
index 543200a878..9737417cc6 100644
--- a/assets/layers/toilet_at_amenity/toilet_at_amenity.json
+++ b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
@@ -321,27 +321,7 @@
         }
       ]
     },
-    {
-      "id": "is_open",
-      "options": [
-        {
-          "question": {
-            "nl": "Nu geopened",
-            "en": "Opened now",
-            "de": "Derzeit geöffnet",
-            "es": "Abierto ahora",
-            "fr": "Ouvert maintenant",
-            "da": "Åbnet nu"
-          },
-          "osmTags": {
-            "or": [
-              "opening_hours=",
-              "_isOpen=yes"
-            ]
-          }
-        }
-      ]
-    }
+    "open_now"
   ],
   "deletion": {
     "softDeletionTags": {
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 240c29e848..e7f88af636 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -629,11 +629,15 @@
     "freeform": {
       "key": "opening_hours",
       "type": "opening_hours"
-    },
-    "mappings": [
-      {
-        "if": "opening_hours=24/7",
-        "then": {
+    }
+  },
+  "opening_hours_24_7": {
+    "builtin": "opening_hours",
+    "override": {
+      "mappings": [
+        {
+          "if": "opening_hours=24/7",
+          "then": {
             "en": "24/7 opened (including holidays)",
             "de": "durchgehend geöffnet (auch an Feiertagen)",
             "zh_Hant": "24/7 開放 (包括假日)",
@@ -644,8 +648,9 @@
             "fr": "Ouvert 24h/24 (jours fériés compris)",
             "nb_NO": "Døgnåpent (inkludert helligdager)"
           }
-      }
-    ]
+        }
+      ]
+    }
   },
   "service:electricity": {
     "#": "service:socket describes if a pub, restaurant or café offers electricity to their customers.",