maplibre-gl 2.1.1 → 2.1.2

package/src/ui/handler/box_zoom.test.ts

@@ -1,6 +1,6 @@
 import Map from '../map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {setWebGlContext, setPerformance, setMatchMedia} from '../../util/test/util';
 
 function createMap(clickTolerance) {

package/src/ui/handler/box_zoom.ts

@@ -24,7 +24,7 @@ class BoxZoomHandler {
      * @private
      */
     constructor(map: Map, options: {
-      clickTolerance: number;
+        clickTolerance: number;
     }) {
         this._map = map;
         this._el = map.getCanvasContainer();

package/src/ui/handler/dblclick_zoom.test.ts

@@ -1,4 +1,4 @@
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {setMatchMedia, setPerformance, setWebGlContext} from '../../util/test/util';
 import Map, {MapOptions} from '../map';
 

package/src/ui/handler/drag_pan.test.ts

@@ -1,5 +1,5 @@
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {setMatchMedia, setPerformance, setWebGlContext} from '../../util/test/util';
 import Map, {MapOptions} from '../map';
 

package/src/ui/handler/drag_rotate.test.ts

@@ -1,7 +1,7 @@
 import {extend} from '../../util/util';
 import Map from '../map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import browser from '../../util/browser';
 
 import {setMatchMedia, setPerformance, setWebGlContext} from '../../util/test/util';

package/src/ui/handler/keyboard.test.ts

@@ -1,6 +1,6 @@
 import Map from '../../ui/map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {extend} from '../../util/util';
 import {setMatchMedia, setPerformance, setWebGlContext} from '../../util/test/util';
 

package/src/ui/handler/keyboard.ts

@@ -53,57 +53,57 @@ class KeyboardHandler {
         let yDir = 0;
 
         switch (e.keyCode) {
-        case 61:
-        case 107:
-        case 171:
-        case 187:
-            zoomDir = 1;
-            break;
-
-        case 189:
-        case 109:
-        case 173:
-            zoomDir = -1;
-            break;
-
-        case 37:
-            if (e.shiftKey) {
-                bearingDir = -1;
-            } else {
-                e.preventDefault();
-                xDir = -1;
-            }
-            break;
-
-        case 39:
-            if (e.shiftKey) {
-                bearingDir = 1;
-            } else {
-                e.preventDefault();
-                xDir = 1;
-            }
-            break;
-
-        case 38:
-            if (e.shiftKey) {
-                pitchDir = 1;
-            } else {
-                e.preventDefault();
-                yDir = -1;
-            }
-            break;
-
-        case 40:
-            if (e.shiftKey) {
-                pitchDir = -1;
-            } else {
-                e.preventDefault();
-                yDir = 1;
-            }
-            break;
-
-        default:
-            return;
+            case 61:
+            case 107:
+            case 171:
+            case 187:
+                zoomDir = 1;
+                break;
+
+            case 189:
+            case 109:
+            case 173:
+                zoomDir = -1;
+                break;
+
+            case 37:
+                if (e.shiftKey) {
+                    bearingDir = -1;
+                } else {
+                    e.preventDefault();
+                    xDir = -1;
+                }
+                break;
+
+            case 39:
+                if (e.shiftKey) {
+                    bearingDir = 1;
+                } else {
+                    e.preventDefault();
+                    xDir = 1;
+                }
+                break;
+
+            case 38:
+                if (e.shiftKey) {
+                    pitchDir = 1;
+                } else {
+                    e.preventDefault();
+                    yDir = -1;
+                }
+                break;
+
+            case 40:
+                if (e.shiftKey) {
+                    pitchDir = -1;
+                } else {
+                    e.preventDefault();
+                    yDir = 1;
+                }
+                break;
+
+            default:
+                return;
         }
 
         if (this._rotationDisabled) {

package/src/ui/handler/map_event.test.ts

@@ -1,6 +1,6 @@
 import Map, {MapOptions} from '../map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {setMatchMedia, setPerformance, setWebGlContext} from '../../util/test/util';
 
 function createMap() {

package/src/ui/handler/map_event.ts

@@ -10,7 +10,7 @@ export class MapEventHandler implements Handler {
     _map: Map;
 
     constructor(map: Map, options: {
-      clickTolerance: number;
+        clickTolerance: number;
     }) {
         this._map = map;
         this._clickTolerance = options.clickTolerance;

package/src/ui/handler/mouse.ts

@@ -25,7 +25,7 @@ class MouseHandler {
     _clickTolerance: number;
 
     constructor(options: {
-      clickTolerance: number;
+        clickTolerance: number;
     }) {
         this.reset();
         this._clickTolerance = options.clickTolerance || 1;

package/src/ui/handler/mouse_rotate.test.ts

@@ -1,7 +1,7 @@
 import {extend} from '../../util/util';
 import Map from '../../ui/map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import browser from '../../util/browser';
 import {setMatchMedia, setPerformance, setWebGlContext} from '../../util/test/util';
 

package/src/ui/handler/scroll_zoom.test.ts

@@ -1,7 +1,7 @@
 import browser from '../../util/browser';
 import Map from '../../ui/map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {setMatchMedia, setPerformance, setWebGlContext} from '../../util/test/util';
 
 function createMap() {

package/src/ui/handler/scroll_zoom.ts

@@ -47,9 +47,9 @@ class ScrollZoomHandler {
     _delta: number;
     _easing: ((a: number) => number);
     _prevEase: {
-      start: number;
-      duration: number;
-      easing: (_: number) => number;
+        start: number;
+        duration: number;
+        easing: (_: number) => number;
     };
 
     _frameId: boolean;
@@ -86,12 +86,12 @@ class ScrollZoomHandler {
     }
 
     /**
-    * Set the zoom rate of a mouse wheel
-    * @param {number} [wheelZoomRate=1/450] The rate used to scale mouse wheel movement to a zoom value.
-    * @example
-    * // Slow down zoom of mouse wheel
-    * map.scrollZoom.setWheelZoomRate(1/600);
-    */
+     * Set the zoom rate of a mouse wheel
+     * @param {number} [wheelZoomRate=1/450] The rate used to scale mouse wheel movement to a zoom value.
+     * @example
+     * // Slow down zoom of mouse wheel
+     * map.scrollZoom.setWheelZoomRate(1/600);
+     */
     setWheelZoomRate(wheelZoomRate: number) {
         this._wheelZoomRate = wheelZoomRate;
     }

package/src/ui/handler/shim/drag_pan.ts

@@ -2,10 +2,10 @@ import type {MousePanHandler} from '../mouse';
 import type TouchPanHandler from './../touch_pan';
 
 export type DragPanOptions = {
-  linearity?: number;
-  easing?: (t: number) => number;
-  deceleration?: number;
-  maxSpeed?: number;
+    linearity?: number;
+    easing?: (t: number) => number;
+    deceleration?: number;
+    maxSpeed?: number;
 };
 
 /**

package/src/ui/handler/shim/drag_rotate.ts

@@ -18,7 +18,7 @@ export default class DragRotateHandler {
      * @private
      */
     constructor(options: {
-      pitchWithRotate: boolean;
+        pitchWithRotate: boolean;
     }, mouseRotate: MouseRotateHandler, mousePitch: MousePitchHandler) {
         this._pitchWithRotate = options.pitchWithRotate;
         this._mouseRotate = mouseRotate;

package/src/ui/handler/shim/touch_zoom_rotate.ts

@@ -41,7 +41,7 @@ export default class TouchZoomRotateHandler {
      *   map.touchZoomRotate.enable({ around: 'center' });
      */
     enable(options?: {
-      around?: 'center';
+        around?: 'center';
     } | null) {
         this._touchZoom.enable(options);
         if (!this._rotationDisabled) this._touchRotate.enable(options);

package/src/ui/handler/tap_recognizer.ts

@@ -20,11 +20,11 @@ export class SingleTapRecognizer {
     startTime: number;
     aborted: boolean;
     touches: {
-      [k in number | string]: Point;
+        [k in number | string]: Point;
     };
 
     constructor(options: {
-      numTouches: number;
+        numTouches: number;
     }) {
         this.reset();
         this.numTouches = options.numTouches;
@@ -92,8 +92,8 @@ export class TapRecognizer {
     count: number;
 
     constructor(options: {
-      numTaps: number;
-      numTouches: number;
+        numTaps: number;
+        numTouches: number;
     }) {
         this.singleTap = new SingleTapRecognizer(options);
         this.numTaps = options.numTaps;

package/src/ui/handler/touch_pan.ts

@@ -6,14 +6,14 @@ export default class TouchPanHandler {
     _enabled: boolean;
     _active: boolean;
     _touches: {
-      [k in string | number]: Point;
+        [k in string | number]: Point;
     };
     _minTouches: number;
     _clickTolerance: number;
     _sum: Point;
 
     constructor(options: {
-      clickTolerance: number;
+        clickTolerance: number;
     }) {
         this._minTouches = 1;
         this._clickTolerance = options.clickTolerance || 1;

package/src/ui/handler/touch_zoom_rotate.test.ts

@@ -1,7 +1,7 @@
 import Map, {MapOptions} from '../map';
 import Marker from '../marker';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {setMatchMedia, setPerformance, setWebGlContext} from '../../util/test/util';
 
 function createMap() {

package/src/ui/handler/touch_zoom_rotate.ts

@@ -70,7 +70,7 @@ class TwoTouchHandler {
     }
 
     enable(options?: {
-      around?: 'center';
+        around?: 'center';
     } | null) {
         this._enabled = true;
         this._aroundCenter = !!options && options.around === 'center';

package/src/ui/handler_inertia.ts

@@ -30,10 +30,10 @@ const defaultPitchInertiaOptions = extend({
 }, defaultInertiaOptions);
 
 export type InertiaOptions = {
-  linearity: number;
-  easing: (t: number) => number;
-  deceleration: number;
-  maxSpeed: number;
+    linearity: number;
+    easing: (t: number) => number;
+    deceleration: number;
+    maxSpeed: number;
 };
 
 export type InputEvent = MouseEvent | TouchEvent | KeyboardEvent | WheelEvent;
@@ -41,8 +41,8 @@ export type InputEvent = MouseEvent | TouchEvent | KeyboardEvent | WheelEvent;
 export default class HandlerInertia {
     _map: Map;
     _inertiaBuffer: Array<{
-      time: number;
-      settings: any;
+        time: number;
+        settings: any;
     }>;
 
     constructor(map: Map) {

package/src/ui/handler_manager.ts

@@ -36,49 +36,49 @@ class RenderFrameEvent extends Event {
 // For example, if there is a mousedown and mousemove, the mousePan handler
 // would return a `panDelta` on the mousemove.
 export interface Handler {
-  enable(): void;
-  disable(): void;
-  isEnabled(): boolean;
-  isActive(): boolean;
-  // `reset` can be called by the manager at any time and must reset everything to it's original state
-  reset(): void;
-  // Handlers can optionally implement these methods.
-  // They are called with dom events whenever those dom evens are received.
-  readonly touchstart?: (e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) => HandlerResult | void;
-  readonly touchmove?: (e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) => HandlerResult | void;
-  readonly touchend?: (e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) => HandlerResult | void;
-  readonly touchcancel?: (e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) => HandlerResult | void;
-  readonly mousedown?: (e: MouseEvent, point: Point) => HandlerResult | void;
-  readonly mousemove?: (e: MouseEvent, point: Point) => HandlerResult | void;
-  readonly mouseup?: (e: MouseEvent, point: Point) => HandlerResult | void;
-  readonly dblclick?: (e: MouseEvent, point: Point) => HandlerResult | void;
-  readonly wheel?: (e: WheelEvent, point: Point) => HandlerResult | void;
-  readonly keydown?: (e: KeyboardEvent) => HandlerResult | void;
-  readonly keyup?: (e: KeyboardEvent) => HandlerResult | void;
-  // `renderFrame` is the only non-dom event. It is called during render
-  // frames and can be used to smooth camera changes (see scroll handler).
-  readonly renderFrame?: () => HandlerResult | void;
+    enable(): void;
+    disable(): void;
+    isEnabled(): boolean;
+    isActive(): boolean;
+    // `reset` can be called by the manager at any time and must reset everything to it's original state
+    reset(): void;
+    // Handlers can optionally implement these methods.
+    // They are called with dom events whenever those dom evens are received.
+    readonly touchstart?: (e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) => HandlerResult | void;
+    readonly touchmove?: (e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) => HandlerResult | void;
+    readonly touchend?: (e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) => HandlerResult | void;
+    readonly touchcancel?: (e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>) => HandlerResult | void;
+    readonly mousedown?: (e: MouseEvent, point: Point) => HandlerResult | void;
+    readonly mousemove?: (e: MouseEvent, point: Point) => HandlerResult | void;
+    readonly mouseup?: (e: MouseEvent, point: Point) => HandlerResult | void;
+    readonly dblclick?: (e: MouseEvent, point: Point) => HandlerResult | void;
+    readonly wheel?: (e: WheelEvent, point: Point) => HandlerResult | void;
+    readonly keydown?: (e: KeyboardEvent) => HandlerResult | void;
+    readonly keyup?: (e: KeyboardEvent) => HandlerResult | void;
+    // `renderFrame` is the only non-dom event. It is called during render
+    // frames and can be used to smooth camera changes (see scroll handler).
+    readonly renderFrame?: () => HandlerResult | void;
 }
 
 // All handler methods that are called with events can optionally return a `HandlerResult`.
 export type HandlerResult = {
-  panDelta?: Point;
-  zoomDelta?: number;
-  bearingDelta?: number;
-  pitchDelta?: number;
-  // the point to not move when changing the camera
-  around?: Point | null;
-  // same as above, except for pinch actions, which are given higher priority
-  pinchAround?: Point | null;
-  // A method that can fire a one-off easing by directly changing the map's camera.
-  cameraAnimation?: (map: Map) => any;
-  // The last three properties are needed by only one handler: scrollzoom.
-  // The DOM event to be used as the `originalEvent` on any camera change events.
-  originalEvent?: any;
-  // Makes the manager trigger a frame, allowing the handler to return multiple results over time (see scrollzoom).
-  needsRenderFrame?: boolean;
-  // The camera changes won't get recorded for inertial zooming.
-  noInertia?: boolean;
+    panDelta?: Point;
+    zoomDelta?: number;
+    bearingDelta?: number;
+    pitchDelta?: number;
+    // the point to not move when changing the camera
+    around?: Point | null;
+    // same as above, except for pinch actions, which are given higher priority
+    pinchAround?: Point | null;
+    // A method that can fire a one-off easing by directly changing the map's camera.
+    cameraAnimation?: (map: Map) => any;
+    // The last three properties are needed by only one handler: scrollzoom.
+    // The DOM event to be used as the `originalEvent` on any camera change events.
+    originalEvent?: any;
+    // Makes the manager trigger a frame, allowing the handler to return multiple results over time (see scrollzoom).
+    needsRenderFrame?: boolean;
+    // The camera changes won't get recorded for inertial zooming.
+    noInertia?: boolean;
 };
 
 function hasChange(result: HandlerResult) {
@@ -89,9 +89,9 @@ class HandlerManager {
     _map: Map;
     _el: HTMLElement;
     _handlers: Array<{
-      handlerName: string;
-      handler: Handler;
-      allowed: any;
+        handlerName: string;
+        handler: Handler;
+        allowed: any;
     }>;
     _eventsInProgress: any;
     _frameId: number;
@@ -102,8 +102,8 @@ class HandlerManager {
     _changes: Array<[HandlerResult, any, any]>;
     _previousActiveHandlers: {[x: string]: Handler};
     _listeners: Array<[Window | Document | HTMLElement, string, {
-      passive?: boolean;
-      capture?: boolean;
+        passive?: boolean;
+        capture?: boolean;
     } | undefined]>;
 
     constructor(map: Map, options: CompleteMapOptions) {

package/src/ui/map/isMoving.test.ts

@@ -1,7 +1,7 @@
 import browser from '../../util/browser';
 import Map from '../map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {setWebGlContext, setPerformance, setMatchMedia} from '../../util/test/util';
 
 let map;

package/src/ui/map/isRotating.test.ts

@@ -1,6 +1,6 @@
 import Map from '../../ui/map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import browser from '../../util/browser';
 import {setWebGlContext, setPerformance, setMatchMedia} from '../../util/test/util';
 

package/src/ui/map/isZooming.test.ts

@@ -1,7 +1,7 @@
 import browser from '../../util/browser';
 import Map from '../../ui/map';
 import DOM from '../../util/dom';
-import simulate from '../../../test/util/simulate_interaction';
+import simulate from '../../../test/unit/lib/simulate_interaction';
 import {setWebGlContext, setPerformance, setMatchMedia} from '../../util/test/util';
 
 function createMap() {

package/src/ui/map.test.ts

@@ -4,15 +4,15 @@ import LngLat from '../geo/lng_lat';
 import Tile from '../source/tile';
 import {OverscaledTileID} from '../source/tile_id';
 import {Event, ErrorEvent} from '../util/evented';
-import simulate from '../../test/util/simulate_interaction';
-import {fixedLngLat, fixedNum} from '../../test/util/fixed';
+import simulate from '../../test/unit/lib/simulate_interaction';
+import {fixedLngLat, fixedNum} from '../../test/unit/lib/fixed';
 import {LayerSpecification, SourceSpecification, StyleSpecification} from '../style-spec/types';
 import {RequestTransformFunction} from '../util/request_manager';
 import {extend} from '../util/util';
 import {LngLatBoundsLike} from '../geo/lng_lat_bounds';
 import {IControl} from './control/control';
 import EvaluationParameters from '../style/evaluation_parameters';
-import {fakeServer, SinonFakeServer} from 'sinon';
+import {fakeServer, FakeServer} from 'nise';
 
 function createStyleSource() {
     return {
@@ -24,7 +24,7 @@ function createStyleSource() {
     } as SourceSpecification;
 }
 
-let server: SinonFakeServer;
+let server: FakeServer;
 
 beforeEach(() => {
     setPerformance();
@@ -2115,6 +2115,12 @@ describe('Map', () => {
         expect(map.painter.height).toBe(1024);
     });
 
+    test('fires sourcedataabort event on dataabort event', done => {
+        const map = createMap();
+        map.once('sourcedataabort', () => done());
+        map.fire(new Event('dataabort'));
+    });
+
 });
 
 function createStyle() {