From 51292cc5292612a67a82eefa0538a73f293a5e4e Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Tue, 27 Jun 2023 21:29:41 +0200
Subject: [PATCH] Add filter, move free to filters.json

---
 assets/layers/filters/filters.json | 23 +++++++++++++++++++-
 assets/layers/shower/shower.json   | 34 ++++++++++++++++++++++++++++--
 assets/layers/toilet/toilet.json   | 22 +------------------
 3 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index db570487e9..4b1f6edadd 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -173,6 +173,27 @@
           }
         }
       ]
+    },
+    {
+      "id": "free",
+      "options": [
+        {
+          "question": {
+            "en": "Free to use",
+            "nl": "Gratis toegankelijk",
+            "de": "Nutzung kostenlos",
+            "fr": "Utilisation gratuite",
+            "da": "Gratis at bruge"
+          },
+          "osmTags": {
+            "or": [
+              "fee=no",
+              "fee=0",
+              "charge=0"
+            ]
+          }
+        }
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/layers/shower/shower.json b/assets/layers/shower/shower.json
index f6192eea34..927edc9bba 100644
--- a/assets/layers/shower/shower.json
+++ b/assets/layers/shower/shower.json
@@ -12,7 +12,19 @@
       "en": "Shower"
     }
   },
-  "presets": [],
+  "presets": [
+    {
+      "title": {
+        "en": "a shower"
+      },
+      "description": {
+        "en": "A (public) shower"
+      },
+      "tags": [
+        "amenity=shower"
+      ]
+    }
+  ],
   "tagRenderings": [
     "images",
     "level",
@@ -118,7 +130,25 @@
       }
     }
   ],
-  "filter": [],
+  "filter": [
+    "free",
+    {
+      "id": "hot-water",
+      "options": [
+        {
+          "question": {
+            "en": "Hot water available"
+          },
+          "osmTags": {
+            "or": [
+              "hot_water=yes",
+              "hot_water=fee"
+            ]
+          }
+        }
+      ]
+    }
+  ],
   "deletion": {
     "softDeletionTags": {
       "and": [
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 4130253014..1b5344bc80 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -646,27 +646,7 @@
         }
       ]
     },
-    {
-      "id": "free",
-      "options": [
-        {
-          "question": {
-            "en": "Free to use",
-            "nl": "Gratis toegankelijk",
-            "de": "Nutzung kostenlos",
-            "fr": "Utilisation gratuite",
-            "da": "Gratis at bruge"
-          },
-          "osmTags": {
-            "or": [
-              "fee=no",
-              "fee=0",
-              "charge=0"
-            ]
-          }
-        }
-      ]
-    },
+    "free",
     "open_now"
   ],
   "deletion": {