Themes(cafe_pub, toilets): add toilet information to pubs; forward wheelchair accessibility information to 'toilet_at_amenity'

assets/layers/cafe_pub/cafe_pub.json

@@ -413,10 +413,9 @@
     "service:electricity",
     "seating",
     "dog-access",
-    "internet",
-    "internet-fee",
-    "internet-ssid",
-    "reviews"
+    "internet-all",
+    "reviews",
+    "toilet_at_amenity_lib.all"
   ],
   "filter": [
     "open_now",

assets/layers/toilet/toilet.json

@@ -1158,12 +1158,23 @@
         ]
       }
     },
+    {
+      "builtin":
     "description",
+      "override": {
+        "labels": [
+          "amenity-no-prefix",
+          "no-prefix",
+          "relevant-questions"
+        ]
+      }
+    },
     {
       "id": "wheelchair-group",
       "labels": [
         "relevant-questions",
-        "prefixed"
+        "prefixed",
+        "amenity-prefixed"
       ],
       "render": {
         "special": {
@@ -1179,7 +1190,8 @@
         "relevant-questions",
         "wheelchair",
         "hidden",
-        "no-prefix"
+        "no-prefix",
+        "amenity-no-prefix"
       ],
       "question": {
         "en": "Is there a dedicated toilet for wheelchair users?",
@@ -1190,7 +1202,8 @@
         "da": "Er der et særligt toilet til kørestolsbrugere?",
         "ca": "Hi ha un lavabo específic per a usuaris amb cadira de rodes?",
         "cs": "Je zde vyhrazená toaleta pro vozíčkáře?",
-        "es": "¿Hay un baño dedicado para usuarios de sillas de ruedas?"
+        "es": "¿Hay un baño dedicado para usuarios de sillas de ruedas?",
+        "sl": "Ali je tu stranišče namenjeno invalidom na vozičku?"
       },
       "mappings": [
         {
@@ -1219,7 +1232,8 @@
             "es": "Sin acceso para sillas de ruedas",
             "da": "Ingen kørestolsadgang",
             "ca": "Sense accés per a cadires de rodes",
-            "cs": "Žádný bezbariérový přístup"
+            "cs": "Žádný bezbariérový přístup",
+            "sl": "Ni dostopno invalidom na vozičku"
           }
         },
         {
@@ -1253,7 +1267,8 @@
         "wheelchair",
         "hidden",
         "relevant-questions",
-        "prefixed"
+        "prefixed",
+        "amenity-prefixed"
       ],
       "render": {
         "special": {
@@ -1279,7 +1294,8 @@
         "wheelchair",
         "hidden",
         "relevant-questions",
-        "prefixed"
+        "prefixed",
+        "amenity-prefixed"
       ],
       "render": {
         "special": {
@@ -1297,7 +1313,8 @@
       "labels": [
         "hidden",
         "relevant-questions",
-        "prefixed"
+        "prefixed",
+        "amenity-prefixed"
       ],
       "render": {
         "en": "Wheelchair accessible toilet",
@@ -1332,7 +1349,7 @@
       ]
     },
     {
-      "id": "wheelchair-access",
+      "id": "toilet-wheelchair-access",
       "question": {
         "en": "Is the wheelchair-accessible toilet locked?",
         "nl": "Is de rolstoeltoegankelijke toilet op slot?"
@@ -1359,7 +1376,8 @@
         "hidden",
         "wheelchair",
         "relevant-questions",
-        "prefixed"
+        "prefixed",
+        "amenity-prefixed"
       ],
       "mappings": [
         {
@@ -1477,7 +1495,8 @@
       "labels": [
         "wheelchair",
         "hidden",
-        "relevant-questions"
+        "relevant-questions",
+        "amenity-prefixed"
       ],
       "render": {
         "special": {
@@ -1492,7 +1511,8 @@
         "labels+": [
           "hidden",
         "prefixed",
-        "adult-changing-table"
+          "adult-changing-table",
+          "amenity-prefixed"
       ],
         "condition": {
           "and": [
@@ -1508,7 +1528,8 @@
         "prefixed",
         "hidden",
         "relevant-questions",
-        "adult-changing-table"
+        "adult-changing-table",
+        "amenity-prefixed"
       ],
       "question": {
         "en": "Does this toilet have an adult changing table?",
@@ -1538,7 +1559,8 @@
         "labels+": [
           "hidden",
           "prefixed",
-          "adult-changing-table"
+          "adult-changing-table",
+          "amenity-prefixed"
         ],
         "condition": {
           "and+": [
@@ -1553,7 +1575,8 @@
       "labels": [
         "hidden",
         "relevant-questions",
-        "adult-changing-table"
+        "adult-changing-table",
+        "amenity-prefixed"
       ],
       "render": {
         "special": {

assets/layers/toilet_at_amenity/toilet_at_amenity.json

@@ -188,93 +188,6 @@
           "relevant_questions"
         ]
       }
-    },
-    {
-      "id": "toilets-wheelchair",
-      "labels": [
-        "wheelchair",
-        "hidden"
-      ],
-      "question": {
-        "en": "Is there a dedicated toilet for wheelchair users?",
-        "de": "Können Rollstuhlfahrer die Toilette benutzen?",
-        "fr": "Y a-t-il des toilettes réservées aux personnes en fauteuil roulant ?",
-        "nl": "Is er een rolstoeltoegankelijke toilet voorzien?",
-        "it": "C'è un WC riservato alle persone in sedia a rotelle?",
-        "da": "Er der et særligt toilet til kørestolsbrugere?",
-        "ca": "Hi ha un lavabo específic per a usuaris amb cadira de rodes?",
-        "cs": "Existuje vyhrazená toaleta pro vozíčkáře?",
-        "sl": "Ali je tu stranišče namenjeno invalidom na vozičku?",
-        "es": "¿Hay un baño dedicado para usuarios de sillas de ruedas?"
-      },
-      "mappings": [
-        {
-          "then": {
-            "en": "There is a dedicated toilet for wheelchair users",
-            "de": "Rollstuhlfahrer können die Toilette benutzen",
-            "fr": "Il y a des toilettes réservées pour les personnes à mobilité réduite",
-            "nl": "Er is een toilet voor rolstoelgebruikers",
-            "it": "C'è un WC riservato alle persone in sedia a rotelle",
-            "es": "Hay un baño dedicado para usuarios de sillas de ruedas",
-            "da": "Der er et særligt toilet til kørestolsbrugere",
-            "ca": "Hi ha un lavabo dedicat per a usuaris amb cadira de rodes",
-            "cs": "K dispozici je vyhrazená toaleta pro vozíčkáře"
-          },
-          "if": "toilets:wheelchair=yes"
-        },
-        {
-          "if": "toilets:wheelchair=no",
-          "then": {
-            "en": "No wheelchair access",
-            "de": "Rollstuhlfahrer können die Toilette nicht benutzen",
-            "fr": "Non accessible aux personnes à mobilité réduite",
-            "nl": "Niet toegankelijk voor rolstoelgebruikers",
-            "it": "Non accessibile in sedia a rotelle",
-            "ru": "Недоступно пользователям кресел-колясок",
-            "es": "Sin acceso para sillas de ruedas",
-            "da": "Ingen kørestolsadgang",
-            "ca": "Sense accés per a cadires de rodes",
-            "cs": "Žádný bezbariérový přístup",
-            "sl": "Ni dostopno invalidom na vozičku"
-          }
-        },
-        {
-          "if": "toilets:wheelchair=designated",
-          "then": {
-            "en": "There is only a dedicated toilet for wheelchair users",
-            "nl": "Er is alleen een toilet voor rolstoelgebruikers",
-            "de": "Es gibt nur eine barrierefreie Toilette für Rollstuhlfahrer",
-            "da": "Der er kun et særligt toilet til kørestolsbrugere",
-            "ca": "Sols hi ha un lavabo per a usuaris amb cadira de rodes",
-            "cs": "K dispozici je pouze vyhrazená toaleta pro vozíčkáře",
-            "es": "Solo hay un baño dedicado para usuarios de sillas de ruedas"
-          }
-        }
-      ]
-    },
-    {
-      "id": "questions-wheelchair",
-      "labels": [
-        "wheelchair",
-        "hidden"
-      ],
-      "render": {
-        "special": {
-          "type": "questions",
-          "labels": "wheelchair",
-          "show_all": "yes"
-        }
-      }
-    },
-    {
-      "builtin": "description",
-      "override": {
-        "render": "{toilets:description}",
-        "freeform": {
-          "key": "toilets:description",
-          "type": "string"
-        }
-      }
     }
   ],
   "filter": [

assets/layers/toilet_at_amenity_lib/toilet_at_amenity_lib.json

@@ -12,7 +12,8 @@
         "special": {
           "type": "group",
           "header": "grouptitle",
-          "labels": "toilet-questions"
+          "labels": "toilet-questions",
+          "blacklist": "wheelchair;wheelchair-title;adult-changing-table"
         }
       }
     },