From 17f2d111fed7a66c72f9d8cacebdbde8fc7a5f4d Mon Sep 17 00:00:00 2001
From: Midgard <midgard@zeus.ugent.be>
Date: Mon, 9 Dec 2024 18:59:06 +0100
Subject: [PATCH] Themes(climbing): Change conditions for gear rental questions

- Also recognize speed as enough to show the harness rental question
- Require answer on climbing styles before showing harness/belay device rental
---
 assets/layers/climbing_gym/climbing_gym.json | 34 +++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/assets/layers/climbing_gym/climbing_gym.json b/assets/layers/climbing_gym/climbing_gym.json
index c5093d811..34b89a06c 100644
--- a/assets/layers/climbing_gym/climbing_gym.json
+++ b/assets/layers/climbing_gym/climbing_gym.json
@@ -242,8 +242,24 @@
       },
       "condition": {
         "or": [
-          "climbing:sport!=no",
-          "climbing:toprope!=no"
+          "condition": {
+            "and": [
+              "climbing:sport!=",
+              "climbing:sport!=no"
+            ]
+          },
+          "condition": {
+            "and": [
+              "climbing:toprope!=",
+              "climbing:toprope!=no"
+            ]
+          },
+          "condition": {
+            "and": [
+              "climbing:speed!=",
+              "climbing:speed!=no"
+            ]
+          }
         ]
       },
       "mappings": [
@@ -327,8 +343,18 @@
       },
       "condition": {
         "or": [
-          "climbing:sport!=no",
-          "climbing:toprope!=no"
+          "condition": {
+            "and": [
+              "climbing:sport!=",
+              "climbing:sport!=no"
+            ]
+          },
+          "condition": {
+            "and": [
+              "climbing:toprope!=",
+              "climbing:toprope!=no"
+            ]
+          }
         ]
       },
       "mappings": [