From 0e5c6da0567dd73b5cadf20c1c1b4839bb23b13c Mon Sep 17 00:00:00 2001
From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:17:40 -0400
Subject: [PATCH] Adjust syntax to try and fix issue with __not__ not working

---
 renderer/layers/trails.yml       | 12 ++++++------
 renderer/layers/water_trails.yml |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/renderer/layers/trails.yml b/renderer/layers/trails.yml
index 4454f71..3100aa1 100644
--- a/renderer/layers/trails.yml
+++ b/renderer/layers/trails.yml
@@ -20,7 +20,7 @@ layers:
             - trail: yes
           # gather ways we think might be trails based on common tagging patterns
           - __all__:
-            - __any__:
+            __any__:
               - highway:
                 - bridleway
                 - path
@@ -40,18 +40,18 @@ layers:
                   snowmobile: __any__
                   wheelchair: __any__
               - __all__:
-                - highway:
+                highway:
                   - footway
                   - steps
-                - __not__:
+                __not__:
                   # ignore sidewalks, crossings, access aisles, etc.
                   footway: __any__
               - __all__:
-                - highway: cycleway
-                - __not__:
+                highway: cycleway
+                __not__:
                   # ignore bike lanes that are part of roads
                   cycleway: lane
-            - __not__:
+            __not__:
               __any__:
                 # exclude anything indoors
                 indoor: __any__
diff --git a/renderer/layers/water_trails.yml b/renderer/layers/water_trails.yml
index 7eb79f0..271df30 100644
--- a/renderer/layers/water_trails.yml
+++ b/renderer/layers/water_trails.yml
@@ -144,7 +144,7 @@ layers:
         include_when:
           &waterway_filter
           __all__:
-            - waterway:
+            waterway:
               - river
               - stream
               - tidal_channel
@@ -155,8 +155,8 @@ layers:
               - fairway
               - link
               - flowline
-            - canoe: __any__
-            - __not__:
+            canoe: __any__
+            __not__:
               indoor: __any__
         attributes:
           &waterway_attributes