maplibre-gl 2.1.8 → 2.2.0-pre.2

package/src/shaders/symbol_text_and_icon.vertex.glsl

@@ -54,6 +54,7 @@ void main() {
     float a_size_min = floor(a_size[0] * 0.5);
     float is_sdf = a_size[0] - 2.0 * a_size_min;
 
+    float ele = get_elevation(a_pos);
     highp float segment_angle = -a_projected_pos[2];
     float size;
 
@@ -65,7 +66,7 @@ void main() {
         size = u_size;
     }
 
-    vec4 projectedPoint = u_matrix * vec4(a_pos, 0, 1);
+    vec4 projectedPoint = u_matrix * vec4(a_pos, ele, 1);
     highp float camera_to_anchor_distance = projectedPoint.w;
     // If the label is pitched with the map, layout is done in pitched space,
     // which makes labels in the distance smaller relative to viewport space.
@@ -90,7 +91,7 @@ void main() {
         // Point labels with 'rotation-alignment: map' are horizontal with respect to tile units
         // To figure out that angle in projected space, we draw a short horizontal line in tile
         // space, project it, and measure its angle in projected space.
-        vec4 offsetProjectedPoint = u_matrix * vec4(a_pos + vec2(1, 0), 0, 1);
+        vec4 offsetProjectedPoint = u_matrix * vec4(a_pos + vec2(1, 0), ele, 1);
 
         vec2 a = projectedPoint.xy / projectedPoint.w;
         vec2 b = offsetProjectedPoint.xy / offsetProjectedPoint.w;
@@ -102,13 +103,15 @@ void main() {
     highp float angle_cos = cos(segment_angle + symbol_rotation);
     mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);
 
-    vec4 projected_pos = u_label_plane_matrix * vec4(a_projected_pos.xy, 0.0, 1.0);
-    gl_Position = u_coord_matrix * vec4(projected_pos.xy / projected_pos.w + rotation_matrix * (a_offset / 32.0 * fontScale), 0.0, 1.0);
+    vec4 projected_pos = u_label_plane_matrix * vec4(a_projected_pos.xy, ele, 1.0);
+    float z = float(u_pitch_with_map) * projected_pos.z / projected_pos.w;
+    gl_Position = u_coord_matrix * vec4(projected_pos.xy / projected_pos.w + rotation_matrix * (a_offset / 32.0 * fontScale), z, 1.0);
     float gamma_scale = gl_Position.w;
 
     vec2 fade_opacity = unpack_opacity(a_fade_opacity);
+    float visibility = calculate_visibility(projectedPoint);
     float fade_change = fade_opacity[1] > 0.5 ? u_fade_change : -u_fade_change;
-    float interpolated_fade_opacity = max(0.0, min(1.0, fade_opacity[0] + fade_change));
+    float interpolated_fade_opacity = max(0.0, min(visibility, fade_opacity[0] + fade_change));
 
     v_data0.xy = a_tex / u_texsize;
     v_data0.zw = a_tex / u_texsize_icon;

package/src/shaders/symbol_text_and_icon.vertex.glsl.g.ts

@@ -1,2 +1,2 @@
 // This file is generated. Edit build/generate-shaders.ts, then run `npm run codegen`.
-export default 'const float PI=3.141592653589793;attribute vec4 a_pos_offset;attribute vec4 a_data;attribute vec3 a_projected_pos;attribute float a_fade_opacity;uniform bool u_is_size_zoom_constant;uniform bool u_is_size_feature_constant;uniform highp float u_size_t;uniform highp float u_size;uniform mat4 u_matrix;uniform mat4 u_label_plane_matrix;uniform mat4 u_coord_matrix;uniform bool u_is_text;uniform bool u_pitch_with_map;uniform highp float u_pitch;uniform bool u_rotate_symbol;uniform highp float u_aspect_ratio;uniform highp float u_camera_to_center_distance;uniform float u_fade_change;uniform vec2 u_texsize;uniform vec2 u_texsize_icon;varying vec4 v_data0;varying vec4 v_data1;\n#pragma mapbox: define highp vec4 fill_color\n#pragma mapbox: define highp vec4 halo_color\n#pragma mapbox: define lowp float opacity\n#pragma mapbox: define lowp float halo_width\n#pragma mapbox: define lowp float halo_blur\nvoid main() {\n#pragma mapbox: initialize highp vec4 fill_color\n#pragma mapbox: initialize highp vec4 halo_color\n#pragma mapbox: initialize lowp float opacity\n#pragma mapbox: initialize lowp float halo_width\n#pragma mapbox: initialize lowp float halo_blur\nvec2 a_pos=a_pos_offset.xy;vec2 a_offset=a_pos_offset.zw;vec2 a_tex=a_data.xy;vec2 a_size=a_data.zw;float a_size_min=floor(a_size[0]*0.5);float is_sdf=a_size[0]-2.0*a_size_min;highp float segment_angle=-a_projected_pos[2];float size;if (!u_is_size_zoom_constant && !u_is_size_feature_constant) {size=mix(a_size_min,a_size[1],u_size_t)/128.0;} else if (u_is_size_zoom_constant && !u_is_size_feature_constant) {size=a_size_min/128.0;} else {size=u_size;}vec4 projectedPoint=u_matrix*vec4(a_pos,0,1);highp float camera_to_anchor_distance=projectedPoint.w;highp float distance_ratio=u_pitch_with_map ?\ncamera_to_anchor_distance/u_camera_to_center_distance :\nu_camera_to_center_distance/camera_to_anchor_distance;highp float perspective_ratio=clamp(0.5+0.5*distance_ratio,0.0,4.0);size*=perspective_ratio;float fontScale=size/24.0;highp float symbol_rotation=0.0;if (u_rotate_symbol) {vec4 offsetProjectedPoint=u_matrix*vec4(a_pos+vec2(1,0),0,1);vec2 a=projectedPoint.xy/projectedPoint.w;vec2 b=offsetProjectedPoint.xy/offsetProjectedPoint.w;symbol_rotation=atan((b.y-a.y)/u_aspect_ratio,b.x-a.x);}highp float angle_sin=sin(segment_angle+symbol_rotation);highp float angle_cos=cos(segment_angle+symbol_rotation);mat2 rotation_matrix=mat2(angle_cos,-1.0*angle_sin,angle_sin,angle_cos);vec4 projected_pos=u_label_plane_matrix*vec4(a_projected_pos.xy,0.0,1.0);gl_Position=u_coord_matrix*vec4(projected_pos.xy/projected_pos.w+rotation_matrix*(a_offset/32.0*fontScale),0.0,1.0);float gamma_scale=gl_Position.w;vec2 fade_opacity=unpack_opacity(a_fade_opacity);float fade_change=fade_opacity[1] > 0.5 ? u_fade_change :-u_fade_change;float interpolated_fade_opacity=max(0.0,min(1.0,fade_opacity[0]+fade_change));v_data0.xy=a_tex/u_texsize;v_data0.zw=a_tex/u_texsize_icon;v_data1=vec4(gamma_scale,size,interpolated_fade_opacity,is_sdf);}';
+export default 'const float PI=3.141592653589793;attribute vec4 a_pos_offset;attribute vec4 a_data;attribute vec3 a_projected_pos;attribute float a_fade_opacity;uniform bool u_is_size_zoom_constant;uniform bool u_is_size_feature_constant;uniform highp float u_size_t;uniform highp float u_size;uniform mat4 u_matrix;uniform mat4 u_label_plane_matrix;uniform mat4 u_coord_matrix;uniform bool u_is_text;uniform bool u_pitch_with_map;uniform highp float u_pitch;uniform bool u_rotate_symbol;uniform highp float u_aspect_ratio;uniform highp float u_camera_to_center_distance;uniform float u_fade_change;uniform vec2 u_texsize;uniform vec2 u_texsize_icon;varying vec4 v_data0;varying vec4 v_data1;\n#pragma mapbox: define highp vec4 fill_color\n#pragma mapbox: define highp vec4 halo_color\n#pragma mapbox: define lowp float opacity\n#pragma mapbox: define lowp float halo_width\n#pragma mapbox: define lowp float halo_blur\nvoid main() {\n#pragma mapbox: initialize highp vec4 fill_color\n#pragma mapbox: initialize highp vec4 halo_color\n#pragma mapbox: initialize lowp float opacity\n#pragma mapbox: initialize lowp float halo_width\n#pragma mapbox: initialize lowp float halo_blur\nvec2 a_pos=a_pos_offset.xy;vec2 a_offset=a_pos_offset.zw;vec2 a_tex=a_data.xy;vec2 a_size=a_data.zw;float a_size_min=floor(a_size[0]*0.5);float is_sdf=a_size[0]-2.0*a_size_min;float ele=get_elevation(a_pos);highp float segment_angle=-a_projected_pos[2];float size;if (!u_is_size_zoom_constant && !u_is_size_feature_constant) {size=mix(a_size_min,a_size[1],u_size_t)/128.0;} else if (u_is_size_zoom_constant && !u_is_size_feature_constant) {size=a_size_min/128.0;} else {size=u_size;}vec4 projectedPoint=u_matrix*vec4(a_pos,ele,1);highp float camera_to_anchor_distance=projectedPoint.w;highp float distance_ratio=u_pitch_with_map ?\ncamera_to_anchor_distance/u_camera_to_center_distance :\nu_camera_to_center_distance/camera_to_anchor_distance;highp float perspective_ratio=clamp(0.5+0.5*distance_ratio,0.0,4.0);size*=perspective_ratio;float fontScale=size/24.0;highp float symbol_rotation=0.0;if (u_rotate_symbol) {vec4 offsetProjectedPoint=u_matrix*vec4(a_pos+vec2(1,0),ele,1);vec2 a=projectedPoint.xy/projectedPoint.w;vec2 b=offsetProjectedPoint.xy/offsetProjectedPoint.w;symbol_rotation=atan((b.y-a.y)/u_aspect_ratio,b.x-a.x);}highp float angle_sin=sin(segment_angle+symbol_rotation);highp float angle_cos=cos(segment_angle+symbol_rotation);mat2 rotation_matrix=mat2(angle_cos,-1.0*angle_sin,angle_sin,angle_cos);vec4 projected_pos=u_label_plane_matrix*vec4(a_projected_pos.xy,ele,1.0);float z=float(u_pitch_with_map)*projected_pos.z/projected_pos.w;gl_Position=u_coord_matrix*vec4(projected_pos.xy/projected_pos.w+rotation_matrix*(a_offset/32.0*fontScale),z,1.0);float gamma_scale=gl_Position.w;vec2 fade_opacity=unpack_opacity(a_fade_opacity);float visibility=calculate_visibility(projectedPoint);float fade_change=fade_opacity[1] > 0.5 ? u_fade_change :-u_fade_change;float interpolated_fade_opacity=max(0.0,min(visibility,fade_opacity[0]+fade_change));v_data0.xy=a_tex/u_texsize;v_data0.zw=a_tex/u_texsize_icon;v_data1=vec4(gamma_scale,size,interpolated_fade_opacity,is_sdf);}';

package/src/shaders/terrain.fragment.glsl

@@ -0,0 +1,7 @@
+uniform sampler2D u_texture;
+
+varying vec2 v_texture_pos;
+
+void main() {
+    gl_FragColor = texture2D(u_texture, v_texture_pos);
+}

package/src/shaders/terrain.fragment.glsl.g.ts

@@ -0,0 +1,2 @@
+// This file is generated. Edit build/generate-shaders.ts, then run `npm run codegen`.
+export default 'uniform sampler2D u_texture;varying vec2 v_texture_pos;void main() {gl_FragColor=texture2D(u_texture,v_texture_pos);}';

package/src/shaders/terrain.vertex.glsl

@@ -0,0 +1,12 @@
+attribute vec2 a_pos;
+
+uniform mat4 u_matrix;
+
+varying vec2 v_texture_pos;
+varying float v_depth;
+
+void main() {
+    v_texture_pos = a_pos / 8192.0; // 8192.0 is the hardcoded vector-tiles coordinates resolution
+    gl_Position = u_matrix * vec4(a_pos, get_elevation(a_pos), 1.0);
+    v_depth = gl_Position.z / gl_Position.w;
+}

package/src/shaders/terrain.vertex.glsl.g.ts

@@ -0,0 +1,2 @@
+// This file is generated. Edit build/generate-shaders.ts, then run `npm run codegen`.
+export default 'attribute vec2 a_pos;uniform mat4 u_matrix;varying vec2 v_texture_pos;varying float v_depth;void main() {v_texture_pos=a_pos/8192.0;gl_Position=u_matrix*vec4(a_pos,get_elevation(a_pos),1.0);v_depth=gl_Position.z/gl_Position.w;}';

package/src/shaders/terrain_coords.fragment.glsl

@@ -0,0 +1,11 @@
+precision mediump float;
+
+uniform sampler2D u_texture;
+uniform float u_terrain_coords_id;
+
+varying vec2 v_texture_pos;
+
+void main() {
+   vec4 rgba = texture2D(u_texture, v_texture_pos);
+   gl_FragColor = vec4(rgba.r, rgba.g, rgba.b, u_terrain_coords_id);
+}

package/src/shaders/terrain_coords.fragment.glsl.g.ts

@@ -0,0 +1,2 @@
+// This file is generated. Edit build/generate-shaders.ts, then run `npm run codegen`.
+export default 'precision mediump float;uniform sampler2D u_texture;uniform float u_terrain_coords_id;varying vec2 v_texture_pos;void main() {vec4 rgba=texture2D(u_texture,v_texture_pos);gl_FragColor=vec4(rgba.r,rgba.g,rgba.b,u_terrain_coords_id);}';

package/src/shaders/terrain_depth.fragment.glsl

@@ -0,0 +1,15 @@
+varying float v_depth;
+
+// methods for pack/unpack depth value to texture rgba
+// https://stackoverflow.com/questions/34963366/encode-floating-point-data-in-a-rgba-texture
+const highp vec4 bitSh = vec4(256. * 256. * 256., 256. * 256., 256., 1.);
+const highp vec4 bitMsk = vec4(0.,vec3(1./256.0));
+highp vec4 pack(highp float value) {
+    highp vec4 comp = fract(value * bitSh);
+    comp -= comp.xxyz * bitMsk;
+    return comp;
+}
+
+void main() {
+    gl_FragColor = pack(v_depth);
+}

package/src/shaders/terrain_depth.fragment.glsl.g.ts

@@ -0,0 +1,2 @@
+// This file is generated. Edit build/generate-shaders.ts, then run `npm run codegen`.
+export default 'varying float v_depth;const highp vec4 bitSh=vec4(256.*256.*256.,256.*256.,256.,1.);const highp vec4 bitMsk=vec4(0.,vec3(1./256.0));highp vec4 pack(highp float value) {highp vec4 comp=fract(value*bitSh);comp-=comp.xxyz*bitMsk;return comp;}void main() {gl_FragColor=pack(v_depth);}';

package/src/source/canvas_source.test.ts

@@ -61,7 +61,7 @@ describe('CanvasSource', () => {
     });
 
     test('self-validates', () => {
-        const stub = jest.spyOn(console, 'error');
+        const stub = jest.spyOn(console, 'error').mockImplementation(() => {});
         createSource({coordinates: []});
         expect(stub).toHaveBeenCalled();
         stub.mockReset();

package/src/source/geojson_source.test.ts

@@ -90,6 +90,18 @@ describe('GeoJSONSource#setData', () => {
         source.load();
     });
 
+    test('fires "dataabort" event', done => {
+        const source = new GeoJSONSource('id', {} as any, wrapDispatcher({
+            send(type, data, callback) {
+                setTimeout(() => callback(null, {abandoned: true}));
+            }
+        }), undefined);
+        source.on('dataabort', () => {
+            done();
+        });
+        source.load();
+    });
+
     test('respects collectResourceTiming parameter on source', done => {
         const source = createSource({collectResourceTiming: true});
         source.map = {
@@ -137,6 +149,19 @@ describe('GeoJSONSource#setData', () => {
         });
         source.setData({} as GeoJSON.GeoJSON);
     });
+
+    test('marks source as loaded before firing "dataabort" event', done => {
+        const source = new GeoJSONSource('id', {} as any, wrapDispatcher({
+            send(type, data, callback) {
+                setTimeout(() => callback(null, {abandoned: true}));
+            }
+        }), undefined);
+        source.on('dataabort', () => {
+            expect(source.loaded()).toBeTruthy();
+            done();
+        });
+        source.setData({} as GeoJSON.GeoJSON);
+    });
 });
 
 describe('GeoJSONSource#onRemove', () => {

package/src/source/geojson_source.ts

@@ -256,20 +256,13 @@ class GeoJSONSource extends Evented implements Source {
             this._pendingLoads--;
 
             if (this._removed || (result && result.abandoned)) {
+                this.fire(new Event('dataabort', {dataType: 'source', sourceDataType}));
                 return;
             }
 
             let resourceTiming = null;
             if (result && result.resourceTiming && result.resourceTiming[this.id])
                 resourceTiming = result.resourceTiming[this.id].slice(0);
-            // Any `loadData` calls that piled up while we were processing
-            // this one will get coalesced into a single call when this
-            // 'coalesce' message is processed.
-            // We would self-send from the worker if we had access to its
-            // message queue. Waiting instead for the 'coalesce' to round-trip
-            // through the foreground just means we're throttling the worker
-            // to run at a little less than full-throttle.
-            this.actor.send(`${this.type}.coalesce`, {source: options.source}, null);
 
             if (err) {
                 this.fire(new ErrorEvent(err));

package/src/source/geojson_worker_source.test.ts

@@ -46,7 +46,6 @@ describe('reloadTile', () => {
 
         function addData(callback) {
             source.loadData({source: 'sourceId', data: JSON.stringify(geoJson)} as LoadGeoJSONParameters, (err) => {
-                source.coalesce();
                 expect(err).toBeNull();
                 callback();
             });
@@ -134,7 +133,10 @@ describe('resourceTiming', () => {
         window.performance.getEntriesByName = jest.fn().mockReturnValue([ exampleResourceTiming ]);
 
         const layerIndex = new StyleLayerIndex(layers);
-        const source = new GeoJSONWorkerSource(actor, layerIndex, [], (params, callback) => { return callback(null, geoJson); });
+        const source = new GeoJSONWorkerSource(actor, layerIndex, [], (params, callback) => {
+            callback(null, geoJson);
+            return {cancel: () => {}};
+        });
 
         source.loadData({source: 'testSource', request: {url: 'http://localhost/nonexistent', collectResourceTiming: true}} as LoadGeoJSONParameters, (err, result) => {
             expect(err).toBeNull();
@@ -166,7 +168,10 @@ describe('resourceTiming', () => {
         jest.spyOn(perf, 'clearMeasures').mockImplementation(() => { return null; });
 
         const layerIndex = new StyleLayerIndex(layers);
-        const source = new GeoJSONWorkerSource(actor, layerIndex, [], (params, callback) => { return callback(null, geoJson); });
+        const source = new GeoJSONWorkerSource(actor, layerIndex, [], (params, callback) => {
+            callback(null, geoJson);
+            return {cancel: () => {}};
+        });
 
         source.loadData({source: 'testSource', request: {url: 'http://localhost/nonexistent', collectResourceTiming: true}} as LoadGeoJSONParameters, (err, result) => {
             expect(err).toBeNull();
@@ -221,55 +226,46 @@ describe('loadData', () => {
         // (regardless of timing)
         const originalLoadGeoJSON = worker.loadGeoJSON;
         worker.loadGeoJSON = function(params, callback) {
-            setTimeout(() => {
+            const timeout = setTimeout(() => {
                 originalLoadGeoJSON(params, callback);
             }, 0);
+
+            return {cancel: () => clearTimeout(timeout)};
         };
         return worker;
     }
 
-    test('abandons coalesced callbacks', done => {
-        // Expect first call to run, second to be abandoned,
-        // and third to run in response to coalesce
+    test('abandons previous callbacks', done => {
         const worker = createWorker();
-        worker.loadData({source: 'source1', data: JSON.stringify(geoJson)} as LoadGeoJSONParameters, (err, result) => {
-            expect(err).toBeNull();
-            expect(result && result.abandoned).toBeFalsy();
-            worker.coalesce();
-        });
+        let firstCallbackHasRun = false;
 
         worker.loadData({source: 'source1', data: JSON.stringify(geoJson)} as LoadGeoJSONParameters, (err, result) => {
             expect(err).toBeNull();
             expect(result && result.abandoned).toBeTruthy();
+            firstCallbackHasRun = true;
         });
 
         worker.loadData({source: 'source1', data: JSON.stringify(geoJson)} as LoadGeoJSONParameters, (err, result) => {
             expect(err).toBeNull();
             expect(result && result.abandoned).toBeFalsy();
+            expect(firstCallbackHasRun).toBeTruthy();
             done();
         });
     });
 
     test('removeSource aborts callbacks', done => {
-        // Expect:
-        // First loadData starts running before removeSource arrives
-        // Second loadData is pending when removeSource arrives, gets cancelled
-        // removeSource is executed immediately
-        // First loadData finishes running, sends results back to foreground
         const worker = createWorker();
-        worker.loadData({source: 'source1', data: JSON.stringify(geoJson)} as LoadGeoJSONParameters, (err, result) => {
-            expect(err).toBeNull();
-            expect(result && result.abandoned).toBeFalsy();
-            done();
-        });
-
+        let loadDataCallbackHasRun = false;
         worker.loadData({source: 'source1', data: JSON.stringify(geoJson)} as LoadGeoJSONParameters, (err, result) => {
             expect(err).toBeNull();
             expect(result && result.abandoned).toBeTruthy();
+            loadDataCallbackHasRun = true;
         });
 
         worker.removeSource({source: 'source1'}, (err) => {
             expect(err).toBeFalsy();
+            expect(loadDataCallbackHasRun).toBeTruthy();
+            done();
         });
 
     });

package/src/source/geojson_worker_source.ts

@@ -21,6 +21,7 @@ import type StyleLayerIndex from '../style/style_layer_index';
 import type {LoadVectorDataCallback} from './vector_tile_worker_source';
 import type {RequestParameters, ResponseCallback} from '../util/ajax';
 import type {Callback} from '../types/callback';
+import type {Cancelable} from '../types/cancelable';
 
 export type LoadGeoJSONParameters = {
     request?: RequestParameters;
@@ -33,7 +34,7 @@ export type LoadGeoJSONParameters = {
     filter?: Array<unknown>;
 };
 
-export type LoadGeoJSON = (params: LoadGeoJSONParameters, callback: ResponseCallback<any>) => void;
+export type LoadGeoJSON = (params: LoadGeoJSONParameters, callback: ResponseCallback<any>) => Cancelable;
 
 export interface GeoJSONIndex {
     getTile(z: number, x: number, y: number): any;
@@ -72,10 +73,6 @@ function loadGeoJSONTile(params: WorkerTileParameters, callback: LoadVectorDataC
     });
 }
 
-export type SourceState = // Source empty or data loaded
-'Idle' | // Data finished loading, but discard 'loadData' messages until receiving 'coalesced'
-'Coalescing' | 'NeedsLoadData';  // 'loadData' received while coalescing, trigger one more 'loadData' on receiving 'coalesced'
-
 /**
  * The {@link WorkerSource} implementation that supports {@link GeoJSONSource}.
  * This class is designed to be easily reused to support custom source types
@@ -87,12 +84,11 @@ export type SourceState = // Source empty or data loaded
  * @private
  */
 class GeoJSONWorkerSource extends VectorTileWorkerSource {
-    _state: SourceState;
     _pendingCallback: Callback<{
         resourceTiming?: {[_: string]: Array<PerformanceResourceTiming>};
         abandoned?: boolean;
     }>;
-    _pendingLoadDataParams: LoadGeoJSONParameters;
+    _pendingRequest: Cancelable;
     _geoJSONIndex: GeoJSONIndex;
 
     /**
@@ -117,9 +113,8 @@ class GeoJSONWorkerSource extends VectorTileWorkerSource {
      * expecting `callback(error, data)` to be called with either an error or a
      * parsed GeoJSON object.
      *
-     * When `loadData` requests come in faster than they can be processed,
-     * they are coalesced into a single request using the latest data.
-     * See {@link GeoJSONWorkerSource#coalesce}
+     * When a `loadData` request comes in while a previous one is being processed,
+     * the previous one is aborted.
      *
      * @param params
      * @param callback
@@ -129,40 +124,20 @@ class GeoJSONWorkerSource extends VectorTileWorkerSource {
         resourceTiming?: {[_: string]: Array<PerformanceResourceTiming>};
         abandoned?: boolean;
     }>) {
+        this._pendingRequest?.cancel();
         if (this._pendingCallback) {
             // Tell the foreground the previous call has been abandoned
             this._pendingCallback(null, {abandoned: true});
         }
-        this._pendingCallback = callback;
-        this._pendingLoadDataParams = params;
-
-        if (this._state &&
-            this._state !== 'Idle') {
-            this._state = 'NeedsLoadData';
-        } else {
-            this._state = 'Coalescing';
-            this._loadData();
-        }
-    }
-
-    /**
-     * Internal implementation: called directly by `loadData`
-     * or by `coalesce` using stored parameters.
-     */
-    _loadData() {
-        if (!this._pendingCallback || !this._pendingLoadDataParams) {
-            assert(false);
-            return;
-        }
-        const callback = this._pendingCallback;
-        const params = this._pendingLoadDataParams;
-        delete this._pendingCallback;
-        delete this._pendingLoadDataParams;
 
         const perf = (params && params.request && params.request.collectResourceTiming) ?
             new RequestPerformance(params.request) : false;
 
-        this.loadGeoJSON(params, (err?: Error | null, data?: any | null) => {
+        this._pendingCallback = callback;
+        this._pendingRequest = this.loadGeoJSON(params, (err?: Error | null, data?: any | null) => {
+            delete this._pendingCallback;
+            delete this._pendingRequest;
+
             if (err || !data) {
                 return callback(err);
             } else if (typeof data !== 'object') {
@@ -204,35 +179,6 @@ class GeoJSONWorkerSource extends VectorTileWorkerSource {
         });
     }
 
-    /**
-     * While processing `loadData`, we coalesce all further
-     * `loadData` messages into a single call to _loadData
-     * that will happen once we've finished processing the
-     * first message. {@link GeoJSONSource#_updateWorkerData}
-     * is responsible for sending us the `coalesce` message
-     * at the time it receives a response from `loadData`
-     *
-     *          State: Idle
-     *          ↑          |
-     *     'coalesce'   'loadData'
-     *          |     (triggers load)
-     *          |          ↓
-     *        State: Coalescing
-     *          ↑          |
-     *   (triggers load)   |
-     *     'coalesce'   'loadData'
-     *          |          ↓
-     *        State: NeedsLoadData
-     */
-    coalesce() {
-        if (this._state === 'Coalescing') {
-            this._state = 'Idle';
-        } else if (this._state === 'NeedsLoadData') {
-            this._state = 'Coalescing';
-            this._loadData();
-        }
-    }
-
     /**
     * Implements {@link WorkerSource#reloadTile}.
     *
@@ -264,24 +210,27 @@ class GeoJSONWorkerSource extends VectorTileWorkerSource {
      * @param params
      * @param [params.url] A URL to the remote GeoJSON data.
      * @param [params.data] Literal GeoJSON data. Must be provided if `params.url` is not.
+     * @returns {Cancelable} A Cancelable object.
      * @private
      */
-    loadGeoJSON(params: LoadGeoJSONParameters, callback: ResponseCallback<any>) {
+    loadGeoJSON(params: LoadGeoJSONParameters, callback: ResponseCallback<any>): Cancelable {
         // Because of same origin issues, urls must either include an explicit
         // origin or absolute path.
         // ie: /foo/bar.json or http://example.com/bar.json
         // but not ../foo/bar.json
         if (params.request) {
-            getJSON(params.request, callback);
+            return getJSON(params.request, callback);
         } else if (typeof params.data === 'string') {
             try {
-                return callback(null, JSON.parse(params.data));
+                callback(null, JSON.parse(params.data));
             } catch (e) {
-                return callback(new Error(`Input data given to '${params.source}' is not a valid GeoJSON object.`));
+                callback(new Error(`Input data given to '${params.source}' is not a valid GeoJSON object.`));
             }
         } else {
-            return callback(new Error(`Input data given to '${params.source}' is not a valid GeoJSON object.`));
+            callback(new Error(`Input data given to '${params.source}' is not a valid GeoJSON object.`));
         }
+
+        return {cancel: () => {}};
     }
 
     removeSource(params: {

package/src/source/raster_dem_tile_source.ts

@@ -70,15 +70,16 @@ class RasterDEMTileSource extends RasterTileSource implements Source {
             }
         }
 
-        function done(err, dem) {
+        function done(err, data) {
             if (err) {
                 tile.state = 'errored';
                 callback(err);
             }
 
-            if (dem) {
-                tile.dem = dem;
+            if (data) {
+                tile.dem = data;
                 tile.needsHillshadePrepare = true;
+                tile.needsTerrainPrepare = true;
                 tile.state = 'loaded';
                 callback(null);
             }

package/src/source/raster_dem_tile_worker_source.ts

@@ -1,6 +1,5 @@
 import DEMData from '../data/dem_data';
 import {RGBAImage} from '../util/image';
-
 import type Actor from '../util/actor';
 import type {
     WorkerDEMTileParameters,

package/src/source/source_cache.test.ts

@@ -1690,3 +1690,86 @@ describe('SourceCache#onRemove', () => {
         expect(sourceOnRemove).toHaveBeenCalled();
     });
 });
+
+describe('SourceCache#usedForTerrain', () => {
+    test('loads covering tiles with usedForTerrain with source zoom 0-14', done => {
+        const transform = new Transform();
+        transform.resize(511, 511);
+        transform.zoom = 10;
+
+        const sourceCache = createSourceCache({});
+        sourceCache.usedForTerrain = true;
+        sourceCache.tileSize = 1024;
+        expect(sourceCache.usedForTerrain).toBeTruthy();
+        sourceCache.on('data', (e) => {
+            if (e.sourceDataType === 'metadata') {
+                sourceCache.update(transform);
+                expect(Object.values(sourceCache._tiles).map(t => t.tileID.key)).toEqual(
+                    ['2tc099', '2tbz99', '2sxs99', '2sxr99', 'pds88', 'eo55', 'pdr88', 'en55', 'p6o88', 'ds55', 'p6n88', 'dr55']
+                );
+                done();
+            }
+        });
+        sourceCache.onAdd(undefined);
+    });
+
+    test('loads covering tiles with usedForTerrain with source zoom 8-14', done => {
+        const transform = new Transform();
+        transform.resize(511, 511);
+        transform.zoom = 10;
+
+        const sourceCache = createSourceCache({minzoom: 8, maxzoom: 14});
+        sourceCache.usedForTerrain = true;
+        sourceCache.tileSize = 1024;
+        sourceCache.on('data', (e) => {
+            if (e.sourceDataType === 'metadata') {
+                sourceCache.update(transform);
+                expect(Object.values(sourceCache._tiles).map(t => t.tileID.key)).toEqual(
+                    ['2tc099', '2tbz99', '2sxs99', '2sxr99', 'pds88', 'pdr88', 'p6o88', 'p6n88']
+                );
+                done();
+            }
+        });
+        sourceCache.onAdd(undefined);
+    });
+
+    test('loads covering tiles with usedForTerrain with source zoom 0-4', done => {
+        const transform = new Transform();
+        transform.resize(511, 511);
+        transform.zoom = 10;
+
+        const sourceCache = createSourceCache({minzoom: 0, maxzoom: 4});
+        sourceCache.usedForTerrain = true;
+        sourceCache.tileSize = 1024;
+        sourceCache.on('data', (e) => {
+            if (e.sourceDataType === 'metadata') {
+                sourceCache.update(transform);
+                expect(Object.values(sourceCache._tiles).map(t => t.tileID.key)).toEqual(
+                    ['1033', '3s44', '3r44', '3c44', '3b44', 'z33', 's33', 'r33']
+                );
+                done();
+            }
+        });
+        sourceCache.onAdd(undefined);
+    });
+
+    test('loads covering tiles with usedForTerrain with source zoom 4-4', done => {
+        const transform = new Transform();
+        transform.resize(511, 511);
+        transform.zoom = 10;
+
+        const sourceCache = createSourceCache({minzoom: 4, maxzoom: 4});
+        sourceCache.usedForTerrain = true;
+        sourceCache.tileSize = 1024;
+        sourceCache.on('data', (e) => {
+            if (e.sourceDataType === 'metadata') {
+                sourceCache.update(transform);
+                expect(Object.values(sourceCache._tiles).map(t => t.tileID.key)).toEqual(
+                    ['3s44', '3r44', '3c44', '3b44']
+                );
+                done();
+            }
+        });
+        sourceCache.onAdd(undefined);
+    });
+});