Merge branch 'roadsv3.0' into roadsv4.0

gravitystorm · Sep 19, 2013 · 35e7cb0 · 35e7cb0
2 parents e4adbc4 + 3e21ae1
commit 35e7cb0
Showing 1 changed file with 44 additions and 42 deletions.
diff --git a/roads.mss b/roads.mss
@@ -1083,50 +1083,52 @@
   }
 
   [feature = 'highway_track'] {
-    line-color: @track-casing;
-    line-join: round;
-    line-cap: round;
-    line-opacity: 0.4;
-    b/line-color: @track-fill;
-    b/line-cap: round;
-    b/line-join: round;
-    [zoom >= 13][zoom < 14] {
-      line-width: 2.5;
-      b/line-width: 1.2;
-      b/line-dasharray: 3,4;
-    }
-    [zoom >= 14] {
-      [tracktype = 'grade1'] {
-        line-width: 3.5;
-        b/line-width: 2;
-        b/line-color: @track-grade1-fill;
-        b/line-dasharray: 100,0; /* i.e. none, see https://github.com/mapbox/carto/issues/214 */
-        b/line-opacity: 0.7;
-      }
-      [tracktype = 'grade2'] {
-        line-width: 3;
-        b/line-color: @track-grade2-fill;
-        b/line-width: 1.5;
-        b/line-dasharray: 9,4;
-        b/line-opacity: 0.8;
-      }
-      [tracktype = 'grade3'] {
-        line-width: 3;
-        b/line-width: 1.5;
+    [zoom >= 13] {
+      line-color: @track-casing;
+      line-join: round;
+      line-cap: round;
+      line-opacity: 0.4;
+      b/line-color: @track-fill;
+      b/line-cap: round;
+      b/line-join: round;
+      [zoom >= 13][zoom < 14] {
+        line-width: 2.5;
+        b/line-width: 1.2;
         b/line-dasharray: 3,4;
-        b/line-opacity: 0.8;
       }
-      [tracktype = 'grade4'] {
-        line-width: 3;
-        b/line-width: 2;
-        b/line-dasharray: 4,7,1,5;
-        b/line-opacity: 0.8;
-      }
-      [tracktype = 'grade5'] {
-        line-width: 3;
-        b/line-width: 2;
-        b/line-dasharray: 1,5;
-        b/line-opacity: 0.8;
+      [zoom >= 14] {
+        [tracktype = 'grade1'] {
+          line-width: 3.5;
+          b/line-width: 2;
+          b/line-color: @track-grade1-fill;
+          b/line-dasharray: 100,0; /* i.e. none, see https://github.com/mapbox/carto/issues/214 */
+          b/line-opacity: 0.7;
+        }
+        [tracktype = 'grade2'] {
+          line-width: 3;
+          b/line-color: @track-grade2-fill;
+          b/line-width: 1.5;
+          b/line-dasharray: 9,4;
+          b/line-opacity: 0.8;
+        }
+        [tracktype = 'grade3'] {
+          line-width: 3;
+          b/line-width: 1.5;
+          b/line-dasharray: 3,4;
+          b/line-opacity: 0.8;
+        }
+        [tracktype = 'grade4'] {
+          line-width: 3;
+          b/line-width: 2;
+          b/line-dasharray: 4,7,1,5;
+          b/line-opacity: 0.8;
+         }
+        [tracktype = 'grade5'] {
+          line-width: 3;
+          b/line-width: 2;
+          b/line-dasharray: 1,5;
+          b/line-opacity: 0.8;
+        }
       }
     }
   }