maplibre-gl 2.2.0-pre.2 → 2.2.0

package/src/ui/map_events.test.ts

@@ -1,6 +1,7 @@
 import simulate, {window} from '../../test/unit/lib/simulate_interaction';
 import StyleLayer from '../style/style_layer';
 import {createMap, setPerformance, setWebGlContext} from '../util/test/util';
+import {MapGeoJSONFeature} from '../util/vectortile_to_geojson';
 import {MapLayerEventType} from './events';
 
 beforeEach(() => {
@@ -37,10 +38,10 @@ describe('map events', () => {
 
     test('Map#on adds a listener for an event on a given layer', () => {
         const map = createMap();
-        const features = [{}];
+        const features = [{} as MapGeoJSONFeature];
 
         jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-        jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((point, options) => {
+        jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((_point, options) => {
             expect(options).toEqual({layers: ['layer']});
             return features;
         });
@@ -79,7 +80,7 @@ describe('map events', () => {
     test('Map#on adds a listener not triggered when the specified layer does not exiist', () => {
         const map = createMap();
 
-        jest.spyOn(map, 'getLayer').mockReturnValue(null);
+        jest.spyOn(map, 'getLayer').mockReturnValue(null as unknown as StyleLayer);
 
         const spy = jest.fn();
 
@@ -94,7 +95,7 @@ describe('map events', () => {
         const map = createMap();
 
         jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
         const spyDown = jest.fn((e) => {
             expect(e.type).toBe('mousedown');
@@ -114,11 +115,11 @@ describe('map events', () => {
 
     test('Map#on distinguishes distinct layers', () => {
         const map = createMap();
-        const featuresA = [{}];
-        const featuresB = [{}];
+        const featuresA = [{} as MapGeoJSONFeature];
+        const featuresB = [{} as MapGeoJSONFeature];
 
         jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-        jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((point, options) => {
+        jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((_point, options) => {
             return (options as any).layers[0] === 'A' ? featuresA : featuresB;
         });
 
@@ -142,7 +143,7 @@ describe('map events', () => {
         const map = createMap();
 
         jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
         const spyA = jest.fn();
         const spyB = jest.fn();
@@ -159,7 +160,7 @@ describe('map events', () => {
         const map = createMap();
 
         jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
         const spy = jest.fn();
 
@@ -175,7 +176,7 @@ describe('map events', () => {
         const map = createMap();
 
         jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
         const spy = jest.fn((e) => {
             expect(e.type).toBe('mousedown');
@@ -191,7 +192,7 @@ describe('map events', () => {
 
     test('Map#off distinguishes distinct layers', () => {
         const map = createMap();
-        const featuresA = [{}];
+        const featuresA = [{} as MapGeoJSONFeature];
 
         jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
         jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((point, options) => {
@@ -215,7 +216,7 @@ describe('map events', () => {
         const map = createMap();
 
         jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+        jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
         const spyA = jest.fn();
         const spyB = jest.fn();
@@ -233,7 +234,7 @@ describe('map events', () => {
         test(`Map#on ${event} does not fire if the specified layer does not exist`, () => {
             const map = createMap();
 
-            jest.spyOn(map, 'getLayer').mockReturnValue(null);
+            jest.spyOn(map, 'getLayer').mockReturnValue(null as unknown as StyleLayer);
 
             const spy = jest.fn();
 
@@ -247,10 +248,10 @@ describe('map events', () => {
 
         test(`Map#on ${event} fires when entering the specified layer`, () => {
             const map = createMap();
-            const features = [{}];
+            const features = [{} as MapGeoJSONFeature];
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((point, options) => {
+            jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((_point, options) => {
                 expect(options).toEqual({layers: ['layer']});
                 return features;
             });
@@ -272,7 +273,7 @@ describe('map events', () => {
             const map = createMap();
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
             const spy = jest.fn();
 
@@ -288,9 +289,9 @@ describe('map events', () => {
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
             jest.spyOn(map, 'queryRenderedFeatures')
-                .mockReturnValueOnce([{}])
+                .mockReturnValueOnce([{} as MapGeoJSONFeature])
                 .mockReturnValueOnce([])
-                .mockReturnValueOnce([{}]);
+                .mockReturnValueOnce([{} as MapGeoJSONFeature]);
 
             const spy = jest.fn();
 
@@ -306,7 +307,7 @@ describe('map events', () => {
             const map = createMap();
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
             const spy = jest.fn();
 
@@ -320,11 +321,11 @@ describe('map events', () => {
 
         test(`Map#on ${event} distinguishes distinct layers`, () => {
             const map = createMap();
-            const featuresA = [{}];
-            const featuresB = [{}];
+            const featuresA = [{} as MapGeoJSONFeature];
+            const featuresB = [{} as MapGeoJSONFeature];
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((point, options) => {
+            jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((_point, options) => {
                 return (options as any).layers[0] === 'A' ? featuresA : featuresB;
             });
 
@@ -350,7 +351,7 @@ describe('map events', () => {
             const map = createMap();
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
             const spyA = jest.fn();
             const spyB = jest.fn();
@@ -367,7 +368,7 @@ describe('map events', () => {
             const map = createMap();
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
             const spy = jest.fn();
 
@@ -381,10 +382,10 @@ describe('map events', () => {
 
         test(`Map#off ${event} distinguishes distinct layers`, () => {
             const map = createMap();
-            const featuresA = [{}];
+            const featuresA = [{} as MapGeoJSONFeature];
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((point, options) => {
+            jest.spyOn(map, 'queryRenderedFeatures').mockImplementation((_point, options) => {
                 expect(options).toEqual({layers: ['A']});
                 return featuresA;
             });
@@ -405,7 +406,7 @@ describe('map events', () => {
             const map = createMap();
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
             const spyA = jest.fn();
             const spyB = jest.fn();
@@ -424,7 +425,7 @@ describe('map events', () => {
         test(`Map#on ${event} does not fire if the specified layer does not exiist`, () => {
             const map = createMap();
 
-            jest.spyOn(map, 'getLayer').mockReturnValue(null);
+            jest.spyOn(map, 'getLayer').mockReturnValue(null as unknown as StyleLayer);
 
             const spy = jest.fn();
 
@@ -440,7 +441,7 @@ describe('map events', () => {
             const map = createMap();
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
             const spy = jest.fn();
 
@@ -457,7 +458,7 @@ describe('map events', () => {
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
             jest.spyOn(map, 'queryRenderedFeatures')
-                .mockReturnValueOnce([{}])
+                .mockReturnValueOnce([{} as MapGeoJSONFeature])
                 .mockReturnValueOnce([]);
 
             const spy = jest.fn(function (e) {
@@ -477,7 +478,7 @@ describe('map events', () => {
             const map = createMap();
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
-            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{}]);
+            jest.spyOn(map, 'queryRenderedFeatures').mockReturnValue([{} as MapGeoJSONFeature]);
 
             const spy = jest.fn(function (e) {
                 expect(this).toBe(map);
@@ -497,7 +498,7 @@ describe('map events', () => {
 
             jest.spyOn(map, 'getLayer').mockReturnValue({} as StyleLayer);
             jest.spyOn(map, 'queryRenderedFeatures')
-                .mockReturnValueOnce([{}])
+                .mockReturnValueOnce([{} as MapGeoJSONFeature])
                 .mockReturnValueOnce([]);
 
             const spy = jest.fn();

package/src/ui/popup.test.ts

@@ -625,8 +625,8 @@ describe('popup', () => {
             .trackPointer()
             .addTo(map);
 
-        simulate.mousemove(map.getCanvas(), {screenX:0, screenY:0});
-        expect(popup._pos).toEqual({x:0, y:0});
+        simulate.mousemove(map.getCanvas(), {screenX: 0, screenY: 0});
+        expect(popup._pos).toEqual({x: 0, y: 0});
     });
 
     test('Popup closes on Map#remove', () => {

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/find_pole_of_inaccessibility.ts

@@ -13,7 +13,7 @@ import {distToSegmentSquared} from './intersection_tests';
  * @returns Pole of Inaccessibiliy.
  * @private
  */
-export default function(
+export default function findPoleOfInaccessibility(
     polygonRings: Array<Array<Point>>,
     precision: number = 1,
     debug: boolean = false

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/smart_wrap.ts

@@ -18,7 +18,7 @@ import type Transform from '../geo/transform';
  *
  * @private
  */
-export default function(lngLat: LngLat, priorPos: Point, transform: Transform): LngLat {
+export default function smartWrap(lngLat: LngLat, priorPos: Point, transform: Transform): LngLat {
     lngLat = new LngLat(lngLat.lng, lngLat.lat);
 
     // First, try shifting one world in either direction, and see if either is closer to the

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 => {