maplibre-gl 6.0.0 → 6.2.0

package/src/style/style.test.ts

@@ -4,6 +4,7 @@ import {TileManager} from '../tile/tile_manager.ts';
 import {StyleLayer} from './style_layer.ts';
 import {extend} from '../util/util.ts';
 import {Event} from '../util/evented.ts';
+import {type AJAXError} from '../util/ajax.ts';
 import {RGBAImage} from '../util/image.ts';
 import {rtlMainThreadPluginFactory} from '../source/rtl_text_plugin_main_thread.ts';
 import {browser} from '../util/browser.ts';
@@ -71,7 +72,7 @@ let mockConsoleError: MockInstance;
 beforeEach(() => {
     global.fetch = null;
     server = fakeServer.create();
-    mockConsoleError = vi.spyOn(console, 'error').mockImplementation(() => { });
+    mockConsoleError = vi.spyOn(console, 'error').mockImplementation(() => {});
 });
 
 afterEach(() => {
@@ -206,7 +207,7 @@ describe('Style.loadURL', () => {
         const {error} = await promise;
 
         expect(error).toBeTruthy();
-        expect(error.status).toBe(errorStatus);
+        expect((error as AJAXError).status).toBe(errorStatus);
     });
 
     test('does not throw if request is pending when removed', async () => {
@@ -442,9 +443,9 @@ describe('Style.loadJSON', () => {
         const event = await style.once('error');
         const err = event.error;
         expect(err).toBeTruthy();
-        expect(err.toString().indexOf('-source-layer-') !== -1).toBeTruthy();
-        expect(err.toString().indexOf('-source-id-') !== -1).toBeTruthy();
-        expect(err.toString().indexOf('-layer-id-') !== -1).toBeTruthy();
+        expect(err.toString()).toContain('-source-layer-');
+        expect(err.toString()).toContain('-source-id-');
+        expect(err.toString()).toContain('-layer-id-');
     });
 
     test('sets up layer event forwarding', async () => {
@@ -597,7 +598,7 @@ describe('Style.loadJSON', () => {
         layer.recalculate({} as EvaluationParameters, []);
         const paint = layer.paint as PossiblyEvaluated<CirclePaintProps, CirclePaintPropsPossiblyEvaluated>;
         expect(paint.get('circle-color').evaluate({} as Feature, {})).toEqual(new Color(1, 0, 0, 1));
-        expect(paint.get('circle-radius').evaluate({} as Feature, {})).toEqual(12);
+        expect(paint.get('circle-radius').evaluate({} as Feature, {})).toBe(12);
     });
 
     test('does not throw if request is pending when removed', async () => {
@@ -695,7 +696,7 @@ describe('Style._load', () => {
                 type: 'custom'
             }]
         });
-        const stub = vi.spyOn(console, 'error');
+        const stub = vi.spyOn(console, 'error').mockImplementation(() => {});
 
         style._load(styleSpec, {validate: true});
 
@@ -777,7 +778,7 @@ describe('Style.update', () => {
 
         await style.once('style.load');
 
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
 
         // Add multiple images — should NOT broadcast setImages immediately
@@ -805,7 +806,7 @@ describe('Style.update', () => {
 
         await style.once('style.load');
 
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
 
         // Trigger an update that changes layers but not images
@@ -825,7 +826,7 @@ describe('Style.update', () => {
 
         await style.once('style.load');
 
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
 
         // Trigger both image and layer changes in the same frame
@@ -852,7 +853,7 @@ describe('Style.update', () => {
         style.addImage('img2', {data: new RGBAImage({width: 1, height: 1}, new Uint8Array(4)), pixelRatio: 1, sdf: false});
         style.update({} as EvaluationParameters);
 
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
 
         style.removeImage('img1');
@@ -876,7 +877,7 @@ describe('Style.update', () => {
         style.addImage('img1', {data: new RGBAImage({width: 1, height: 1}, new Uint8Array(4)), pixelRatio: 1, sdf: false});
         style.update({} as EvaluationParameters);
 
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
 
         style.updateImage('img1', {data: new RGBAImage({width: 1, height: 1}, new Uint8Array(4)), pixelRatio: 1, sdf: false});
@@ -1299,7 +1300,7 @@ describe('Style.addSource', () => {
             style.addSource('source-id', source);
             style.update({} as EvaluationParameters);
         });
-        await dataPromise;
+        await expect(dataPromise).resolves.toBeDefined();
     });
 
     test('throws on duplicates', async () => {
@@ -1369,7 +1370,7 @@ describe('Style.removeSource', () => {
             style.removeSource('source-id');
             style.update({} as EvaluationParameters);
         });
-        await dataPromise;
+        await expect(dataPromise).resolves.toBeDefined();
     });
 
     test('clears tiles', async () => {
@@ -1417,8 +1418,8 @@ describe('Style.removeSource', () => {
         const promise =  style.once('error');
         style.removeSource('mapLibre-source');
         const event = await promise;
-        expect(event.error.message.includes('"mapLibre-source"')).toBeTruthy();
-        expect(event.error.message.includes('"mapLibre-layer"')).toBeTruthy();
+        expect(event.error.message).toContain('"mapLibre-source"');
+        expect(event.error.message).toContain('"mapLibre-layer"');
     });
 
     test('does not throw if source is not in use', async () => {
@@ -2327,9 +2328,9 @@ describe('Style.addLayer', () => {
         const err = event.error;
 
         expect(err).toBeTruthy();
-        expect(err.toString().indexOf('-source-layer-') !== -1).toBeTruthy();
-        expect(err.toString().indexOf('-source-id-') !== -1).toBeTruthy();
-        expect(err.toString().indexOf('-layer-id-') !== -1).toBeTruthy();
+        expect(err.toString()).toContain('-source-layer-');
+        expect(err.toString()).toContain('-source-id-');
+        expect(err.toString()).toContain('-layer-id-');
     });
 
     test('emits error on invalid layer', async () => {
@@ -2473,7 +2474,7 @@ describe('Style.addLayer', () => {
             style.addLayer(layer);
             style.update({} as EvaluationParameters);
         });
-        await dataPromise;
+        await expect(dataPromise).resolves.toBeDefined();
     });
 
     test('emits error on duplicates', async () => {
@@ -2591,7 +2592,7 @@ describe('Style.removeLayer', () => {
             style.update({} as EvaluationParameters);
         });
 
-        await dataPromise;
+        await expect(dataPromise).resolves.toBeDefined();
     });
 
     test('tears down layer event forwarding', async () => {
@@ -2603,9 +2604,8 @@ describe('Style.removeLayer', () => {
             }]
         }));
 
-        style.on('error', () => {
-            throw new Error('test failed');
-        });
+        const styleErrorListener = vi.fn();
+        style.on('error', styleErrorListener);
 
         await style.once('style.load');
         const layer = style._layers.background;
@@ -2615,6 +2615,8 @@ describe('Style.removeLayer', () => {
         layer.on('error', () => {});
 
         layer.fire(new Event('error', {mapLibre: true}));
+
+        expect(styleErrorListener).not.toHaveBeenCalled();
     });
 
     test('fires an error on non-existence', async () => {
@@ -2681,7 +2683,7 @@ describe('Style.moveLayer', () => {
             style.moveLayer('background');
             style.update({} as EvaluationParameters);
         });
-        await dataPromise;
+        await expect(dataPromise).resolves.toBeDefined();
     });
 
     test('fires an error on non-existence', async () => {
@@ -2983,7 +2985,7 @@ describe('Style.setFilter', () => {
         const style = createStyle();
 
         await style.once('style.load');
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
 
         style.setFilter('symbol', ['==', 'id', 1]);
@@ -3017,7 +3019,7 @@ describe('Style.setFilter', () => {
         style.setFilter('symbol', filter);
         style.update({} as EvaluationParameters); // flush pending operations
 
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
         filter[2] = 2;
         style.setFilter('symbol', filter);
@@ -3066,7 +3068,7 @@ describe('Style.setFilter', () => {
         const style = createStyle();
 
         await style.once('style.load');
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
 
         style.setFilter('symbol', 'notafilter' as any as FilterSpecification, {validate: false});
@@ -3118,7 +3120,7 @@ describe('Style.setLayerZoomRange', () => {
         const style = createStyle();
 
         await style.once('style.load');
-        const spy = vi.fn().mockReturnValue(Promise.resolve({}));
+        const spy = vi.fn().mockResolvedValue({});
         style.dispatcher.broadcast = spy;
         style.setLayerZoomRange('symbol', 5, 12);
         expect(style.getLayer('symbol').minzoom).toBe(5);
@@ -3473,7 +3475,7 @@ describe('Style.query*Features', () => {
         expect(onError.mock.calls[0][0].error.message).toMatch(/queryRenderedFeatures\.filter/);
     });
 
-    test('querySourceFeatures not raise validation errors if validation was disabled', () => {
+    test('queryRenderedFeatures not raise validation errors if validation was disabled', () => {
         let errors = 0;
         vi.spyOn(style, 'fire').mockImplementation((event) => {
             if (event['error']) {
@@ -3780,12 +3782,12 @@ describe('Style.serialize', () => {
         expect(result['4,2,true']).toBeDefined();
 
         // Verify the entries have the expected atlas properties
-        expect(typeof result['2,1,false'].width).toBe('number');
-        expect(typeof result['2,1,false'].height).toBe('number');
-        expect(typeof result['2,1,false'].y).toBe('number');
-        expect(typeof result['4,2,true'].width).toBe('number');
-        expect(typeof result['4,2,true'].height).toBe('number');
-        expect(typeof result['4,2,true'].y).toBe('number');
+        expect(result['2,1,false'].width).toBeTypeOf('number');
+        expect(result['2,1,false'].height).toBeTypeOf('number');
+        expect(result['2,1,false'].y).toBeTypeOf('number');
+        expect(result['4,2,true'].width).toBeTypeOf('number');
+        expect(result['4,2,true'].height).toBeTypeOf('number');
+        expect(result['4,2,true'].y).toBeTypeOf('number');
     });
 });
 

package/src/style/style.ts

@@ -491,10 +491,10 @@ export class Style extends Evented<MapEventType> {
         this.glyphManager.setURL(nextState.glyphs);
         this._createLayers();
 
-        this.light = new Light(this.stylesheet.light);
+        this.light = new Light(this.stylesheet.light ?? {}, this._globalState);
         this._setProjectionInternal(this.stylesheet.projection?.type || 'mercator');
 
-        this.sky = new Sky(this.stylesheet.sky);
+        this.sky = new Sky(this.stylesheet.sky, this._globalState);
 
         // The stylesheet's terrain was already validated as part of the style itself.
         this.map.setTerrain(this.stylesheet.terrain ?? null, {validate: false});
@@ -1760,7 +1760,7 @@ export class Style extends Evented<MapEventType> {
     }
 
     _setProjectionInternal(name: ProjectionSpecification['type']): void {
-        const projectionObjects = createProjectionFromName(name, this.map._camera?.transform.constrainOverride);
+        const projectionObjects = createProjectionFromName(name, this.map._camera?.transform.constrainOverride, this._globalState);
         this.projection = projectionObjects.projection;
         this.map.migrateProjection(projectionObjects.transform, projectionObjects.cameraHelper);
         for (const key in this.tileManagers) {

package/src/style/style_layer/color_relief_style_layer.test.ts

@@ -20,7 +20,7 @@ describe('ColorReliefStyleLayer', () => {
         const layer = createStyleLayer(layerSpec, {});
         expect(layer).toBeInstanceOf(ColorReliefStyleLayer);
         const colorReliefStyleLayer = layer as ColorReliefStyleLayer;
-        expect(colorReliefStyleLayer.paint.get('color-relief-opacity')).toEqual(1);
+        expect(colorReliefStyleLayer.paint.get('color-relief-opacity')).toBe(1);
         const colorRamp = colorReliefStyleLayer._createColorRamp(256);
         expect(colorRamp.elevationStops).toEqual([0,1]);
         expect(colorRamp.colorStops).toEqual([Color.transparent,Color.transparent]);

package/src/style/style_layer/fill_extrusion_style_layer.ts

@@ -3,13 +3,13 @@ import {type QueryIntersectsFeatureParams, StyleLayer} from '../style_layer.ts';
 import {FillExtrusionBucket} from '../../data/bucket/fill_extrusion_bucket.ts';
 import {polygonIntersectsPolygon, polygonIntersectsMultiPolygon} from '../../util/intersection_tests.ts';
 import {translateDistance, translate} from '../query_utils.ts';
-import properties, {type FillExtrusionPaintPropsPossiblyEvaluated} from './fill_extrusion_style_layer_properties.g.ts';
-import {type Transitionable, type Transitioning, type PossiblyEvaluated} from '../properties.ts';
+import properties, {type FillExtrusionLayoutPropsPossiblyEvaluated, type FillExtrusionPaintPropsPossiblyEvaluated} from './fill_extrusion_style_layer_properties.g.ts';
+import {type Layout, type Transitionable, type Transitioning, type PossiblyEvaluated} from '../properties.ts';
 import {type mat4, vec4} from 'gl-matrix';
 import Point from '@mapbox/point-geometry';
 import type {LayerSpecification} from '@maplibre/maplibre-gl-style-spec';
 import type {BucketParameters} from '../../data/bucket.ts';
-import type {FillExtrusionPaintProps} from './fill_extrusion_style_layer_properties.g.ts';
+import type {FillExtrusionLayoutProps, FillExtrusionPaintProps} from './fill_extrusion_style_layer_properties.g.ts';
 
 export class Point3D extends Point {
     z: number;
@@ -18,6 +18,9 @@ export class Point3D extends Point {
 export const isFillExtrusionStyleLayer = (layer: StyleLayer): layer is FillExtrusionStyleLayer => layer.type === 'fill-extrusion';
 
 export class FillExtrusionStyleLayer extends StyleLayer {
+    _unevaluatedLayout: Layout<FillExtrusionLayoutProps>;
+    layout: PossiblyEvaluated<FillExtrusionLayoutProps, FillExtrusionLayoutPropsPossiblyEvaluated>;
+
     _transitionablePaint: Transitionable<FillExtrusionPaintProps>;
     _transitioningPaint: Transitioning<FillExtrusionPaintProps>;
     paint: PossiblyEvaluated<FillExtrusionPaintProps, FillExtrusionPaintPropsPossiblyEvaluated>;

package/src/style/style_layer/fill_extrusion_style_layer_properties.g.ts

@@ -18,6 +18,19 @@ import type {Color, Formatted, Padding, NumberArray, ColorArray, ResolvedImage,
 import {StylePropertySpecification} from '@maplibre/maplibre-gl-style-spec';
 
 
+export type FillExtrusionLayoutProps = {
+    "fill-extrusion-rounded-corner-distance": DataConstantProperty<number>,
+};
+
+export type FillExtrusionLayoutPropsPossiblyEvaluated = {
+    "fill-extrusion-rounded-corner-distance": number,
+};
+
+let layout: Properties<FillExtrusionLayoutProps>;
+const getLayout = (): Properties<FillExtrusionLayoutProps> => layout = layout || new Properties({
+    "fill-extrusion-rounded-corner-distance": new DataConstantProperty(styleSpec["layout_fill-extrusion"]["fill-extrusion-rounded-corner-distance"] as any as StylePropertySpecification, "fill-extrusion-rounded-corner-distance"),
+});
+
 export type FillExtrusionPaintProps = {
     "fill-extrusion-opacity": DataConstantProperty<number>,
     "fill-extrusion-color": DataDrivenProperty<Color>,
@@ -52,4 +65,4 @@ const getPaint = (): Properties<FillExtrusionPaintProps> => paint = paint || new
     "fill-extrusion-vertical-gradient": new DataConstantProperty(styleSpec["paint_fill-extrusion"]["fill-extrusion-vertical-gradient"] as any as StylePropertySpecification, "fill-extrusion-vertical-gradient"),
 });
 
-export default ({ get paint(): Properties<FillExtrusionPaintProps> { return getPaint() } });
+export default ({ get paint(): Properties<FillExtrusionPaintProps> { return getPaint() }, get layout(): Properties<FillExtrusionLayoutProps> { return getLayout() } });

package/src/style/style_layer/raster_style_layer.test.ts

@@ -18,7 +18,7 @@ describe('RasterStyleLayer correctly handles "resampling" and "raster-resampling
         const layer = createStyleLayer(layerSpec, {});
     
         const rasterResampling = layer.getPaintProperty('raster-resampling');
-        expect(rasterResampling).toEqual(undefined);
+        expect(rasterResampling).toBeUndefined();
     });
 
     test('"resampling" is undefined when instantiated with "raster-resampling"', () => {
@@ -26,7 +26,7 @@ describe('RasterStyleLayer correctly handles "resampling" and "raster-resampling
         const layer = createStyleLayer(layerSpec, {});
     
         const resampling = layer.getPaintProperty('resampling');
-        expect(resampling).toEqual(undefined);
+        expect(resampling).toBeUndefined();
     });
 
 });

package/src/style/style_layer.test.ts

@@ -1,4 +1,4 @@
-import {describe, test, expect} from 'vitest';
+import {describe, test, expect, vi} from 'vitest';
 import {createStyleLayer} from './create_style_layer.ts';
 import {FillStyleLayer} from './style_layer/fill_style_layer.ts';
 import {extend} from '../util/util.ts';
@@ -171,8 +171,8 @@ describe('StyleLayer.setPaintProperty', () => {
         layer.updateTransitions({} as TransitionParameters);
         layer.recalculate({zoom: 0, zoomHistory: {}} as EvaluationParameters, undefined);
 
-        layer.paint.get('fill-outline-color');
-
+        const outlineColor = layer.paint.get('fill-outline-color');
+        expect(outlineColor.value).toMatchObject({kind: 'constant', value: {r: 1, g: 0, b: 0, a: 1}});
     });
 
     test('sets null property value', () => {
@@ -379,6 +379,7 @@ describe('StyleLayer.getLayoutAffectingGlobalStateRefs', () => {
     });
 
     test('returns global-state references from visibility', () => {
+        vi.spyOn(console, 'warn').mockImplementation(() => {});
         const layer = createStyleLayer({
             id: 'background',
             type: 'background',
@@ -507,54 +508,7 @@ describe('StyleLayer.serialize', () => {
 
 });
 
-describe('StyleLayer.serialize', () => {
-
-    function createSymbolLayer(layer?) {
-        return extend({
-            id: 'symbol',
-            type: 'symbol',
-            paint: {
-                'text-color': 'blue'
-            },
-            layout: {
-                'text-transform': 'uppercase'
-            }
-        }, layer);
-    }
-
-    test('serializes layers', () => {
-        expect(createStyleLayer(createSymbolLayer(), {}).serialize()).toEqual(createSymbolLayer());
-    });
-
-    test('serializes functions', () => {
-        const layerPaint = {
-            'text-color': {
-                base: 2,
-                stops: [[0, 'red'], [1, 'blue']]
-            }
-        };
-
-        expect(createStyleLayer(createSymbolLayer({paint: layerPaint}), {}).serialize().paint).toEqual(layerPaint);
-    });
-
-    test('serializes added paint properties', () => {
-        const layer = createStyleLayer(createSymbolLayer(), {});
-        layer.setPaintProperty('text-halo-color', 'orange');
-
-        expect(layer.serialize().paint['text-halo-color']).toBe('orange');
-        expect(layer.serialize().paint['text-color']).toBe('blue');
-
-    });
-
-    test('serializes added layout properties', () => {
-        const layer = createStyleLayer(createSymbolLayer(), {});
-        layer.setLayoutProperty('text-size', 20);
-
-        expect(layer.serialize().layout['text-transform']).toBe('uppercase');
-        expect(layer.serialize().layout['text-size']).toBe(20);
-
-    });
-
+describe('StyleLayer.paint', () => {
     test('layer.paint is never undefined', () => {
         const layer = createStyleLayer({type: 'fill'} as LayerSpecification, {});
         // paint is never undefined

package/src/style/validate_style.test.ts

@@ -1,7 +1,7 @@
 import {describe, test, expect, vi, afterEach} from 'vitest';
 import {validateAndEmit, validateStyle, validateStyleAndEmit} from './validate_style.ts';
-import type {StyleSpecification} from '@maplibre/maplibre-gl-style-spec';
 import {Evented} from '../util/evented.ts';
+import type {StyleSpecification} from '@maplibre/maplibre-gl-style-spec';
 
 class TestEmitter extends Evented {}
 

package/src/symbol/collision_index.test.ts

@@ -10,7 +10,7 @@ describe('CollisionIndex', () => {
         const transform = new MercatorTransform({minZoom: 0, maxZoom: 22, minPitch: 0, maxPitch: 60, renderWorldCopies: true});
         transform.resize(200, 200);
         const tile = new UnwrappedTileID(0, new CanonicalTileID(0, 0, 0));
-        vi.spyOn(transform, 'calculatePosMatrix').mockImplementation(() => createIdentityMat4f64());
+        vi.spyOn(transform, 'calculatePosMatrix').mockReturnValue(createIdentityMat4f64());
 
         const ci = new CollisionIndex(transform);
         expect(ci.projectAndGetPerspectiveRatio(x, y, tile, null).x).toBeCloseTo(10000212.3456, 10);

package/src/symbol/grid_index.test.ts

@@ -86,7 +86,7 @@ describe('GridIndex', () => {
         // differs from y_boundary_a by less than 1e-10 (1-2 ULPs)
         const y_boundary_b = 406.2043266199999;
         // y_boundary_b < y_boundary_a, so strict >= would fail
-        expect(y_boundary_b >= y_boundary_a).toBe(false);
+        expect(y_boundary_b).toBeLessThan(y_boundary_a);
 
         // Despite the floating-point difference, hitTest should detect overlap
         expect(grid.hitTest(660, 366, y_boundary_b, y_boundary_b, 'never')).toBeFalsy();

package/src/tile/terrain_tile_manager.test.ts

@@ -1,4 +1,4 @@
-import {describe, beforeAll, afterAll, test, expect, vi, type Mock} from 'vitest';
+import {describe, beforeAll, afterAll, test, expect, vi} from 'vitest';
 import {TerrainTileManager} from './terrain_tile_manager.ts';
 import {Style} from '../style/style.ts';
 import {RequestManager} from '../util/request_manager.ts';
@@ -248,7 +248,7 @@ describe('TerrainTileManager', () => {
 
             tsc.releaseAllRTT();
 
-            expect((painter.releaseRTT as Mock<typeof painter.releaseRTT>).mock.calls.length).toBe(Object.keys(tiles).length);
+            expect((vi.mocked(painter.releaseRTT))).toHaveBeenCalledTimes(Object.keys(tiles).length);
             for (const key in rttObjects) {
                 expect(painter.releaseRTT).toHaveBeenCalledWith(rttObjects[key]);
                 expect(tiles[key].getRTT(0)).toBeUndefined();

package/src/tile/tile_id.test.ts

@@ -7,16 +7,16 @@ describe('CanonicalTileID', () => {
     test('constructor', () => {
         expect(() => {
             new CanonicalTileID(MIN_TILE_ZOOM - 1, 0, 0);
-        }).toThrow();
+        }).toThrow(`x=0, y=0, z=${MIN_TILE_ZOOM - 1} outside of bounds`);
         expect(() => {
             new CanonicalTileID(MAX_TILE_ZOOM + 1, 0, 0);
-        }).toThrow();
+        }).toThrow(`x=0, y=0, z=${MAX_TILE_ZOOM + 1} outside of bounds`);
         expect(() => {
             new CanonicalTileID(2, 4, 0);
-        }).toThrow();
+        }).toThrow('x=4, y=0, z=2 outside of bounds');
         expect(() => {
             new CanonicalTileID(2, 0, 4);
-        }).toThrow();
+        }).toThrow('x=0, y=4, z=2 outside of bounds');
     });
 
     test('.key', () => {
@@ -67,7 +67,7 @@ describe('OverscaledTileID', () => {
     });
 
     test('constructor - deeper canonicalZ than overscaledZ disallowed', () => {
-        expect(() => new OverscaledTileID(7, 0, 8, 0, 0)).toThrow();
+        expect(() => new OverscaledTileID(7, 0, 8, 0, 0)).toThrow('overscaledZ should be >= z; overscaledZ = 7; z = 8');
     });
 
     test('.key', () => {