maplibre-gl 6.0.0 → 6.2.0

package/src/ui/control/geolocate_control.test.ts

@@ -3,7 +3,7 @@ import geolocation from 'mock-geolocation';
 import {LngLatBounds} from '../../geo/lng_lat_bounds.ts';
 import {createMap, beforeMapTest, sleep} from '../../util/test/util.ts';
 import {GeolocateControl} from './geolocate_control.ts';
-vi.mock('../../util/geolocation_support', () => (
+vi.mock(import('../../util/geolocation_support'), () => (
     {
         checkGeolocationSupport: vi.fn()
     }
@@ -61,7 +61,7 @@ describe('GeolocateControl with no options', () => {
     beforeEach(() => {
         beforeMapTest();
         map = createMap();
-        (checkGeolocationSupport as unknown as MockInstance).mockImplementationOnce(() => Promise.resolve(true));
+        (checkGeolocationSupport as unknown as MockInstance).mockResolvedValueOnce(true);
         createResizeObserverEntryMock();
     });
 
@@ -70,7 +70,7 @@ describe('GeolocateControl with no options', () => {
     });
 
     test('is disabled when there is no support', async () => {
-        (checkGeolocationSupport as unknown as MockInstance).mockReset().mockImplementationOnce(() => Promise.resolve(false));
+        (checkGeolocationSupport as unknown as MockInstance).mockReset().mockResolvedValueOnce(false);
         const geolocate = new GeolocateControl(undefined);
         const spy = vi.spyOn(console, 'warn').mockImplementation(() => {});
         map.addControl(geolocate);
@@ -237,13 +237,13 @@ describe('GeolocateControl with no options', () => {
 
     test('does not throw if removed quickly', () => {
         (checkGeolocationSupport as unknown as MockInstance).mockReset()
-            .mockImplementationOnce(() => {
-                return sleep(10);
-            });
+            .mockReturnValueOnce(sleep(10));
 
         const geolocate = new GeolocateControl(undefined);
         map.addControl(geolocate);
         map.removeControl(geolocate);
+
+        expect(map.hasControl(geolocate)).toBe(false);
     });
 
     test('outofmaxbounds event in waiting active state', async () => {
@@ -422,7 +422,7 @@ describe('GeolocateControl with no options', () => {
     });
 
     test('trigger before added to map', () => {
-        vi.spyOn(console, 'warn').mockImplementation(() => { });
+        vi.spyOn(console, 'warn').mockImplementation(() => {});
 
         const geolocate = new GeolocateControl(undefined);
 
@@ -857,29 +857,6 @@ describe('GeolocateControl with no options', () => {
         expect(geolocate._circleElement.style.width).toBeTruthy();
     });
 
-    test('shown even if trackUserLocation = false', async () => {
-        const geolocate = new GeolocateControl({
-            trackUserLocation: false,
-            showUserLocation: true,
-            showAccuracyCircle: true,
-        });
-        map.addControl(geolocate);
-        await sleep(0);
-        const click = new window.Event('click');
-
-        const geolocatePromise = geolocate.once('geolocate');
-        geolocate._geolocateButton.dispatchEvent(click);
-        geolocation.send({latitude: 10, longitude: 20, accuracy: 700});
-        await geolocatePromise;
-        map.jumpTo({
-            center: [10, 20]
-        });
-        const zoomendPromise = map.once('zoomend');
-        map.zoomTo(10, {duration: 0});
-        await zoomendPromise;
-        expect(geolocate._circleElement.style.width).toBeTruthy();
-    });
-
     test('GeolocateControl does not crash on movestart after removal in ACTIVE_LOCK state', async () => {
         const geolocate = new GeolocateControl({trackUserLocation: true});
         map.addControl(geolocate);

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

@@ -191,7 +191,7 @@ describe('dbclick_zoom', () => {
         expect(zoom).not.toHaveBeenCalled();
     });
 
-    test('DoubleClickZoomHandler snaps to nearest zoomSnap', () => {
+    test('DoubleClickZoomHandler snaps to nearest zoomSnap on a non-interactive map', () => {
         const map = createMap({zoom: 9.7, zoomSnap: 1.0});
         const spy = vi.spyOn(map, 'easeTo');
 
@@ -203,7 +203,7 @@ describe('dbclick_zoom', () => {
         map.remove();
     });
 
-    test('DoubleClickZoomHandler double-tap snaps to nearest zoomSnap', async () => {
+    test('DoubleClickZoomHandler double-tap snaps to nearest zoomSnap on a non-interactive map', async () => {
         const map = createMap({zoom: 9.7, zoomSnap: 1.0});
         const spy = vi.spyOn(map, 'easeTo');
 

package/src/ui/handler/mouse.ts

@@ -51,12 +51,16 @@ export function generateMousePanHandler({enable, clickTolerance}: {
     });
 };
 
-export function generateMouseRotationHandler({enable, clickTolerance, aroundCenter = true, minPixelCenterThreshold = 100, rotateDegreesPerPixelMoved = 0.8}: {
+export function generateMouseRotationHandler({enable, clickTolerance, aroundCenter = true, minPixelCenterThreshold = 100, rotateSpeed = 0.8}: {
     clickTolerance: number;
     enable?: boolean;
     aroundCenter?: boolean;
     minPixelCenterThreshold?: number;
-    rotateDegreesPerPixelMoved?: number;
+    /**
+     * Degrees the bearing changes per pixel of horizontal drag.
+     * @defaultValue 0.8
+     */
+    rotateSpeed?: number;
 }, getCenter: () => Point): MouseRotateHandler {
     const mouseMoveStateManager = new MouseMoveStateManager({
         checkCorrectEvent: (e: MouseEvent): boolean =>
@@ -71,7 +75,7 @@ export function generateMouseRotationHandler({enable, clickTolerance, aroundCent
                 // Avoid rotation related to y axis since it is "saved" for pitch
                 return {bearingDelta: getAngleDelta(new Point(lastPoint.x, currentPoint.y), currentPoint, center)};
             }
-            let bearingDelta = (currentPoint.x - lastPoint.x) * rotateDegreesPerPixelMoved;
+            let bearingDelta = (currentPoint.x - lastPoint.x) * rotateSpeed;
             if (aroundCenter && currentPoint.y < center.y) {
                 bearingDelta = -bearingDelta;
             }
@@ -85,9 +89,13 @@ export function generateMouseRotationHandler({enable, clickTolerance, aroundCent
     });
 };
 
-export function generateMousePitchHandler({enable, clickTolerance, pitchDegreesPerPixelMoved = -0.5}: {
+export function generateMousePitchHandler({enable, clickTolerance, pitchSpeed = -0.5}: {
     clickTolerance: number;
-    pitchDegreesPerPixelMoved?: number;
+    /**
+     * Degrees the pitch changes per pixel of vertical drag.
+     * @defaultValue -0.5
+     */
+    pitchSpeed?: number;
     enable?: boolean;
 }): MousePitchHandler {
     const mouseMoveStateManager = new MouseMoveStateManager({
@@ -97,8 +105,8 @@ export function generateMousePitchHandler({enable, clickTolerance, pitchDegreesP
     });
     return new DragHandler<DragPitchResult, MouseEvent>({
         clickTolerance,
-        move: (lastPoint: Point, point: Point) => 
-            ({pitchDelta: (point.y - lastPoint.y) * pitchDegreesPerPixelMoved}),
+        move: (lastPoint: Point, point: Point) =>
+            ({pitchDelta: (point.y - lastPoint.y) * pitchSpeed}),
         // prevent browser context menu when necessary; we don't allow it with rotation
         // because we can't discern rotation gesture start from contextmenu on Mac
         moveStateManager: mouseMoveStateManager,

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

@@ -2,7 +2,7 @@ import {describe, test, expect} from 'vitest';
 import Point from '@mapbox/point-geometry';
 
 import {generateMousePanHandler, generateMousePitchHandler, generateMouseRollHandler, generateMouseRotationHandler} from './mouse.ts';
-import {type DragRotateResult} from './drag_handler.ts';
+import {type DragPitchResult, type DragRotateResult} from './drag_handler.ts';
 
 describe('mouse handler tests', () => {
     test('MouseRotateHandler', () => {
@@ -40,6 +40,26 @@ describe('mouse handler tests', () => {
         expect(mouseRotate.isActive()).toBe(false);
     });
 
+    test('MouseRotateHandler rotates 2 degrees per dragged pixel when rotateSpeed is 2', () => {
+        const mouseRotate = generateMouseRotationHandler({clickTolerance: 2, rotateSpeed: 2}, () => new Point(10, 10));
+
+        mouseRotate.enable();
+        mouseRotate.dragStart(new MouseEvent('mousedown', {buttons: 2, button: 2}), new Point(0, 0));
+
+        const overToleranceMove = new MouseEvent('mousemove', {buttons: 2, clientX: 10, clientY: 10});
+        expect((mouseRotate.dragMove(overToleranceMove, new Point(10, 10)) as DragRotateResult).bearingDelta).toBeCloseTo(20);
+    });
+
+    test('MousePitchHandler pitches 2 degrees per dragged pixel when pitchSpeed is -2', () => {
+        const mousePitch = generateMousePitchHandler({clickTolerance: 2, pitchSpeed: -2});
+
+        mousePitch.enable();
+        mousePitch.dragStart(new MouseEvent('mousedown', {buttons: 2, button: 2}), new Point(0, 0));
+
+        const overToleranceMove = new MouseEvent('mousemove', {buttons: 2, clientX: 0, clientY: 10});
+        expect((mousePitch.dragMove(overToleranceMove, new Point(0, 10)) as DragPitchResult).pitchDelta).toBeCloseTo(-20);
+    });
+
     test('MousePitchHandler', () => {
         const mousePitch = generateMousePitchHandler({clickTolerance: 2});
 

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

@@ -359,6 +359,7 @@ describe('ScrollZoomHandler', () => {
 
         const map = createMap();
         map._renderTaskQueue.run();
+        const startZoom = map.getZoom();
 
         simulate.wheel(map.getCanvas(), {deltaY: -1});
         simulate.wheel(map.getCanvas(), {deltaY: -1});
@@ -372,6 +373,7 @@ describe('ScrollZoomHandler', () => {
         timeControlNow.mockReturnValue(now);
         map._renderTaskQueue.run();
 
+        expect(map.getZoom()).toBeCloseTo(startZoom);
         map.remove();
     });
 

package/src/ui/handler_manager.test.ts

@@ -1,4 +1,4 @@
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
+import {afterEach, beforeEach, describe, expect, vi, test} from 'vitest';
 import Point from '@mapbox/point-geometry';
 
 import type {HandlerManager, MapControlsScenarioOptions, EventInProgress, EventsInProgress} from './handler_manager.ts';
@@ -25,7 +25,7 @@ afterEach(() => {
 });
 
 describe('HandlerManager terrain scenarios', () => {
-    it('_handleMapControls keeps terrain movement disabled when terrain is not enabled', () => {
+    test('_handleMapControls keeps terrain movement disabled when terrain is not enabled', () => {
         const handleZoom = vi.fn();
         const handlePan = vi.fn();
         map._camera.cameraHelper = {
@@ -73,7 +73,7 @@ describe('HandlerManager terrain scenarios', () => {
         expect(setCenterMock).not.toHaveBeenCalled();
     });
 
-    it('_handleMapControls enables terrain movement for globe terrain handling', () => {
+    test('_handleMapControls enables terrain movement for globe terrain handling', () => {
         const handleZoom = vi.fn();
         const handlePan = vi.fn();
         map._camera.cameraHelper = {
@@ -114,7 +114,7 @@ describe('HandlerManager terrain scenarios', () => {
         expect(handlePan).toHaveBeenCalledWith(options.deltasForHelper, options.tr, options.preZoomAroundLoc);
     });
 
-    it('_handleMapControls keeps terrain movement state when globe terrain is already active', () => {
+    test('_handleMapControls keeps terrain movement state when globe terrain is already active', () => {
         const handleZoom = vi.fn();
         const handlePan = vi.fn();
         map._camera.cameraHelper = {
@@ -155,7 +155,7 @@ describe('HandlerManager terrain scenarios', () => {
         expect(handlePan).toHaveBeenCalledWith(options.deltasForHelper, options.tr, options.preZoomAroundLoc);
     });
 
-    it('_handleMapControls activates terrain movement on first drag in mercator terrain', () => {
+    test('_handleMapControls activates terrain movement on first drag in mercator terrain', () => {
         const handleZoom = vi.fn();
         const handlePan = vi.fn();
         map._camera.cameraHelper = {
@@ -199,7 +199,7 @@ describe('HandlerManager terrain scenarios', () => {
         expect(setCenterMock).not.toHaveBeenCalled();
     });
 
-    it('_handleMapControls drags using transform when already moving in mercator terrain', () => {
+    test('_handleMapControls drags using transform when already moving in mercator terrain', () => {
         const handleZoom = vi.fn();
         const handlePan = vi.fn();
         map._camera.cameraHelper = {
@@ -245,7 +245,7 @@ describe('HandlerManager terrain scenarios', () => {
         expect(handlePan).not.toHaveBeenCalled();
     });
 
-    it('_handleMapControls falls back to helper panning when not dragging in mercator terrain', () => {
+    test('_handleMapControls falls back to helper panning when not dragging in mercator terrain', () => {
         const handleZoom = vi.fn();
         const handlePan = vi.fn();
         map._camera.cameraHelper = {

package/src/ui/hash.test.ts

@@ -522,6 +522,7 @@ describe('hash', () => {
 
         map.remove();
 
+        expect(map._removed).toBe(true);
     });
 
     test('hash with URL in other parameter does not change except normalization', () => {

package/src/ui/map.ts

@@ -356,6 +356,17 @@ export type MapOptions = {
      * @defaultValue false
      */
     rollEnabled?: boolean;
+    /**
+     * Degrees the map's bearing changes per pixel of horizontal drag when rotating.
+     * @defaultValue 0.8
+     */
+    rotateSpeed?: number;
+    /**
+     * Degrees the map's pitch changes per pixel of vertical drag. Negative, so that
+     * dragging up pitches the map toward the horizon.
+     * @defaultValue -0.5
+     */
+    pitchSpeed?: number;
     /**
      * If `true`, gesture inertia (such as panning) is disabled. If not provided, gesture inertia defaults to the user's device settings.
      * @defaultValue undefined
@@ -531,6 +542,8 @@ const defaultOptions: Readonly<Partial<MapOptions>> = {
     localIdeographFontFamily: 'sans-serif',
     pitchWithRotate: true,
     rollEnabled: false,
+    rotateSpeed: 0.8,
+    pitchSpeed: -0.5,
     reduceMotion: undefined,
     validateStyle: true,
     /**Because GL MAX_TEXTURE_SIZE is usually at least 4096px. */
@@ -2930,29 +2943,15 @@ export class Map extends Evented<MapEventType> {
                     warnOnce('You are using the same source for a color-relief layer and for 3D terrain. Please consider using two separate sources to improve rendering quality.');
                 }
             }
+            if (this.terrain) {
+                this.terrain.destroy();
+            }
             this.terrain = new Terrain(this.painter, tileManager, options, this._terrainSkirtLength);
             this.painter.renderToTexture = new RenderToTexture(this.painter, this.terrain);
             this._camera.terrain = this.terrain;
             this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
             this._camera.transform.setElevation(this.terrain.getElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
-            this._terrainDataCallback = e => {
-                if (e.dataType === 'style') {
-                    this.terrain.tileManager.releaseAllRTT();
-                } else if (e.dataType === 'source' && e.tile) {
-                    if (e.sourceId === options.source && !this._camera.elevationFreeze) {
-                        this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
-                        if (this.getCenterClampedToGround()) {
-                            this._camera.transform.setElevation(this.terrain.getElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
-                        }
-                    }
-
-                    if (e.source?.type === 'image') {
-                        this.terrain.tileManager.releaseAllRTT();
-                    } else {
-                        this.terrain.tileManager.releaseRTT(e.tile.tileID);
-                    }
-                }
-            };
+            this._terrainDataCallback = e => this._handleTerrainDataEvent(e, options.source);
             this.style.on('data', this._terrainDataCallback);
         }
 
@@ -2960,6 +2959,31 @@ export class Map extends Evented<MapEventType> {
         return this;
     }
 
+    private _handleTerrainDataEvent(event: MapStyleDataEvent | MapSourceDataEvent, terrainSourceId: string): void {
+        if (event.dataType === 'style') {
+            this.terrain.tileManager.releaseAllRTT();
+            return;
+        }
+
+        const isTerrainSourceEvent = event.sourceId === terrainSourceId;
+        if (isTerrainSourceEvent) {
+            this.terrain.resetElevationCache();
+        }
+        if (isTerrainSourceEvent && event.tile && !this._camera.elevationFreeze) {
+            this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
+            if (this.getCenterClampedToGround()) {
+                this._camera.transform.setElevation(this.terrain.getElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
+            }
+        }
+
+        if (!event.tile) return;
+        if (event.source?.type === 'image') {
+            this.terrain.tileManager.releaseAllRTT();
+            return;
+        }
+        this.terrain.tileManager.releaseRTT(event.tile.tileID);
+    }
+
     /**
      * Get the terrain-options if terrain is loaded
      * @returns the TerrainSpecification passed to setTerrain
@@ -4242,8 +4266,7 @@ export class Map extends Evented<MapEventType> {
         }
 
         const globeRenderingChanged = this.style.projection?.transitionState > 0 !== isGlobeRendering;
-        this.style.projection?.setErrorQueryLatitudeDegrees(this._camera.transform.center.lat);
-        this._camera.transform.setTransitionState(this.style.projection?.transitionState, this.style.projection?.latitudeErrorCorrectionRadians);
+        this._camera.transform.setTransitionState(this.style.projection?.transitionState);
 
         // If we are in _render for any reason other than an in-progress paint
         // transition, update tile managers to check for and load any tiles we
@@ -4256,6 +4279,8 @@ export class Map extends Evented<MapEventType> {
         // update terrain stuff
         if (this.terrain) {
             this.terrain.tileManager.update(this._camera.transform, this.terrain);
+            // Tile selection can change with the transform or cache state without a data event.
+            this.terrain.resetElevationCache();
             this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
             if (!this._camera.elevationFreeze && this.getCenterClampedToGround()) {
                 this._camera.transform.setElevation(this.terrain.getElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));

package/src/ui/map_tests/map_basic.test.ts

@@ -1,6 +1,6 @@
 import {describe, beforeEach, test, expect, vi} from 'vitest';
 import {Map} from '../map.ts';
-import {createMap, beforeMapTest, createStyle, createStyleSource, sleep} from '../../util/test/util.ts';
+import {createMap, beforeMapTest, createStyle, createStyleSource, sleep, waitForEvent} from '../../util/test/util.ts';
 import {Tile} from '../../tile/tile.ts';
 import {OverscaledTileID} from '../../tile/tile_id.ts';
 import {fixedLngLat} from '../../../test/unit/lib/fixed.ts';
@@ -47,14 +47,6 @@ describe('Map', () => {
         );
     });
 
-    test('bad map-specific token breaks map', () => {
-        const container = window.document.createElement('div');
-        Object.defineProperty(container, 'offsetWidth', {value: 512});
-        Object.defineProperty(container, 'offsetHeight', {value: 512});
-        createMap();
-        //t.error();
-    });
-
     describe('setTransformRequest', () => {
         test('returns self', () => {
             const transformRequest = (() => {}) as any as RequestTransformFunction;
@@ -69,6 +61,8 @@ describe('Map', () => {
             const transformRequest = (() => {}) as any as RequestTransformFunction;
             map.setTransformRequest(transformRequest);
             map.setTransformRequest(transformRequest);
+
+            expect(map._requestManager._transformRequestFn).toBe(transformRequest);
         });
 
         test('removes function when called with null', () => {
@@ -89,17 +83,12 @@ describe('Map', () => {
             const map = createMap({style});
 
             await map.once('load');
-            const promise = new Promise<void>((resolve) => {
-                map.on('data', (e) => {
-                    if (e.dataType === 'source' && e.sourceDataType === 'idle') {
-                        expect(map.isSourceLoaded('geojson')).toBe(true);
-                        resolve();
-                    }
-                });
-            });
+            const idlePromise = waitForEvent(map, 'data', (e) => e.dataType === 'source' && e.sourceDataType === 'idle');
             map.addSource('geojson', createStyleSource());
             expect(map.isSourceLoaded('geojson')).toBe(false);
-            await promise;
+
+            await idlePromise;
+            expect(map.isSourceLoaded('geojson')).toBe(true);
         });
 
         test('Map.isSourceLoaded (equivalent to event.isSourceLoaded)', async () => {
@@ -109,11 +98,10 @@ describe('Map', () => {
             await map.once('load');
             const promise = new Promise<void>((resolve) => {
                 map.on('data', (e: MapSourceDataEvent) => {
-                    if (e.dataType === 'source' && 'source' in e) {
-                        expect(map.isSourceLoaded('geojson')).toBe(e.isSourceLoaded);
-                        if (e.sourceDataType === 'idle') {
-                            resolve();
-                        }
+                    if (e.dataType !== 'source' || !('source' in e)) return;
+                    expect(map.isSourceLoaded('geojson')).toBe(e.isSourceLoaded);
+                    if (e.sourceDataType === 'idle') {
+                        resolve();
                     }
                 });
             });

package/src/ui/map_tests/map_calculate_camera_options.test.ts

@@ -27,7 +27,7 @@ describe('calculateCameraOptionsFromTo', () => {
         const cameraOptions: CameraOptions = map.calculateCameraOptionsFromTo(new LngLat(1, 0), 111200, new LngLat(0, 0));
         expect(cameraOptions).toBeDefined();
         expect(cameraOptions.pitch).toBeCloseTo(90);
-        expect(mockedGetElevation.mock.calls).toHaveLength(1);
+        expect(mockedGetElevation).toHaveBeenCalledTimes(1);
     });
 
     test('pitch 153.435 with terrain', () => {
@@ -44,7 +44,7 @@ describe('calculateCameraOptionsFromTo', () => {
         const cameraOptions: CameraOptions = map.calculateCameraOptionsFromTo(new LngLat(1, 0), 111200, new LngLat(0, 0));
         expect(cameraOptions).toBeDefined();
         expect(cameraOptions.pitch).toBeCloseTo(153.435);
-        expect(mockedGetElevation.mock.calls).toHaveLength(1);
+        expect(mockedGetElevation).toHaveBeenCalledTimes(1);
     });
 
     test('pitch 63 with terrain', () => {
@@ -62,7 +62,7 @@ describe('calculateCameraOptionsFromTo', () => {
         const cameraOptions: CameraOptions = map.calculateCameraOptionsFromTo(new LngLat(0, 0), 111200, new LngLat(1, 0));
         expect(cameraOptions).toBeDefined();
         expect(cameraOptions.pitch).toBeCloseTo(63.435);
-        expect(mockedGetElevation.mock.calls).toHaveLength(1);
+        expect(mockedGetElevation).toHaveBeenCalledTimes(1);
     });
 
     test('zoom distance 1000', () => {
@@ -79,7 +79,7 @@ describe('calculateCameraOptionsFromTo', () => {
 
         expect(cameraOptions).toBeDefined();
         expect(cameraOptions.zoom).toBeCloseTo(expectedZoom);
-        expect(mockedGetElevation.mock.calls).toHaveLength(1);
+        expect(mockedGetElevation).toHaveBeenCalledTimes(1);
     });
 
     test('don\'t call getElevation when altitude supplied', () => {
@@ -94,7 +94,7 @@ describe('calculateCameraOptionsFromTo', () => {
         const cameraOptions = map.calculateCameraOptionsFromTo(new LngLat(0, 0), 0, new LngLat(0, 0), 1000);
 
         expect(cameraOptions).toBeDefined();
-        expect(mockedGetElevation.mock.calls).toHaveLength(0);
+        expect(mockedGetElevation).toHaveBeenCalledTimes(0);
     });
 
     test('don\'t call getElevation when altitude 0 supplied', () => {
@@ -109,6 +109,6 @@ describe('calculateCameraOptionsFromTo', () => {
         const cameraOptions = map.calculateCameraOptionsFromTo(new LngLat(0, 0), 0, new LngLat(1, 0), 0);
 
         expect(cameraOptions).toBeDefined();
-        expect(mockedGetElevation.mock.calls).toHaveLength(0);
+        expect(mockedGetElevation).toHaveBeenCalledTimes(0);
     });
 });

package/src/ui/map_tests/map_events.test.ts

@@ -6,7 +6,6 @@ import {type MapGeoJSONFeature} from '../../util/vectortile_to_geojson.ts';
 import {type MapLibreEvent} from '../events.ts';
 import {Map} from '../map.ts';
 import {Event as EventedEvent, ErrorEvent} from '../../util/evented.ts';
-import {GlobeProjection} from '../../geo/projection/globe_projection.ts';
 import {type StyleSpecification} from '@maplibre/maplibre-gl-style-spec';
 
 type IsAny<T> = 0 extends T & 1 ? T : never;
@@ -248,7 +247,7 @@ describe('map events', () => {
         expect(handler.onMove).toHaveBeenCalledTimes(1);
     });
 
-    test('Map.on allows a listener to infer the event type ', () => {
+    test('Map.on allows a listener to infer the event type', () => {
         const map = createMap();
 
         const spy = vi.fn();
@@ -412,7 +411,7 @@ describe('map events', () => {
         expect(handler.onMove).toHaveBeenCalledTimes(0);
     });
 
-    test('Map.off allows a listener to infer the event type ', () => {
+    test('Map.off allows a listener to infer the event type', () => {
         const map = createMap();
 
         const spy = vi.fn();
@@ -441,7 +440,7 @@ describe('map events', () => {
         expect(handler.onMoveOnce).toHaveBeenCalledTimes(1);
     });
 
-    test('Map.once allows a listener to infer the event type ', () => {
+    test('Map.once allows a listener to infer the event type', () => {
         const map = createMap();
 
         const spy = vi.fn();
@@ -965,7 +964,7 @@ describe('map events', () => {
         map.on('load', loadHandler);
         await sleep(1);
 
-        expect(loadHandler).toThrowError();
+        expect(loadHandler).toThrow('Error in load handler');
     });
 
     test('no idle event during move', async () => {
@@ -982,7 +981,7 @@ describe('map events', () => {
         const map = createMap();
         const sourcePromise = map.once('sourcedataabort');
         map.fire(new EventedEvent('dataabort'));
-        await sourcePromise;
+        await expect(sourcePromise).resolves.toBeDefined();
     });
 
     test('getZoom on moveend is the same as after the map end moving, with terrain on', async () => {
@@ -1139,7 +1138,6 @@ describe('map events', () => {
         });
         test('projectiontransition is fired when globe transitions to mercator', async () => {
             const map = createMap();
-            vi.spyOn(GlobeProjection.prototype, 'updateGPUdependent').mockImplementation(() => {});
             await map.once('load');
 
             const spy = vi.fn();

package/src/ui/map_tests/map_global_state.test.ts

@@ -1,4 +1,4 @@
-import {describe, beforeEach, test, expect, vitest} from 'vitest';
+import {describe, beforeEach, test, expect, vi} from 'vitest';
 import {createMap, beforeMapTest} from '../../util/test/util.ts';
 
 beforeEach(() => {
@@ -27,7 +27,7 @@ describe('setGlobalStateProperty', () => {
         });
 
         await map.once('style.load');
-        map._update = vitest.fn();
+        map._update = vi.fn();
 
         map.setGlobalStateProperty('backgroundColor', 'blue');
 
@@ -56,7 +56,7 @@ describe('setGlobalStateProperty', () => {
         });
 
         await map.once('style.load');
-        map._update = vitest.fn();
+        map._update = vi.fn();
 
         map.setGlobalStateProperty('backgroundColor', 'blue');
 

package/src/ui/map_tests/map_images.test.ts

@@ -7,6 +7,7 @@ import {MessageType} from '../../util/actor_messages.ts';
 beforeEach(() => {
     beforeMapTest();
     global.fetch = null;
+    vi.spyOn(console, 'warn').mockImplementation(() => {});
 });
 
 test('listImages', async () => {
@@ -89,7 +90,7 @@ test('map fires `styleimagemissing` when missing style image resolver returns no
     const generatedImage = await map.style.imageManager.getImages([id]);
     expect(resolver).toHaveBeenCalledWith(id);
     expect(generatedImage[id]).toBeUndefined();
-    expect(missingImageEventSpy).toHaveBeenCalledOnce();
+    expect(missingImageEventSpy).toHaveBeenCalledTimes(1);
     expect(missingImageEventSpy.mock.calls[0][0].id).toBe(id);
     expect(map.hasImage(id)).toBeFalsy();
 });
@@ -244,7 +245,7 @@ test('setImages broadcasts even when getImages is called between addImage and up
 
     await map.once('load');
 
-    const broadcastSpy = vi.fn().mockReturnValue(Promise.resolve({}));
+    const broadcastSpy = vi.fn().mockResolvedValue({});
     map.style.dispatcher.broadcast = broadcastSpy;
 
     map.addImage('new-image', {width: 1, height: 1, data: new Uint8Array(4)});
@@ -270,7 +271,7 @@ test('setImages broadcasts after missing style image resolver adds an image', as
 
     await map.once('load');
 
-    const broadcastSpy = vi.fn().mockReturnValue(Promise.resolve({}));
+    const broadcastSpy = vi.fn().mockResolvedValue({});
     map.style.dispatcher.broadcast = broadcastSpy;
 
     map.setMissingStyleImageResolver((id) => {

package/src/ui/map_tests/map_is_moving.test.ts

@@ -69,7 +69,7 @@ describe('Map.isMoving', () => {
 
     test('returns true when drag rotating', async () => {
         // Prevent inertial rotation.
-        vi.spyOn(timeControl, 'now').mockImplementation(() => 0);
+        vi.spyOn(timeControl, 'now').mockReturnValue(0);
 
         map.on('movestart', () => {
             expect(map.isMoving()).toBe(true);

package/src/ui/map_tests/map_is_rotating.test.ts

@@ -40,7 +40,7 @@ describe('Map.isRotating', () => {
 
     test('returns true when drag rotating', async () => {
         // Prevent inertial rotation.
-        vi.spyOn(timeControl, 'now').mockImplementation(() => 0);
+        vi.spyOn(timeControl, 'now').mockReturnValue(0);
 
         map.on('rotatestart', () => {
             expect(map.isRotating()).toBe(true);

package/src/ui/map_tests/map_layer.test.ts

@@ -98,7 +98,8 @@ test('removeLayer restores Map.loaded() to true', async () => {
 
     await map.once('render');
     map.removeLayer('layerId');
-    await waitForEvent(map, 'render', () => map.loaded());
+    await expect(waitForEvent(map, 'render', () => map.loaded())).resolves.toBeDefined();
+
     map.remove();
 });