isard 1.5.0 → 1.7.0

package/dist/layers/vectors.d.ts

@@ -13,7 +13,7 @@ export interface VectorSublayer {
     id: string;
     /** Its source layer, if any (not for a background) */
     sourceLayer: string | undefined;
-    kind: 'fill' | 'line' | 'extrusion';
+    kind: 'fill' | 'line' | 'extrusion' | 'circle';
     minZoom: number;
     maxZoom: number;
     visible: boolean;
@@ -21,8 +21,19 @@ export interface VectorSublayer {
      * it) */
     opacity: Size;
     dash: [number, number, number, number];
-    /** The caps of its lines' ends (`line-cap`; the joins between their pieces are round) */
+    /** The caps of its lines' ends (`line-cap`) */
     cap: 'butt' | 'round' | 'square';
+    /** The joins of its lines' pieces (`line-join`), a miter longer than `miterLimit` line widths bevelled
+     * (`line-miter-limit`); round and 2 if left out */
+    join?: 'miter' | 'bevel' | 'round';
+    miterLimit?: number;
+    /** How far its fills or lines move on screen (`fill-translate`, `line-translate`: CSS pixels, x right, y down),
+     * turning with the map or staying on the screen (`*-translate-anchor`); none and `map` if left out */
+    translate?: [number, number];
+    translateAnchor?: 'map' | 'viewport';
+    /** Its fills have patterns (`fill-pattern`, `background-pattern`): over the relief, the engine finds the ground under
+     * them */
+    patterned?: boolean;
     /** Its lines glow at night (the streets: its id names a road, not its casing; `setSun`) */
     lit: boolean;
 }
@@ -33,10 +44,16 @@ export type VectorFeature = Feature<Record<string, unknown>> & {
 };
 export declare class VectorLayer extends Layer {
     private readonly tiles;
+    /** The tiles waiting for their upload (`UPLOAD_MS` a frame), each with what resolves its `setTile`; `sent`: in the
+     * engine already, its blocks still uploading */
+    private readonly queue;
+    private flushing;
     private sublayers;
     private nextKey;
     /** The whole layer shown (`setVisible`), over each style layer's visibility */
     private shown;
+    /** Its buildings' walls show their windows (`setFacades`) */
+    private facades;
     /** Resolves once the style is loaded, its layers drawn known (`layers`), and the map has drawn the layer; rejected
      * if the style fails */
     get ready(): Promise<void>;
@@ -44,6 +61,14 @@ export declare class VectorLayer extends Layer {
     get layers(): readonly VectorSublayer[];
     /** Keys of the tiles held (`z/x/y`) */
     get tileKeys(): string[];
+    /** Uploads the waiting tiles on the next frame */
+    private flushSoon;
+    /** Uploads waiting tiles for `UPLOAD_MS` at most (one at least, or a part of its blocks), the rest on the next
+     * frames; a tile's `setTile` resolves once its blocks are all there */
+    private flush;
+    /** Sends a tile to the engine (its blocks' first part); its key */
+    private upload;
+    remove(): void;
     /** The feature of a picked index (no geometry: the tiles hold it cut), its properties and style layer. Tiles are
      * numbered one after the other, in the order they were first added */
     featureAt(index: number): VectorFeature | undefined;
@@ -53,6 +78,8 @@ export declare class VectorLayer extends Layer {
     /** Changes a layout property of a style layer drawn (`visibility`: shown or hidden at once), as MapLibre's
      * `setLayoutProperty` */
     setLayoutProperty(layer: string, name: string, value: unknown): void;
+    /** Whether its buildings' walls show their windows: glass by day, some lit at night (only the lit ones without) */
+    setFacades(facades: boolean): void;
     setVisible(visible: boolean): void;
     private sendSublayers;
     /** A tile to the engine: its mesh uploaded as it is, or without one its geometry, which the engine makes ready */

package/dist/layers/vectors.js

@@ -4,14 +4,24 @@
  * tiles again. The workers cut each vector tile into polygons and lines and style its features; the engine draws the
  * style's layers in their order, each over its zoom range.
  */
-import { FLOATS, stops } from "./features.js";
+import { FLOATS } from "../util/style-floats.js";
+import { stops } from "./features.js";
 import { Layer } from "./layers.js";
+/** The main thread's time a frame gives to uploading tiles (ms): tiles arriving together are uploaded over several
+ * frames, not all in the one (copying a tile's buffers to the GPU takes milliseconds) */
+const UPLOAD_MS = 4;
 export class VectorLayer extends Layer {
     tiles = new Map();
+    /** The tiles waiting for their upload (`UPLOAD_MS` a frame), each with what resolves its `setTile`; `sent`: in the
+     * engine already, its blocks still uploading */
+    queue = new Map();
+    flushing = false;
     sublayers = [];
     nextKey = 0;
     /** The whole layer shown (`setVisible`), over each style layer's visibility */
     shown = true;
+    /** Its buildings' walls show their windows (`setFacades`) */
+    facades = false;
     /** @internal Resolved once the style is loaded and its layers drawn known (set by its `VectorTiles`) */
     styled = Promise.resolve();
     /** @internal Changes a property of a style layer drawn (set by its `VectorTiles`) */
@@ -41,24 +51,93 @@ export class VectorLayer extends Layer {
         this.sendSublayers(this.map.engine, this.id);
         this.map.requestRender();
     }
-    /** @internal Adds or replaces a tile, cut by the workers (and made ready for the GPU there, with its mesh) */
+    /** @internal Adds or replaces a tile, cut by the workers (and made ready for the GPU there, with its mesh): uploaded
+     * on a coming frame, within its share of the frame (`UPLOAD_MS`); resolves once it is (or once dropped meanwhile) */
     setTile(tile, vectors) {
+        if (this.removed)
+            return Promise.resolve();
+        // The map not idle until it is uploaded
+        return this.map.track(new Promise((uploaded) => {
+            // A newer cut of a tile still waiting takes its place
+            this.queue.get(tile)?.uploaded();
+            this.queue.set(tile, { vectors, uploaded });
+            this.flushSoon();
+        }));
+    }
+    /** Uploads the waiting tiles on the next frame */
+    flushSoon() {
+        if (this.flushing)
+            return;
+        this.flushing = true;
+        requestAnimationFrame(() => {
+            this.flushing = false;
+            this.flush();
+        });
+    }
+    /** Uploads waiting tiles for `UPLOAD_MS` at most (one at least, or a part of its blocks), the rest on the next
+     * frames; a tile's `setTile` resolves once its blocks are all there */
+    flush() {
+        // Removed meanwhile, or between two engines (the new one asks for the tiles again)
+        if (this.id < 0)
+            return;
+        const start = performance.now();
+        const within = () => performance.now() - start <= UPLOAD_MS;
+        for (const [tile, waiting] of this.queue) {
+            waiting.sent ??= this.upload(tile, waiting.vectors);
+            // A large tile's blocks (a pitched view's far tiles of a city: 10 MB and more), a part at a time
+            let left = this.map.engine.uploadVectorTile(this.id, waiting.sent);
+            while (left && within())
+                left = this.map.engine.uploadVectorTile(this.id, waiting.sent);
+            if (left)
+                break;
+            this.queue.delete(tile);
+            waiting.uploaded();
+            if (!within())
+                break;
+        }
+        if (this.queue.size > 0)
+            this.flushSoon();
+        this.map.requestRender();
+    }
+    /** Sends a tile to the engine (its blocks' first part); its key */
+    upload(tile, vectors) {
         const key = this.tiles.get(tile)?.key ?? this.nextKey++;
         const { properties, sublayer } = vectors;
         this.tiles.set(tile, { key, vectors: { properties, sublayer } });
         this.sendTile(this.map.engine, this.id, key, vectors);
-        this.map.requestRender();
+        return key;
     }
     /** @internal New styles of a tile's features, as the workers evaluated them (the same features) */
     setTileStyles(tile, styles) {
+        const waiting = this.queue.get(tile);
+        // Not uploaded yet: uploaded with them
+        if (waiting && waiting.sent === undefined) {
+            if (styles.length === waiting.vectors.properties.length * FLOATS)
+                waiting.vectors.styles = styles;
+            return;
+        }
         const t = this.tiles.get(tile);
         if (!t || styles.length !== t.vectors.properties.length * FLOATS)
             return;
         this.map.engine.setFeatureStyle(this.id, styles, t.key);
         this.map.requestRender();
     }
+    remove() {
+        super.remove();
+        this.dispose();
+    }
+    /** @internal The tiles waiting resolved (dropped), none held */
+    dispose() {
+        this.queue.forEach((waiting) => {
+            waiting.uploaded();
+        });
+        this.queue.clear();
+        this.tiles.clear();
+    }
     /** @internal */
     removeTile(tile) {
+        this.queue.get(tile)?.uploaded();
+        this.queue.delete(tile);
         const t = this.tiles.get(tile);
         if (!t)
             return;
@@ -96,6 +175,12 @@ export class VectorLayer extends Layer {
     setLayoutProperty(layer, name, value) {
         this.restyle?.(layer, 'layout', name, value);
     }
+    /** Whether its buildings' walls show their windows: glass by day, some lit at night (only the lit ones without) */
+    setFacades(facades) {
+        this.facades = facades;
+        this.map.engine.setFacades(this.id, facades);
+        this.map.requestRender();
+    }
     setVisible(visible) {
         this.shown = visible;
         this.sendSublayers(this.map.engine, this.id);
@@ -103,26 +188,30 @@ export class VectorLayer extends Layer {
     }
     sendSublayers(engine, id) {
         const s = this.sublayers;
-        engine.setVectorSublayers(id, Uint8Array.from(s, (l) => ({ fill: 0, line: 1, extrusion: 2 })[l.kind]), Float64Array.from(s.flatMap((l) => [l.minZoom, l.maxZoom])), Uint8Array.from(s, (l) => (l.visible && this.shown ? 1 : 0)), Float32Array.from(s.flatMap((l) => l.dash)), Float32Array.from(s.flatMap((l) => stops(l.opacity))), Uint8Array.from(s, (l) => ({ butt: 0, round: 1, square: 2 })[l.cap]), Uint8Array.from(s, (l) => (l.lit ? 1 : 0)));
+        engine.setVectorSublayers(id, Uint8Array.from(s, (l) => ({ fill: 0, line: 1, extrusion: 2, circle: 3 })[l.kind]), Float64Array.from(s.flatMap((l) => [l.minZoom, l.maxZoom])), Uint8Array.from(s, (l) => (l.visible && this.shown ? 1 : 0)), Float32Array.from(s.flatMap((l) => l.dash)), Float32Array.from(s.flatMap((l) => stops(l.opacity))), Uint8Array.from(s, (l) => ({ butt: 0, round: 1, square: 2 })[l.cap]), Uint8Array.from(s, (l) => (l.lit ? 1 : 0)), Float32Array.from(s.flatMap((l) => [{ round: 0, miter: 1, bevel: 2 }[l.join ?? 'round'], l.miterLimit ?? 2])), Float32Array.from(s.flatMap((l) => [...(l.translate ?? [0, 0]), l.translateAnchor === 'viewport' ? 1 : 0])), Uint8Array.from(s, (l) => (l.patterned ? 1 : 0)));
     }
     /** A tile to the engine: its mesh uploaded as it is, or without one its geometry, which the engine makes ready */
     sendTile(engine, id, key, vectors) {
-        const { fills, lines, styles, properties, mesh } = vectors;
+        const { fills, lines, circles, styles, properties, mesh } = vectors;
         if (mesh) {
             engine.setVectorTileMesh(id, key, fills.points, fills.ringStart, fills.polygonStart, fills.feature, fills.fillStart, mesh.vertices, mesh.indices, mesh.fillRanges, mesh.prism, mesh.pieces, mesh.lineTable, mesh.lineRanges, mesh.blocks, mesh.blockIndices, mesh.blockRanges, mesh.bounds, properties.length);
-            engine.setFeatureStyle(id, styles, key);
-            return;
         }
-        engine.setVectorTile(id, key, fills.points, fills.ringStart, fills.polygonStart, fills.feature, fills.fillStart, lines.points, lines.start, lines.feature, lines.lineStart, properties.length, vectors.tile ?? new Float64Array());
+        else {
+            engine.setVectorTile(id, key, fills.points, fills.ringStart, fills.polygonStart, fills.feature, fills.fillStart, lines.points, lines.start, lines.feature, lines.lineStart, properties.length, vectors.tile ?? new Float64Array(), fills.roofs ?? new Uint8Array(), fills.roofHeights ?? new Float32Array(), fills.roofOutlines ?? new Float64Array(), fills.roofOutlineStart ?? new Uint32Array(), fills.roofMetres ?? 0);
+        }
+        // The circles' points, once the tile is there
+        if (circles)
+            engine.setVectorTilePoints(id, key, circles.points, circles.feature, circles.circleStart);
         engine.setFeatureStyle(id, styles, key);
     }
     /** @internal */
     create(engine) {
         const id = engine.addVectorTiles();
         this.sendSublayers(engine, id);
+        engine.setFacades(id, this.facades);
         // An engine made anew (after a context loss, or the one with 3D Tiles): its tiles cut again by the workers, once
         // the layer has its id there. Keeping their geometry here would double the memory they take
-        this.tiles.clear();
+        this.dispose();
         queueMicrotask(() => this.recut?.());
         return id;
     }

package/dist/layers/vectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"vectors.js","sourceRoot":"","sources":["../../src/layers/vectors.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The fills and lines of a MapLibre style drawn as geometry, tile by tile (`VectorTiles.vectors`), instead of into the\n * images of a raster layer: sharp at any zoom and pitch, on the relief, picked by feature, restyled without cutting the\n * tiles again. The workers cut each vector tile into polygons and lines and style its features; the engine draws the\n * style's layers in their order, each over its zoom range.\n */\n\nimport type { LayerHost } from '../types.ts';\nimport type { Engine } from '../wasm/isard.js';\nimport type { TileVectors } from '../workers/basemap.worker.ts';\nimport { type Feature, FLOATS, type Size, stops } from './features.ts';\nimport { Layer } from './layers.ts';\n\n/** A style layer as the engine draws it: its kind, zoom range, visibility and dashes (dash, gap, dash, gap, in line\n * widths; zeros: solid) */\nexport interface VectorSublayer {\n  /** The style layer's id */\n  id: string;\n  /** Its source layer, if any (not for a background) */\n  sourceLayer: string | undefined;\n  kind: 'fill' | 'line' | 'extrusion';\n  minZoom: number;\n  maxZoom: number;\n  visible: boolean;\n  /** Its opacity when it depends on the zoom only, evaluated at the camera's zoom (else 1: the features' colors hold\n   * it) */\n  opacity: Size;\n  dash: [number, number, number, number];\n  /** The caps of its lines' ends (`line-cap`; the joins between their pieces are round) */\n  cap: 'butt' | 'round' | 'square';\n  /** Its lines glow at night (the streets: its id names a road, not its casing; `setSun`) */\n  lit: boolean;\n}\n\n/** The properties of a picked feature, with the style layer that drew it */\nexport type VectorFeature = Feature<Record<string, unknown>> & { layer: string; sourceLayer: string | undefined };\n\ninterface Tile {\n  /** Its number in the engine: tiles are numbered for picking in this order */\n  key: number;\n  /** What picking needs (its geometry and styles are the engine's only: an engine made anew asks the tiles again) */\n  vectors: Pick<TileVectors, 'properties' | 'sublayer'>;\n}\n\nexport class VectorLayer extends Layer {\n  private readonly tiles = new Map<string, Tile>();\n  private sublayers: VectorSublayer[] = [];\n  private nextKey = 0;\n  /** The whole layer shown (`setVisible`), over each style layer's visibility */\n  private shown = true;\n  /** @internal Resolved once the style is loaded and its layers drawn known (set by its `VectorTiles`) */\n  styled: Promise<void> = Promise.resolve();\n  /** @internal Changes a property of a style layer drawn (set by its `VectorTiles`) */\n  restyle: ((layer: string, group: 'paint' | 'layout', name: string, value: unknown) => void) | undefined;\n  /** @internal Asks the workers for the tiles in view again (set by its `VectorTiles`): an engine made anew has none */\n  recut: (() => void) | undefined;\n\n  /** @internal */\n  constructor(map: LayerHost) {\n    super(map);\n  }\n\n  /** Resolves once the style is loaded, its layers drawn known (`layers`), and the map has drawn the layer; rejected\n   * if the style fails */\n  override get ready(): Promise<void> {\n    return this.styled.then(() => super.ready);\n  }\n\n  /** The style layers drawn, in order */\n  get layers(): readonly VectorSublayer[] {\n    return this.sublayers;\n  }\n\n  /** Keys of the tiles held (`z/x/y`) */\n  get tileKeys(): string[] {\n    return [...this.tiles.keys()];\n  }\n\n  /** @internal Sets the style layers drawn, in order (the tiles' sublayers) */\n  setSublayers(sublayers: VectorSublayer[]): void {\n    this.sublayers = sublayers;\n    this.sendSublayers(this.map.engine, this.id);\n    this.map.requestRender();\n  }\n\n  /** @internal Adds or replaces a tile, cut by the workers (and made ready for the GPU there, with its mesh) */\n  setTile(tile: string, vectors: TileVectors): void {\n    const key = this.tiles.get(tile)?.key ?? this.nextKey++;\n    const { properties, sublayer } = vectors;\n\n    this.tiles.set(tile, { key, vectors: { properties, sublayer } });\n    this.sendTile(this.map.engine, this.id, key, vectors);\n    this.map.requestRender();\n  }\n\n  /** @internal New styles of a tile's features, as the workers evaluated them (the same features) */\n  setTileStyles(tile: string, styles: Float32Array): void {\n    const t = this.tiles.get(tile);\n\n    if (!t || styles.length !== t.vectors.properties.length * FLOATS) return;\n    this.map.engine.setFeatureStyle(this.id, styles, t.key);\n    this.map.requestRender();\n  }\n\n  /** @internal */\n  removeTile(tile: string): void {\n    const t = this.tiles.get(tile);\n\n    if (!t) return;\n    this.tiles.delete(tile);\n    this.map.engine.removeVectorTile(this.id, t.key);\n    this.map.requestRender();\n  }\n\n  /** The feature of a picked index (no geometry: the tiles hold it cut), its properties and style layer. Tiles are\n   * numbered one after the other, in the order they were first added */\n  featureAt(index: number): VectorFeature | undefined {\n    const tiles = [...this.tiles.values()].sort((a, b) => a.key - b.key);\n    // The tile holding the index, and the index among its features (one pass, the features of the tiles before\n    // taken off)\n    const { tile, rest } = tiles.reduce<{ tile?: Tile; rest: number }>(\n      (found, t) => {\n        if (found.tile) return found;\n\n        const count = t.vectors.properties.length;\n\n        return found.rest < count ? { tile: t, rest: found.rest } : { rest: found.rest - count };\n      },\n      { rest: index },\n    );\n\n    if (!tile) return undefined;\n\n    const properties = tile.vectors.properties[rest];\n    const sublayer = this.sublayers[tile.vectors.sublayer[rest] ?? -1];\n\n    if (properties === undefined || !sublayer) return undefined;\n\n    return { type: 'Feature', properties, geometry: null, layer: sublayer.id, sourceLayer: sublayer.sourceLayer };\n  }\n\n  /** Changes a paint property of a style layer drawn, as MapLibre's `setPaintProperty`: the tiles are restyled, not cut\n   * again */\n  setPaintProperty(layer: string, name: string, value: unknown): void {\n    this.restyle?.(layer, 'paint', name, value);\n  }\n\n  /** Changes a layout property of a style layer drawn (`visibility`: shown or hidden at once), as MapLibre's\n   * `setLayoutProperty` */\n  setLayoutProperty(layer: string, name: string, value: unknown): void {\n    this.restyle?.(layer, 'layout', name, value);\n  }\n\n  setVisible(visible: boolean): void {\n    this.shown = visible;\n    this.sendSublayers(this.map.engine, this.id);\n    this.map.requestRender();\n  }\n\n  private sendSublayers(engine: Engine, id: number): void {\n    const s = this.sublayers;\n\n    engine.setVectorSublayers(\n      id,\n      Uint8Array.from(s, (l) => ({ fill: 0, line: 1, extrusion: 2 })[l.kind]),\n      Float64Array.from(s.flatMap((l) => [l.minZoom, l.maxZoom])),\n      Uint8Array.from(s, (l) => (l.visible && this.shown ? 1 : 0)),\n      Float32Array.from(s.flatMap((l) => l.dash)),\n      Float32Array.from(s.flatMap((l) => stops(l.opacity))),\n      Uint8Array.from(s, (l) => ({ butt: 0, round: 1, square: 2 })[l.cap]),\n      Uint8Array.from(s, (l) => (l.lit ? 1 : 0)),\n    );\n  }\n\n  /** A tile to the engine: its mesh uploaded as it is, or without one its geometry, which the engine makes ready */\n  private sendTile(engine: Engine, id: number, key: number, vectors: TileVectors): void {\n    const { fills, lines, styles, properties, mesh } = vectors;\n\n    if (mesh) {\n      engine.setVectorTileMesh(\n        id,\n        key,\n        fills.points,\n        fills.ringStart,\n        fills.polygonStart,\n        fills.feature,\n        fills.fillStart,\n        mesh.vertices,\n        mesh.indices,\n        mesh.fillRanges,\n        mesh.prism,\n        mesh.pieces,\n        mesh.lineTable,\n        mesh.lineRanges,\n        mesh.blocks,\n        mesh.blockIndices,\n        mesh.blockRanges,\n        mesh.bounds,\n        properties.length,\n      );\n      engine.setFeatureStyle(id, styles, key);\n\n      return;\n    }\n    engine.setVectorTile(\n      id,\n      key,\n      fills.points,\n      fills.ringStart,\n      fills.polygonStart,\n      fills.feature,\n      fills.fillStart,\n      lines.points,\n      lines.start,\n      lines.feature,\n      lines.lineStart,\n      properties.length,\n      vectors.tile ?? new Float64Array(),\n    );\n    engine.setFeatureStyle(id, styles, key);\n  }\n\n  /** @internal */\n  protected create(engine: Engine): number {\n    const id = engine.addVectorTiles();\n\n    this.sendSublayers(engine, id);\n    // An engine made anew (after a context loss, or the one with 3D Tiles): its tiles cut again by the workers, once\n    // the layer has its id there. Keeping their geometry here would double the memory they take\n    this.tiles.clear();\n    queueMicrotask(() => this.recut?.());\n\n    return id;\n  }\n}\n"]}
+{"version":3,"file":"vectors.js","sourceRoot":"","sources":["../../src/layers/vectors.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The fills and lines of a MapLibre style drawn as geometry, tile by tile (`VectorTiles.vectors`), instead of into the\n * images of a raster layer: sharp at any zoom and pitch, on the relief, picked by feature, restyled without cutting the\n * tiles again. The workers cut each vector tile into polygons and lines and style its features; the engine draws the\n * style's layers in their order, each over its zoom range.\n */\n\nimport type { LayerHost } from '../types.ts';\nimport { FLOATS } from '../util/style-floats.ts';\nimport type { Engine } from '../wasm/isard.js';\nimport type { TileVectors } from '../workers/basemap.worker.ts';\nimport { type Feature, type Size, stops } from './features.ts';\nimport { Layer } from './layers.ts';\n\n/** A style layer as the engine draws it: its kind, zoom range, visibility and dashes (dash, gap, dash, gap, in line\n * widths; zeros: solid) */\nexport interface VectorSublayer {\n  /** The style layer's id */\n  id: string;\n  /** Its source layer, if any (not for a background) */\n  sourceLayer: string | undefined;\n  kind: 'fill' | 'line' | 'extrusion' | 'circle';\n  minZoom: number;\n  maxZoom: number;\n  visible: boolean;\n  /** Its opacity when it depends on the zoom only, evaluated at the camera's zoom (else 1: the features' colors hold\n   * it) */\n  opacity: Size;\n  dash: [number, number, number, number];\n  /** The caps of its lines' ends (`line-cap`) */\n  cap: 'butt' | 'round' | 'square';\n  /** The joins of its lines' pieces (`line-join`), a miter longer than `miterLimit` line widths bevelled\n   * (`line-miter-limit`); round and 2 if left out */\n  join?: 'miter' | 'bevel' | 'round';\n  miterLimit?: number;\n  /** How far its fills or lines move on screen (`fill-translate`, `line-translate`: CSS pixels, x right, y down),\n   * turning with the map or staying on the screen (`*-translate-anchor`); none and `map` if left out */\n  translate?: [number, number];\n  translateAnchor?: 'map' | 'viewport';\n  /** Its fills have patterns (`fill-pattern`, `background-pattern`): over the relief, the engine finds the ground under\n   * them */\n  patterned?: boolean;\n  /** Its lines glow at night (the streets: its id names a road, not its casing; `setSun`) */\n  lit: boolean;\n}\n\n/** The properties of a picked feature, with the style layer that drew it */\nexport type VectorFeature = Feature<Record<string, unknown>> & { layer: string; sourceLayer: string | undefined };\n\n/** The main thread's time a frame gives to uploading tiles (ms): tiles arriving together are uploaded over several\n * frames, not all in the one (copying a tile's buffers to the GPU takes milliseconds) */\nconst UPLOAD_MS = 4;\n\ninterface Tile {\n  /** Its number in the engine: tiles are numbered for picking in this order */\n  key: number;\n  /** What picking needs (its geometry and styles are the engine's only: an engine made anew asks the tiles again) */\n  vectors: Pick<TileVectors, 'properties' | 'sublayer'>;\n}\n\nexport class VectorLayer extends Layer {\n  private readonly tiles = new Map<string, Tile>();\n  /** The tiles waiting for their upload (`UPLOAD_MS` a frame), each with what resolves its `setTile`; `sent`: in the\n   * engine already, its blocks still uploading */\n  private readonly queue = new Map<string, { vectors: TileVectors; uploaded: () => void; sent?: number }>();\n  private flushing = false;\n  private sublayers: VectorSublayer[] = [];\n  private nextKey = 0;\n  /** The whole layer shown (`setVisible`), over each style layer's visibility */\n  private shown = true;\n  /** Its buildings' walls show their windows (`setFacades`) */\n  private facades = false;\n  /** @internal Resolved once the style is loaded and its layers drawn known (set by its `VectorTiles`) */\n  styled: Promise<void> = Promise.resolve();\n  /** @internal Changes a property of a style layer drawn (set by its `VectorTiles`) */\n  restyle: ((layer: string, group: 'paint' | 'layout', name: string, value: unknown) => void) | undefined;\n  /** @internal Asks the workers for the tiles in view again (set by its `VectorTiles`): an engine made anew has none */\n  recut: (() => void) | undefined;\n\n  /** @internal */\n  constructor(map: LayerHost) {\n    super(map);\n  }\n\n  /** Resolves once the style is loaded, its layers drawn known (`layers`), and the map has drawn the layer; rejected\n   * if the style fails */\n  override get ready(): Promise<void> {\n    return this.styled.then(() => super.ready);\n  }\n\n  /** The style layers drawn, in order */\n  get layers(): readonly VectorSublayer[] {\n    return this.sublayers;\n  }\n\n  /** Keys of the tiles held (`z/x/y`) */\n  get tileKeys(): string[] {\n    return [...this.tiles.keys()];\n  }\n\n  /** @internal Sets the style layers drawn, in order (the tiles' sublayers) */\n  setSublayers(sublayers: VectorSublayer[]): void {\n    this.sublayers = sublayers;\n    this.sendSublayers(this.map.engine, this.id);\n    this.map.requestRender();\n  }\n\n  /** @internal Adds or replaces a tile, cut by the workers (and made ready for the GPU there, with its mesh): uploaded\n   * on a coming frame, within its share of the frame (`UPLOAD_MS`); resolves once it is (or once dropped meanwhile) */\n  setTile(tile: string, vectors: TileVectors): Promise<void> {\n    if (this.removed) return Promise.resolve();\n    // The map not idle until it is uploaded\n    return this.map.track(\n      new Promise((uploaded) => {\n        // A newer cut of a tile still waiting takes its place\n        this.queue.get(tile)?.uploaded();\n        this.queue.set(tile, { vectors, uploaded });\n        this.flushSoon();\n      }),\n    );\n  }\n\n  /** Uploads the waiting tiles on the next frame */\n  private flushSoon(): void {\n    if (this.flushing) return;\n    this.flushing = true;\n    requestAnimationFrame(() => {\n      this.flushing = false;\n      this.flush();\n    });\n  }\n\n  /** Uploads waiting tiles for `UPLOAD_MS` at most (one at least, or a part of its blocks), the rest on the next\n   * frames; a tile's `setTile` resolves once its blocks are all there */\n  private flush(): void {\n    // Removed meanwhile, or between two engines (the new one asks for the tiles again)\n    if (this.id < 0) return;\n\n    const start = performance.now();\n    const within = () => performance.now() - start <= UPLOAD_MS;\n\n    for (const [tile, waiting] of this.queue) {\n      waiting.sent ??= this.upload(tile, waiting.vectors);\n\n      // A large tile's blocks (a pitched view's far tiles of a city: 10 MB and more), a part at a time\n      let left = this.map.engine.uploadVectorTile(this.id, waiting.sent);\n\n      while (left && within()) left = this.map.engine.uploadVectorTile(this.id, waiting.sent);\n      if (left) break;\n      this.queue.delete(tile);\n      waiting.uploaded();\n      if (!within()) break;\n    }\n    if (this.queue.size > 0) this.flushSoon();\n    this.map.requestRender();\n  }\n\n  /** Sends a tile to the engine (its blocks' first part); its key */\n  private upload(tile: string, vectors: TileVectors): number {\n    const key = this.tiles.get(tile)?.key ?? this.nextKey++;\n    const { properties, sublayer } = vectors;\n\n    this.tiles.set(tile, { key, vectors: { properties, sublayer } });\n    this.sendTile(this.map.engine, this.id, key, vectors);\n\n    return key;\n  }\n\n  /** @internal New styles of a tile's features, as the workers evaluated them (the same features) */\n  setTileStyles(tile: string, styles: Float32Array): void {\n    const waiting = this.queue.get(tile);\n\n    // Not uploaded yet: uploaded with them\n    if (waiting && waiting.sent === undefined) {\n      if (styles.length === waiting.vectors.properties.length * FLOATS) waiting.vectors.styles = styles;\n\n      return;\n    }\n\n    const t = this.tiles.get(tile);\n\n    if (!t || styles.length !== t.vectors.properties.length * FLOATS) return;\n    this.map.engine.setFeatureStyle(this.id, styles, t.key);\n    this.map.requestRender();\n  }\n\n  override remove(): void {\n    super.remove();\n    this.dispose();\n  }\n\n  /** @internal The tiles waiting resolved (dropped), none held */\n  override dispose(): void {\n    this.queue.forEach((waiting) => {\n      waiting.uploaded();\n    });\n    this.queue.clear();\n    this.tiles.clear();\n  }\n\n  /** @internal */\n  removeTile(tile: string): void {\n    this.queue.get(tile)?.uploaded();\n    this.queue.delete(tile);\n\n    const t = this.tiles.get(tile);\n\n    if (!t) return;\n    this.tiles.delete(tile);\n    this.map.engine.removeVectorTile(this.id, t.key);\n    this.map.requestRender();\n  }\n\n  /** The feature of a picked index (no geometry: the tiles hold it cut), its properties and style layer. Tiles are\n   * numbered one after the other, in the order they were first added */\n  featureAt(index: number): VectorFeature | undefined {\n    const tiles = [...this.tiles.values()].sort((a, b) => a.key - b.key);\n    // The tile holding the index, and the index among its features (one pass, the features of the tiles before\n    // taken off)\n    const { tile, rest } = tiles.reduce<{ tile?: Tile; rest: number }>(\n      (found, t) => {\n        if (found.tile) return found;\n\n        const count = t.vectors.properties.length;\n\n        return found.rest < count ? { tile: t, rest: found.rest } : { rest: found.rest - count };\n      },\n      { rest: index },\n    );\n\n    if (!tile) return undefined;\n\n    const properties = tile.vectors.properties[rest];\n    const sublayer = this.sublayers[tile.vectors.sublayer[rest] ?? -1];\n\n    if (properties === undefined || !sublayer) return undefined;\n\n    return { type: 'Feature', properties, geometry: null, layer: sublayer.id, sourceLayer: sublayer.sourceLayer };\n  }\n\n  /** Changes a paint property of a style layer drawn, as MapLibre's `setPaintProperty`: the tiles are restyled, not cut\n   * again */\n  setPaintProperty(layer: string, name: string, value: unknown): void {\n    this.restyle?.(layer, 'paint', name, value);\n  }\n\n  /** Changes a layout property of a style layer drawn (`visibility`: shown or hidden at once), as MapLibre's\n   * `setLayoutProperty` */\n  setLayoutProperty(layer: string, name: string, value: unknown): void {\n    this.restyle?.(layer, 'layout', name, value);\n  }\n\n  /** Whether its buildings' walls show their windows: glass by day, some lit at night (only the lit ones without) */\n  setFacades(facades: boolean): void {\n    this.facades = facades;\n    this.map.engine.setFacades(this.id, facades);\n    this.map.requestRender();\n  }\n\n  setVisible(visible: boolean): void {\n    this.shown = visible;\n    this.sendSublayers(this.map.engine, this.id);\n    this.map.requestRender();\n  }\n\n  private sendSublayers(engine: Engine, id: number): void {\n    const s = this.sublayers;\n\n    engine.setVectorSublayers(\n      id,\n      Uint8Array.from(s, (l) => ({ fill: 0, line: 1, extrusion: 2, circle: 3 })[l.kind]),\n      Float64Array.from(s.flatMap((l) => [l.minZoom, l.maxZoom])),\n      Uint8Array.from(s, (l) => (l.visible && this.shown ? 1 : 0)),\n      Float32Array.from(s.flatMap((l) => l.dash)),\n      Float32Array.from(s.flatMap((l) => stops(l.opacity))),\n      Uint8Array.from(s, (l) => ({ butt: 0, round: 1, square: 2 })[l.cap]),\n      Uint8Array.from(s, (l) => (l.lit ? 1 : 0)),\n      Float32Array.from(s.flatMap((l) => [{ round: 0, miter: 1, bevel: 2 }[l.join ?? 'round'], l.miterLimit ?? 2])),\n      Float32Array.from(s.flatMap((l) => [...(l.translate ?? [0, 0]), l.translateAnchor === 'viewport' ? 1 : 0])),\n      Uint8Array.from(s, (l) => (l.patterned ? 1 : 0)),\n    );\n  }\n\n  /** A tile to the engine: its mesh uploaded as it is, or without one its geometry, which the engine makes ready */\n  private sendTile(engine: Engine, id: number, key: number, vectors: TileVectors): void {\n    const { fills, lines, circles, styles, properties, mesh } = vectors;\n\n    if (mesh) {\n      engine.setVectorTileMesh(\n        id,\n        key,\n        fills.points,\n        fills.ringStart,\n        fills.polygonStart,\n        fills.feature,\n        fills.fillStart,\n        mesh.vertices,\n        mesh.indices,\n        mesh.fillRanges,\n        mesh.prism,\n        mesh.pieces,\n        mesh.lineTable,\n        mesh.lineRanges,\n        mesh.blocks,\n        mesh.blockIndices,\n        mesh.blockRanges,\n        mesh.bounds,\n        properties.length,\n      );\n    } else {\n      engine.setVectorTile(\n        id,\n        key,\n        fills.points,\n        fills.ringStart,\n        fills.polygonStart,\n        fills.feature,\n        fills.fillStart,\n        lines.points,\n        lines.start,\n        lines.feature,\n        lines.lineStart,\n        properties.length,\n        vectors.tile ?? new Float64Array(),\n        fills.roofs ?? new Uint8Array(),\n        fills.roofHeights ?? new Float32Array(),\n        fills.roofOutlines ?? new Float64Array(),\n        fills.roofOutlineStart ?? new Uint32Array(),\n        fills.roofMetres ?? 0,\n      );\n    }\n    // The circles' points, once the tile is there\n    if (circles) engine.setVectorTilePoints(id, key, circles.points, circles.feature, circles.circleStart);\n    engine.setFeatureStyle(id, styles, key);\n  }\n\n  /** @internal */\n  protected create(engine: Engine): number {\n    const id = engine.addVectorTiles();\n\n    this.sendSublayers(engine, id);\n    engine.setFacades(id, this.facades);\n    // An engine made anew (after a context loss, or the one with 3D Tiles): its tiles cut again by the workers, once\n    // the layer has its id there. Keeping their geometry here would double the memory they take\n    this.dispose();\n    queueMicrotask(() => this.recut?.());\n\n    return id;\n  }\n}\n"]}

package/dist/map/frame-loop.d.ts

@@ -21,6 +21,8 @@ export interface FrameHost {
     customLayers(): boolean;
     /** The engine with 3D Tiles is loading: not idle */
     upgrading(): boolean;
+    /** Work the page waits on for what it draws (the vector tiles cut in the workers, uploaded over frames): not idle */
+    working(): boolean;
     /** The frame is drawn: what follows it (the overlays placed, the hover picking asked for at `hovered`) */
     drawn(hovered: Point | undefined): void;
 }

package/dist/map/frame-loop.js

@@ -131,9 +131,9 @@ export class FrameLoop {
         // A move goes on until a frame finds the camera still: that frame sends 'moveend'
         if (this.animation || (moved && this.moving))
             this.request();
-        // Idle: nothing loading (the engine with 3D Tiles neither), no animation, no frame asked for (uploads waiting,
-        // fades, listeners)
-        if (loading || host.upgrading() || this.animation || this.requested !== 0) {
+        // Idle: nothing loading (the engine with 3D Tiles neither, nor the page's work for what it draws), no animation,
+        // no frame asked for (uploads waiting, fades, listeners)
+        if (loading || host.upgrading() || host.working() || this.animation || this.requested !== 0) {
             this.#settled = false;
         }
         else if (!this.#settled) {

package/dist/map/frame-loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"frame-loop.js","sourceRoot":"","sources":["../../src/map/frame-loop.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The frame loop of a map: frames drawn on demand only (an idle map costs nothing), the running animation stepped in\n * each, and the events of a frame sent with it: the camera's moves, the pointer's position (coalesced to one per\n * frame, so the values computed for it are drawn in the same frame), 'render', and 'idle' once everything is loaded.\n */\n\nimport type { Point } from '../types.ts';\nimport type { Step } from '../util/animation.ts';\nimport type { Camera, Engine } from '../wasm/isard.js';\nimport type { MapListeners } from './events.ts';\n\n/** What the frame loop needs of its map */\nexport interface FrameHost {\n  /** The map's engine of the moment */\n  engine(): Engine;\n  /** The map's camera */\n  camera(): Camera;\n  /** The WebGL context is lost: nothing is drawn */\n  lost(): boolean;\n  /** The pointer or the keys are moving the camera: no 'moveend' yet */\n  interacting(): boolean;\n  /** Custom layers are drawn: they read the camera of the frame */\n  customLayers(): boolean;\n  /** The engine with 3D Tiles is loading: not idle */\n  upgrading(): boolean;\n  /** The frame is drawn: what follows it (the overlays placed, the hover picking asked for at `hovered`) */\n  drawn(hovered: Point | undefined): void;\n}\n\n/** The frames of a map, asked for and drawn */\nexport class FrameLoop {\n  private readonly host: FrameHost;\n  private readonly listeners: MapListeners;\n  /** Frame asked for, 0 if none */\n  private requested = 0;\n  private inFrame = false;\n  private animation: Step | undefined;\n  /** The pointer's position for the next frame */\n  private hoverPoint: Point | undefined;\n  private lastCamera = '';\n  /** The camera moved since the last 'moveend' */\n  private moving = false;\n  #settled = false;\n  #camera: Camera | undefined;\n\n  /** `listeners`: the map's, told of the frame's events */\n  constructor(host: FrameHost, listeners: MapListeners) {\n    this.host = host;\n    this.listeners = listeners;\n  }\n\n  /** The last frame found everything loaded ('idle' sent) */\n  get settled(): boolean {\n    return this.#settled;\n  }\n\n  /** The camera of the frame being drawn: what `getCamera` gives the custom layers while the engine is busy */\n  get camera(): Camera | undefined {\n    return this.#camera;\n  }\n\n  /** Asks for a frame; several calls before the next frame draw it once */\n  request(): void {\n    // Changes made by listeners during a frame are drawn by that frame; nothing is drawn without a context\n    if (this.inFrame || this.host.lost()) return;\n    this.requested ||= requestAnimationFrame((now) => this.frame(now));\n  }\n\n  /** Asks for a frame that sends 'idle' once everything is loaded, even if the last one already did: the waiters of\n   * `whenIdle` on a map already idle (else no frame would change from loading to loaded, and none would send it) */\n  requestIdle(): void {\n    this.#settled = false;\n    this.request();\n  }\n\n  /** Runs `step` every frame until it returns false; replaces the running animation */\n  animate(step: Step | undefined): void {\n    // A flight cut short no longer needs its destination\n    if (this.animation) this.host.engine().clearPreload();\n    this.animation = step;\n    this.request();\n  }\n\n  /** The pointer's position for the next frame (undefined: none) */\n  hover(point: Point | undefined): void {\n    this.hoverPoint = point;\n  }\n\n  /** Draws a frame now, in place of the one asked for (a resized canvas is cleared: waiting one frame would flash) */\n  drawNow(): void {\n    cancelAnimationFrame(this.requested);\n    this.frame(performance.now());\n  }\n\n  /** Cancels the frame asked for (the context is lost); a new one can be asked for */\n  cancel(): void {\n    cancelAnimationFrame(this.requested);\n    this.requested = 0;\n  }\n\n  /** Cancels the frame asked for, for good (the map is destroyed): it stays marked as asked for */\n  stop(): void {\n    cancelAnimationFrame(this.requested);\n  }\n\n  private frame(now: number): void {\n    this.requested = 0;\n    try {\n      this.inFrame = true;\n      this.draw(now);\n    } finally {\n      // Whatever throws in a frame, the next ones are still drawn\n      this.inFrame = false;\n    }\n  }\n\n  private draw(now: number): void {\n    if (this.animation && !this.animation(now)) this.animation = undefined;\n\n    const { host, listeners } = this;\n    const camera = host.camera();\n    const key = `${camera.center}|${camera.zoom}|${camera.pitch}|${camera.bearing}`;\n    const moved = key !== this.lastCamera;\n\n    if (moved) {\n      // The first frame is no move\n      if (!this.moving && this.lastCamera !== '') {\n        this.moving = true;\n        listeners.emit('movestart', camera);\n      }\n      this.lastCamera = key;\n      listeners.emit('move', camera);\n    } else if (this.moving && !this.animation && !host.interacting()) {\n      this.moving = false;\n      listeners.emit('moveend', camera);\n    }\n\n    // Values for the pointer position are computed before drawing, in the same frame\n    const hovered = this.hoverPoint;\n\n    if (hovered) {\n      this.hoverPoint = undefined;\n      // The position under the pointer for its listeners only (a 'hoverfeature' alone does not need it)\n      if (listeners.has('hover')) {\n        listeners.emit('hover', { point: hovered, lonLat: host.engine().ground(hovered[0], hovered[1]) });\n      }\n    }\n\n    const t0 = performance.now();\n\n    // The engine asks for the next frame while it draws (uploads past the frame budget, fades): not ignored\n    this.inFrame = false;\n    // As the engine has it now (a listener may have moved it), for the custom layers drawn in the frame\n    this.#camera = host.customLayers() ? host.engine().camera() : undefined;\n\n    const render = (): boolean => {\n      try {\n        return host.engine().render();\n      } finally {\n        this.#camera = undefined;\n      }\n    };\n    const loading = render();\n\n    this.inFrame = true;\n    host.drawn(hovered);\n    listeners.emit('render', { ms: performance.now() - t0 });\n    this.inFrame = false;\n    // A move goes on until a frame finds the camera still: that frame sends 'moveend'\n    if (this.animation || (moved && this.moving)) this.request();\n    // Idle: nothing loading (the engine with 3D Tiles neither), no animation, no frame asked for (uploads waiting,\n    // fades, listeners)\n    if (loading || host.upgrading() || this.animation || this.requested !== 0) {\n      this.#settled = false;\n    } else if (!this.#settled) {\n      this.#settled = true;\n      listeners.emit('idle', {});\n    }\n  }\n}\n"]}
+{"version":3,"file":"frame-loop.js","sourceRoot":"","sources":["../../src/map/frame-loop.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The frame loop of a map: frames drawn on demand only (an idle map costs nothing), the running animation stepped in\n * each, and the events of a frame sent with it: the camera's moves, the pointer's position (coalesced to one per\n * frame, so the values computed for it are drawn in the same frame), 'render', and 'idle' once everything is loaded.\n */\n\nimport type { Point } from '../types.ts';\nimport type { Step } from '../util/animation.ts';\nimport type { Camera, Engine } from '../wasm/isard.js';\nimport type { MapListeners } from './events.ts';\n\n/** What the frame loop needs of its map */\nexport interface FrameHost {\n  /** The map's engine of the moment */\n  engine(): Engine;\n  /** The map's camera */\n  camera(): Camera;\n  /** The WebGL context is lost: nothing is drawn */\n  lost(): boolean;\n  /** The pointer or the keys are moving the camera: no 'moveend' yet */\n  interacting(): boolean;\n  /** Custom layers are drawn: they read the camera of the frame */\n  customLayers(): boolean;\n  /** The engine with 3D Tiles is loading: not idle */\n  upgrading(): boolean;\n  /** Work the page waits on for what it draws (the vector tiles cut in the workers, uploaded over frames): not idle */\n  working(): boolean;\n  /** The frame is drawn: what follows it (the overlays placed, the hover picking asked for at `hovered`) */\n  drawn(hovered: Point | undefined): void;\n}\n\n/** The frames of a map, asked for and drawn */\nexport class FrameLoop {\n  private readonly host: FrameHost;\n  private readonly listeners: MapListeners;\n  /** Frame asked for, 0 if none */\n  private requested = 0;\n  private inFrame = false;\n  private animation: Step | undefined;\n  /** The pointer's position for the next frame */\n  private hoverPoint: Point | undefined;\n  private lastCamera = '';\n  /** The camera moved since the last 'moveend' */\n  private moving = false;\n  #settled = false;\n  #camera: Camera | undefined;\n\n  /** `listeners`: the map's, told of the frame's events */\n  constructor(host: FrameHost, listeners: MapListeners) {\n    this.host = host;\n    this.listeners = listeners;\n  }\n\n  /** The last frame found everything loaded ('idle' sent) */\n  get settled(): boolean {\n    return this.#settled;\n  }\n\n  /** The camera of the frame being drawn: what `getCamera` gives the custom layers while the engine is busy */\n  get camera(): Camera | undefined {\n    return this.#camera;\n  }\n\n  /** Asks for a frame; several calls before the next frame draw it once */\n  request(): void {\n    // Changes made by listeners during a frame are drawn by that frame; nothing is drawn without a context\n    if (this.inFrame || this.host.lost()) return;\n    this.requested ||= requestAnimationFrame((now) => this.frame(now));\n  }\n\n  /** Asks for a frame that sends 'idle' once everything is loaded, even if the last one already did: the waiters of\n   * `whenIdle` on a map already idle (else no frame would change from loading to loaded, and none would send it) */\n  requestIdle(): void {\n    this.#settled = false;\n    this.request();\n  }\n\n  /** Runs `step` every frame until it returns false; replaces the running animation */\n  animate(step: Step | undefined): void {\n    // A flight cut short no longer needs its destination\n    if (this.animation) this.host.engine().clearPreload();\n    this.animation = step;\n    this.request();\n  }\n\n  /** The pointer's position for the next frame (undefined: none) */\n  hover(point: Point | undefined): void {\n    this.hoverPoint = point;\n  }\n\n  /** Draws a frame now, in place of the one asked for (a resized canvas is cleared: waiting one frame would flash) */\n  drawNow(): void {\n    cancelAnimationFrame(this.requested);\n    this.frame(performance.now());\n  }\n\n  /** Cancels the frame asked for (the context is lost); a new one can be asked for */\n  cancel(): void {\n    cancelAnimationFrame(this.requested);\n    this.requested = 0;\n  }\n\n  /** Cancels the frame asked for, for good (the map is destroyed): it stays marked as asked for */\n  stop(): void {\n    cancelAnimationFrame(this.requested);\n  }\n\n  private frame(now: number): void {\n    this.requested = 0;\n    try {\n      this.inFrame = true;\n      this.draw(now);\n    } finally {\n      // Whatever throws in a frame, the next ones are still drawn\n      this.inFrame = false;\n    }\n  }\n\n  private draw(now: number): void {\n    if (this.animation && !this.animation(now)) this.animation = undefined;\n\n    const { host, listeners } = this;\n    const camera = host.camera();\n    const key = `${camera.center}|${camera.zoom}|${camera.pitch}|${camera.bearing}`;\n    const moved = key !== this.lastCamera;\n\n    if (moved) {\n      // The first frame is no move\n      if (!this.moving && this.lastCamera !== '') {\n        this.moving = true;\n        listeners.emit('movestart', camera);\n      }\n      this.lastCamera = key;\n      listeners.emit('move', camera);\n    } else if (this.moving && !this.animation && !host.interacting()) {\n      this.moving = false;\n      listeners.emit('moveend', camera);\n    }\n\n    // Values for the pointer position are computed before drawing, in the same frame\n    const hovered = this.hoverPoint;\n\n    if (hovered) {\n      this.hoverPoint = undefined;\n      // The position under the pointer for its listeners only (a 'hoverfeature' alone does not need it)\n      if (listeners.has('hover')) {\n        listeners.emit('hover', { point: hovered, lonLat: host.engine().ground(hovered[0], hovered[1]) });\n      }\n    }\n\n    const t0 = performance.now();\n\n    // The engine asks for the next frame while it draws (uploads past the frame budget, fades): not ignored\n    this.inFrame = false;\n    // As the engine has it now (a listener may have moved it), for the custom layers drawn in the frame\n    this.#camera = host.customLayers() ? host.engine().camera() : undefined;\n\n    const render = (): boolean => {\n      try {\n        return host.engine().render();\n      } finally {\n        this.#camera = undefined;\n      }\n    };\n    const loading = render();\n\n    this.inFrame = true;\n    host.drawn(hovered);\n    listeners.emit('render', { ms: performance.now() - t0 });\n    this.inFrame = false;\n    // A move goes on until a frame finds the camera still: that frame sends 'moveend'\n    if (this.animation || (moved && this.moving)) this.request();\n    // Idle: nothing loading (the engine with 3D Tiles neither, nor the page's work for what it draws), no animation,\n    // no frame asked for (uploads waiting, fades, listeners)\n    if (loading || host.upgrading() || host.working() || this.animation || this.requested !== 0) {\n      this.#settled = false;\n    } else if (!this.#settled) {\n      this.#settled = true;\n      listeners.emit('idle', {});\n    }\n  }\n}\n"]}

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

@@ -5,6 +5,7 @@ import type { FlowOptions } from '../layers/flow.ts';
 import type { GroundOptions, Layer, ModelOptions } from '../layers/layers.ts';
 import type { PointCloudOptions } from '../layers/pointclouds.ts';
 import type { SymbolOptions } from '../layers/symbols.ts';
+import type { TreeOptions } from '../layers/trees.ts';
 import type { GeoMap } from '../map.ts';
 import type { NetworkOptions, RasterOptions, Tiles3dOptions } from '../types.ts';
 /** A layer by its type and the options of its `add…` method (`GeoMap.add`) */
@@ -39,6 +40,8 @@ export type LayerSpec<P = Record<string, unknown>> = ({
 } & ModelOptions & {
     before?: Layer;
 }) | ({
+    type: 'trees';
+} & TreeOptions<P>) | ({
     type: 'flow';
 } & FlowOptions);
 /** Adds the layer a description gives with the `add…` method of its type; an unknown type throws */

package/dist/map/layer-spec.js

@@ -24,6 +24,8 @@ export const addSpec = (map, spec) => {
             return map.addPointCloud(spec);
         case 'models':
             return map.addModels(spec);
+        case 'trees':
+            return map.addTrees(spec);
         case 'flow':
             return map.addFlow(spec);
         default: {

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

@@ -1 +1 @@
-{"version":3,"file":"layer-spec.js","sourceRoot":"","sources":["../../src/map/layer-spec.ts"],"names":[],"mappings":"AAAA,oHAAoH;AA0BpH,oGAAoG;AACpG,MAAM,CAAC,MAAM,OAAO,GAAG,CAA8B,GAAW,EAAE,IAAkB,EAAS,EAAE;IAC7F,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO;YACV,OAAO,GAAG,CAAC,QAAQ,CAAI,IAAI,CAAC,CAAC;QAC/B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,UAAU,CAAI,IAAI,CAAC,CAAC;QACjC,KAAK,OAAO;YACV,OAAO,GAAG,CAAC,QAAQ,CAAI,IAAI,CAAC,CAAC;QAC/B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,UAAU,CAAI,IAAI,CAAC,CAAC;QACjC,KAAK,YAAY;YACf,OAAO,GAAG,CAAC,aAAa,CAAI,IAAI,CAAC,CAAC;QACpC,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9B,KAAK,YAAY;YACf,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjC,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,MAAM;YACT,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,CAAC,CAAC,CAAC;YACR,sFAAsF;YACtF,MAAM,EAAE,IAAI,EAAE,GAAuB,IAAI,CAAC;YAE1C,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;AACH,CAAC,CAAC","sourcesContent":["/** A layer described by its type and options, as an application's configuration gives it, and the map adding it. */\n\nimport type { ExtrusionOptions } from '../layers/extrusions.ts';\nimport type { CircleOptions, FillOptions, LineOptions } from '../layers/features.ts';\nimport type { FlowOptions } from '../layers/flow.ts';\nimport type { GroundOptions, Layer, ModelOptions } from '../layers/layers.ts';\nimport type { PointCloudOptions } from '../layers/pointclouds.ts';\nimport type { SymbolOptions } from '../layers/symbols.ts';\nimport type { GeoMap } from '../map.ts';\nimport type { NetworkOptions, RasterOptions, Tiles3dOptions } from '../types.ts';\n\n/** A layer by its type and the options of its `add…` method (`GeoMap.add`) */\nexport type LayerSpec<P = Record<string, unknown>> =\n  | ({ type: 'lines' } & LineOptions<P>)\n  | ({ type: 'circles' } & CircleOptions<P>)\n  | ({ type: 'fills' } & FillOptions<P>)\n  | ({ type: 'symbols' } & SymbolOptions<P>)\n  | ({ type: 'extrusions' } & ExtrusionOptions<P>)\n  | ({ type: 'raster' } & RasterOptions & { before?: Layer })\n  | ({ type: 'ground' } & GroundOptions & { before?: Layer })\n  | ({ type: 'network' } & NetworkOptions)\n  | ({ type: 'tiles3d' } & Tiles3dOptions)\n  | ({ type: 'pointcloud' } & PointCloudOptions & { before?: Layer })\n  | ({ type: 'models' } & ModelOptions & { before?: Layer })\n  | ({ type: 'flow' } & FlowOptions);\n\n/** Adds the layer a description gives with the `add…` method of its type; an unknown type throws */\nexport const addSpec = <P = Record<string, unknown>>(map: GeoMap, spec: LayerSpec<P>): Layer => {\n  switch (spec.type) {\n    case 'lines':\n      return map.addLines<P>(spec);\n    case 'circles':\n      return map.addCircles<P>(spec);\n    case 'fills':\n      return map.addFills<P>(spec);\n    case 'symbols':\n      return map.addSymbols<P>(spec);\n    case 'extrusions':\n      return map.addExtrusions<P>(spec);\n    case 'raster':\n      return map.addRaster(spec);\n    case 'ground':\n      return map.addGround(spec);\n    case 'network':\n      return map.addNetwork(spec);\n    case 'tiles3d':\n      return map.addTiles3d(spec);\n    case 'pointcloud':\n      return map.addPointCloud(spec);\n    case 'models':\n      return map.addModels(spec);\n    case 'flow':\n      return map.addFlow(spec);\n    default: {\n      // Only from an application's configuration, untyped: the cases above cover every type\n      const { type }: { type?: unknown } = spec;\n\n      throw new Error(`isard: no layer of type ${String(type)}`);\n    }\n  }\n};\n"]}
+{"version":3,"file":"layer-spec.js","sourceRoot":"","sources":["../../src/map/layer-spec.ts"],"names":[],"mappings":"AAAA,oHAAoH;AA4BpH,oGAAoG;AACpG,MAAM,CAAC,MAAM,OAAO,GAAG,CAA8B,GAAW,EAAE,IAAkB,EAAS,EAAE;IAC7F,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO;YACV,OAAO,GAAG,CAAC,QAAQ,CAAI,IAAI,CAAC,CAAC;QAC/B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,UAAU,CAAI,IAAI,CAAC,CAAC;QACjC,KAAK,OAAO;YACV,OAAO,GAAG,CAAC,QAAQ,CAAI,IAAI,CAAC,CAAC;QAC/B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,UAAU,CAAI,IAAI,CAAC,CAAC;QACjC,KAAK,YAAY;YACf,OAAO,GAAG,CAAC,aAAa,CAAI,IAAI,CAAC,CAAC;QACpC,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9B,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9B,KAAK,YAAY;YACf,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjC,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,OAAO;YACV,OAAO,GAAG,CAAC,QAAQ,CAAI,IAAI,CAAC,CAAC;QAC/B,KAAK,MAAM;YACT,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,CAAC,CAAC,CAAC;YACR,sFAAsF;YACtF,MAAM,EAAE,IAAI,EAAE,GAAuB,IAAI,CAAC;YAE1C,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;AACH,CAAC,CAAC","sourcesContent":["/** A layer described by its type and options, as an application's configuration gives it, and the map adding it. */\n\nimport type { ExtrusionOptions } from '../layers/extrusions.ts';\nimport type { CircleOptions, FillOptions, LineOptions } from '../layers/features.ts';\nimport type { FlowOptions } from '../layers/flow.ts';\nimport type { GroundOptions, Layer, ModelOptions } from '../layers/layers.ts';\nimport type { PointCloudOptions } from '../layers/pointclouds.ts';\nimport type { SymbolOptions } from '../layers/symbols.ts';\nimport type { TreeOptions } from '../layers/trees.ts';\nimport type { GeoMap } from '../map.ts';\nimport type { NetworkOptions, RasterOptions, Tiles3dOptions } from '../types.ts';\n\n/** A layer by its type and the options of its `add…` method (`GeoMap.add`) */\nexport type LayerSpec<P = Record<string, unknown>> =\n  | ({ type: 'lines' } & LineOptions<P>)\n  | ({ type: 'circles' } & CircleOptions<P>)\n  | ({ type: 'fills' } & FillOptions<P>)\n  | ({ type: 'symbols' } & SymbolOptions<P>)\n  | ({ type: 'extrusions' } & ExtrusionOptions<P>)\n  | ({ type: 'raster' } & RasterOptions & { before?: Layer })\n  | ({ type: 'ground' } & GroundOptions & { before?: Layer })\n  | ({ type: 'network' } & NetworkOptions)\n  | ({ type: 'tiles3d' } & Tiles3dOptions)\n  | ({ type: 'pointcloud' } & PointCloudOptions & { before?: Layer })\n  | ({ type: 'models' } & ModelOptions & { before?: Layer })\n  | ({ type: 'trees' } & TreeOptions<P>)\n  | ({ type: 'flow' } & FlowOptions);\n\n/** Adds the layer a description gives with the `add…` method of its type; an unknown type throws */\nexport const addSpec = <P = Record<string, unknown>>(map: GeoMap, spec: LayerSpec<P>): Layer => {\n  switch (spec.type) {\n    case 'lines':\n      return map.addLines<P>(spec);\n    case 'circles':\n      return map.addCircles<P>(spec);\n    case 'fills':\n      return map.addFills<P>(spec);\n    case 'symbols':\n      return map.addSymbols<P>(spec);\n    case 'extrusions':\n      return map.addExtrusions<P>(spec);\n    case 'raster':\n      return map.addRaster(spec);\n    case 'ground':\n      return map.addGround(spec);\n    case 'network':\n      return map.addNetwork(spec);\n    case 'tiles3d':\n      return map.addTiles3d(spec);\n    case 'pointcloud':\n      return map.addPointCloud(spec);\n    case 'models':\n      return map.addModels(spec);\n    case 'trees':\n      return map.addTrees<P>(spec);\n    case 'flow':\n      return map.addFlow(spec);\n    default: {\n      // Only from an application's configuration, untyped: the cases above cover every type\n      const { type }: { type?: unknown } = spec;\n\n      throw new Error(`isard: no layer of type ${String(type)}`);\n    }\n  }\n};\n"]}

package/dist/map.d.ts

@@ -14,8 +14,10 @@ import { FlowLayer, type FlowOptions } from './layers/flow.ts';
 import type { ImageOptions, Pixels } from './layers/icons.ts';
 import { CustomLayer, type CustomLayerInterface, GroundLayer, type GroundOptions, type Layer, ModelLayer, type ModelOptions, NetworkLayer, RasterLayer, Tiles3dLayer } from './layers/layers.ts';
 import { type PanoramaOptions, type Panoramas } from './layers/panoramas.ts';
+import { type PhotoOptions } from './layers/photos.ts';
 import { PointCloudLayer, type PointCloudOptions } from './layers/pointclouds.ts';
 import { SymbolLayer, type SymbolOptions } from './layers/symbols.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, NetworkOptions, Point, Projection, RasterOptions, SunOptions, SwipeOptions, TerrainModel, TerrainOptions, Tiles3dOptions, ViewshedOptions } from './types.ts';
@@ -327,6 +329,12 @@ export declare class GeoMap {
     addModels(options: ModelOptions & {
         before?: Layer;
     }): 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 */
+    addTrees<P = Record<string, unknown>>(options: TreeOptions<P>): ModelLayer;
+    /** A photo standing where it was taken, facing its way (see `PhotoOptions`): flat on a frame across its field of
+     * 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

package/dist/map.js

@@ -17,8 +17,10 @@ import { CircleLayer, circleStyle, FillLayer, fillStyle, LineLayer, lineStyle, }
 import { FlowLayer } from "./layers/flow.js";
 import { CustomLayer, GroundLayer, ModelLayer, NetworkLayer, RasterLayer, Tiles3dLayer, } from "./layers/layers.js";
 import { loadPanoramas } from "./layers/panoramas.js";
+import { addPhoto } from "./layers/photos.js";
 import { PointCloudLayer } from "./layers/pointclouds.js";
 import { SymbolLayer, symbolStyle } from "./layers/symbols.js";
+import { addTrees } from "./layers/trees.js";
 import { VectorLayer } from "./layers/vectors.js";
 import { BasemapLayers } from "./map/basemap-layers.js";
 import { createCanvas, labelCanvas, watchContext, watchPixelRatio } from "./map/canvas.js";
@@ -48,6 +50,8 @@ const hasFeatures = (layer) => 'featureAt' in layer && typeof layer.featureAt ==
 export class GeoMap {
     canvas;
     #engine;
+    /** 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 */
     engines;
     /** The layers in drawing order and those kept on top */
@@ -133,6 +137,7 @@ export class GeoMap {
             interacting: () => this.interaction?.active === true,
             customLayers: () => this.layers.some((layer) => layer instanceof CustomLayer),
             upgrading: () => this.engines.upgrading !== undefined,
+            working: () => this.#working > 0,
             drawn: (hovered) => {
                 // The picking pass sees the frame just drawn; its answer comes on a later frame
                 if (hovered && this.listeners.has('hoverfeature'))
@@ -679,13 +684,28 @@ export class GeoMap {
     /** @internal A layer made anew from its description, in the place of `old` in the drawing order (old removed) */
     rebuildLayer(old, spec) {
         const index = this.layers.indexOf(old);
-        const above = index >= 0 ? this.layers[index + 1] : undefined;
+        // The first layer above that goes not with it: its companions are removed with it
+        const above = index >= 0 ? this.layers.slice(index + 1).find((l) => !old.companions.includes(l)) : undefined;
         const layer = this.add(spec);
         if (!('before' in spec && spec.before) && index >= 0)
-            this.moveLayer(layer, above);
+            layer.moveBefore(above);
         old.remove();
         return layer;
     }
+    /**
+     * @internal Work the map waits on before it is idle (the vector tiles cut in the workers, uploaded over frames): the
+     * engine knows only the tiles it holds, not those coming (an engine made anew holds none until the workers cut them
+     * again from their cache, no request on the network meanwhile); a frame once it is done, to tell
+     */
+    track(work) {
+        this.#working += 1;
+        const done = () => {
+            this.#working -= 1;
+            this.requestRender();
+        };
+        work.then(done, done);
+        return work;
+    }
     /** @internal Resolves once the map is idle (everything in view loaded and drawn) */
     whenIdle() {
         if (this.gone)
@@ -816,6 +836,16 @@ export class GeoMap {
     addModels(options) {
         return this.place(new ModelLayer(this, options), options.before);
     }
+    /** 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 */
+    addTrees(options) {
+        return addTrees((o) => this.addModels(o), options);
+    }
+    /** A photo standing where it was taken, facing its way (see `PhotoOptions`): flat on a frame across its field of
+     * view, a 360° one on a band round its camera; resolves once its image is read */
+    addPhoto(options) {
+        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