From 36faf6f7f137f5b5159f7c3af7decea158a77ee2 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Mon, 8 Nov 2021 03:05:37 +0100
Subject: [PATCH 1/2] Readd questions in toilet which dissappeared

---
 assets/layers/toilet/toilet.json | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 1257902dc9..045e7570ed 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -285,6 +285,31 @@
       },
       "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": {
@@ -515,10 +540,32 @@
             "de": "Für diese Toilette müssen Sie Ihr eigenes Toilettenpapier mitbringen"
           }
         }
+      ],
+      "condition": {
+        "#": "Urinals normally don't have toilet paper",
+        "and": ["toilets:position!=urinal"]
+      }
       ]
     }
   ],
+  "iconBadges": [{
+    "if": "opening_hours~*",
+    "then": "isOpen"
+  }],
   "filter": [
+    {
+      "id": "is_open",
+      "options": [{
+        "question": {
+          "nl": "Nu geopened",
+          "en": "Opened now"
+        },
+        "osmTags": {
+          "or": ["opening_hours=","_isOpen=yes"]
+        }
+      }
+      ]
+    },
     {
       "id": "wheelchair",
       "options": [

From 49ee00e10ac6c3d2ce585a343e42b91d3ec5f1b4 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Mon, 8 Nov 2021 03:06:33 +0100
Subject: [PATCH 2/2] Fix typo

---
 assets/layers/toilet/toilet.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 045e7570ed..411029341e 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -545,7 +545,6 @@
         "#": "Urinals normally don't have toilet paper",
         "and": ["toilets:position!=urinal"]
       }
-      ]
     }
   ],
   "iconBadges": [{