isard 2.0.0 → 2.1.0

package/dist/map/layer-stack.d.ts

@@ -1,6 +1,6 @@
 /**
- * The drawing order of a map's layers, kept beside the engine's: the layers waiting for the engine with 3D Tiles are
- * in the order but not in the engine yet, and the order recreates the layers in a new engine after a context loss.
+ * The drawing order of a map's layers, kept beside the engine's: it recreates the layers in a new engine after a
+ * context loss; a layer whose creation failed stays in the order, not in the engine.
  */
 import type { Layer } from '../layers/layers.ts';
 import type { Engine } from '../wasm/isard_webgpu.js';
@@ -24,13 +24,12 @@ export declare class LayerStack {
     replace(layer: Layer, old: number): void;
     /** Moves a layer under all the others */
     toBottom(layer: Layer): void;
-    /** Creates the layers in a new engine, in order, but those still `waiting` (for the engine with 3D Tiles); a layer
-     * that fails is reported and left out */
+    /** Creates the layers in a new engine, in order; a layer that fails is reported and left out */
     reattach(engine: Engine): void;
-    /** Frees what the layers hold beside the engine (custom layers' WebGL objects, models' data) */
+    /** Frees what the layers hold beside the engine (custom layers' GPU objects, models' data) */
     dispose(): void;
     /** Takes a layer out of the drawing order (to put it back elsewhere, or for good) */
     private unlist;
-    /** Index in the engine of the layer at `index`: the layers waiting for the engine with 3D Tiles are not in it yet */
+    /** Index in the engine of the layer at `index`: the layers without an id (their creation failed) are not in it */
     private engineIndex;
 }

package/dist/map/layer-stack.js

@@ -1,6 +1,6 @@
 /**
- * The drawing order of a map's layers, kept beside the engine's: the layers waiting for the engine with 3D Tiles are
- * in the order but not in the engine yet, and the order recreates the layers in a new engine after a context loss.
+ * The drawing order of a map's layers, kept beside the engine's: it recreates the layers in a new engine after a
+ * context loss; a layer whose creation failed stays in the order, not in the engine.
  */
 import { report } from "./checks.js";
 /** A map's layers in drawing order, bottom first, and those kept on top */
@@ -52,8 +52,7 @@ export class LayerStack {
         this.unlist(layer);
         this.layers.unshift(layer);
     }
-    /** Creates the layers in a new engine, in order, but those still `waiting` (for the engine with 3D Tiles); a layer
-     * that fails is reported and left out */
+    /** Creates the layers in a new engine, in order; a layer that fails is reported and left out */
     reattach(engine) {
         // No layer refers to an id of the old engine while the others are created
         this.layers.forEach((layer) => {
@@ -79,7 +78,7 @@ export class LayerStack {
             }
         });
     }
-    /** Frees what the layers hold beside the engine (custom layers' WebGL objects, models' data) */
+    /** Frees what the layers hold beside the engine (custom layers' GPU objects, models' data) */
     dispose() {
         this.layers.forEach((layer) => {
             layer.dispose();
@@ -91,7 +90,7 @@ export class LayerStack {
         if (index >= 0)
             this.layers.splice(index, 1);
     }
-    /** Index in the engine of the layer at `index`: the layers waiting for the engine with 3D Tiles are not in it yet */
+    /** Index in the engine of the layer at `index`: the layers without an id (their creation failed) are not in it */
     engineIndex(index) {
         return this.layers.slice(0, index).filter((layer) => layer.id >= 0).length;
     }

package/dist/map/layer-stack.js.map

@@ -1 +1 @@
-{"version":3,"file":"layer-stack.js","sourceRoot":"","sources":["../../src/map/layer-stack.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The drawing order of a map's layers, kept beside the engine's: the layers waiting for the engine with 3D Tiles are\n * in the order but not in the engine yet, and the order recreates the layers in a new engine after a context loss.\n */\n\nimport type { Layer } from '../layers/layers.ts';\nimport type { Engine } from '../wasm/isard_webgpu.js';\nimport { report } from './checks.ts';\n\n/** A map's layers in drawing order, bottom first, and those kept on top */\nexport class LayerStack {\n  /** Layers in drawing order (bottom first), to recreate them after a context loss */\n  readonly layers: Layer[] = [];\n  /** Layers new layers go under */\n  readonly onTop = new Set<Layer>();\n  private readonly engine: () => Engine;\n\n  /** `engine`: the map's engine of the moment */\n  constructor(engine: () => Engine) {\n    this.engine = engine;\n  }\n\n  has(layer: Layer): boolean {\n    return this.layers.includes(layer);\n  }\n\n  /** Puts a new layer on top, under the layers kept on top (the basemap's labels) */\n  add(layer: Layer): void {\n    this.layers.push(layer);\n\n    const top = this.layers.find((l) => this.onTop.has(l) && l !== layer);\n\n    if (top) this.move(layer, top);\n  }\n\n  /** Forgets a removed layer */\n  forget(layer: Layer): void {\n    this.unlist(layer);\n    this.onTop.delete(layer);\n  }\n\n  /** Moves a layer under `before`, or on top of all */\n  move(layer: Layer, before: Layer | undefined): void {\n    this.unlist(layer);\n\n    const index = before ? this.layers.indexOf(before) : -1;\n    const at = index < 0 ? this.layers.length : index;\n\n    this.layers.splice(at, 0, layer);\n    if (layer.id >= 0) this.engine().moveLayer(layer.id, this.engineIndex(at));\n  }\n\n  /** A layer made again in the engine under a new id: `old` removed, the new one moved to the layer's place */\n  replace(layer: Layer, old: number): void {\n    const engine = this.engine();\n\n    engine.removeLayer(old);\n\n    const index = this.layers.indexOf(layer);\n\n    if (index >= 0) engine.moveLayer(layer.id, this.engineIndex(index));\n  }\n\n  /** Moves a layer under all the others */\n  toBottom(layer: Layer): void {\n    this.engine().moveLayer(layer.id, 0);\n    this.unlist(layer);\n    this.layers.unshift(layer);\n  }\n\n  /** Creates the layers in a new engine, in order, but those still `waiting` (for the engine with 3D Tiles); a layer\n   * that fails is reported and left out */\n  reattach(engine: Engine): void {\n    // No layer refers to an id of the old engine while the others are created\n    this.layers.forEach((layer) => {\n      layer.forgetEngine();\n    });\n    this.layers.forEach((layer) => {\n      try {\n        layer.attach(engine);\n      } catch (error) {\n        report(error);\n      }\n    });\n    // Links between layers, once every layer has its new id (buildings colored by a network above them)\n    this.layers.forEach((layer) => {\n      if (layer.id < 0) return;\n      try {\n        layer.relink(engine);\n      } catch (error) {\n        report(error);\n      }\n    });\n  }\n\n  /** Frees what the layers hold beside the engine (custom layers' WebGL objects, models' data) */\n  dispose(): void {\n    this.layers.forEach((layer) => {\n      layer.dispose();\n    });\n  }\n\n  /** Takes a layer out of the drawing order (to put it back elsewhere, or for good) */\n  private unlist(layer: Layer): void {\n    const index = this.layers.indexOf(layer);\n\n    if (index >= 0) this.layers.splice(index, 1);\n  }\n\n  /** Index in the engine of the layer at `index`: the layers waiting for the engine with 3D Tiles are not in it yet */\n  private engineIndex(index: number): number {\n    return this.layers.slice(0, index).filter((layer) => layer.id >= 0).length;\n  }\n}\n"]}
+{"version":3,"file":"layer-stack.js","sourceRoot":"","sources":["../../src/map/layer-stack.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The drawing order of a map's layers, kept beside the engine's: it recreates the layers in a new engine after a\n * context loss; a layer whose creation failed stays in the order, not in the engine.\n */\n\nimport type { Layer } from '../layers/layers.ts';\nimport type { Engine } from '../wasm/isard_webgpu.js';\nimport { report } from './checks.ts';\n\n/** A map's layers in drawing order, bottom first, and those kept on top */\nexport class LayerStack {\n  /** Layers in drawing order (bottom first), to recreate them after a context loss */\n  readonly layers: Layer[] = [];\n  /** Layers new layers go under */\n  readonly onTop = new Set<Layer>();\n  private readonly engine: () => Engine;\n\n  /** `engine`: the map's engine of the moment */\n  constructor(engine: () => Engine) {\n    this.engine = engine;\n  }\n\n  has(layer: Layer): boolean {\n    return this.layers.includes(layer);\n  }\n\n  /** Puts a new layer on top, under the layers kept on top (the basemap's labels) */\n  add(layer: Layer): void {\n    this.layers.push(layer);\n\n    const top = this.layers.find((l) => this.onTop.has(l) && l !== layer);\n\n    if (top) this.move(layer, top);\n  }\n\n  /** Forgets a removed layer */\n  forget(layer: Layer): void {\n    this.unlist(layer);\n    this.onTop.delete(layer);\n  }\n\n  /** Moves a layer under `before`, or on top of all */\n  move(layer: Layer, before: Layer | undefined): void {\n    this.unlist(layer);\n\n    const index = before ? this.layers.indexOf(before) : -1;\n    const at = index < 0 ? this.layers.length : index;\n\n    this.layers.splice(at, 0, layer);\n    if (layer.id >= 0) this.engine().moveLayer(layer.id, this.engineIndex(at));\n  }\n\n  /** A layer made again in the engine under a new id: `old` removed, the new one moved to the layer's place */\n  replace(layer: Layer, old: number): void {\n    const engine = this.engine();\n\n    engine.removeLayer(old);\n\n    const index = this.layers.indexOf(layer);\n\n    if (index >= 0) engine.moveLayer(layer.id, this.engineIndex(index));\n  }\n\n  /** Moves a layer under all the others */\n  toBottom(layer: Layer): void {\n    this.engine().moveLayer(layer.id, 0);\n    this.unlist(layer);\n    this.layers.unshift(layer);\n  }\n\n  /** Creates the layers in a new engine, in order; a layer that fails is reported and left out */\n  reattach(engine: Engine): void {\n    // No layer refers to an id of the old engine while the others are created\n    this.layers.forEach((layer) => {\n      layer.forgetEngine();\n    });\n    this.layers.forEach((layer) => {\n      try {\n        layer.attach(engine);\n      } catch (error) {\n        report(error);\n      }\n    });\n    // Links between layers, once every layer has its new id (buildings colored by a network above them)\n    this.layers.forEach((layer) => {\n      if (layer.id < 0) return;\n      try {\n        layer.relink(engine);\n      } catch (error) {\n        report(error);\n      }\n    });\n  }\n\n  /** Frees what the layers hold beside the engine (custom layers' GPU objects, models' data) */\n  dispose(): void {\n    this.layers.forEach((layer) => {\n      layer.dispose();\n    });\n  }\n\n  /** Takes a layer out of the drawing order (to put it back elsewhere, or for good) */\n  private unlist(layer: Layer): void {\n    const index = this.layers.indexOf(layer);\n\n    if (index >= 0) this.layers.splice(index, 1);\n  }\n\n  /** Index in the engine of the layer at `index`: the layers without an id (their creation failed) are not in it */\n  private engineIndex(index: number): number {\n    return this.layers.slice(0, index).filter((layer) => layer.id >= 0).length;\n  }\n}\n"]}

package/dist/map.d.ts

@@ -26,7 +26,7 @@ import { Tiles3dLayer } from './layers/tiles3d.ts';
 import { type TreeOptions } from './layers/trees.ts';
 import { type HoverPicking } from './map/hover-pick.ts';
 import { type LayerSpec } from './map/layer-spec.ts';
-import type { AnimationOptions, AtmosphereOptions, Basemap, FeatureHit, FirstPersonView, FlyToOptions, GeoMapOptions, LoadingMode, LonLat, MapEvents, MapGpuTimings, NetworkOptions, PickOptions, Point, Projection, Quality, RasterOptions, SunOptions, SwipeOptions, TerrainModel, TerrainOptions, Tiles3dOptions, ViewshedOptions } from './types.ts';
+import type { AnimationOptions, AtmosphereOptions, Basemap, FeatureHit, FirstPersonView, FlyToOptions, GeoMapOptions, LoadingMode, LonLat, MapEvents, MapGpuTimings, MapMemory, NetworkOptions, PickOptions, Point, Projection, Quality, RasterOptions, SunOptions, SwipeOptions, TerrainModel, TerrainOptions, Tiles3dOptions, ViewshedOptions } from './types.ts';
 import { type Control, type ControlPosition } from './ui/controls.ts';
 import type { Camera, PickHit, RasterLayerStats } from './wasm/isard_webgpu.js';
 export type { LayerSpec } from './map/layer-spec.ts';
@@ -35,7 +35,7 @@ export declare class GeoMap {
     readonly canvas: HTMLCanvasElement;
     /** The frames' parts timed on the GPU (`setGpuTiming`), again on a new engine */
     private gpuTiming;
-    /** The engine class (core, or with 3D Tiles) and the engine with 3D Tiles loaded when needed */
+    /** The engine, made asynchronously, and the workers decoding its 3D Tiles */
     private readonly engines;
     /** The layers in drawing order and those kept on top */
     private readonly stack;
@@ -49,7 +49,7 @@ export declare class GeoMap {
     /** The canvas in the container, the markers and popups over it, the controls in its corners */
     private readonly overlays;
     private readonly settings;
-    /** The WebGL context is lost: nothing is drawn until it is restored */
+    /** The GPU is lost (the WebGL context, the WebGPU device): nothing is drawn until a new engine is there */
     private lost;
     private gone;
     private readonly listeners;
@@ -85,6 +85,15 @@ export declare class GeoMap {
     private get layers();
     /** Layers new layers go under */
     private get onTop();
+    /** The GPU is lost: nothing drawn, the engine dropped (`dropLostEngine`) */
+    private gpuLost;
+    /**
+     * Follows the loss of `engine`'s WebGPU device (a phone taking its memory back, a driver reset, the GPU process
+     * gone): while it is the map's, the map drops it and makes a new one at once, WebGPU having no event for the GPU
+     * given back. The device of an engine the map freed itself (replaced, the map destroyed) is lost too: not the map's
+     * any more, left be
+     */
+    private watchDevice;
     /**
      * The context is lost: its engine freed at once, the map's calls going to one that does nothing until `restore`
      * builds the next. The old engine's GPU objects went with the context: deleted now, it is silent (on the context
@@ -92,8 +101,8 @@ export declare class GeoMap {
      * would fail on the lost context, whose limits read 0
      */
     private dropLostEngine;
-    /** After a context loss: a new engine with the same camera, settings and layers (same handles, same order); the
-     * engine made asynchronously, adopted once there */
+    /** After the GPU lost: a new engine with the same camera, settings and layers (same handles, same order); the engine
+     * made asynchronously, adopted once there */
     private restore;
     /** A new engine in place of the map's (a placeholder, or a lost one): the same camera, settings and layers (same
      * handles, same order) */
@@ -178,6 +187,9 @@ export declare class GeoMap {
     setTerrain(terrain: boolean | TerrainModel | TerrainOptions): void;
     /** Color behind the map, a CSS color (its alpha ignored) */
     setBackground(color: string): void;
+    /** The GPU memory its layers hold (bytes): the tiles of the 3D Tiles and point clouds, kept within the budget
+     * (`GeoMapOptions.memory`), the rasters' pools */
+    memory(): MapMemory;
     /** Tile counters of the raster layers, for diagnostics */
     stats(): RasterLayerStats[];
     /** Times the parts of each frame on the GPU, for profiling (`gpuTimings`): timer queries, read a few frames later.
@@ -296,7 +308,7 @@ export declare class GeoMap {
     addTiles3d(options: Tiles3dOptions): Tiles3dLayer;
     /**
      * A point cloud (see `PointCloudOptions`): a COPC file read by range requests (IGN's LiDAR HD…), or 3D Tiles
-     * points; with depth, on the engine with 3D Tiles; under `before` if given
+     * points; with depth; under `before` if given
      */
     addPointCloud(options: PointCloudOptions): PointCloudLayer;
     /**
@@ -311,7 +323,7 @@ export declare class GeoMap {
     /** Particles carried by a field of velocities (a wind, a current), their trails animated and colored by speed on
      * the globe and the relief (see `FlowOptions`) */
     addFlow(options: FlowOptions): FlowLayer;
-    /** A glTF model drawn at positions (see `ModelOptions`), with depth; on the engine with 3D Tiles, as they are */
+    /** A glTF model drawn at positions (see `ModelOptions`), with depth */
     addModels(options: ModelOptions): ModelLayer;
     /** Trees at the points of a source that has them (a city's street trees), broadleaved or conifers by their data,
      * scaled to their height (see `TreeOptions`); the conifers on a layer that goes with the one returned */
@@ -320,8 +332,9 @@ export declare class GeoMap {
      * view, a 360° one on a band round its camera; resolves once its image is read */
     addPhoto(options: PhotoOptions): Promise<ModelLayer>;
     /**
-     * The page's own WebGL drawing at its place among the layers, in every frame (see `CustomLayerInterface`): raw
-     * WebGL, three.js… with the matrices of the frame (`frame.matrixAt`); under `before` if given
+     * The page's own WebGPU drawing at its place among the layers, in every frame (see `CustomLayerInterface`): raw
+     * WebGPU, three.js's WebGPU renderer… with the map's device and the matrices of the frame (`frame.matrixAt`); under
+     * `before` if given. Not drawn on the WebGL2 fallback
      */
     addCustomLayer(layer: CustomLayerInterface, options?: {
         before?: Layer;

package/dist/map.js

@@ -82,7 +82,7 @@ export class GeoMap {
     gpuTiming = false;
     /** The work the map waits on before it is idle (`track`) */
     #working = 0;
-    /** The engine class (core, or with 3D Tiles) and the engine with 3D Tiles loaded when needed */
+    /** The engine, made asynchronously, and the workers decoding its 3D Tiles */
     engines;
     /** The layers in drawing order and those kept on top */
     stack = new LayerStack(() => this.#engine);
@@ -100,7 +100,7 @@ export class GeoMap {
     tessUrl;
     /** @internal Where the workers load the grid module from (`isard_grid_bg.wasm`) */
     gridUrl;
-    /** The WebGL context is lost: nothing is drawn until it is restored */
+    /** The GPU is lost (the WebGL context, the WebGPU device): nothing is drawn until a new engine is there */
     lost = false;
     gone = false;
     listeners = new MapListeners();
@@ -186,12 +186,9 @@ export class GeoMap {
         this.#engine = destroyedEngine(EARTH_START);
         // Once it has an engine: a map whose creation failed before is not left following them
         this.unwatchHeaders = onHeaderRules((rules) => sendHeaders(this.#engine, rules));
-        // The browser may take the GPU away (driver reset, background tab on mobile): the map waits, then rebuilds
-        this.unwatchContext = watchContext(this.canvas, () => {
-            this.lost = true;
-            this.frames.cancel();
-            this.dropLostEngine();
-        }, () => this.restore());
+        // The browser may take the GPU away (driver reset, background tab on mobile): the map waits, then rebuilds. A
+        // WebGPU device lost is watched with each engine (`adopt`)
+        this.unwatchContext = watchContext(this.canvas, () => this.gpuLost(), () => this.restore());
         const start = this.earth ? EARTH_START : BODY_START;
         this.setCamera({ ...start, ...options });
         this.setBasemap(options.basemap ?? (this.earth ? 'osm-positron' : 'none'), options.hillshade ?? 0);
@@ -240,6 +237,27 @@ export class GeoMap {
     get onTop() {
         return this.stack.onTop;
     }
+    /** The GPU is lost: nothing drawn, the engine dropped (`dropLostEngine`) */
+    gpuLost() {
+        this.lost = true;
+        this.frames.cancel();
+        this.dropLostEngine();
+    }
+    /**
+     * Follows the loss of `engine`'s WebGPU device (a phone taking its memory back, a driver reset, the GPU process
+     * gone): while it is the map's, the map drops it and makes a new one at once, WebGPU having no event for the GPU
+     * given back. The device of an engine the map freed itself (replaced, the map destroyed) is lost too: not the map's
+     * any more, left be
+     */
+    watchDevice(engine) {
+        void engine.gpuDevice()?.lost.then((info) => {
+            if (this.gone || this.#engine !== engine)
+                return;
+            console.warn(`isard: the GPU device was lost (${info.reason}: ${info.message}), the map made again`);
+            this.gpuLost();
+            this.restore();
+        });
+    }
     /**
      * The context is lost: its engine freed at once, the map's calls going to one that does nothing until `restore`
      * builds the next. The old engine's GPU objects went with the context: deleted now, it is silent (on the context
@@ -254,8 +272,8 @@ export class GeoMap {
         // Glyph ranges and icons arriving meanwhile upload to it, not to the freed engine
         this.atlases.attach(this.#engine);
     }
-    /** After a context loss: a new engine with the same camera, settings and layers (same handles, same order); the
-     * engine made asynchronously, adopted once there */
+    /** After the GPU lost: a new engine with the same camera, settings and layers (same handles, same order); the engine
+     * made asynchronously, adopted once there */
     restore() {
         if (this.gone)
             return;
@@ -276,6 +294,7 @@ export class GeoMap {
         this.#engine.free();
         this.#engine = engine;
         this.lost = false;
+        this.watchDevice(engine);
         // Still timed (profiling)
         if (this.gpuTiming)
             engineGpuTiming(engine, true);
@@ -572,6 +591,22 @@ export class GeoMap {
         this.engine.setBackground(...this.settings.background);
         this.requestRender();
     }
+    /** The GPU memory its layers hold (bytes): the tiles of the 3D Tiles and point clouds, kept within the budget
+     * (`GeoMapOptions.memory`), the rasters' pools */
+    memory() {
+        // Two numbers a layer, its id and its bytes, the relief's (id 0) last
+        const pairs = this.engine.memory();
+        const byId = new Map(Array.from({ length: pairs.length / 2 }, (_, i) => [pairs[2 * i], pairs[2 * i + 1] ?? 0]));
+        const layers = this.layers.flatMap((layer) => {
+            const bytes = layer.id >= 0 ? byId.get(layer.id) : undefined;
+            return bytes === undefined ? [] : [{ layer, bytes }];
+        });
+        return {
+            budget: this.settings.memory,
+            held: [...byId.values()].reduce((sum, bytes) => sum + bytes, 0),
+            layers,
+        };
+    }
     /** Tile counters of the raster layers, for diagnostics */
     stats() {
         return this.engine.stats();
@@ -817,7 +852,7 @@ export class GeoMap {
     }
     /** Polygons raised into blocks with depth (buildings), styled per feature; tiles of them come with `setTile` */
     addExtrusions(options = {}) {
-        return this.place(new ExtrusionLayer(this, options.data, extrusionStyle(options)), options.before);
+        return this.place(new ExtrusionLayer(this, options.data, extrusionStyle(options), options.drape), options.before);
     }
     /** Text labels from GeoJSON (points, the middle of lines, the center of polygons), placed without overlaps */
     addSymbols(options) {
@@ -894,7 +929,7 @@ export class GeoMap {
     }
     /**
      * A point cloud (see `PointCloudOptions`): a COPC file read by range requests (IGN's LiDAR HD…), or 3D Tiles
-     * points; with depth, on the engine with 3D Tiles; under `before` if given
+     * points; with depth; under `before` if given
      */
     addPointCloud(options) {
         return this.place(new PointCloudLayer(this, options), options.before);
@@ -913,7 +948,7 @@ export class GeoMap {
     addFlow(options) {
         return this.place(new FlowLayer(this, options), options.before);
     }
-    /** A glTF model drawn at positions (see `ModelOptions`), with depth; on the engine with 3D Tiles, as they are */
+    /** A glTF model drawn at positions (see `ModelOptions`), with depth */
     addModels(options) {
         return this.place(new ModelLayer(this, options), options.before);
     }
@@ -928,8 +963,9 @@ export class GeoMap {
         return addPhoto((o) => this.addModels(o), options);
     }
     /**
-     * The page's own WebGL drawing at its place among the layers, in every frame (see `CustomLayerInterface`): raw
-     * WebGL, three.js… with the matrices of the frame (`frame.matrixAt`); under `before` if given
+     * The page's own WebGPU drawing at its place among the layers, in every frame (see `CustomLayerInterface`): raw
+     * WebGPU, three.js's WebGPU renderer… with the map's device and the matrices of the frame (`frame.matrixAt`); under
+     * `before` if given. Not drawn on the WebGL2 fallback
      */
     addCustomLayer(layer, options = {}) {
         const custom = new CustomLayer(this, layer, this, (lon, lat, altitude) => this.engines.customMatrix(lon, lat, altitude), () => this.getCamera());
@@ -990,7 +1026,7 @@ export class GeoMap {
         this.resizeObserver.disconnect();
         this.interaction?.destroy();
         this.engines.destroy();
-        // Custom layers free their WebGL objects, models their data, while the context is there
+        // Custom layers free their GPU objects, models their data, while the device is there
         this.stack.dispose();
         this.engine.free();
         // Work still under way (labels being shaped, tiles arriving, timers) may call the engine after this: it finds one