maplibre-gl 2.2.0-pre.3 → 2.2.1

package/src/util/ajax.test.ts

@@ -34,7 +34,7 @@ describe('ajax', () => {
         server.respondWith(request => {
             request.respond(404, undefined, '404 Not Found');
         });
-        getArrayBuffer({url:'http://example.com/test.bin'}, async (error) => {
+        getArrayBuffer({url: 'http://example.com/test.bin'}, async (error) => {
             const ajaxError = error as AJAXError;
             const body = await readAsText(ajaxError.body);
             expect(ajaxError.status).toBe(404);
@@ -50,7 +50,7 @@ describe('ajax', () => {
         server.respondWith(request => {
             request.respond(200, {'Content-Type': 'application/json'}, '{"foo": "bar"}');
         });
-        getJSON({url:''}, (error, body) => {
+        getJSON({url: ''}, (error, body) => {
             expect(error).toBeFalsy();
             expect(body).toEqual({foo: 'bar'});
             done();
@@ -62,7 +62,7 @@ describe('ajax', () => {
         server.respondWith(request => {
             request.respond(200, {'Content-Type': 'application/json'}, 'how do i even');
         });
-        getJSON({url:''}, (error) => {
+        getJSON({url: ''}, (error) => {
             expect(error).toBeTruthy();
             done();
         });
@@ -73,7 +73,7 @@ describe('ajax', () => {
         server.respondWith(request => {
             request.respond(404, undefined, '404 Not Found');
         });
-        getJSON({url:'http://example.com/test.json'}, async (error) => {
+        getJSON({url: 'http://example.com/test.json'}, async (error) => {
             const ajaxError = error as AJAXError;
             const body = await readAsText(ajaxError.body);
             expect(ajaxError.status).toBe(404);
@@ -89,7 +89,7 @@ describe('ajax', () => {
         server.respondWith(request => {
             request.respond(204, undefined, undefined);
         });
-        postData({url:'api.mapbox.com'}, (error) => {
+        postData({url: 'api.mapbox.com'}, (error) => {
             expect(error).toBeNull();
             done();
         });

package/src/util/ajax.ts

@@ -341,7 +341,7 @@ function arrayBufferToImageBitmap(data: ArrayBuffer, callback: (err?: Error | nu
     });
 }
 
-export type ExpiryData = {cacheControl?: string | null; expires?: string | null};
+export type ExpiryData = {cacheControl?: string | null; expires?: Date | string | null};
 
 function arrayBufferToCanvasImageSource(data: ArrayBuffer, callback: Callback<CanvasImageSource>) {
     const imageBitmapSupported = typeof createImageBitmap === 'function';

package/src/util/classify_rings.test.ts

@@ -16,11 +16,11 @@ describe('classifyRings', () => {
 
         geometry = [
             [
-                {x:0, y:0},
-                {x:0, y:40},
-                {x:40, y:40},
-                {x:40, y:0},
-                {x:0, y:0}
+                {x: 0, y: 0},
+                {x: 0, y: 40},
+                {x: 40, y: 40},
+                {x: 40, y: 0},
+                {x: 0, y: 0}
             ]
         ];
         classified = classifyRings(geometry, undefined);
@@ -29,18 +29,18 @@ describe('classifyRings', () => {
 
         geometry = [
             [
-                {x:0, y:0},
-                {x:0, y:40},
-                {x:40, y:40},
-                {x:40, y:0},
-                {x:0, y:0}
+                {x: 0, y: 0},
+                {x: 0, y: 40},
+                {x: 40, y: 40},
+                {x: 40, y: 0},
+                {x: 0, y: 0}
             ],
             [
-                {x:60, y:0},
-                {x:60, y:40},
-                {x:100, y:40},
-                {x:100, y:0},
-                {x:60, y:0}
+                {x: 60, y: 0},
+                {x: 60, y: 40},
+                {x: 100, y: 40},
+                {x: 100, y: 0},
+                {x: 60, y: 0}
             ]
         ];
         classified = classifyRings(geometry, undefined);
@@ -50,17 +50,17 @@ describe('classifyRings', () => {
 
         geometry = [
             [
-                {x:0, y:0},
-                {x:0, y:40},
-                {x:40, y:40},
-                {x:40, y:0},
-                {x:0, y:0}
+                {x: 0, y: 0},
+                {x: 0, y: 40},
+                {x: 40, y: 40},
+                {x: 40, y: 0},
+                {x: 0, y: 0}
             ],
             [
-                {x:10, y:10},
-                {x:20, y:10},
-                {x:20, y:20},
-                {x:10, y:10}
+                {x: 10, y: 10},
+                {x: 20, y: 10},
+                {x: 20, y: 20},
+                {x: 10, y: 10}
             ]
         ];
         classified = classifyRings(geometry, undefined);
@@ -80,11 +80,11 @@ describe('classifyRings + maxRings', () => {
     function createGeometry(options?) {
         const geometry = [
             // Outer ring, area = 3200
-            [ {x:0, y:0}, {x:0, y:40}, {x:40, y:40}, {x:40, y:0}, {x:0, y:0} ],
+            [{x: 0, y: 0}, {x: 0, y: 40}, {x: 40, y: 40}, {x: 40, y: 0}, {x: 0, y: 0}],
             // Inner ring, area = 100
-            [ {x:30, y:30}, {x:32, y:30}, {x:32, y:32}, {x:30, y:30} ],
+            [{x: 30, y: 30}, {x: 32, y: 30}, {x: 32, y: 32}, {x: 30, y: 30}],
             // Inner ring, area = 4
-            [ {x:10, y:10}, {x:20, y:10}, {x:20, y:20}, {x:10, y:10} ]
+            [{x: 10, y: 10}, {x: 20, y: 10}, {x: 20, y: 20}, {x: 10, y: 10}]
         ] as Point[][];
         if (options && options.reverse) {
             geometry[0].reverse();

package/src/util/primitives.ts

@@ -7,12 +7,12 @@ class Frustum {
     public static fromInvProjectionMatrix(invProj: mat4, worldSize: number, zoom: number): Frustum {
         const clipSpaceCorners = [
             [-1, 1, -1, 1],
-            [ 1, 1, -1, 1],
-            [ 1, -1, -1, 1],
+            [1, 1, -1, 1],
+            [1, -1, -1, 1],
             [-1, -1, -1, 1],
             [-1, 1, 1, 1],
-            [ 1, 1, 1, 1],
-            [ 1, -1, 1, 1],
+            [1, 1, 1, 1],
+            [1, -1, 1, 1],
             [-1, -1, 1, 1]
         ];
 

package/src/util/resolve_tokens.test.ts

@@ -1,7 +1,7 @@
 import resolveTokens from './resolve_tokens';
 
 test('resolveToken', () => {
-    expect('3 Fine Fields').toBe(resolveTokens({a:3, b:'Fine', c:'Fields'}, '{a} {b} {c}'));
+    expect('3 Fine Fields').toBe(resolveTokens({a: 3, b: 'Fine', c: 'Fields'}, '{a} {b} {c}'));
 
     // No tokens.
     expect(resolveTokens({}, 'Test')).toBe('Test');

package/src/util/tile_request_cache.test.ts

@@ -21,7 +21,7 @@ describe('tile_request_cache', () => {
 
         let result;
         try {
-            result = cachePut({url:''} as Request, undefined, undefined);
+            result = cachePut({url: ''} as Request, undefined, undefined);
             expect(result).toBeFalsy();
         } catch (e) {
             expect(e).toBeFalsy();
@@ -32,7 +32,7 @@ describe('tile_request_cache', () => {
     test('cacheGet, no caches', done => {
         delete global.caches;
 
-        cacheGet({url:''} as Request, (result) => {
+        cacheGet({url: ''} as Request, (result) => {
             expect(result).toBeFalsy();
             expect(result).toBeNull();
             done();
@@ -42,7 +42,7 @@ describe('tile_request_cache', () => {
     test('cacheGet, cache open error', done => {
         global.caches.open = jest.fn().mockRejectedValue(new Error('The operation is insecure'));
 
-        cacheGet({url:''} as Request, (error) => {
+        cacheGet({url: ''} as Request, (error) => {
             expect(error).toBeTruthy();
             expect(error.message).toBe('The operation is insecure');
             done();
@@ -55,7 +55,7 @@ describe('tile_request_cache', () => {
         };
         global.caches.open = jest.fn().mockResolvedValue(fakeCache);
 
-        cacheGet({url:'someurl'} as Request, (error) => {
+        cacheGet({url: 'someurl'} as Request, (error) => {
             expect(error).toBeTruthy();
             expect(error.message).toBe('ohno');
             done();
@@ -86,7 +86,7 @@ describe('tile_request_cache', () => {
         };
         global.caches.open = jest.fn().mockResolvedValue(fakeCache);
 
-        cacheGet({url:'someurl'} as Request, (error, response, fresh) => {
+        cacheGet({url: 'someurl'} as Request, (error, response, fresh) => {
             expect(error).toBeFalsy();
             expect(fakeCache.match).toHaveBeenCalledWith('someurl');
             expect(fakeCache.delete).toHaveBeenCalledWith('someurl');

package/src/util/util.test.ts

@@ -6,11 +6,11 @@ describe('util', () => {
     expect(easeCubicInOut(0.2)).toBe(0.03200000000000001);
     expect(easeCubicInOut(0.5)).toBe(0.5);
     expect(easeCubicInOut(1)).toBe(1);
-    expect(keysDifference({a:1}, {})).toEqual(['a']);
-    expect(keysDifference({a:1}, {a:1})).toEqual([]);
-    expect(extend({a:1}, {b:2})).toEqual({a:1, b:2});
-    expect(pick({a:1, b:2, c:3}, ['a', 'c'])).toEqual({a:1, c:3});
-    expect(pick({a:1, b:2, c:3}, ['a', 'c', 'd'])).toEqual({a:1, c:3});
+    expect(keysDifference({a: 1}, {})).toEqual(['a']);
+    expect(keysDifference({a: 1}, {a: 1})).toEqual([]);
+    expect(extend({a: 1}, {b: 2})).toEqual({a: 1, b: 2});
+    expect(pick({a: 1, b: 2, c: 3}, ['a', 'c'])).toEqual({a: 1, c: 3});
+    expect(pick({a: 1, b: 2, c: 3}, ['a', 'c', 'd'])).toEqual({a: 1, c: 3});
     expect(typeof uniqueId() === 'number').toBeTruthy();
 
     test('bindAll', done => {

package/src/util/util.ts

@@ -384,7 +384,6 @@ export function sphericalToCartesian([r, azimuthal, polar]: [number, number, num
     };
 }
 
-/* global self, WorkerGlobalScope */
 /**
  *  Returns true if the when run in the web-worker context.
  *
@@ -392,8 +391,8 @@ export function sphericalToCartesian([r, azimuthal, polar]: [number, number, num
  * @returns {boolean}
  */
 export function isWorker(): boolean {
-    return typeof WorkerGlobalScope !== 'undefined' && typeof self !== 'undefined' &&
-           self instanceof WorkerGlobalScope;
+    // @ts-ignore
+    return typeof WorkerGlobalScope !== 'undefined' && typeof self !== 'undefined' && self instanceof WorkerGlobalScope;
 }
 
 /**