Manually check for areas so barriers aren't rendered twice

osmus · Nov 11, 2024 · a1d8d06 · a1d8d06
1 parent 6ed6cfc
commit a1d8d06
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/renderer/layers/trails.yml b/renderer/layers/trails.yml
@@ -575,12 +575,17 @@ layers:
         geometry: polygon
         min_zoom: 7
         min_size: 1
-        include_when: &barrier_filter
-          - man_made: breakwater
-          - natural: beaver_dam
-          - waterway:
-            - dam
-            - weir
+        include_when:
+          - __all__:
+            - __any__: &barrier_filter
+              - man_made: breakwater
+              - natural: beaver_dam
+              - waterway:
+                - dam
+                - weir
+            - __any__: &area_filter
+              - area: yes
+              - type: multipolygon
         attributes: &barrier_attributes
           - key: OSM_ID
             value: "${feature.id}"
@@ -613,7 +618,10 @@ layers:
         geometry: line
         min_zoom: 7
         min_size: 1
-        include_when: *barrier_filter
+        include_when: 
+          - __all__:
+            - __any__: *barrier_filter
+            - __not_: *area_filter
         attributes: *barrier_attributes
 args:
   area: