From 7d905d4b382097e297bc87908629632a29a0f6e8 Mon Sep 17 00:00:00 2001
From: Nathaniel Kelso <nvkelso@gmail.com>
Date: Mon, 22 May 2017 17:07:30 -0400
Subject: [PATCH] fixes #26 to restore fence lines; add landuse draw orders for
 some styles

---
 cinnabar-style.yaml | 56 +++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/cinnabar-style.yaml b/cinnabar-style.yaml
index f725156..c7978d0 100644
--- a/cinnabar-style.yaml
+++ b/cinnabar-style.yaml
@@ -3716,31 +3716,6 @@ layers:
                             transform: uppercase
                             stroke: { color: global.earth1, width: 3px }
 
-        city_walls:
-            filter: { kind: city_wall }
-            draw:
-                lines:
-                    color: global.city_wall
-                    width: [[12, 0.75px], [13, 1.0px], [14, 1.2px], [15, 2.0px], [16, 2.5px], [19, 6m]]
-        retaining_wall:
-            filter: { kind: retaining_wall }
-            draw:
-                lines:
-                    color: global.retaining_wall
-                    width: [[14, 0.5px], [15, 1.0px], [16, 1.5px], [17, 2.0px], [19, 4m]]
-        fence:
-            filter: { kind: fence }
-            draw:
-                lines:
-                    color: global.fence
-                    width: [[16, 0px], [17, 1px], [18, 1.5px], [20, 0.5m]]
-        snow_fence:
-            filter: { kind: snow_fence }
-            draw:
-                lines:
-                    color: global.snow_fence
-                    width: [[14, 0.5px], [15, 1.0px], [16, 1.5px], [17, 2.0px], [19, 4m]]
-
     places:
         data: { source: mapzen, layer: places }
         filter:
@@ -5386,6 +5361,8 @@ layers:
         draw:
             polygons:
                 order: global.feature_order
+            lines:
+                order: global.feature_order
 
         landuse-labels:
             filter:
@@ -5870,6 +5847,7 @@ layers:
                         color: global.orange2
                     outline:
                         style: lines
+                        order: global.feature_order
                         color: global.green6
                         width: [[14,0px],[15,1px],[16,1m]]
             place_of_worship:
@@ -5903,6 +5881,7 @@ layers:
                         color: global.grey11
                     outline:
                         style: lines
+                        order: global.feature_order
                         color: global.grey11_o
                         width: [[14,0px],[15,1px],[16,0.5m]]
 
@@ -5955,6 +5934,7 @@ layers:
                         visible: true
                     outline:
                         style: lines
+                        order: global.feature_order
                         color: global.grey12_o
                         width: [[14,0px],[15,1px],[16,0.5m]]
             minor-zoo-landuse:
@@ -5970,6 +5950,7 @@ layers:
                         visible: true
                     outline:
                         style: lines
+                        order: global.feature_order
                         color: global.green11_o
                         width: [[14,0px],[15,1px],[16,0.5m]]
 
@@ -5983,6 +5964,31 @@ layers:
                     order: global.feature_order
                     color: [[0, global.earth2_e],[6, global.earth2_e2],[8, global.earth2_e3]]
 
+        city_walls:
+            filter: { kind: city_wall }
+            draw:
+                lines:
+                    color: global.city_wall
+                    width: [[12, 0.75px], [13, 1.0px], [14, 1.2px], [15, 2.0px], [16, 2.5px], [19, 6m]]
+        retaining_wall:
+            filter: { kind: retaining_wall }
+            draw:
+                lines:
+                    color: global.retaining_wall
+                    width: [[14, 0.5px], [15, 1.0px], [16, 1.5px], [17, 2.0px], [19, 4m]]
+        fence:
+            filter: { kind: fence }
+            draw:
+                lines:
+                    color: global.fence
+                    width: [[16, 0px], [17, 1px], [18, 1.5px], [20, 0.5m]]
+        snow_fence:
+            filter: { kind: snow_fence }
+            draw:
+                lines:
+                    color: global.snow_fence
+                    width: [[14, 0.5px], [15, 1.0px], [16, 1.5px], [17, 2.0px], [19, 4m]]
+
 #    transit-bus-roads:
 #        data: { source: mapzen, layer: roads }
 #        filter: