From 3d4eb321b258d617239d163e41c495a293a417b0 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 15 Apr 2025 12:46:22 +0200
Subject: [PATCH] Themes(drinking water): add spring as water source type

---
 assets/layers/drinking_water/drinking_water.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 46ebbb30c..fe9f8ff0a 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -296,9 +296,20 @@
         "es": "¿Qué tipo de punto de agua potable es este?"
       },
       "multiAnswer": true,
+      "invalidValues": {
+        "or": [
+          {
+            "and": [
+              "natural=spring",
+              "fountain~*"
+            ]
+          }
+        ]
+      },
       "mappings": [
         {
           "if": "fountain=bubbler",
+          "ifnot": "fountain=",
           "icon": "./assets/layers/drinking_water/bubbler.svg",
           "then": {
             "en": "This is a bubbler fountain. A water jet to drink from is sent upwards, typically controlled by a push button.",
@@ -311,6 +322,7 @@
         },
         {
           "if": "fountain=bottle_refill",
+          "ifnot": "fountain=",
           "icon": "./assets/layers/drinking_water/bottle.svg",
           "then": {
             "en": "This is a bottle refill point where the water is sent downwards, typically controlled by a push button or a motion sensor. Drinking directly from the stream might be very hard or impossible.",