Render 3px line for hedges without area=yes and only show fill with a…

…rea=yes
gravitystorm · Aug 3, 2019 · 91c77cb · 91c77cb
1 parent 3a1ec10
commit 91c77cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/landcover.mss b/landcover.mss
@@ -825,13 +825,16 @@
 }
 
 #area-barriers {
-  [zoom >= 16] {
-    line-color: #444;
-    line-width: 0.4;
-    [feature = 'barrier_hedge'] {
-      line-color: #aed1a0;
-      line-width: 1;
+    [feature = 'barrier_hedge'][area = 'yes'] {
       polygon-fill: #aed1a0;
+      [zoom >= 17] {
+        line-width: 2;
+      }
+      [zoom >= 18] {
+        line-width: 1;
+      }
+      [zoom >= 19] {
+        line-width: 0.5;
     }
   }
 }

diff --git a/project.mml b/project.mml
@@ -613,8 +613,8 @@ Layer:
       <<: *osm2pgsql
       table: |-
         (SELECT
-            way, COALESCE(historic, barrier) AS feature
-          FROM (SELECT way,
+            way, area, COALESCE(historic, barrier) AS feature
+          FROM (SELECT way, tags->'area' AS area,
             ('barrier_' || (CASE WHEN barrier IN ('chain', 'city_wall', 'embankment', 'ditch', 'fence', 'guard_rail',
                   'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall') THEN barrier ELSE NULL END)) AS barrier,
             ('historic_' || (CASE WHEN historic = 'citywalls' THEN historic ELSE NULL END)) AS historic
@@ -623,7 +623,6 @@ Layer:
                   'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall')
               OR historic = 'citywalls')
               AND building IS NULL
-              AND tags->'area' = 'yes'
           ) AS features
         ) AS area_barriers
     properties: