maplibre-gl 2.2.0 → 2.3.1-pre.1

package/src/symbol/symbol_layout.ts

@@ -151,55 +151,55 @@ export function evaluateVariableOffset(anchor: TextAnchor, offset: [number, numb
     return (offset[1] !== INVALID_TEXT_OFFSET) ? fromTextOffset(anchor, offset[0], offset[1]) : fromRadialOffset(anchor, offset[0]);
 }
 
-export function performSymbolLayout(
-    bucket: SymbolBucket,
+export function performSymbolLayout(args: {
+    bucket: SymbolBucket;
     glyphMap: {
         [_: string]: {
             [x: number]: StyleGlyph;
         };
-    },
+    };
     glyphPositions: {
         [_: string]: {
             [x: number]: GlyphPosition;
         };
-    },
-    imageMap: {[_: string]: StyleImage},
-    imagePositions: {[_: string]: ImagePosition},
-    showCollisionBoxes: boolean,
-    canonical: CanonicalTileID
-) {
-    bucket.createArrays();
+    };
+    imageMap: {[_: string]: StyleImage};
+    imagePositions: {[_: string]: ImagePosition};
+    showCollisionBoxes: boolean;
+    canonical: CanonicalTileID;
+}) {
+    args.bucket.createArrays();
 
-    const tileSize = 512 * bucket.overscaling;
-    bucket.tilePixelRatio = EXTENT / tileSize;
-    bucket.compareText = {};
-    bucket.iconsNeedLinear = false;
+    const tileSize = 512 * args.bucket.overscaling;
+    args.bucket.tilePixelRatio = EXTENT / tileSize;
+    args.bucket.compareText = {};
+    args.bucket.iconsNeedLinear = false;
 
-    const layout = bucket.layers[0].layout;
-    const unevaluatedLayoutValues = bucket.layers[0]._unevaluatedLayout._values;
+    const layout = args.bucket.layers[0].layout;
+    const unevaluatedLayoutValues = args.bucket.layers[0]._unevaluatedLayout._values;
 
     const sizes: Sizes = {
         // Filled in below, if *SizeData.kind is 'composite'
         // compositeIconSizes: undefined,
         // compositeTextSizes: undefined,
-        layoutIconSize: unevaluatedLayoutValues['icon-size'].possiblyEvaluate(new EvaluationParameters(bucket.zoom + 1), canonical),
-        layoutTextSize: unevaluatedLayoutValues['text-size'].possiblyEvaluate(new EvaluationParameters(bucket.zoom + 1), canonical),
+        layoutIconSize: unevaluatedLayoutValues['icon-size'].possiblyEvaluate(new EvaluationParameters(args.bucket.zoom + 1), args.canonical),
+        layoutTextSize: unevaluatedLayoutValues['text-size'].possiblyEvaluate(new EvaluationParameters(args.bucket.zoom + 1), args.canonical),
         textMaxSize: unevaluatedLayoutValues['text-size'].possiblyEvaluate(new EvaluationParameters(18))
     } as Sizes;
 
-    if (bucket.textSizeData.kind === 'composite') {
-        const {minZoom, maxZoom} = bucket.textSizeData;
+    if (args.bucket.textSizeData.kind === 'composite') {
+        const {minZoom, maxZoom} = args.bucket.textSizeData;
         sizes.compositeTextSizes = [
-            unevaluatedLayoutValues['text-size'].possiblyEvaluate(new EvaluationParameters(minZoom), canonical),
-            unevaluatedLayoutValues['text-size'].possiblyEvaluate(new EvaluationParameters(maxZoom), canonical)
+            unevaluatedLayoutValues['text-size'].possiblyEvaluate(new EvaluationParameters(minZoom), args.canonical),
+            unevaluatedLayoutValues['text-size'].possiblyEvaluate(new EvaluationParameters(maxZoom), args.canonical)
         ];
     }
 
-    if (bucket.iconSizeData.kind === 'composite') {
-        const {minZoom, maxZoom} = bucket.iconSizeData;
+    if (args.bucket.iconSizeData.kind === 'composite') {
+        const {minZoom, maxZoom} = args.bucket.iconSizeData;
         sizes.compositeIconSizes = [
-            unevaluatedLayoutValues['icon-size'].possiblyEvaluate(new EvaluationParameters(minZoom), canonical),
-            unevaluatedLayoutValues['icon-size'].possiblyEvaluate(new EvaluationParameters(maxZoom), canonical)
+            unevaluatedLayoutValues['icon-size'].possiblyEvaluate(new EvaluationParameters(minZoom), args.canonical),
+            unevaluatedLayoutValues['icon-size'].possiblyEvaluate(new EvaluationParameters(maxZoom), args.canonical)
         ];
     }
 
@@ -208,11 +208,11 @@ export function performSymbolLayout(
     const keepUpright = layout.get('text-keep-upright');
     const textSize = layout.get('text-size');
 
-    for (const feature of bucket.features) {
-        const fontstack = layout.get('text-font').evaluate(feature, {}, canonical).join(',');
-        const layoutTextSizeThisZoom = textSize.evaluate(feature, {}, canonical);
-        const layoutTextSize = sizes.layoutTextSize.evaluate(feature, {}, canonical);
-        const layoutIconSize = sizes.layoutIconSize.evaluate(feature, {}, canonical);
+    for (const feature of args.bucket.features) {
+        const fontstack = layout.get('text-font').evaluate(feature, {}, args.canonical).join(',');
+        const layoutTextSizeThisZoom = textSize.evaluate(feature, {}, args.canonical);
+        const layoutTextSize = sizes.layoutTextSize.evaluate(feature, {}, args.canonical);
+        const layoutIconSize = sizes.layoutIconSize.evaluate(feature, {}, args.canonical);
 
         const shapedTextOrientations: ShapedTextOrientations = {
             horizontal: {} as Record<TextJustify, Shaping>,
@@ -222,14 +222,14 @@ export function performSymbolLayout(
         let textOffset: [number, number] = [0, 0];
         if (text) {
             const unformattedText = text.toString();
-            const spacing = layout.get('text-letter-spacing').evaluate(feature, {}, canonical) * ONE_EM;
+            const spacing = layout.get('text-letter-spacing').evaluate(feature, {}, args.canonical) * ONE_EM;
             const spacingIfAllowed = allowsLetterSpacing(unformattedText) ? spacing : 0;
 
-            const textAnchor = layout.get('text-anchor').evaluate(feature, {}, canonical);
+            const textAnchor = layout.get('text-anchor').evaluate(feature, {}, args.canonical);
             const variableTextAnchor = layout.get('text-variable-anchor');
 
             if (!variableTextAnchor) {
-                const radialOffset = layout.get('text-radial-offset').evaluate(feature, {}, canonical);
+                const radialOffset = layout.get('text-radial-offset').evaluate(feature, {}, args.canonical);
                 // Layers with variable anchors use the `text-radial-offset` property and the [x, y] offset vector
                 // is calculated at placement time instead of layout time
                 if (radialOffset) {
@@ -237,25 +237,25 @@ export function performSymbolLayout(
                     // but doesn't actually specify what happens if you use both. We go with the radial offset.
                     textOffset = evaluateVariableOffset(textAnchor, [radialOffset * ONE_EM, INVALID_TEXT_OFFSET]) as [number, number];
                 } else {
-                    textOffset = (layout.get('text-offset').evaluate(feature, {}, canonical).map(t => t * ONE_EM) as [number, number]);
+                    textOffset = (layout.get('text-offset').evaluate(feature, {}, args.canonical).map(t => t * ONE_EM) as [number, number]);
                 }
             }
 
             let textJustify = textAlongLine ?
                 'center' :
-                layout.get('text-justify').evaluate(feature, {}, canonical);
+                layout.get('text-justify').evaluate(feature, {}, args.canonical);
 
             const symbolPlacement = layout.get('symbol-placement');
             const maxWidth = symbolPlacement === 'point' ?
-                layout.get('text-max-width').evaluate(feature, {}, canonical) * ONE_EM :
+                layout.get('text-max-width').evaluate(feature, {}, args.canonical) * ONE_EM :
                 0;
 
             const addVerticalShapingForPointLabelIfNeeded = () => {
-                if (bucket.allowVerticalPlacement && allowsVerticalWritingMode(unformattedText)) {
+                if (args.bucket.allowVerticalPlacement && allowsVerticalWritingMode(unformattedText)) {
                     // Vertical POI label placement is meant to be used for scripts that support vertical
                     // writing mode, thus, default left justification is used. If Latin
                     // scripts would need to be supported, this should take into account other justifications.
-                    shapedTextOrientations.vertical = shapeText(text, glyphMap, glyphPositions, imagePositions, fontstack, maxWidth, lineHeight, textAnchor,
+                    shapedTextOrientations.vertical = shapeText(text, args.glyphMap, args.glyphPositions, args.imagePositions, fontstack, maxWidth, lineHeight, textAnchor,
                         'left', spacingIfAllowed, textOffset, WritingMode.vertical, true, symbolPlacement, layoutTextSize, layoutTextSizeThisZoom);
                 }
             };
@@ -277,7 +277,7 @@ export function performSymbolLayout(
                     } else {
                         // If using text-variable-anchor for the layer, we use a center anchor for all shapings and apply
                         // the offsets for the anchor in the placement step.
-                        const shaping = shapeText(text, glyphMap, glyphPositions, imagePositions, fontstack, maxWidth, lineHeight, 'center',
+                        const shaping = shapeText(text, args.glyphMap, args.glyphPositions, args.imagePositions, fontstack, maxWidth, lineHeight, 'center',
                             justification, spacingIfAllowed, textOffset, WritingMode.horizontal, false, symbolPlacement, layoutTextSize, layoutTextSizeThisZoom);
                         if (shaping) {
                             shapedTextOrientations.horizontal[justification] = shaping;
@@ -293,7 +293,7 @@ export function performSymbolLayout(
                 }
 
                 // Horizontal point or line label.
-                const shaping = shapeText(text, glyphMap, glyphPositions, imagePositions, fontstack, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed,
+                const shaping = shapeText(text, args.glyphMap, args.glyphPositions, args.imagePositions, fontstack, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed,
                     textOffset, WritingMode.horizontal, false, symbolPlacement, layoutTextSize, layoutTextSizeThisZoom);
                 if (shaping) shapedTextOrientations.horizontal[textJustify] = shaping;
 
@@ -302,7 +302,7 @@ export function performSymbolLayout(
 
                 // Verticalized line label.
                 if (allowsVerticalWritingMode(unformattedText) && textAlongLine && keepUpright) {
-                    shapedTextOrientations.vertical = shapeText(text, glyphMap, glyphPositions, imagePositions, fontstack, maxWidth, lineHeight, textAnchor, textJustify,
+                    shapedTextOrientations.vertical = shapeText(text, args.glyphMap, args.glyphPositions, args.imagePositions, fontstack, maxWidth, lineHeight, textAnchor, textJustify,
                         spacingIfAllowed, textOffset, WritingMode.vertical, false, symbolPlacement, layoutTextSize, layoutTextSizeThisZoom);
                 }
             }
@@ -311,36 +311,36 @@ export function performSymbolLayout(
         let shapedIcon;
         let isSDFIcon = false;
         if (feature.icon && feature.icon.name) {
-            const image = imageMap[feature.icon.name];
+            const image = args.imageMap[feature.icon.name];
             if (image) {
                 shapedIcon = shapeIcon(
-                    imagePositions[feature.icon.name],
-                    layout.get('icon-offset').evaluate(feature, {}, canonical),
-                    layout.get('icon-anchor').evaluate(feature, {}, canonical));
+                    args.imagePositions[feature.icon.name],
+                    layout.get('icon-offset').evaluate(feature, {}, args.canonical),
+                    layout.get('icon-anchor').evaluate(feature, {}, args.canonical));
                 // null/undefined SDF property treated same as default (false)
                 isSDFIcon = !!image.sdf;
-                if (bucket.sdfIcons === undefined) {
-                    bucket.sdfIcons = isSDFIcon;
-                } else if (bucket.sdfIcons !== isSDFIcon) {
+                if (args.bucket.sdfIcons === undefined) {
+                    args.bucket.sdfIcons = isSDFIcon;
+                } else if (args.bucket.sdfIcons !== isSDFIcon) {
                     warnOnce('Style sheet warning: Cannot mix SDF and non-SDF icons in one buffer');
                 }
-                if (image.pixelRatio !== bucket.pixelRatio) {
-                    bucket.iconsNeedLinear = true;
+                if (image.pixelRatio !== args.bucket.pixelRatio) {
+                    args.bucket.iconsNeedLinear = true;
                 } else if (layout.get('icon-rotate').constantOr(1) !== 0) {
-                    bucket.iconsNeedLinear = true;
+                    args.bucket.iconsNeedLinear = true;
                 }
             }
         }
 
         const shapedText = getDefaultHorizontalShaping(shapedTextOrientations.horizontal) || shapedTextOrientations.vertical;
-        bucket.iconsInText = shapedText ? shapedText.iconsInText : false;
+        args.bucket.iconsInText = shapedText ? shapedText.iconsInText : false;
         if (shapedText || shapedIcon) {
-            addFeature(bucket, feature, shapedTextOrientations, shapedIcon, imageMap, sizes, layoutTextSize, layoutIconSize, textOffset, isSDFIcon, canonical);
+            addFeature(args.bucket, feature, shapedTextOrientations, shapedIcon, args.imageMap, sizes, layoutTextSize, layoutIconSize, textOffset, isSDFIcon, args.canonical);
         }
     }
 
-    if (showCollisionBoxes) {
-        bucket.generateCollisionDebugBuffers();
+    if (args.showCollisionBoxes) {
+        args.bucket.generateCollisionDebugBuffers();
     }
 }
 

package/src/ui/camera.ts

@@ -5,7 +5,6 @@ import LngLat from '../geo/lng_lat';
 import LngLatBounds from '../geo/lng_lat_bounds';
 import Point from '@mapbox/point-geometry';
 import {Event, Evented} from '../util/evented';
-import assert from 'assert';
 import {Debug} from '../util/debug';
 
 import type Transform from '../geo/transform';
@@ -1273,19 +1272,10 @@ function addAssertions(camera: Camera) { //eslint-disable-line
             inProgress[name] = false;
 
             camera.on(`${name}start`, () => {
-                assert(!inProgress[name], `"${name}start" fired twice without a "${name}end"`);
                 inProgress[name] = true;
-                assert(inProgress.move);
-            });
-
-            camera.on(name, () => {
-                assert(inProgress[name]);
-                assert(inProgress.move);
             });
 
             camera.on(`${name}end`, () => {
-                assert(inProgress.move);
-                assert(inProgress[name]);
                 inProgress[name] = false;
             });
         });

package/src/ui/control/geolocate_control.ts

@@ -1,7 +1,6 @@
 import {Event, Evented} from '../../util/evented';
 import DOM from '../../util/dom';
 import {extend, bindAll, warnOnce} from '../../util/util';
-import assert from 'assert';
 import LngLat from '../../geo/lng_lat';
 import Marker from '../marker';
 
@@ -195,7 +194,7 @@ class GeolocateControl extends Evented implements IControl {
             case 'ACTIVE_ERROR':
                 break;
             default:
-                assert(false, `Unexpected watchState ${this._watchState}`);
+                throw new Error(`Unexpected watchState ${this._watchState}`);
         }
     }
 
@@ -244,7 +243,7 @@ class GeolocateControl extends Evented implements IControl {
                     this._geolocateButton.classList.add('maplibregl-ctrl-geolocate-background', 'mapboxgl-ctrl-geolocate-background');
                     break;
                 default:
-                    assert(false, `Unexpected watchState ${this._watchState}`);
+                    throw new Error(`Unexpected watchState ${this._watchState}`);
             }
         }
 
@@ -306,7 +305,6 @@ class GeolocateControl extends Evented implements IControl {
     }
 
     _updateCircleRadius() {
-        assert(this._circleElement);
         const y = this._map._container.clientHeight / 2;
         const a = this._map.unproject([0, y]);
         const b = this._map.unproject([1, y]);
@@ -485,7 +483,7 @@ class GeolocateControl extends Evented implements IControl {
                     this.fire(new Event('trackuserlocationstart'));
                     break;
                 default:
-                    assert(false, `Unexpected watchState ${this._watchState}`);
+                    throw new Error(`Unexpected watchState ${this._watchState}`);
             }
 
             // incoming state setup
@@ -500,7 +498,7 @@ class GeolocateControl extends Evented implements IControl {
                 case 'OFF':
                     break;
                 default:
-                    assert(false, `Unexpected watchState ${this._watchState}`);
+                    throw new Error(`Unexpected watchState ${this._watchState}`);
             }
 
             // manage geolocation.watchPosition / geolocation.clearWatch

package/src/ui/handler/handler_util.ts

@@ -1,8 +1,7 @@
-import assert from 'assert';
 import Point from '@mapbox/point-geometry';
 
 export function indexTouches(touches: Array<Touch>, points: Array<Point>) {
-    assert(touches.length === points.length);
+    if (touches.length !== points.length) throw new Error(`The number of touches and points are not equal - touches ${touches.length}, points ${points.length}`);
     const obj = {};
     for (let i = 0; i < touches.length; i++) {
         obj[touches[i].identifier] = points[i];

package/src/ui/handler/scroll_zoom.ts

@@ -1,4 +1,3 @@
-import assert from 'assert';
 import DOM from '../../util/dom';
 
 import {ease as _ease, bindAll, bezier} from '../../util/util';
@@ -282,7 +281,6 @@ class ScrollZoomHandler {
         let finished = false;
         let zoom;
         if (this._type === 'wheel' && startZoom && easing) {
-            assert(easing && typeof startZoom === 'number');
 
             const t = Math.min((browser.now() - this._lastWheelEventTime) / 200, 1);
             const k = easing(t);

package/src/ui/handler_manager.ts

@@ -19,7 +19,6 @@ import TouchZoomRotateHandler from './handler/shim/touch_zoom_rotate';
 import {bindAll, extend} from '../util/util';
 import Point from '@mapbox/point-geometry';
 import LngLat from '../geo/lng_lat';
-import assert from 'assert';
 
 export type InputEvent = MouseEvent | TouchEvent | KeyboardEvent | WheelEvent;
 
@@ -299,7 +298,6 @@ class HandlerManager {
         }
 
         this._updatingCamera = true;
-        assert(e.timeStamp !== undefined);
 
         const inputEvent = e.type === 'renderFrame' ? undefined : (e as any as InputEvent);
 

package/src/ui/map.test.ts

@@ -40,6 +40,17 @@ afterEach(() => {
 
 describe('Map', () => {
 
+    test('version', () => {
+        const map = createMap({interactive: true, style: null});
+
+        expect(typeof map.version === 'string').toBeTruthy();
+
+        // Semver regex: https://gist.github.com/jhorsman/62eeea161a13b80e39f5249281e17c39
+        // Backslashes are doubled to escape them
+        const regexp = new RegExp('^([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*))?(?:\\+[0-9A-Za-z-]+)?$');
+        expect(regexp.test(map.version)).toBeTruthy();
+    });
+
     test('constructor', () => {
         const map = createMap({interactive: true, style: null});
         expect(map.getContainer()).toBeTruthy();

package/src/ui/map.ts

@@ -1,6 +1,7 @@
 import {extend, bindAll, warnOnce, uniqueId, isImageBitmap} from '../util/util';
 import browser from '../util/browser';
 import DOM from '../util/dom';
+import packageJSON from '../../package.json' assert {type: 'json'};
 import {getImage, GetImageCallback, getJSON, ResourceType} from '../util/ajax';
 import {RequestManager} from '../util/request_manager';
 import Style from '../style/style';
@@ -58,6 +59,8 @@ import {Callback} from '../types/callback';
 import type {ControlPosition, IControl} from './control/control';
 import type {MapGeoJSONFeature} from '../util/vectortile_to_geojson';
 
+const version = packageJSON.version;
+
 /* eslint-enable no-use-before-define */
 export type MapOptions = {
     hash?: boolean | string;
@@ -2925,6 +2928,14 @@ class Map extends Camera {
     _setCacheLimits(limit: number, checkThreshold: number) {
         setCacheLimits(limit, checkThreshold);
     }
+
+    /**
+     * Returns the package version of the library
+     * @returns {string} Package version of the library
+     */
+    get version(): string {
+        return version;
+    }
 }
 
 export default Map;

package/src/util/ajax.ts

@@ -1,6 +1,5 @@
 import {extend, warnOnce, isWorker} from './util';
 import config from './config';
-import assert from 'assert';
 import {cacheGet, cachePut} from './tile_request_cache';
 import webpSupported from './webp_supported';
 
@@ -390,7 +389,7 @@ export const getImage = function(
         if (advanced) return;
         advanced = true;
         numImageRequests--;
-        assert(numImageRequests >= 0);
+
         while (imageQueue.length && numImageRequests < config.MAX_PARALLEL_IMAGE_REQUESTS) { // eslint-disable-line
             const request = imageQueue.shift();
             const {requestParameters, callback, cancelled} = request;

package/src/util/color_ramp.ts

@@ -1,6 +1,5 @@
 import {RGBAImage} from './image';
 import {isPowerOfTwo} from './util';
-import assert from 'assert';
 
 import type {StylePropertyExpression} from '../style-spec/expression/index';
 
@@ -24,7 +23,7 @@ export function renderColorRamp(params: ColorRampParams): RGBAImage {
     const height = params.clips ? params.clips.length : 1;
     const image = params.image || new RGBAImage({width, height});
 
-    assert(isPowerOfTwo(width));
+    if (!isPowerOfTwo(width)) throw new Error(`width is not a power of 2 - ${width}`);
 
     const renderPixel = (stride, index, progress) => {
         evaluationGlobals[params.evaluationKey] = progress;

package/src/util/dictionary_coder.ts

@@ -1,4 +1,3 @@
-import assert from 'assert';
 
 class DictionaryCoder {
     _stringToNumber: {[_: string]: number};
@@ -15,12 +14,11 @@ class DictionaryCoder {
     }
 
     encode(string: string) {
-        assert(string in this._stringToNumber);
         return this._stringToNumber[string];
     }
 
     decode(n: number) {
-        assert(n < this._numberToString.length);
+        if (n >= this._numberToString.length) throw new Error(`Out of bounds. Index requested n=${n} can't be >= this._numberToString.length ${this._numberToString.length}`);
         return this._numberToString[n];
     }
 }

package/src/util/dispatcher.ts

@@ -1,6 +1,5 @@
 import {uniqueId, asyncAll} from './util';
 import Actor from './actor';
-import assert from 'assert';
 
 import type WorkerPool from './worker_pool';
 
@@ -33,7 +32,7 @@ class Dispatcher {
             actor.name = `Worker ${i}`;
             this.actors.push(actor);
         }
-        assert(this.actors.length);
+        if (!this.actors.length) throw new Error('No actors found');
     }
 
     /**
@@ -41,7 +40,6 @@ class Dispatcher {
      * @private
      */
     broadcast(type: string, data: unknown, cb?: (...args: any[]) => any) {
-        assert(this.actors.length);
         cb = cb || function () {};
         asyncAll(this.actors, (actor, done) => {
             actor.send(type, data, done);
@@ -53,7 +51,6 @@ class Dispatcher {
      * @returns An actor object backed by a web worker for processing messages.
      */
     getActor(): Actor {
-        assert(this.actors.length);
         this.currentActor = (this.currentActor + 1) % this.actors.length;
         return this.actors[this.currentActor];
     }

package/src/util/dom.ts

@@ -1,7 +1,5 @@
 import Point from '@mapbox/point-geometry';
 
-import assert from 'assert';
-
 export default class DOM {
     private static readonly docStyle = typeof window !== 'undefined' && window.document && window.document.documentElement.style;
 
@@ -107,7 +105,6 @@ export default class DOM {
     }
 
     public static mouseButton(e: MouseEvent) {
-        assert(e.type === 'mousedown' || e.type === 'mouseup');
         return e.button;
     }
 

package/src/util/image.ts

@@ -1,5 +1,3 @@
-import assert from 'assert';
-
 import {register} from './web_worker_transfer';
 
 export type Size = {
@@ -71,7 +69,7 @@ function copyImage(srcImg: any, dstImg: any, srcPt: Point2D, dstPt: Point2D, siz
     const srcData = srcImg.data;
     const dstData = dstImg.data;
 
-    assert(srcData !== dstData);
+    if (srcData === dstData) throw new Error('srcData equals dstData, so image is already copied');
 
     for (let y = 0; y < size.height; y++) {
         const srcOffset = ((srcPt.y + y) * srcImg.width + srcPt.x) * channels;

package/src/util/struct_array.ts

@@ -1,7 +1,5 @@
 // Note: all "sizes" are measured in bytes
 
-import assert from 'assert';
-
 import type {Transferable} from '../types/transferable';
 
 const viewTypes = {
@@ -111,7 +109,6 @@ abstract class StructArray {
      * @private
      */
     static serialize(array: StructArray, transferables?: Array<Transferable>): SerializedStructArray {
-        assert(!array.isTransferred);
 
         array._trim();
 
@@ -160,7 +157,6 @@ abstract class StructArray {
      * @param {number} n The new size of the array.
      */
     resize(n: number) {
-        assert(!this.isTransferred);
         this.reserve(n);
         this.length = n;
     }
@@ -209,7 +205,6 @@ function createLayout(
     let offset = 0;
     let maxSize = 0;
     const layoutMembers = members.map((member) => {
-        assert(member.name.length);
         const typeSize = sizeOf(member.type);
         const memberOffset = offset = align(offset, Math.max(alignment, typeSize));
         const components = member.components || 1;

package/src/util/task_queue.ts

@@ -1,5 +1,3 @@
-import assert from 'assert';
-
 export type TaskID = number; // can't mark opaque due to https://github.com/flowtype/flow-remove-types/pull/61
 
 type Task = {
@@ -40,7 +38,7 @@ class TaskQueue {
     }
 
     run(timeStamp: number = 0) {
-        assert(!this._currentlyRunning);
+        if (this._currentlyRunning) throw new Error('Attempting to run(), but is already running.');
         const queue = this._currentlyRunning = this._queue;
 
         // Tasks queued by callbacks in the current queue should be executed

package/src/util/util.ts

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

package/src/util/web_worker_transfer.ts

@@ -1,5 +1,3 @@
-import assert from 'assert';
-
 import TransferableGridIndex from './transferable_grid_index';
 import Color from '../style-spec/util/color';
 import {StylePropertyFunction, StyleExpression, ZoomDependentExpression, ZoomConstantExpression} from '../style-spec/expression';
@@ -51,7 +49,7 @@ export function register<T extends any>(
     },
     options: RegisterOptions<T> = {}
 ) {
-    assert(!registry[name], `${name} is already registered.`);
+    if (registry[name]) throw new Error(`${name} is already registered.`);
     ((Object.defineProperty as any))(klass, '_classRegistryKey', {
         value: name,
         writeable: false
@@ -159,7 +157,7 @@ export function serialize(input: unknown, transferables?: Array<Transferable> |
         if (!name) {
             throw new Error('can\'t serialize object of unregistered class');
         }
-        assert(registry[name]);
+        if (!registry[name]) throw new Error(`${name} is not registered.`);
 
         const properties: SerializedObject = klass.serialize ?
             // (Temporary workaround) allow a class to provide static
@@ -185,8 +183,9 @@ export function serialize(input: unknown, transferables?: Array<Transferable> |
                 properties.message = input.message;
             }
         } else {
-            // make sure statically serialized object survives transfer of $name property
-            assert(!transferables || properties as any !== transferables[transferables.length - 1]);
+            if (transferables && properties as any === transferables[transferables.length - 1]) {
+                throw new Error('statically serialized object won\'t survive transfer of $name property');
+            }
         }
 
         if (properties.$name) {