Fix issue with collecting way too much data

osmus · Jul 16, 2024 · e792081 · e792081
1 parent 0e5c6da
commit e792081
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git 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,27 +40,26 @@ layers:
                   snowmobile: __any__
                   wheelchair: __any__
               - __all__:
-                highway:
+                - highway:
                   - footway
                   - steps
-                __not__:
+                - __not__:
                   # ignore sidewalks, crossings, access aisles, etc.
-                  footway: __any__
+                  - footway: __any__
               - __all__:
-                highway: cycleway
-                __not__:
+                - highway: cycleway
+                - __not__:
                   # ignore bike lanes that are part of roads
-                  cycleway: lane
-            __not__:
-              __any__:
-                # exclude anything indoors
-                indoor: __any__
-                # exclude common combinations that probably aren't trails
-                man_made: pier
-                public_transport: platform
-                railway: platform
-                # exclude anything explicitly marked as not a trail
-                trail: no
+                  - cycleway: lane
+            - __not__:
+              # exclude anything indoors
+              - indoor: __any__
+              # exclude common combinations that probably aren't trails
+              - man_made: pier
+              - public_transport: platform
+              - railway: platform
+              # exclude anything explicitly marked as not a trail
+              - trail: no
         attributes:
           &trail_attributes
           - key: OSM_ID

diff --git a/renderer/layers/water_trails.yml b/renderer/layers/water_trails.yml
@@ -143,8 +143,8 @@ layers:
         min_zoom: *min_zoom
         include_when:
           &waterway_filter
-          __all__:
-            waterway:
+          - __all__:
+            - waterway:
               - river
               - stream
               - tidal_channel
@@ -155,9 +155,9 @@ layers:
               - fairway
               - link
               - flowline
-            canoe: __any__
-            __not__:
-              indoor: __any__
+            - canoe: __any__
+            - __not__:
+              - indoor: __any__
         attributes:
           &waterway_attributes
           - key: OSM_ID