isard 1.16.0 → 2.0.0

package/dist/layers/tiles3d.d.ts

@@ -1,6 +1,6 @@
 /** A 3D Tiles tileset as a layer: its style, its features picked */
 import type { Tiles3dDrape, Tiles3dStyle } from '../types.ts';
-import type { Tiles3dStats } from '../wasm/isard.js';
+import type { Tiles3dStats } from '../wasm/isard_webgpu.js';
 import { Layer } from './layers.ts';
 /** Textured meshes in 3D Tiles */
 export declare class Tiles3dLayer extends Layer {

package/dist/layers/tiles3d.js

@@ -73,10 +73,6 @@ export class Tiles3dLayer extends Layer {
             this.applyFeatureColor(this.map.engine, this.id);
         this.map.requestRender();
     }
-    /** @internal */
-    get needsFullEngine() {
-        return true;
-    }
     /** @internal The feature picked (`pickFeature`, 'hoverfeature'): the properties of its feature in the tile
      * (`EXT_structural_metadata`, a b3dm batch table), none for a mesh without features; its index in the tile as id */
     featureAt(index) {

package/dist/layers/tiles3d.js.map

@@ -1 +1 @@
-{"version":3,"file":"tiles3d.js","sourceRoot":"","sources":["../../src/layers/tiles3d.ts"],"names":[],"mappings":"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","sourcesContent":["/** A 3D Tiles tileset as a layer: its style, its features picked */\n\nimport { rgb } from '../settings.ts';\nimport type { FeatureColor, LayerHost, Tiles3dDrape, Tiles3dStyle } from '../types.ts';\nimport { parseColor } from '../util/color.ts';\nimport type { Engine, Tiles3dStats } from '../wasm/isard.js';\nimport type { Feature } from './features.ts';\nimport { Layer } from './layers.ts';\n\n/**\n * The engine's colors of a tile's features from a `featureColor`: RGBA bytes for each (alpha 0: the layer's color),\n * the CSS colors parsed once each\n */\nconst featureColors = (color: FeatureColor) => {\n  const parsed = new Map<string, number[]>();\n  const bytesOf = (css: string) => {\n    const known = parsed.get(css);\n\n    if (known) return known;\n\n    const [r, g, b] = parseColor(css);\n    const made = [r, g, b].map((c) => Math.round(c * 255)).concat(255);\n\n    parsed.set(css, made);\n\n    return made;\n  };\n\n  return (properties: Record<string, unknown>[] | undefined, count: number): Uint8Array => {\n    const rgba = new Uint8Array(count * 4);\n\n    Array.from({ length: count }, (_, i) => color(properties?.[i] ?? {}, i)).forEach((css, i) => {\n      if (css) rgba.set(bytesOf(css), i * 4);\n    });\n\n    return rgba;\n  };\n};\n\n/** Textured meshes in 3D Tiles */\nexport class Tiles3dLayer extends Layer {\n  /** @internal */\n  constructor(\n    map: LayerHost,\n    private readonly url: string,\n    private readonly geoid: boolean,\n    private style: Tiles3dStyle,\n    private facades = false,\n    private drape: Tiles3dDrape | undefined = undefined,\n  ) {\n    super(map);\n  }\n\n  /** Whether the walls of its untextured meshes (buildings without their photos, as the IGN's Bâtiments 3D) show\n   * windows, as the vector tiles' buildings do: glass by day, some lit at night. Their faces near vertical are walls,\n   * bays of 3 metres along them and floors of 3.2 metres from the ellipsoid (a mesh tells neither foot nor top) */\n  setFacades(facades: boolean): void {\n    this.facades = facades;\n    // Kept for its creation while the engine with 3D Tiles loads\n    if (this.id < 0) return;\n    this.map.engine.setTiles3dFacades(this.id, facades);\n    this.map.requestRender();\n  }\n\n  /** A raster layer draped on its meshes, its roofs by default (see `Tiles3dDrape`); undefined: none */\n  setDrape(drape: Tiles3dDrape | undefined): void {\n    this.drape = drape;\n    // Kept for its creation while the engine with 3D Tiles loads\n    if (this.id < 0) return;\n    this.sendDrape(this.map.engine, this.id);\n    this.map.requestRender();\n  }\n\n  setStyle(style: Partial<Tiles3dStyle>): void {\n    this.style = { ...this.style, ...style };\n    // Kept for its creation while the engine with 3D Tiles loads\n    if (this.id < 0) return;\n    this.applyStyle(this.map.engine, this.id);\n    // The features colored again only when their function changed: every tile asks for its colors then\n    if ('featureColor' in style) this.applyFeatureColor(this.map.engine, this.id);\n    this.map.requestRender();\n  }\n\n  /** @internal */\n  override get needsFullEngine(): boolean {\n    return true;\n  }\n\n  /** @internal The feature picked (`pickFeature`, 'hoverfeature'): the properties of its feature in the tile\n   * (`EXT_structural_metadata`, a b3dm batch table), none for a mesh without features; its index in the tile as id */\n  featureAt(index: number): Feature<Record<string, unknown>> | undefined {\n    if (this.id < 0) return undefined;\n\n    const hit = this.map.engine.tiles3dFeature(this.id, index);\n\n    if (!hit) return undefined;\n\n    const [properties, feature] = hit;\n\n    return { type: 'Feature', id: feature, properties: properties ?? {}, geometry: null };\n  }\n\n  /** Loading counters; undefined once the layer is removed, and while the engine with 3D Tiles loads (see\n   * `GeoMapOptions.tiles3d`) */\n  stats(): Tiles3dStats | undefined {\n    return this.id < 0 ? undefined : this.map.engine.tiles3dStats(this.id);\n  }\n\n  /** @internal */\n  protected create(engine: Engine): number {\n    const id = engine.addTiles3d(this.url, this.style.maxScreenSpaceError * this.map.quality.errorScale, this.geoid);\n\n    this.applyStyle(engine, id);\n    this.applyFeatureColor(engine, id);\n    engine.setTiles3dFacades(id, this.facades);\n    // A raster created before (on a new engine, the map relinks once every layer is there)\n    this.sendDrape(engine, id);\n\n    return id;\n  }\n\n  /** @internal On a new engine, the raster may come after the tiles: draped once both are there */\n  override relink(engine: Engine): void {\n    this.sendDrape(engine, this.id);\n  }\n\n  private sendDrape(engine: Engine, id: number): void {\n    const { raster, faces = 'up', opacity = 1 } = this.drape ?? {};\n    const rasterId = raster && raster.id >= 0 ? raster.id : undefined;\n\n    engine.setTiles3dDrape(id, rasterId, faces === 'all', opacity);\n  }\n\n  /** @internal */\n  override qualityChanged(): void {\n    if (this.id >= 0) this.applyStyle(this.map.engine, this.id);\n  }\n\n  private applyStyle(engine: Engine, id: number): void {\n    const { maxScreenSpaceError, opacity, pointSize, color } = this.style;\n    // Coarser far away at a lower quality\n    const error = maxScreenSpaceError * this.map.quality.errorScale;\n\n    engine.setTiles3dStyle(id, error, opacity, pointSize, new Float32Array(color ? rgb(color) : []));\n  }\n\n  private applyFeatureColor(engine: Engine, id: number): void {\n    const { featureColor } = this.style;\n\n    engine.setTiles3dFeatureColors(id, featureColor ? featureColors(featureColor) : null);\n  }\n}\n"]}
+{"version":3,"file":"tiles3d.js","sourceRoot":"","sources":["../../src/layers/tiles3d.ts"],"names":[],"mappings":"AAAA,oEAAoE;AAEpE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC;;;GAGG;AACH,MAAM,aAAa,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC5C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC3C,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;QAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE9B,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QAExB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEnE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEtB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,CAAC,UAAiD,EAAE,KAAa,EAAc,EAAE;QACtF,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAEvC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YAC1F,IAAI,GAAG;gBAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,kCAAkC;AAClC,MAAM,OAAO,YAAa,SAAQ,KAAK;IAIlB;IACA;IACT;IACA;IACA;IAPV,gBAAgB;IAChB,YACE,GAAc,EACG,GAAW,EACX,KAAc,EACvB,KAAmB,EACnB,UAAU,KAAK,EACf,QAAkC,SAAS;QAEnD,KAAK,CAAC,GAAG,CAAC,CAAC;QANM,QAAG,GAAH,GAAG,CAAQ;QACX,UAAK,GAAL,KAAK,CAAS;QACvB,UAAK,GAAL,KAAK,CAAc;QACnB,YAAO,GAAP,OAAO,CAAQ;QACf,UAAK,GAAL,KAAK,CAAsC;IAGrD,CAAC;IAED;;qHAEiH;IACjH,UAAU,CAAC,OAAgB;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,6DAA6D;QAC7D,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC;YAAE,OAAO;QACxB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;IAC3B,CAAC;IAED,sGAAsG;IACtG,QAAQ,CAAC,KAA+B;QACtC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,6DAA6D;QAC7D,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC;YAAE,OAAO;QACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;IAC3B,CAAC;IAED,QAAQ,CAAC,KAA4B;QACnC,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC;QACzC,6DAA6D;QAC7D,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC;YAAE,OAAO;QACxB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1C,mGAAmG;QACnG,IAAI,cAAc,IAAI,KAAK;YAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9E,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;IAC3B,CAAC;IAED;wHACoH;IACpH,SAAS,CAAC,KAAa;QACrB,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC;YAAE,OAAO,SAAS,CAAC;QAElC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAE3D,IAAI,CAAC,GAAG;YAAE,OAAO,SAAS,CAAC;QAE3B,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,GAAG,CAAC;QAElC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACxF,CAAC;IAED;kCAC8B;IAC9B,KAAK;QACH,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,gBAAgB;IACN,MAAM,CAAC,MAAc;QAC7B,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAEjH,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACnC,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,uFAAuF;QACvF,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAE3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,iGAAiG;IACxF,MAAM,CAAC,MAAc;QAC5B,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAEO,SAAS,CAAC,MAAc,EAAE,EAAU;QAC1C,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QAC/D,MAAM,QAAQ,GAAG,MAAM,IAAI,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAElE,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,KAAK,KAAK,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,gBAAgB;IACP,cAAc;QACrB,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC;YAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9D,CAAC;IAEO,UAAU,CAAC,MAAc,EAAE,EAAU;QAC3C,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtE,sCAAsC;QACtC,MAAM,KAAK,GAAG,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;QAEhE,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACnG,CAAC;IAEO,iBAAiB,CAAC,MAAc,EAAE,EAAU;QAClD,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEpC,MAAM,CAAC,uBAAuB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACxF,CAAC;CACF","sourcesContent":["/** A 3D Tiles tileset as a layer: its style, its features picked */\n\nimport { rgb } from '../settings.ts';\nimport type { FeatureColor, LayerHost, Tiles3dDrape, Tiles3dStyle } from '../types.ts';\nimport { parseColor } from '../util/color.ts';\nimport type { Engine, Tiles3dStats } from '../wasm/isard_webgpu.js';\nimport type { Feature } from './features.ts';\nimport { Layer } from './layers.ts';\n\n/**\n * The engine's colors of a tile's features from a `featureColor`: RGBA bytes for each (alpha 0: the layer's color),\n * the CSS colors parsed once each\n */\nconst featureColors = (color: FeatureColor) => {\n  const parsed = new Map<string, number[]>();\n  const bytesOf = (css: string) => {\n    const known = parsed.get(css);\n\n    if (known) return known;\n\n    const [r, g, b] = parseColor(css);\n    const made = [r, g, b].map((c) => Math.round(c * 255)).concat(255);\n\n    parsed.set(css, made);\n\n    return made;\n  };\n\n  return (properties: Record<string, unknown>[] | undefined, count: number): Uint8Array => {\n    const rgba = new Uint8Array(count * 4);\n\n    Array.from({ length: count }, (_, i) => color(properties?.[i] ?? {}, i)).forEach((css, i) => {\n      if (css) rgba.set(bytesOf(css), i * 4);\n    });\n\n    return rgba;\n  };\n};\n\n/** Textured meshes in 3D Tiles */\nexport class Tiles3dLayer extends Layer {\n  /** @internal */\n  constructor(\n    map: LayerHost,\n    private readonly url: string,\n    private readonly geoid: boolean,\n    private style: Tiles3dStyle,\n    private facades = false,\n    private drape: Tiles3dDrape | undefined = undefined,\n  ) {\n    super(map);\n  }\n\n  /** Whether the walls of its untextured meshes (buildings without their photos, as the IGN's Bâtiments 3D) show\n   * windows, as the vector tiles' buildings do: glass by day, some lit at night. Their faces near vertical are walls,\n   * bays of 3 metres along them and floors of 3.2 metres from the ellipsoid (a mesh tells neither foot nor top) */\n  setFacades(facades: boolean): void {\n    this.facades = facades;\n    // Kept for its creation while the engine with 3D Tiles loads\n    if (this.id < 0) return;\n    this.map.engine.setTiles3dFacades(this.id, facades);\n    this.map.requestRender();\n  }\n\n  /** A raster layer draped on its meshes, its roofs by default (see `Tiles3dDrape`); undefined: none */\n  setDrape(drape: Tiles3dDrape | undefined): void {\n    this.drape = drape;\n    // Kept for its creation while the engine with 3D Tiles loads\n    if (this.id < 0) return;\n    this.sendDrape(this.map.engine, this.id);\n    this.map.requestRender();\n  }\n\n  setStyle(style: Partial<Tiles3dStyle>): void {\n    this.style = { ...this.style, ...style };\n    // Kept for its creation while the engine with 3D Tiles loads\n    if (this.id < 0) return;\n    this.applyStyle(this.map.engine, this.id);\n    // The features colored again only when their function changed: every tile asks for its colors then\n    if ('featureColor' in style) this.applyFeatureColor(this.map.engine, this.id);\n    this.map.requestRender();\n  }\n\n  /** @internal The feature picked (`pickFeature`, 'hoverfeature'): the properties of its feature in the tile\n   * (`EXT_structural_metadata`, a b3dm batch table), none for a mesh without features; its index in the tile as id */\n  featureAt(index: number): Feature<Record<string, unknown>> | undefined {\n    if (this.id < 0) return undefined;\n\n    const hit = this.map.engine.tiles3dFeature(this.id, index);\n\n    if (!hit) return undefined;\n\n    const [properties, feature] = hit;\n\n    return { type: 'Feature', id: feature, properties: properties ?? {}, geometry: null };\n  }\n\n  /** Loading counters; undefined once the layer is removed, and while the engine with 3D Tiles loads (see\n   * `GeoMapOptions.tiles3d`) */\n  stats(): Tiles3dStats | undefined {\n    return this.id < 0 ? undefined : this.map.engine.tiles3dStats(this.id);\n  }\n\n  /** @internal */\n  protected create(engine: Engine): number {\n    const id = engine.addTiles3d(this.url, this.style.maxScreenSpaceError * this.map.quality.errorScale, this.geoid);\n\n    this.applyStyle(engine, id);\n    this.applyFeatureColor(engine, id);\n    engine.setTiles3dFacades(id, this.facades);\n    // A raster created before (on a new engine, the map relinks once every layer is there)\n    this.sendDrape(engine, id);\n\n    return id;\n  }\n\n  /** @internal On a new engine, the raster may come after the tiles: draped once both are there */\n  override relink(engine: Engine): void {\n    this.sendDrape(engine, this.id);\n  }\n\n  private sendDrape(engine: Engine, id: number): void {\n    const { raster, faces = 'up', opacity = 1 } = this.drape ?? {};\n    const rasterId = raster && raster.id >= 0 ? raster.id : undefined;\n\n    engine.setTiles3dDrape(id, rasterId, faces === 'all', opacity);\n  }\n\n  /** @internal */\n  override qualityChanged(): void {\n    if (this.id >= 0) this.applyStyle(this.map.engine, this.id);\n  }\n\n  private applyStyle(engine: Engine, id: number): void {\n    const { maxScreenSpaceError, opacity, pointSize, color } = this.style;\n    // Coarser far away at a lower quality\n    const error = maxScreenSpaceError * this.map.quality.errorScale;\n\n    engine.setTiles3dStyle(id, error, opacity, pointSize, new Float32Array(color ? rgb(color) : []));\n  }\n\n  private applyFeatureColor(engine: Engine, id: number): void {\n    const { featureColor } = this.style;\n\n    engine.setTiles3dFeatureColors(id, featureColor ? featureColors(featureColor) : null);\n  }\n}\n"]}

package/dist/layers/vectors.d.ts

@@ -45,8 +45,7 @@ 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 */
+    /** The tiles waiting for their upload (`UPLOAD_MS` a frame), each with what resolves its `setTile` */
     private readonly queue;
     private flushing;
     private sublayers;
@@ -66,10 +65,10 @@ export declare class VectorLayer extends Layer {
     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 */
+    /** Uploads waiting tiles for `UPLOAD_MS` at most (one at least), the rest on the next frames; a tile's `setTile`
+     * resolves once it is there */
     private flush;
-    /** Sends a tile to the engine (its blocks' first part); its key */
+    /** Sends a tile to the engine (its blocks whole, mapped at their buffer's creation); 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

package/dist/layers/vectors.js

@@ -12,8 +12,7 @@ import { Layer } from "./layers.js";
 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 */
+    /** The tiles waiting for their upload (`UPLOAD_MS` a frame), each with what resolves its `setTile` */
     queue = new Map();
     flushing = false;
     sublayers = [];
@@ -82,32 +81,25 @@ export class VectorLayer extends Layer {
             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 */
+    /** Uploads waiting tiles for `UPLOAD_MS` at most (one at least), the rest on the next frames; a tile's `setTile`
+     * resolves once it is 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.upload(tile, waiting.vectors);
             this.queue.delete(tile);
             waiting.uploaded();
-            if (!within())
+            if (performance.now() - start > UPLOAD_MS)
                 break;
         }
         if (this.queue.size > 0)
             this.flushSoon();
         this.map.requestRender();
     }
-    /** Sends a tile to the engine (its blocks' first part); its key */
+    /** Sends a tile to the engine (its blocks whole, mapped at their buffer's creation); its key */
     upload(tile, vectors) {
         const key = this.tiles.get(tile)?.key ?? this.nextKey++;
         const { properties, sublayer } = vectors;
@@ -119,7 +111,7 @@ export class VectorLayer extends Layer {
     setTileStyles(tile, styles) {
         const waiting = this.queue.get(tile);
         // Not uploaded yet: uploaded with them
-        if (waiting && waiting.sent === undefined) {
+        if (waiting) {
             if (styles.length === waiting.vectors.properties.length * FLOATS)
                 waiting.vectors.styles = styles;
             return;

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 { FLOATS } from '../util/style-floats.ts';\nimport type { Engine } from '../wasm/isard.js';\nimport type { TileVectors } from '../workers/basemap/protocol.ts';\nimport { type Feature, type Size, stops } from './features.ts';\nimport { Layer } from './layers.ts';\nimport type { Tiles3dLayer } from './tiles3d.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  /** @internal Asks for the tiles in view (set by its `VectorTiles`): those of a new quality */\n  refresh: (() => void) | undefined;\n  /** The 3D buildings drawn in place of its raised ones (`vectors({ buildings3d })`), for `map.pickFeature` */\n  buildings3d: Tiles3dLayer | undefined;\n\n  /** @internal */\n  constructor(map: LayerHost) {\n    super(map);\n  }\n\n  /** @internal Its tiles as far as the map's quality reaches */\n  override qualityChanged(): void {\n    this.refresh?.();\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    // Its 3D buildings' walls too\n    this.buildings3d?.setFacades(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, sublayer, 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        sublayer,\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        sublayer,\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"]}
+{"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_webgpu.js';\nimport type { TileVectors } from '../workers/basemap/protocol.ts';\nimport { type Feature, type Size, stops } from './features.ts';\nimport { Layer } from './layers.ts';\nimport type { Tiles3dLayer } from './tiles3d.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` */\n  private readonly queue = new Map<string, { vectors: TileVectors; uploaded: () => void }>();\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  /** @internal Asks for the tiles in view (set by its `VectorTiles`): those of a new quality */\n  refresh: (() => void) | undefined;\n  /** The 3D buildings drawn in place of its raised ones (`vectors({ buildings3d })`), for `map.pickFeature` */\n  buildings3d: Tiles3dLayer | undefined;\n\n  /** @internal */\n  constructor(map: LayerHost) {\n    super(map);\n  }\n\n  /** @internal Its tiles as far as the map's quality reaches */\n  override qualityChanged(): void {\n    this.refresh?.();\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), the rest on the next frames; a tile's `setTile`\n   * resolves once it is 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\n    for (const [tile, waiting] of this.queue) {\n      this.upload(tile, waiting.vectors);\n      this.queue.delete(tile);\n      waiting.uploaded();\n      if (performance.now() - start > UPLOAD_MS) 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 whole, mapped at their buffer's creation); 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) {\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    // Its 3D buildings' walls too\n    this.buildings3d?.setFacades(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, sublayer, 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        sublayer,\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        sublayer,\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/engine-settings.d.ts

@@ -6,7 +6,7 @@ import type { PngEncoding } from '../basemap/terrain.ts';
 import { type Settings, type TerrainLoader } from '../settings.ts';
 import type { GeoMapOptions } from '../types.ts';
 import { type HeaderRules } from '../util/requests.ts';
-import type { Engine } from '../wasm/isard.js';
+import type { Engine } from '../wasm/isard_webgpu.js';
 /** The settings of a map from its options; `earth`: the map is of the Earth */
 export declare const mapSettings: (options: GeoMapOptions, earth: boolean, terrainLoader: (url: string, encoding: PngEncoding, floor?: number) => TerrainLoader) => Settings;
 /** Gives a new engine the settings and the page's request headers */

package/dist/map/engine-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine-settings.js","sourceRoot":"","sources":["../../src/map/engine-settings.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The settings of the map's engine: made from the options, given to each new engine (at creation, and again after a\n * context loss or once the engine with 3D Tiles is loaded), with the page's request headers.\n */\n\nimport { SEA } from '../basemap/basemaps.ts';\nimport type { PngEncoding } from '../basemap/terrain.ts';\nimport {\n  atmosphereSettings,\n  bodySettings,\n  haloSettings,\n  rgb,\n  type Settings,\n  type TerrainLoader,\n  terrainSettings,\n} from '../settings.ts';\nimport type { GeoMapOptions } from '../types.ts';\nimport { type HeaderRules, headerRules } from '../util/requests.ts';\nimport type { Engine } from '../wasm/isard.js';\n\n/** The settings of a map from its options; `earth`: the map is of the Earth */\nexport const mapSettings = (\n  options: GeoMapOptions,\n  earth: boolean,\n  terrainLoader: (url: string, encoding: PngEncoding, floor?: number) => TerrainLoader,\n): Settings => {\n  const body = bodySettings(options.body);\n\n  return {\n    body,\n    zoomRange: [options.minZoom ?? 0, options.maxZoom ?? 22],\n    maxPitch: options.maxPitch ?? 70,\n    globe: (options.projection ?? 'globe') === 'globe',\n    sky: options.sky ?? true,\n    atmosphere: atmosphereSettings(options.atmosphere),\n    terrain: terrainSettings(options.terrain, options.body, body.radius, terrainLoader),\n    loading: options.loading ?? 'immediate',\n    background: rgb(options.background ?? (earth ? '#f2f2f0' : '#000000')),\n    globeColor: earth ? SEA['osm-positron'] : rgb(body.color),\n  };\n};\n\n/** Gives a new engine the settings and the page's request headers */\nexport const applySettings = (engine: Engine, settings: Settings): void => {\n  // The body first: the layers' shaders may take its size\n  const { radius, flattening, atmosphere: air, relief } = settings.body;\n\n  engine.setBody(radius, flattening, haloSettings(air), ...relief);\n  sendHeaders(engine, headerRules());\n\n  const { zoomRange, maxPitch, globe, sky, atmosphere, terrain, loading, background, globeColor } = settings;\n\n  engine.setZoomRange(...zoomRange);\n  engine.setMaxPitch(maxPitch);\n  engine.setGlobe(globe);\n  engine.setSky(sky);\n  engine.setAtmosphere(atmosphere);\n  engine.setTerrain(terrain?.url, terrain?.exaggeration ?? 1, terrain?.maxZoom, terrain?.geoid, terrain?.loader);\n  engine.setImmediateLoading(loading === 'immediate');\n  engine.setBackground(...background);\n  engine.setGlobeColor(...globeColor);\n};\n\n/** The page's request headers to an engine (its own requests: raster tiles, tilesets, point clouds) */\nexport const sendHeaders = (engine: Engine, rules: HeaderRules): void => {\n  engine.setRequestHeaders(\n    rules.map(([prefix]) => prefix),\n    Uint32Array.from(rules, ([, headers]) => Object.keys(headers).length),\n    rules.flatMap(([, headers]) => Object.entries(headers).flat()),\n  );\n};\n"]}
+{"version":3,"file":"engine-settings.js","sourceRoot":"","sources":["../../src/map/engine-settings.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The settings of the map's engine: made from the options, given to each new engine (at creation, and again after a\n * context loss or once the engine with 3D Tiles is loaded), with the page's request headers.\n */\n\nimport { SEA } from '../basemap/basemaps.ts';\nimport type { PngEncoding } from '../basemap/terrain.ts';\nimport {\n  atmosphereSettings,\n  bodySettings,\n  haloSettings,\n  rgb,\n  type Settings,\n  type TerrainLoader,\n  terrainSettings,\n} from '../settings.ts';\nimport type { GeoMapOptions } from '../types.ts';\nimport { type HeaderRules, headerRules } from '../util/requests.ts';\nimport type { Engine } from '../wasm/isard_webgpu.js';\n\n/** The settings of a map from its options; `earth`: the map is of the Earth */\nexport const mapSettings = (\n  options: GeoMapOptions,\n  earth: boolean,\n  terrainLoader: (url: string, encoding: PngEncoding, floor?: number) => TerrainLoader,\n): Settings => {\n  const body = bodySettings(options.body);\n\n  return {\n    body,\n    zoomRange: [options.minZoom ?? 0, options.maxZoom ?? 22],\n    maxPitch: options.maxPitch ?? 70,\n    globe: (options.projection ?? 'globe') === 'globe',\n    sky: options.sky ?? true,\n    atmosphere: atmosphereSettings(options.atmosphere),\n    terrain: terrainSettings(options.terrain, options.body, body.radius, terrainLoader),\n    loading: options.loading ?? 'immediate',\n    background: rgb(options.background ?? (earth ? '#f2f2f0' : '#000000')),\n    globeColor: earth ? SEA['osm-positron'] : rgb(body.color),\n  };\n};\n\n/** Gives a new engine the settings and the page's request headers */\nexport const applySettings = (engine: Engine, settings: Settings): void => {\n  // The body first: the layers' shaders may take its size\n  const { radius, flattening, atmosphere: air, relief } = settings.body;\n\n  engine.setBody(radius, flattening, haloSettings(air), ...relief);\n  sendHeaders(engine, headerRules());\n\n  const { zoomRange, maxPitch, globe, sky, atmosphere, terrain, loading, background, globeColor } = settings;\n\n  engine.setZoomRange(...zoomRange);\n  engine.setMaxPitch(maxPitch);\n  engine.setGlobe(globe);\n  engine.setSky(sky);\n  engine.setAtmosphere(atmosphere);\n  engine.setTerrain(terrain?.url, terrain?.exaggeration ?? 1, terrain?.maxZoom, terrain?.geoid, terrain?.loader);\n  engine.setImmediateLoading(loading === 'immediate');\n  engine.setBackground(...background);\n  engine.setGlobeColor(...globeColor);\n};\n\n/** The page's request headers to an engine (its own requests: raster tiles, tilesets, point clouds) */\nexport const sendHeaders = (engine: Engine, rules: HeaderRules): void => {\n  engine.setRequestHeaders(\n    rules.map(([prefix]) => prefix),\n    Uint32Array.from(rules, ([, headers]) => Object.keys(headers).length),\n    rules.flatMap(([, headers]) => Object.entries(headers).flat()),\n  );\n};\n"]}

package/dist/map/engines.d.ts

@@ -1,41 +1,26 @@
 /**
- * Which engine a map runs: the core one, or the one with 3D Tiles, from the start or loaded once a layer needs it
- * (the map is rebuilt on it then); and the workers decoding its 3D Tiles, started with the first engine that has them.
+ * The engine a map runs, made asynchronously (its device asked for), and the workers decoding its 3D Tiles, started
+ * with the first one.
  */
 import { type EngineClass } from '../engine-loader.ts';
 import type { Settings } from '../settings.ts';
 import type { GeoMapOptions } from '../types.ts';
-import type { Engine } from '../wasm/isard.js';
-/** What loading the engine with 3D Tiles and its workers needs */
-export type Tiles3dEngineOptions = Pick<GeoMapOptions, 'wasmUrl' | 'workers' | 'workerUrl' | 'decoders' | 'pointsWasmUrl' | 'assetsUrl' | 'quality' | 'antialias'>;
-/** The engine class of a map, and the engine with 3D Tiles loaded when needed */
+import type { Engine } from '../wasm/isard_webgpu.js';
+/** What making the engine and its workers needs */
+export type Tiles3dEngineOptions = Pick<GeoMapOptions, 'workers' | 'workerUrl' | 'decoders' | 'pointsWasmUrl' | 'tiles3dWasmUrl' | 'assetsUrl' | 'quality' | 'antialias'>;
+/** The engine class of a map (the engine on wgpu, through WebGPU or its WebGL2 fallback: one module, 3D Tiles
+ * included) and the workers decoding its 3D Tiles, started with the first engine */
 export declare class MapEngines {
-    #private;
-    /** The class of the engine: without 3D Tiles until a 3D Tiles layer is added, unless asked for from the start */
-    private engineClass;
-    /** The module of the engine with 3D Tiles once it runs the map (the decoding workers run it too) */
-    private module;
+    private readonly engineClass;
     private loader;
     private readonly options;
-    /** The map is destroyed: a loaded engine is not used */
-    private readonly gone;
-    /** `module`: the module of the engine with 3D Tiles if `engineClass` is that engine */
-    constructor(engineClass: EngineClass, module: WebAssembly.Module | undefined, options: Tiles3dEngineOptions, gone: () => boolean);
-    /** The engine with 3D Tiles runs the map */
-    get tiles3d(): boolean;
-    /** The engine with 3D Tiles is loading, for the 3D Tiles layers added on the core engine */
-    get upgrading(): Promise<void> | undefined;
-    /** A new engine drawing on `canvas`, with the settings and the decoding workers of 3D Tiles if it has them */
-    create(canvas: HTMLCanvasElement, redraw: () => void, settings: Settings): Engine;
+    constructor(engineClass: EngineClass, options: Tiles3dEngineOptions);
+    /** A new engine drawing on `canvas` (its device asked for), with the settings and the decoding workers */
+    create(canvas: HTMLCanvasElement, redraw: () => void, settings: Settings): Promise<Engine>;
     /** Height of the geoid above the ellipsoid at a position, in metres */
     geoidHeight(lon: number, lat: number): number;
     /** The matrix of a custom layer's model at a position */
     customMatrix(lon: number, lat: number, altitude: number): Float32Array | undefined;
-    /** Loads the engine with 3D Tiles, once at a time: `loaded` once it is the map's class, `failed` with the error;
-     * neither if the map is gone by then */
-    upgrade(loaded: () => void, failed: (error: unknown) => void): void;
-    /** Downloads and compiles the engine with 3D Tiles without running it, unless the map is gone or has it by then */
-    preload(): void;
     /** Stops the decoding workers */
     destroy(): void;
 }

package/dist/map/engines.js

@@ -1,41 +1,24 @@
 /**
- * Which engine a map runs: the core one, or the one with 3D Tiles, from the start or loaded once a layer needs it
- * (the map is rebuilt on it then); and the workers decoding its 3D Tiles, started with the first engine that has them.
+ * The engine a map runs, made asynchronously (its device asked for), and the workers decoding its 3D Tiles, started
+ * with the first one.
  */
-import { engineUrl, loadFullEngineLater, preloadFullEngine, startTileLoader, } from "../engine-loader.js";
+import { startTileLoader } from "../engine-loader.js";
 import { applySettings } from "./engine-settings.js";
-/** The engine class of a map, and the engine with 3D Tiles loaded when needed */
+/** The engine class of a map (the engine on wgpu, through WebGPU or its WebGL2 fallback: one module, 3D Tiles
+ * included) and the workers decoding its 3D Tiles, started with the first engine */
 export class MapEngines {
-    /** The class of the engine: without 3D Tiles until a 3D Tiles layer is added, unless asked for from the start */
     engineClass;
-    /** The module of the engine with 3D Tiles once it runs the map (the decoding workers run it too) */
-    module;
-    #upgrading;
     loader;
     options;
-    /** The map is destroyed: a loaded engine is not used */
-    gone;
-    /** `module`: the module of the engine with 3D Tiles if `engineClass` is that engine */
-    constructor(engineClass, module, options, gone) {
+    constructor(engineClass, options) {
         this.engineClass = engineClass;
-        this.module = module;
         this.options = { ...options };
-        this.gone = gone;
     }
-    /** The engine with 3D Tiles runs the map */
-    get tiles3d() {
-        return this.module !== undefined;
-    }
-    /** The engine with 3D Tiles is loading, for the 3D Tiles layers added on the core engine */
-    get upgrading() {
-        return this.#upgrading;
-    }
-    /** A new engine drawing on `canvas`, with the settings and the decoding workers of 3D Tiles if it has them */
-    create(canvas, redraw, settings) {
-        const engine = new this.engineClass(canvas, redraw, this.options.antialias);
+    /** A new engine drawing on `canvas` (its device asked for), with the settings and the decoding workers */
+    async create(canvas, redraw, settings) {
+        const engine = await this.engineClass.create(canvas, redraw, this.options.antialias);
         applySettings(engine, settings);
-        // The decoding workers of 3D Tiles, with the engine that has them (they run its module) and unless turned off
-        this.loader ??= this.module && startTileLoader(this.module, this.options, engine);
+        this.loader ??= startTileLoader(this.options, engine);
         if (this.loader)
             engine.setTileLoader(this.loader);
         return engine;
@@ -48,27 +31,6 @@ export class MapEngines {
     customMatrix(lon, lat, altitude) {
         return this.engineClass.customMatrix(lon, lat, altitude);
     }
-    /** Loads the engine with 3D Tiles, once at a time: `loaded` once it is the map's class, `failed` with the error;
-     * neither if the map is gone by then */
-    upgrade(loaded, failed) {
-        this.#upgrading ??= loadFullEngineLater(engineUrl('full', this.options)).then(({ module, Engine }) => {
-            this.#upgrading = undefined;
-            if (this.gone())
-                return;
-            this.engineClass = Engine;
-            this.module = module;
-            loaded();
-        }, (error) => {
-            this.#upgrading = undefined;
-            if (this.gone())
-                return;
-            failed(error);
-        });
-    }
-    /** Downloads and compiles the engine with 3D Tiles without running it, unless the map is gone or has it by then */
-    preload() {
-        preloadFullEngine(engineUrl('full', this.options), () => !this.gone() && !this.module);
-    }
     /** Stops the decoding workers */
     destroy() {
         this.loader?.destroy();

package/dist/map/engines.js.map

@@ -1 +1 @@
-{"version":3,"file":"engines.js","sourceRoot":"","sources":["../../src/map/engines.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Which engine a map runs: the core one, or the one with 3D Tiles, from the start or loaded once a layer needs it\n * (the map is rebuilt on it then); and the workers decoding its 3D Tiles, started with the first engine that has them.\n */\n\nimport type { TileLoader } from '../decoding/loader.ts';\nimport {\n  type EngineClass,\n  engineUrl,\n  loadFullEngineLater,\n  preloadFullEngine,\n  startTileLoader,\n} from '../engine-loader.ts';\nimport type { Settings } from '../settings.ts';\nimport type { GeoMapOptions } from '../types.ts';\nimport type { Engine } from '../wasm/isard.js';\nimport { applySettings } from './engine-settings.ts';\n\n/** What loading the engine with 3D Tiles and its workers needs */\nexport type Tiles3dEngineOptions = Pick<\n  GeoMapOptions,\n  'wasmUrl' | 'workers' | 'workerUrl' | 'decoders' | 'pointsWasmUrl' | 'assetsUrl' | 'quality' | 'antialias'\n>;\n\n/** The engine class of a map, and the engine with 3D Tiles loaded when needed */\nexport class MapEngines {\n  /** The class of the engine: without 3D Tiles until a 3D Tiles layer is added, unless asked for from the start */\n  private engineClass: EngineClass;\n  /** The module of the engine with 3D Tiles once it runs the map (the decoding workers run it too) */\n  private module: WebAssembly.Module | undefined;\n  #upgrading: Promise<void> | undefined;\n  private loader: TileLoader | undefined;\n  private readonly options: Tiles3dEngineOptions;\n  /** The map is destroyed: a loaded engine is not used */\n  private readonly gone: () => boolean;\n\n  /** `module`: the module of the engine with 3D Tiles if `engineClass` is that engine */\n  constructor(\n    engineClass: EngineClass,\n    module: WebAssembly.Module | undefined,\n    options: Tiles3dEngineOptions,\n    gone: () => boolean,\n  ) {\n    this.engineClass = engineClass;\n    this.module = module;\n    this.options = { ...options };\n    this.gone = gone;\n  }\n\n  /** The engine with 3D Tiles runs the map */\n  get tiles3d(): boolean {\n    return this.module !== undefined;\n  }\n\n  /** The engine with 3D Tiles is loading, for the 3D Tiles layers added on the core engine */\n  get upgrading(): Promise<void> | undefined {\n    return this.#upgrading;\n  }\n\n  /** A new engine drawing on `canvas`, with the settings and the decoding workers of 3D Tiles if it has them */\n  create(canvas: HTMLCanvasElement, redraw: () => void, settings: Settings): Engine {\n    const engine = new this.engineClass(canvas, redraw, this.options.antialias);\n\n    applySettings(engine, settings);\n    // The decoding workers of 3D Tiles, with the engine that has them (they run its module) and unless turned off\n    this.loader ??= this.module && startTileLoader(this.module, this.options, engine);\n    if (this.loader) engine.setTileLoader(this.loader);\n\n    return engine;\n  }\n\n  /** Height of the geoid above the ellipsoid at a position, in metres */\n  geoidHeight(lon: number, lat: number): number {\n    return this.engineClass.geoidHeight(lon, lat);\n  }\n\n  /** The matrix of a custom layer's model at a position */\n  customMatrix(lon: number, lat: number, altitude: number): Float32Array | undefined {\n    return this.engineClass.customMatrix(lon, lat, altitude);\n  }\n\n  /** Loads the engine with 3D Tiles, once at a time: `loaded` once it is the map's class, `failed` with the error;\n   * neither if the map is gone by then */\n  upgrade(loaded: () => void, failed: (error: unknown) => void): void {\n    this.#upgrading ??= loadFullEngineLater(engineUrl('full', this.options)).then(\n      ({ module, Engine }) => {\n        this.#upgrading = undefined;\n        if (this.gone()) return;\n        this.engineClass = Engine;\n        this.module = module;\n        loaded();\n      },\n      (error: unknown) => {\n        this.#upgrading = undefined;\n        if (this.gone()) return;\n        failed(error);\n      },\n    );\n  }\n\n  /** Downloads and compiles the engine with 3D Tiles without running it, unless the map is gone or has it by then */\n  preload(): void {\n    preloadFullEngine(engineUrl('full', this.options), () => !this.gone() && !this.module);\n  }\n\n  /** Stops the decoding workers */\n  destroy(): void {\n    this.loader?.destroy();\n  }\n}\n"]}
+{"version":3,"file":"engines.js","sourceRoot":"","sources":["../../src/map/engines.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAoB,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAIxE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQrD;oFACoF;AACpF,MAAM,OAAO,UAAU;IACJ,WAAW,CAAc;IAClC,MAAM,CAAyB;IACtB,OAAO,CAAuB;IAE/C,YAAY,WAAwB,EAAE,OAA6B;QACjE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAChC,CAAC;IAED,0GAA0G;IAC1G,KAAK,CAAC,MAAM,CAAC,MAAyB,EAAE,MAAkB,EAAE,QAAkB;QAC5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAErF,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEnD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,uEAAuE;IACvE,WAAW,CAAC,GAAW,EAAE,GAAW;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,yDAAyD;IACzD,YAAY,CAAC,GAAW,EAAE,GAAW,EAAE,QAAgB;QACrD,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,iCAAiC;IACjC,OAAO;QACL,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;IACzB,CAAC;CACF","sourcesContent":["/**\n * The engine a map runs, made asynchronously (its device asked for), and the workers decoding its 3D Tiles, started\n * with the first one.\n */\n\nimport type { TileLoader } from '../decoding/loader.ts';\nimport { type EngineClass, startTileLoader } from '../engine-loader.ts';\nimport type { Settings } from '../settings.ts';\nimport type { GeoMapOptions } from '../types.ts';\nimport type { Engine } from '../wasm/isard_webgpu.js';\nimport { applySettings } from './engine-settings.ts';\n\n/** What making the engine and its workers needs */\nexport type Tiles3dEngineOptions = Pick<\n  GeoMapOptions,\n  'workers' | 'workerUrl' | 'decoders' | 'pointsWasmUrl' | 'tiles3dWasmUrl' | 'assetsUrl' | 'quality' | 'antialias'\n>;\n\n/** The engine class of a map (the engine on wgpu, through WebGPU or its WebGL2 fallback: one module, 3D Tiles\n * included) and the workers decoding its 3D Tiles, started with the first engine */\nexport class MapEngines {\n  private readonly engineClass: EngineClass;\n  private loader: TileLoader | undefined;\n  private readonly options: Tiles3dEngineOptions;\n\n  constructor(engineClass: EngineClass, options: Tiles3dEngineOptions) {\n    this.engineClass = engineClass;\n    this.options = { ...options };\n  }\n\n  /** A new engine drawing on `canvas` (its device asked for), with the settings and the decoding workers */\n  async create(canvas: HTMLCanvasElement, redraw: () => void, settings: Settings): Promise<Engine> {\n    const engine = await this.engineClass.create(canvas, redraw, this.options.antialias);\n\n    applySettings(engine, settings);\n    this.loader ??= startTileLoader(this.options, engine);\n    if (this.loader) engine.setTileLoader(this.loader);\n\n    return engine;\n  }\n\n  /** Height of the geoid above the ellipsoid at a position, in metres */\n  geoidHeight(lon: number, lat: number): number {\n    return this.engineClass.geoidHeight(lon, lat);\n  }\n\n  /** The matrix of a custom layer's model at a position */\n  customMatrix(lon: number, lat: number, altitude: number): Float32Array | undefined {\n    return this.engineClass.customMatrix(lon, lat, altitude);\n  }\n\n  /** Stops the decoding workers */\n  destroy(): void {\n    this.loader?.destroy();\n  }\n}\n"]}

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

@@ -5,7 +5,7 @@
  */
 import type { Point } from '../types.ts';
 import type { Step } from '../util/animation.ts';
-import type { Camera, Engine } from '../wasm/isard.js';
+import type { Camera, Engine } from '../wasm/isard_webgpu.js';
 import type { MapListeners } from './events.ts';
 /** What the frame loop needs of its map */
 export interface FrameHost {
@@ -19,8 +19,6 @@ export interface FrameHost {
     interacting(): boolean;
     /** Custom layers are drawn: they read the camera of the frame */
     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`) */

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, 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) {
+        // Idle: nothing loading (nor the page's work for what it draws), no animation, no frame asked for (uploads
+        // waiting, fades, listeners)
+        if (loading || 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  /** 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"]}
+{"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_webgpu.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  /** 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 (nor the page's work for what it draws), no animation, no frame asked for (uploads\n    // waiting, fades, listeners)\n    if (loading || 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/hover-pick.d.ts

@@ -1,10 +1,14 @@
 /**
- * The picking of what is under the pointer for 'hoverfeature', without stalling the GPU: the engine is asked once the
- * frame is drawn, its answer read on a later frame, when the GPU is done.
+ * The picking of what is under a point, without stalling the GPU: the engine draws its picking pass at once, its
+ * answer is read on a later frame, when the GPU is done. For 'hoverfeature' (the latest request only) and for
+ * `map.pick` (`pickOnce`).
  */
 import type { Layer } from '../layers/layers.ts';
 import type { Point } from '../types.ts';
-import type { Engine, PickResult } from '../wasm/isard.js';
+import type { Engine, PickResult } from '../wasm/isard_webgpu.js';
+/** What the engine finds under a point (CSS pixels), within `radius` CSS pixels, in the layers of `only` if given;
+ * undefined if it cannot pick, or no answer came in time */
+export declare const pickOnce: (engine: () => Engine, point: Point, radius: number, only: Uint32Array | undefined) => Promise<PickResult | undefined>;
 /** What 'hoverfeature' looks for: within `radius` CSS pixels, in `layers` only if given */
 export interface HoverPicking {
     radius?: number;
@@ -20,6 +24,8 @@ export declare class HoverPick {
     private poll;
     /** Polls under way: given up after `MAX_POLLS` (an answer that never comes) */
     private polls;
+    /** The request whose answer is awaited */
+    private id;
     /** `engine`: the map's engine of the moment; `answer`: called with what the engine found */
     constructor(engine: () => Engine, lost: () => boolean, answer: (result: PickResult) => void);
     /** Asks the engine what is under the pointer; its answer, read without waiting for the GPU, comes on a later frame */