Async Actor

src/data/dem_data.ts

@@ -16,7 +16,7 @@ import {register} from '../util/web_worker_transfer';
 export type DEMEncoding = 'mapbox' | 'terrarium' | 'custom'
 
 export class DEMData {
-    uid: string;
+    uid: string | number;
     data: Uint32Array;
     stride: number;
     dim: number;
@@ -29,7 +29,7 @@ export class DEMData {
 
     // RGBAImage data has uniform 1px padding on all sides: square tile edge size defines stride
     // and dim is calculated as stride - 2.
-    constructor(uid: string, data: RGBAImage, encoding: DEMEncoding, redFactor = 1.0, greenFactor = 1.0, blueFactor = 1.0, baseShift = 0.0) {
+    constructor(uid: string | number, data: RGBAImage, encoding: DEMEncoding, redFactor = 1.0, greenFactor = 1.0, blueFactor = 1.0, baseShift = 0.0) {
         this.uid = uid;
         if (data.height !== data.width) throw new RangeError('DEM tiles must be square');
         if (encoding && !['mapbox', 'terrarium', 'custom'].includes(encoding)) {

src/source/geojson_source.test.ts

@@ -16,7 +16,7 @@ const wrapDispatcher = (dispatcher) => {
 };
 
 const mockDispatcher = wrapDispatcher({
-    send() {}
+    sendAsync() { return Promise.resolve({}); }
 });
 
 const hawkHill = {
@@ -58,10 +58,10 @@ describe('GeoJSONSource#setData', () => {
         opts = opts || {};
         opts = extend(opts, {data: {}});
         return new GeoJSONSource('id', opts, wrapDispatcher({
-            send (type, data, callback) {
-                if (callback) {
-                    return setTimeout(callback, 0);
-                }
+            sendAsync(_message) {
+                return new Promise((resolve) => {
+                    setTimeout(() => resolve({}), 0);
+                });
             }
         }), undefined);
     }
@@ -91,8 +91,10 @@ describe('GeoJSONSource#setData', () => {
 
     test('fires "dataabort" event', done => {
         const source = new GeoJSONSource('id', {} as any, wrapDispatcher({
-            send(type, data, callback) {
-                setTimeout(() => callback(null, {abandoned: true}));
+            sendAsync(_message) {
+                return new Promise((resolve) => {
+                    setTimeout(() => resolve({abandoned: true}), 0);
+                });
             }
         }), undefined);
         source.on('dataabort', () => {
@@ -108,13 +110,15 @@ describe('GeoJSONSource#setData', () => {
                 transformRequest: (url) => { return {url}; }
             } as any as RequestManager
         } as any;
-        source.actor.send = function(type, params: any, cb) {
-            if (type === 'geojson.loadData') {
-                expect(params.request.collectResourceTiming).toBeTruthy();
-                setTimeout(cb, 0);
-                done();
-            }
-        } as any;
+        source.actor.sendAsync = (message) => {
+            return new Promise((resolve) => {
+                if (message.type === 'geojson.loadData') {
+                    expect((message.data as any).request.collectResourceTiming).toBeTruthy();
+                    setTimeout(() => resolve({} as any), 0);
+                    done();
+                }
+            });
+        };
         source.setData('http://localhost/nonexistent');
     });
 
@@ -148,8 +152,10 @@ describe('GeoJSONSource#setData', () => {
 
     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}));
+            sendAsync(_message) {
+                return new Promise((resolve) => {
+                    setTimeout(() => resolve({abandoned: true}), 0);
+                });
             }
         }), undefined);
         source.on('dataabort', () => {
@@ -163,11 +169,11 @@ describe('GeoJSONSource#setData', () => {
 describe('GeoJSONSource#onRemove', () => {
     test('broadcasts "removeSource" event', done => {
         const source = new GeoJSONSource('id', {data: {}} as GeoJSONSourceOptions, wrapDispatcher({
-            send(type, data, callback) {
-                expect(callback).toBeFalsy();
-                expect(type).toBe('removeSource');
-                expect(data).toEqual({type: 'geojson', source: 'id'});
+            sendAsync(message) {
+                expect(message.type).toBe('removeSource');
+                expect(message.data).toEqual({type: 'geojson', source: 'id'});
                 done();
+                return Promise.resolve({});
             },
             broadcast() {
                 // Ignore
@@ -187,9 +193,10 @@ describe('GeoJSONSource#update', () => {
 
     test('sends initial loadData request to dispatcher', done => {
         const mockDispatcher = wrapDispatcher({
-            send(message) {
-                expect(message).toBe('geojson.loadData');
+            sendAsync(message) {
+                expect(message.type).toBe('geojson.loadData');
                 done();
+                return Promise.resolve({});
             }
         });
 
@@ -198,9 +205,9 @@ describe('GeoJSONSource#update', () => {
 
     test('forwards geojson-vt options with worker request', done => {
         const mockDispatcher = wrapDispatcher({
-            send(message, params) {
-                expect(message).toBe('geojson.loadData');
-                expect(params.geojsonVtOptions).toEqual({
+            sendAsync(message) {
+                expect(message.type).toBe('geojson.loadData');
+                expect(message.data.geojsonVtOptions).toEqual({
                     extent: 8192,
                     maxZoom: 10,
                     tolerance: 4,
@@ -209,6 +216,7 @@ describe('GeoJSONSource#update', () => {
                     generateId: true
                 });
                 done();
+                return Promise.resolve({});
             }
         });
 
@@ -223,9 +231,9 @@ describe('GeoJSONSource#update', () => {
 
     test('forwards Supercluster options with worker request', done => {
         const mockDispatcher = wrapDispatcher({
-            send(message, params) {
-                expect(message).toBe('geojson.loadData');
-                expect(params.superclusterOptions).toEqual({
+            sendAsync(message) {
+                expect(message.type).toBe('geojson.loadData');
+                expect(message.data.superclusterOptions).toEqual({
                     maxZoom: 12,
                     minPoints: 3,
                     extent: 8192,
@@ -234,6 +242,7 @@ describe('GeoJSONSource#update', () => {
                     generateId: true
                 });
                 done();
+                return Promise.resolve({});
             }
         });
 
@@ -250,12 +259,13 @@ describe('GeoJSONSource#update', () => {
     test('modifying cluster properties after adding a source', done => {
         // test setCluster function on GeoJSONSource
         const mockDispatcher = wrapDispatcher({
-            send(message, params) {
-                expect(message).toBe('geojson.loadData');
-                expect(params.cluster).toBe(true);
-                expect(params.superclusterOptions.radius).toBe(80);
-                expect(params.superclusterOptions.maxZoom).toBe(16);
+            sendAsync(message) {
+                expect(message.type).toBe('geojson.loadData');
+                expect(message.data.cluster).toBe(true);
+                expect(message.data.superclusterOptions.radius).toBe(80);
+                expect(message.data.superclusterOptions.maxZoom).toBe(16);
                 done();
+                return Promise.resolve({});
             }
         });
         new GeoJSONSource('id', {
@@ -270,9 +280,9 @@ describe('GeoJSONSource#update', () => {
 
     test('forwards Supercluster options with worker request, ignore max zoom of source', done => {
         const mockDispatcher = wrapDispatcher({
-            send(message, params) {
-                expect(message).toBe('geojson.loadData');
-                expect(params.superclusterOptions).toEqual({
+            sendAsync(message) {
+                expect(message.type).toBe('geojson.loadData');
+                expect(message.data.superclusterOptions).toEqual({
                     maxZoom: 12,
                     minPoints: 3,
                     extent: 8192,
@@ -281,6 +291,7 @@ describe('GeoJSONSource#update', () => {
                     generateId: true
                 });
                 done();
+                return Promise.resolve({});
             }
         });
 
@@ -309,10 +320,10 @@ describe('GeoJSONSource#update', () => {
     });
     test('fires event when metadata loads', done => {
         const mockDispatcher = wrapDispatcher({
-            send(message, args, callback) {
-                if (callback) {
-                    setTimeout(callback, 0);
-                }
+            sendAsync(_message) {
+                return new Promise((resolve) => {
+                    setTimeout(() => resolve({}), 0);
+                });
             }
         });
 
@@ -328,8 +339,10 @@ describe('GeoJSONSource#update', () => {
     test('fires metadata data event even when initial request is aborted', done => {
         let requestCount = 0;
         const mockDispatcher = wrapDispatcher({
-            send(message, args, callback) {
-                setTimeout(() => callback(null, {abandoned: requestCount++ === 0}));
+            sendAsync(_message) {
+                return new Promise((resolve) => {
+                    setTimeout(() => resolve({abandoned: requestCount++ === 0}));
+                });
             }
         });
 
@@ -345,10 +358,8 @@ describe('GeoJSONSource#update', () => {
 
     test('fires "error"', done => {
         const mockDispatcher = wrapDispatcher({
-            send(message, args, callback) {
-                if (callback) {
-                    setTimeout(callback.bind(null, 'error'), 0);
-                }
+            sendAsync(_message) {
+                return Promise.reject('error'); // eslint-disable-line prefer-promise-reject-errors
             }
         });
 
@@ -365,13 +376,11 @@ describe('GeoJSONSource#update', () => {
     test('sends loadData request to dispatcher after data update', done => {
         let expectedLoadDataCalls = 2;
         const mockDispatcher = wrapDispatcher({
-            send(message, args, callback) {
-                if (message === 'geojson.loadData' && --expectedLoadDataCalls <= 0) {
+            sendAsync(message) {
+                if (message.type === 'geojson.loadData' && --expectedLoadDataCalls <= 0) {
                     done();
                 }
-                if (callback) {
-                    setTimeout(callback, 0);
-                }
+                return new Promise((resolve) => setTimeout(() => resolve({}), 0));
             }
         });