enabled -> min-zoom, close #2

mapbox · Apr 4, 2014 · 427ed4f · 427ed4f
1 parent 40ae025
commit 427ed4f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 81 deletions.
diff --git a/migrations/v1.js b/migrations/v1.js
@@ -63,7 +63,7 @@ module.exports = function upgrade(v0) {
 
         var styles = {};
 
-        if (v0bucket.enabled) styles.enabled = {"min-zoom": v0bucket.enabled};
+        if (v0bucket.enabled) styles['min-zoom'] = v0bucket.enabled;
 
         // line styles
         if (v0bucket.cap)        styles['line-cap'] = v0bucket.cap;
@@ -139,7 +139,8 @@ module.exports = function upgrade(v0) {
 
     var otherRules = {
         stroke: 'line-color',
-        strokeWidth: 'line-width'
+        strokeWidth: 'line-width',
+        enabled: 'min-zoom'
     };
 
     function convertValue(v0value, v0rule) {
@@ -166,9 +167,7 @@ module.exports = function upgrade(v0) {
                 };
             }
             if (v0value[0] === 'min') {
-                if (v0rule === 'enabled') {
-                    return {'min-zoom': v0value[1]};
-                }
+                if (v0rule === 'enabled') return v0value[1];
                 return {
                     fn: 'min',
                     val: v0value[1]
@@ -197,7 +196,7 @@ module.exports = function upgrade(v0) {
             if (v0rule === 'stroke') rule = 'text-halo-color';
         }
 
-        style[transition ? 'transition-' + rule : rule] = convertValue(v0value, rule);
+        style[transition ? 'transition-' + rule : rule] = convertValue(v0value, v0rule);
     }
 
     for (var i = 0; i < v0.classes.length; i++) {

diff --git a/test/styles/bright-v1.js b/test/styles/bright-v1.js
@@ -359,23 +359,17 @@
       "aeroway_fill": {
         "fill-color": "aeroway",
         "fill-opacity": 0.7,
-        "enabled": {
-          "min-zoom": 12
-        }
+        "min-zoom": 12
       },
       "aeroway_runway": {
         "line-color": "aeroway",
         "line-width": 5,
-        "enabled": {
-          "min-zoom": 12
-        }
+        "min-zoom": 12
       },
       "aeroway_taxiway": {
         "line-color": "aeroway",
         "line-width": 1.5,
-        "enabled": {
-          "min-zoom": 12
-        }
+        "min-zoom": 12
       },
       "building": {
         "fill-color": "building"
@@ -460,9 +454,7 @@
           "fn": "stops",
           "stops": [[0, 1], [12, 1], [14, 1], [15, 4], [16, 6.5], [22, 6.5]]
         },
-        "enabled": {
-          "min-zoom": 12
-        },
+        "min-zoom": 12,
         "line-cap": "round",
         "line-join": "round"
       },
@@ -472,9 +464,7 @@
           "fn": "stops",
           "stops": [[14.5, 0], [15, 2.5], [16, 4], [22, 4]]
         },
-        "enabled": {
-          "min-zoom": 12
-        },
+        "min-zoom": 12,
         "line-cap": "round",
         "line-join": "round"
       },
@@ -484,18 +474,14 @@
           "fn": "stops",
           "stops": [[0, 1], [15, 1], [16, 4], [22, 4]]
         },
-        "enabled": {
-          "min-zoom": 15
-        },
+        "min-zoom": 15,
         "line-cap": "round",
         "line-join": "round"
       },
       "road_service": {
         "line-color": "street",
         "line-width": 2,
-        "enabled": {
-          "min-zoom": 15
-        },
+        "min-zoom": 15,
         "line-cap": "round",
         "line-join": "round"
       },
@@ -506,9 +492,7 @@
           "fn": "stops",
           "stops": [[15, 1], [16, 1.2], [17, 1.5], [22, 1.5]]
         },
-        "enabled": {
-          "min-zoom": 15
-        }
+        "min-zoom": 15
       },
       "road_major_rail": {
         "line-color": "rail",
@@ -580,9 +564,7 @@
           "fn": "stops",
           "stops": [[12, 0.5], [14, 1], [15, 4], [16, 6.5], [22, 6.5]]
         },
-        "enabled": {
-          "min-zoom": 12
-        },
+        "min-zoom": 12,
         "line-join": "round"
       },
       "bridge_street": {
@@ -595,9 +577,7 @@
           "fn": "stops",
           "stops": [[14, 0], [15, 1], [22, 1]]
         },
-        "enabled": {
-          "min-zoom": 12
-        },
+        "min-zoom": 12,
         "line-join": "round"
       },
       "bridge_service_casing": {
@@ -606,17 +586,13 @@
           "fn": "stops",
           "stops": [[15, 1], [16, 4], [22, 4]]
         },
-        "enabled": {
-          "min-zoom": 15
-        },
+        "min-zoom": 15,
         "line-join": "round"
       },
       "bridge_service": {
         "line-color": "street",
         "line-width": 2,
-        "enabled": {
-          "min-zoom": 15
-        },
+        "min-zoom": 15,
         "line-join": "round"
       },
       "bridge_path": {
@@ -626,9 +602,7 @@
           "fn": "stops",
           "stops": [[15, 1], [16, 1.2], [17, 1.5], [22, 1.5]]
         },
-        "enabled": {
-          "min-zoom": 15
-        }
+        "min-zoom": 15
       },
       "bridge_major_rail": {
         "line-color": "rail",
@@ -709,9 +683,7 @@
           "fn": "stops",
           "stops": [[12, 0.5], [14, 1], [15, 4], [16, 6.5], [22, 6.5]]
         },
-        "enabled": {
-          "min-zoom": 12
-        },
+        "min-zoom": 12,
         "line-join": "round"
       },
       "tunnel_street": {
@@ -724,9 +696,7 @@
           "fn": "stops",
           "stops": [[14, 0], [15, 1], [22, 1]]
         },
-        "enabled": {
-          "min-zoom": 12
-        },
+        "min-zoom": 12,
         "line-join": "round"
       },
       "tunnel_service_casing": {
@@ -736,18 +706,14 @@
           "fn": "stops",
           "stops": [[15, 1], [16, 4], [22, 4]]
         },
-        "enabled": {
-          "min-zoom": 15
-        },
+        "min-zoom": 15,
         "line-cap": "round",
         "line-join": "round"
       },
       "tunnel_service": {
         "line-color": "street",
         "line-width": 2,
-        "enabled": {
-          "min-zoom": 15
-        },
+        "min-zoom": 15,
         "line-cap": "round",
         "line-join": "round"
       },
@@ -766,9 +732,7 @@
       "country_label": {
         "text-color": "text",
         "text-halo-color": [1, 1, 1, 0.8],
-        "enabled": {
-          "min-zoom": 3
-        },
+        "min-zoom": 3,
         "text-field": "name",
         "text-size": 13,
         "text-path": "horizontal"
@@ -777,9 +741,7 @@
         "line-color": "text",
         "line-width": 0.5,
         "line-opacity": 0.5,
-        "enabled": {
-          "min-zoom": 3
-        }
+        "min-zoom": 3
       },
       "marin_label_1": {
         "text-color": "marine_text",

diff --git a/test/styles/debug-v1.js b/test/styles/debug-v1.js
@@ -157,9 +157,7 @@
           "slope": 0.2,
           "min": 1
         },
-        "enabled": {
-          "min-zoom": 14
-        }
+        "min-zoom": 14
       },
       "tunnel_regular_casing": {
         "line-color": [0, 0, 0, 0.5],
@@ -171,9 +169,7 @@
           "slope": 0.2,
           "min": 1
         },
-        "enabled": {
-          "min-zoom": 15.5
-        }
+        "min-zoom": 15.5
       },
       "tunnel_large": {
         "line-color": [1, 1, 1, 0.5],
@@ -212,9 +208,7 @@
           "slope": 0.21,
           "min": 4
         },
-        "enabled": {
-          "min-zoom": 13
-        },
+        "min-zoom": 13,
         "line-opacity": {
           "fn": "linear",
           "z": 14,
@@ -240,9 +234,7 @@
           "slope": 0.2,
           "min": 1
         },
-        "enabled": {
-          "min-zoom": 15.5
-        },
+        "min-zoom": 15.5,
         "line-opacity": {
           "fn": "linear",
           "z": 15.5,
@@ -318,9 +310,7 @@
         "linejoin": "round"
       },
       "road_markers": {
-        "enabled": {
-          "min-zoom": 15.5
-        },
+        "min-zoom": 15.5,
         "point-alignment": "line",
         "point-image": "bicycle-12",
         "point-spacing": 200
@@ -354,9 +344,7 @@
           "slope": 0.2,
           "min": 1
         },
-        "enabled": {
-          "min-zoom": 14
-        }
+        "min-zoom": 14
       },
       "bridge_large": {
         "line-color": "road",