squash

debug/zoomrange.html

@@ -21,12 +21,12 @@
 
 var map = window.map = new mapboxgl.Map({
     container: 'map',
-    zoom: 2.1,
-    center: [-77.01866, 38.888],
-    style: 'mapbox://styles/mapbox/empty-v9'
+    zoom: 3,
+    style: 'mapbox://styles/mapbox/satellite-v9'
 });
 
 map.on('load', function() {
+
     map.addLayer({
         "id": "circle",
         "type": "circle",
@@ -46,7 +46,11 @@
             'circle-color': 'red'
         }
     });
-    map.setLayerZoomRange('circle', 0, 3);
+
+    map.on('click', function() {
+        map.setLayerZoomRange('satellite', 0, 5);
+        map.setLayerZoomRange('circle', 0, 5);
+    });
 });
 </script>
 </body>

src/style-spec/reference/v8.json

@@ -1798,6 +1798,7 @@
     "text-radial-offset": {
       "type": "number",
       "units": "ems",
+      "default": 0,
       "doc": "Radial offset of text, in the direction of the symbol's anchor. Useful in combination with `text-variable-anchor`, which doesn't support the two-dimensional `text-offset`.",
       "requires": [
         {

src/style/style.js

@@ -732,7 +732,7 @@ class Style extends Evented {
         if (maxzoom != null) {
             layer.maxzoom = maxzoom;
         }
-        this._updateLayer(layer);
+        if (layer.type !== 'raster') this._updateLayer(layer);
     }
 
     setFilter(layerId: string, filter: ?FilterSpecification,  options: StyleSetterOptions = {}) {

src/util/actor.js

@@ -102,7 +102,7 @@ class Actor {
             if (cancelable && this.callbacks[data.id] === null) {
                 // Only add the cancelable callback if the done callback wasn't already called.
                 // Otherwise we will never be able to delete it.
-                this.callbacks[data.id]  = cancelable;
+                this.callbacks[data.id] = cancelable.cancel;
             }
         } else if (typeof data.id !== 'undefined' && this.parent.getWorkerSource) {
             // data.type == sourcetype.method