Toilet at amenity layer, reuse some questions

assets/layers/toilet/toilet.json

@@ -237,34 +237,18 @@
       }
     },
     {
-      "id": "Opening-hours",
-      "condition": "access!=no",
-      "question": {
-        "en": "When are these toilets opened?",
-        "nl": "Wanneer zijn deze toiletten open?",
-        "de": "Wann sind diese Toiletten geöffnet?",
-        "es": "",
-        "fr": "Quand ces toilettes sont-elles ouvertes ?",
-        "da": "Hvornår åbnes disse toiletter?"
-      },
-      "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",
-            "de": "Durchgehend geöffnet",
-            "es": "Abierto 24/7",
-            "fr": "Ouvert 24h/24 et 7j/7",
-            "da": "Åbent 24/7"
-          }
+      "builtin": "opening_hours",
+      "override": {
+        "condition": "access!=no",
+        "question": {
+          "en": "When are these toilets opened?",
+          "nl": "Wanneer zijn deze toiletten open?",
+          "de": "Wann sind diese Toiletten geöffnet?",
+          "es": "",
+          "fr": "Quand ces toilettes sont-elles ouvertes ?",
+          "da": "Hvornår åbnes disse toiletter?"
         }
-      ]
+      }
     },
     {
       "id": "toilets-wheelchair",
@@ -315,6 +299,7 @@
     },
     {
       "id": "wheelchair-door-width",
+      "condition": "wheelchair!=no",
       "question": {
         "en": "What is the width of the door to the wheelchair accessible toilet?",
         "nl": "Hoe breed is de deur van de rolstoeltoegankelijke toilet?",
@@ -673,7 +658,7 @@
   },
   "allowMove": {
     "enableRelocation": false,
-    "enableImproveAccuraccy": true
+    "enableImproveAccuracy": true
   },
   "mapRendering": [
     {
@@ -756,4 +741,4 @@
       ]
     }
   ]
-}
+}