isard 1.7.0 → 1.9.0

package/dist/map/engine-settings.js

@@ -3,8 +3,8 @@
  * context loss or once the engine with 3D Tiles is loaded), with the page's request headers.
  */
 import { SEA } from "../basemap/basemaps.js";
-import { headerRules } from "../engine/requests.js";
 import { atmosphereSettings, bodySettings, haloSettings, rgb, terrainSettings, } from "../settings.js";
+import { headerRules } from "../util/requests.js";
 /** The settings of a map from its options; `earth`: the map is of the Earth */
 export const mapSettings = (options, earth, terrainLoader) => {
     const body = bodySettings(options.body);

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 { type HeaderRules, headerRules } from '../engine/requests.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 { 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.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.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 '../engine/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'\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);\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":"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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'\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);\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"]}

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

@@ -2,7 +2,9 @@
 import type { ExtrusionOptions } from '../layers/extrusions.ts';
 import type { CircleOptions, FillOptions, LineOptions } from '../layers/features.ts';
 import type { FlowOptions } from '../layers/flow.ts';
-import type { GroundOptions, Layer, ModelOptions } from '../layers/layers.ts';
+import type { GroundOptions } from '../layers/ground.ts';
+import type { Layer } from '../layers/layers.ts';
+import type { ModelOptions } from '../layers/models.ts';
 import type { PointCloudOptions } from '../layers/pointclouds.ts';
 import type { SymbolOptions } from '../layers/symbols.ts';
 import type { TreeOptions } from '../layers/trees.ts';
@@ -21,25 +23,17 @@ export type LayerSpec<P = Record<string, unknown>> = ({
     type: 'extrusions';
 } & ExtrusionOptions<P>) | ({
     type: 'raster';
-} & RasterOptions & {
-    before?: Layer;
-}) | ({
+} & RasterOptions) | ({
     type: 'ground';
-} & GroundOptions & {
-    before?: Layer;
-}) | ({
+} & GroundOptions) | ({
     type: 'network';
 } & NetworkOptions) | ({
     type: 'tiles3d';
 } & Tiles3dOptions) | ({
     type: 'pointcloud';
-} & PointCloudOptions & {
-    before?: Layer;
-}) | ({
+} & PointCloudOptions) | ({
     type: 'models';
-} & ModelOptions & {
-    before?: Layer;
-}) | ({
+} & ModelOptions) | ({
     type: 'trees';
 } & TreeOptions<P>) | ({
     type: 'flow';

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;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"]}
+{"version":3,"file":"layer-spec.js","sourceRoot":"","sources":["../../src/map/layer-spec.ts"],"names":[],"mappings":"AAAA,oHAAoH;AA8BpH,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 } from '../layers/ground.ts';\nimport type { Layer } from '../layers/layers.ts';\nimport type { ModelOptions } from '../layers/models.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)\n  | ({ type: 'ground' } & GroundOptions)\n  | ({ type: 'network' } & NetworkOptions)\n  | ({ type: 'tiles3d' } & Tiles3dOptions)\n  | ({ type: 'pointcloud' } & PointCloudOptions)\n  | ({ type: 'models' } & ModelOptions)\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/workers.js

@@ -4,9 +4,10 @@
  */
 import { encodedTerrainLoader } from "../basemap/terrain.js";
 import { BasemapWorkers, defaultWorkerCount } from "../basemap/workerpool.js";
-import { withHeaders } from "../engine/requests.js";
 import { decodeGrids } from "../grid-module.js";
 import { gridOf } from "../grids.js";
+import { fetchOk } from "../util/fetch.js";
+import { withHeaders } from "../util/requests.js";
 /** The workers of a map, created on first use */
 export class MapWorkers {
     /** URL of the workers' script */
@@ -73,9 +74,7 @@ export class MapWorkers {
         // Against the page: the workers fetch it, and a relative URL would be theirs
         const absolute = url && typeof document !== 'undefined' ? new URL(url, document.baseURI).href : url;
         const fetchFile = async (at) => {
-            const response = await fetch(at, withHeaders(at, signal ? { signal } : {}));
-            if (!response.ok)
-                throw new Error(`isard: ${at}: ${response.status}`);
+            const response = await fetchOk(at, withHeaders(at, signal ? { signal } : {}));
             return response.arrayBuffer();
         };
         const inPage = async () => decodeGrids(new Uint8Array(bytes ?? (await fetchFile(absolute ?? ''))), module);

package/dist/map/workers.js.map

@@ -1 +1 @@
-{"version":3,"file":"workers.js","sourceRoot":"","sources":["../../src/map/workers.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * A map's workers: the pool drawing vector tiles, shared by the map's `VectorTiles`, which also decodes the relief and\n * reprojects rasters off the page; and the loaders of the relief, one per tile source.\n */\n\nimport type { RemoteReprojection } from '../basemap/grid.ts';\nimport { encodedTerrainLoader, type PngEncoding, type RemoteHeights } from '../basemap/terrain.ts';\nimport { BasemapWorkers, defaultWorkerCount } from '../basemap/workerpool.ts';\nimport { withHeaders } from '../engine/requests.ts';\nimport { decodeGrids } from '../grid-module.ts';\nimport { type Grid, gridOf } from '../grids.ts';\nimport type { TerrainLoader } from '../settings.ts';\nimport type { GeoMapOptions } from '../types.ts';\n\n/** The workers of a map, created on first use */\nexport class MapWorkers {\n  /** URL of the workers' script */\n  readonly url: string | URL;\n  private readonly workers: GeoMapOptions['workers'];\n  /** The map is destroyed: nothing more is sent to the workers */\n  private readonly gone: () => boolean;\n  /** Whose requests the workers' answer (cancelled together) */\n  private readonly owner: object;\n  /** The shared pool, created on first use */\n  private shared: BasemapWorkers | undefined;\n  /** The loaders of the relief by encoding, URL and floor: the same loader for the same tiles (the engine keeps its\n   * tiles when only the exaggeration changes) */\n  private readonly terrainLoaders = new Map<string, TerrainLoader>();\n\n  /** `workers`: the map's option (false or 0, no worker); `owner`: the map */\n  constructor(url: string | URL, workers: GeoMapOptions['workers'], gone: () => boolean, owner: object) {\n    this.url = url;\n    this.workers = workers;\n    this.gone = gone;\n    this.owner = owner;\n  }\n\n  /**\n   * The workers for a `VectorTiles`: the shared pool, or a pool of its own (`own`, to stop with it) when it asks for\n   * another count or URL\n   */\n  pool(count?: number, url?: string | URL): { pool: BasemapWorkers; own: boolean } {\n    // Workers started after the map went would never be stopped\n    if (this.gone()) throw new Error('isard: the map was destroyed');\n\n    const shared = defaultWorkerCount();\n    const workers = Math.max(1, count ?? shared);\n    const workerUrl = url ?? this.url;\n\n    if (workers === shared && String(workerUrl) === String(this.url)) {\n      this.shared ??= new BasemapWorkers(shared, this.url);\n\n      return { pool: this.shared, own: false };\n    }\n\n    return { pool: new BasemapWorkers(workers, workerUrl), own: true };\n  }\n\n  /** Stops the shared pool */\n  terminate(): void {\n    this.shared?.terminate();\n    this.shared = undefined;\n  }\n\n  /** Rasters reprojected by the workers (in the page without them) */\n  readonly remoteReprojection: RemoteReprojection = (job, tile, signal) =>\n    this.decodingPool()?.reproject(job, tile, signal, this.owner);\n\n  /** The loader of the relief tiles of `url` in a PNG encoding (one per URL, encoding and floor) */\n  readonly terrainLoader = (url: string, encoding: PngEncoding, floor?: number): TerrainLoader => {\n    const key = `${encoding} ${floor ?? ''} ${url}`;\n    const cached = this.terrainLoaders.get(key);\n\n    if (cached) return cached;\n\n    const loader = encodedTerrainLoader(url, encoding, floor, this.remoteHeights);\n\n    this.terrainLoaders.set(key, loader);\n\n    return loader;\n  };\n\n  private readonly remoteHeights: RemoteHeights = (url, encoding, floor, tile, signal) =>\n    this.decodingPool()?.heights(url, encoding, floor, tile, signal, this.owner);\n\n  /** A GRIB2 or NetCDF file read into grids by the grid module (`module`), in a worker (in the page without them, or if\n   * the worker fails) */\n  async readGrids(\n    source: string | URL | ArrayBuffer | Uint8Array,\n    module: string,\n    signal?: AbortSignal,\n  ): Promise<Grid[]> {\n    const pool = this.decodingPool();\n    const url = typeof source === 'string' || source instanceof URL ? String(source) : undefined;\n    const copy = source instanceof Uint8Array ? source.slice().buffer : undefined;\n    const bytes = copy ?? (source instanceof ArrayBuffer ? source : undefined);\n    // Against the page: the workers fetch it, and a relative URL would be theirs\n    const absolute = url && typeof document !== 'undefined' ? new URL(url, document.baseURI).href : url;\n    const fetchFile = async (at: string) => {\n      const response = await fetch(at, withHeaders(at, signal ? { signal } : {}));\n\n      if (!response.ok) throw new Error(`isard: ${at}: ${response.status}`);\n\n      return response.arrayBuffer();\n    };\n    const inPage = async () => decodeGrids(new Uint8Array(bytes ?? (await fetchFile(absolute ?? ''))), module);\n    const read = async () => {\n      if (!pool) return inPage();\n\n      return pool\n        .grids(absolute ? { url: absolute } : { bytes: bytes ?? new ArrayBuffer(0) }, module, signal, this.owner)\n        .catch((error: unknown) => {\n          // A worker's failure (the module not fetched, a worker of an older build): read again in the page, unless\n          // cancelled or its bytes handed over\n          if (signal?.aborted || bytes?.byteLength === 0) throw error;\n\n          return inPage();\n        });\n    };\n    const { grids, values } = await read();\n\n    return grids.map((g, i) => gridOf(g, values[i] ?? new Float32Array()));\n  }\n\n  /**\n   * The workers decoding the relief and reprojecting rasters: the shared pool, unless the map has no workers\n   * (`workers: false` or 0, or none in this browser): that is done in the page then\n   */\n  private decodingPool(): BasemapWorkers | undefined {\n    const workers = this.workers;\n\n    if (this.gone() || workers === false || (workers !== undefined && workers <= 0)) return undefined;\n    if (typeof Worker === 'undefined' || typeof OffscreenCanvas === 'undefined') return undefined;\n\n    return this.pool().pool;\n  }\n}\n"]}
+{"version":3,"file":"workers.js","sourceRoot":"","sources":["../../src/map/workers.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * A map's workers: the pool drawing vector tiles, shared by the map's `VectorTiles`, which also decodes the relief and\n * reprojects rasters off the page; and the loaders of the relief, one per tile source.\n */\n\nimport type { RemoteReprojection } from '../basemap/grid.ts';\nimport { encodedTerrainLoader, type PngEncoding, type RemoteHeights } from '../basemap/terrain.ts';\nimport { BasemapWorkers, defaultWorkerCount } from '../basemap/workerpool.ts';\nimport { decodeGrids } from '../grid-module.ts';\nimport { type Grid, gridOf } from '../grids.ts';\nimport type { TerrainLoader } from '../settings.ts';\nimport type { GeoMapOptions } from '../types.ts';\nimport { fetchOk } from '../util/fetch.ts';\nimport { withHeaders } from '../util/requests.ts';\n\n/** The workers of a map, created on first use */\nexport class MapWorkers {\n  /** URL of the workers' script */\n  readonly url: string | URL;\n  private readonly workers: GeoMapOptions['workers'];\n  /** The map is destroyed: nothing more is sent to the workers */\n  private readonly gone: () => boolean;\n  /** Whose requests the workers' answer (cancelled together) */\n  private readonly owner: object;\n  /** The shared pool, created on first use */\n  private shared: BasemapWorkers | undefined;\n  /** The loaders of the relief by encoding, URL and floor: the same loader for the same tiles (the engine keeps its\n   * tiles when only the exaggeration changes) */\n  private readonly terrainLoaders = new Map<string, TerrainLoader>();\n\n  /** `workers`: the map's option (false or 0, no worker); `owner`: the map */\n  constructor(url: string | URL, workers: GeoMapOptions['workers'], gone: () => boolean, owner: object) {\n    this.url = url;\n    this.workers = workers;\n    this.gone = gone;\n    this.owner = owner;\n  }\n\n  /**\n   * The workers for a `VectorTiles`: the shared pool, or a pool of its own (`own`, to stop with it) when it asks for\n   * another count or URL\n   */\n  pool(count?: number, url?: string | URL): { pool: BasemapWorkers; own: boolean } {\n    // Workers started after the map went would never be stopped\n    if (this.gone()) throw new Error('isard: the map was destroyed');\n\n    const shared = defaultWorkerCount();\n    const workers = Math.max(1, count ?? shared);\n    const workerUrl = url ?? this.url;\n\n    if (workers === shared && String(workerUrl) === String(this.url)) {\n      this.shared ??= new BasemapWorkers(shared, this.url);\n\n      return { pool: this.shared, own: false };\n    }\n\n    return { pool: new BasemapWorkers(workers, workerUrl), own: true };\n  }\n\n  /** Stops the shared pool */\n  terminate(): void {\n    this.shared?.terminate();\n    this.shared = undefined;\n  }\n\n  /** Rasters reprojected by the workers (in the page without them) */\n  readonly remoteReprojection: RemoteReprojection = (job, tile, signal) =>\n    this.decodingPool()?.reproject(job, tile, signal, this.owner);\n\n  /** The loader of the relief tiles of `url` in a PNG encoding (one per URL, encoding and floor) */\n  readonly terrainLoader = (url: string, encoding: PngEncoding, floor?: number): TerrainLoader => {\n    const key = `${encoding} ${floor ?? ''} ${url}`;\n    const cached = this.terrainLoaders.get(key);\n\n    if (cached) return cached;\n\n    const loader = encodedTerrainLoader(url, encoding, floor, this.remoteHeights);\n\n    this.terrainLoaders.set(key, loader);\n\n    return loader;\n  };\n\n  private readonly remoteHeights: RemoteHeights = (url, encoding, floor, tile, signal) =>\n    this.decodingPool()?.heights(url, encoding, floor, tile, signal, this.owner);\n\n  /** A GRIB2 or NetCDF file read into grids by the grid module (`module`), in a worker (in the page without them, or if\n   * the worker fails) */\n  async readGrids(\n    source: string | URL | ArrayBuffer | Uint8Array,\n    module: string,\n    signal?: AbortSignal,\n  ): Promise<Grid[]> {\n    const pool = this.decodingPool();\n    const url = typeof source === 'string' || source instanceof URL ? String(source) : undefined;\n    const copy = source instanceof Uint8Array ? source.slice().buffer : undefined;\n    const bytes = copy ?? (source instanceof ArrayBuffer ? source : undefined);\n    // Against the page: the workers fetch it, and a relative URL would be theirs\n    const absolute = url && typeof document !== 'undefined' ? new URL(url, document.baseURI).href : url;\n    const fetchFile = async (at: string) => {\n      const response = await fetchOk(at, withHeaders(at, signal ? { signal } : {}));\n\n      return response.arrayBuffer();\n    };\n    const inPage = async () => decodeGrids(new Uint8Array(bytes ?? (await fetchFile(absolute ?? ''))), module);\n    const read = async () => {\n      if (!pool) return inPage();\n\n      return pool\n        .grids(absolute ? { url: absolute } : { bytes: bytes ?? new ArrayBuffer(0) }, module, signal, this.owner)\n        .catch((error: unknown) => {\n          // A worker's failure (the module not fetched, a worker of an older build): read again in the page, unless\n          // cancelled or its bytes handed over\n          if (signal?.aborted || bytes?.byteLength === 0) throw error;\n\n          return inPage();\n        });\n    };\n    const { grids, values } = await read();\n\n    return grids.map((g, i) => gridOf(g, values[i] ?? new Float32Array()));\n  }\n\n  /**\n   * The workers decoding the relief and reprojecting rasters: the shared pool, unless the map has no workers\n   * (`workers: false` or 0, or none in this browser): that is done in the page then\n   */\n  private decodingPool(): BasemapWorkers | undefined {\n    const workers = this.workers;\n\n    if (this.gone() || workers === false || (workers !== undefined && workers <= 0)) return undefined;\n    if (typeof Worker === 'undefined' || typeof OffscreenCanvas === 'undefined') return undefined;\n\n    return this.pool().pool;\n  }\n}\n"]}

package/dist/map.d.ts

@@ -8,19 +8,25 @@
 import { type PmtilesOptions } from './basemap/pmtileslayer.ts';
 import { VectorTiles, type VectorTilesOptions } from './basemap/vectortiles.ts';
 import type { Grid } from './grids.ts';
+import { CustomLayer, type CustomLayerInterface } from './layers/custom.ts';
 import { ExtrusionLayer, type ExtrusionOptions } from './layers/extrusions.ts';
 import { CircleLayer, type CircleOptions, FillLayer, type FillOptions, LineLayer, type LineOptions } from './layers/features.ts';
 import { FlowLayer, type FlowOptions } from './layers/flow.ts';
+import { GroundLayer, type GroundOptions } from './layers/ground.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 { Layer } from './layers/layers.ts';
+import { ModelLayer, type ModelOptions } from './layers/models.ts';
+import { NetworkLayer } from './layers/network.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 { RasterLayer } from './layers/raster.ts';
 import { SymbolLayer, type SymbolOptions } from './layers/symbols.ts';
+import { Tiles3dLayer } from './layers/tiles3d.ts';
 import { type TreeOptions } from './layers/trees.ts';
 import { type HoverPicking } from './map/hover-pick.ts';
 import { type LayerSpec } from './map/layer-spec.ts';
-import type { AnimationOptions, AtmosphereOptions, Basemap, FeatureHit, FirstPersonView, FlyToOptions, GeoMapOptions, LoadingMode, LonLat, MapEvents, NetworkOptions, Point, Projection, RasterOptions, SunOptions, SwipeOptions, TerrainModel, TerrainOptions, Tiles3dOptions, ViewshedOptions } from './types.ts';
+import type { AnimationOptions, AtmosphereOptions, Basemap, FeatureHit, FirstPersonView, FlyToOptions, GeoMapOptions, LoadingMode, LonLat, MapEvents, NetworkOptions, PickOptions, Point, Projection, RasterOptions, SunOptions, SwipeOptions, TerrainModel, TerrainOptions, Tiles3dOptions, ViewshedOptions } from './types.ts';
 import { type Control, type ControlPosition } from './ui/controls.ts';
 import type { Camera, PickHit, RasterLayerStats } from './wasm/isard.js';
 export type { LayerSpec } from './map/layer-spec.ts';
@@ -108,44 +114,6 @@ export declare class GeoMap {
     private addLayer;
     /** Listens to an event; returns the function that stops listening */
     on<K extends keyof MapEvents>(type: K, listener: (event: MapEvents[K]) => void): () => void;
-    /**
-     * The camera's methods together: `get`, `set`, `easeTo`, `flyTo`, `bounds`, `firstPerson` and `setFirstPerson`
-     * (street level), `project`, `unproject`; the same as the map's own (`getCamera`, `setCamera`…)
-     */
-    readonly camera: {
-        readonly get: () => Camera;
-        readonly set: (camera: Partial<Camera>) => void;
-        readonly easeTo: (camera: Partial<Camera>, options?: number | AnimationOptions) => void;
-        readonly flyTo: (camera: Partial<Camera>, options?: FlyToOptions) => void;
-        readonly bounds: () => [west: number, south: number, east: number, north: number];
-        readonly firstPerson: () => Readonly<Required<FirstPersonView>> | undefined;
-        readonly setFirstPerson: (view: FirstPersonView | undefined) => void;
-        readonly project: (lonLat: LonLat, height?: number) => Point | undefined;
-        readonly unproject: (point: Point) => LonLat | undefined;
-    };
-    /**
-     * What lies under a point or at a position, together: `feature` (`pickFeature`), `surface` (`pickSurface`),
-     * `surfaceAt`, `elevationAt`, `metersPerPixel`
-     */
-    readonly query: {
-        readonly feature: (point: Point, options?: {
-            radius?: number;
-            layers?: readonly Layer[];
-        }) => FeatureHit | undefined;
-        readonly surface: (point: Point) => {
-            lonLat: LonLat;
-            height: number;
-        } | undefined;
-        readonly surfaceAt: (lonLat: LonLat) => number | undefined;
-        readonly elevationAt: (lonLat: LonLat) => number | undefined;
-        readonly metersPerPixel: (point?: Point) => number | undefined;
-    };
-    /** What is drawn over the scene, together: `viewshed` (`setViewshed`), `sun` (`setSun`), `swipe` (`setSwipe`) */
-    readonly effects: {
-        readonly viewshed: (options: ViewshedOptions | readonly ViewshedOptions[] | undefined) => void;
-        readonly sun: (options: SunOptions | undefined) => void;
-        readonly swipe: (options: SwipeOptions | undefined) => void;
-    };
     getCamera(): Camera;
     setCamera(camera: Partial<Camera>): void;
     /** Animated move to a camera: over `duration` milliseconds (or the options), ease-out by default */
@@ -201,16 +169,13 @@ export declare class GeoMap {
      * offscreen picking pass, whatever the number of features, but waits for the GPU to finish the frame (a stall): for
      * clicks and one-off queries. On hover, listen to 'hoverfeature' instead, which picks without waiting.
      */
-    pick(point: Point, radius?: number, layers?: readonly Layer[]): PickHit | undefined;
+    pick(point: Point, { radius, layers }?: PickOptions): PickHit | undefined;
     /**
      * The feature under a screen point (CSS pixels), or the nearest one within `radius` pixels: its layer handle, its
      * index there and, for line, circle and fill layers, the feature itself; undefined if none. `layers` restricts the
      * search to some layers (the others hide nothing).
      */
-    pickFeature(point: Point, options?: {
-        radius?: number;
-        layers?: readonly Layer[];
-    }): FeatureHit | undefined;
+    pickFeature(point: Point, options?: PickOptions): FeatureHit | undefined;
     /** A hit with its layer handle and feature; undefined if the layer is gone */
     private featureHit;
     /** Screen point (CSS pixels) of a position on the ground (the relief), or `height` metres above it, undefined
@@ -252,16 +217,14 @@ export declare class GeoMap {
     setBasemap(basemap: Basemap, hillshade?: number): void;
     /** Raster tiles ({z}, {x}, {y} URL; Web Mercator, or reprojected from another `grid`: longitudes and latitudes,
      * Lambert-93, UTM…), over the layers already added */
-    addRaster(options: RasterOptions & {
-        before?: Layer;
-    }): RasterLayer;
+    addRaster(options: RasterOptions): RasterLayer;
     /**
      * A PMTiles archive (v3) read by range requests: a raster layer of its images, or vector tiles drawn with `style` (by
      * default a plain style of the archive's layers) with their labels. Its header decides which unless `kind` says;
      * `url` with or without `pmtiles://`, relative to the page, or a `blob:` URL. `addRaster({ url: 'pmtiles://…' })` and
      * a style source `pmtiles://…` in `vectorTiles` read archives too
      */
-    addPmtiles(url: string, options?: PmtilesOptions): Promise<RasterLayer | VectorTiles>;
+    addPmtiles(options: PmtilesOptions): Promise<RasterLayer | VectorTiles>;
     /** Line network colored by a value per node; `layer.setValues` recolors it in one texture upload */
     addNetwork(options: NetworkOptions): NetworkLayer;
     /**
@@ -277,9 +240,7 @@ export declare class GeoMap {
     /** Filled polygons from GeoJSON (holes included), styled per feature; over the relief they lie on the ground */
     addFills<P = Record<string, unknown>>(options: FillOptions<P>): FillLayer<P>;
     /** The application's fragment shader over the ground (see `GroundOptions`); under `before` if given */
-    addGround(options: GroundOptions & {
-        before?: Layer;
-    }): GroundLayer;
+    addGround(options: GroundOptions): GroundLayer;
     /** Polygons raised into blocks with depth (buildings), styled per feature; tiles of them come with `setTile` */
     addExtrusions<P = Record<string, unknown>>(options?: ExtrusionOptions<P>): ExtrusionLayer<P>;
     /** Text labels from GeoJSON (points, the middle of lines, the center of polygons), placed without overlaps */
@@ -310,9 +271,7 @@ export declare class GeoMap {
      * A point cloud (see `PointCloudOptions`): a COPC file read by range requests (IGN's LiDAR HD…), or 3D Tiles
      * points; with depth, on the engine with 3D Tiles; under `before` if given
      */
-    addPointCloud(options: PointCloudOptions & {
-        before?: Layer;
-    }): PointCloudLayer;
+    addPointCloud(options: PointCloudOptions): PointCloudLayer;
     /**
      * The grids of a GRIB2 or classic NetCDF file (its URL, or its bytes): a weather or ocean model's fields on grids of
      * longitudes and latitudes, read in a worker by the grid module (loaded with the first file). GRIB2 on a regular
@@ -326,9 +285,7 @@ export declare class GeoMap {
      * the globe and the relief (see `FlowOptions`) */
     addFlow(options: FlowOptions): FlowLayer;
     /** A glTF model drawn at positions (see `ModelOptions`), with depth; on the engine with 3D Tiles, as they are */
-    addModels(options: ModelOptions & {
-        before?: Layer;
-    }): ModelLayer;
+    addModels(options: ModelOptions): ModelLayer;
     /** Trees at the points of a source that has them (a city's street trees), broadleaved or conifers by their data,
      * scaled to their height (see `TreeOptions`); the conifers on a layer that goes with the one returned */
     addTrees<P = Record<string, unknown>>(options: TreeOptions<P>): ModelLayer;

package/dist/map.js

@@ -9,17 +9,21 @@ import { SEA } from "./basemap/basemaps.js";
 import { pmtilesLayer } from "./basemap/pmtileslayer.js";
 import { VectorTiles } from "./basemap/vectortiles.js";
 import { defaultWorkerUrl } from "./basemap/workerpool.js";
-import { onHeaderRules } from "./engine/requests.js";
 import { destroyedEngine, engineUrl, gridUrl, loadEngine, tessUrl } from "./engine-loader.js";
 import { IGN_PRESETS } from "./geoplateforme.js";
+import { CustomLayer } from "./layers/custom.js";
 import { ExtrusionLayer, extrusionStyle } from "./layers/extrusions.js";
 import { CircleLayer, circleStyle, FillLayer, fillStyle, LineLayer, lineStyle, } from "./layers/features.js";
 import { FlowLayer } from "./layers/flow.js";
-import { CustomLayer, GroundLayer, ModelLayer, NetworkLayer, RasterLayer, Tiles3dLayer, } from "./layers/layers.js";
+import { GroundLayer } from "./layers/ground.js";
+import { ModelLayer } from "./layers/models.js";
+import { NetworkLayer } from "./layers/network.js";
 import { loadPanoramas } from "./layers/panoramas.js";
 import { addPhoto } from "./layers/photos.js";
 import { PointCloudLayer } from "./layers/pointclouds.js";
+import { RasterLayer } from "./layers/raster.js";
 import { SymbolLayer, symbolStyle } from "./layers/symbols.js";
+import { Tiles3dLayer } from "./layers/tiles3d.js";
 import { addTrees } from "./layers/trees.js";
 import { VectorLayer } from "./layers/vectors.js";
 import { BasemapLayers } from "./map/basemap-layers.js";
@@ -43,7 +47,22 @@ import { atmosphereSettings, rgb, terrainSettings } from "./settings.js";
 import { AttributionControl } from "./ui/controls.js";
 import { Interaction } from "./ui/interaction.js";
 import { easeTo, flyTo } from "./util/animation.js";
+import { RAD } from "./util/geo.js";
+import { clamp } from "./util/math.js";
+import { onHeaderRules } from "./util/requests.js";
 import { sunPosition } from "./util/sun.js";
+/** Where a map of the Earth opens without a camera given: Saint-Mandé, the IGN's home, its streets in view; of another
+ * body, all of it */
+const EARTH_START = { center: [2.4246, 48.8457], zoom: 13, pitch: 0, bearing: 0 };
+const BODY_START = { center: [0, 0], zoom: 2, pitch: 0, bearing: 0 };
+/** The eye's pitch at street level (degrees from straight down): off the vertical, where its heading means nothing */
+const FIRST_PERSON_PITCH = [1, 179];
+/** The eye's field of view at street level (degrees): from a telephoto to a wide angle, the projection still sane */
+const FIRST_PERSON_FOV = [10, 140];
+/** A network's defaults: the values past which it is unreached (half an hour of travel, in seconds), its halo's
+ * opacity at the middle of a line (a glow, not a second line) */
+const NETWORK_MAX = 1800;
+const NETWORK_HALO_OPACITY = 0.11;
 /** A layer whose picked features come back with their properties (lines, circles, fills, extrusions, 3D Tiles…) */
 const hasFeatures = (layer) => 'featureAt' in layer && typeof layer.featureAt === 'function';
 /** A map (see `GeoMap.create`); layers take it as their host */
@@ -154,9 +173,7 @@ export class GeoMap {
             this.lost = true;
             this.frames.cancel();
         }, () => this.restore());
-        const start = this.earth
-            ? { center: [2.4246, 48.8457], zoom: 13, pitch: 0, bearing: 0 }
-            : { center: [0, 0], zoom: 2, pitch: 0, bearing: 0 };
+        const start = this.earth ? EARTH_START : BODY_START;
         this.setCamera({ ...start, ...options });
         this.setBasemap(options.basemap ?? (this.earth ? 'osm-positron' : 'none'), options.hillshade ?? 0);
         if (options.sun)
@@ -270,8 +287,8 @@ export class GeoMap {
         }
         const lonLat = [view.lonLat[0], view.lonLat[1]];
         const eye = { height: 1.7, pitch: 90, fov: 75, ...view, lonLat };
-        eye.pitch = Math.max(1, Math.min(179, eye.pitch));
-        eye.fov = Math.max(10, Math.min(140, eye.fov));
+        eye.pitch = clamp(eye.pitch, ...FIRST_PERSON_PITCH);
+        eye.fov = clamp(eye.fov, ...FIRST_PERSON_FOV);
         eye.bearing = ((eye.bearing % 360) + 360) % 360;
         this.#firstPerson = eye;
         this.engine.setFirstPerson(eye.lonLat[0], eye.lonLat[1], eye.height, eye.bearing, eye.pitch, eye.fov);
@@ -343,38 +360,6 @@ export class GeoMap {
         this.listeners.emit(type, event);
     }
     // ── Camera ──
-    /**
-     * The camera's methods together: `get`, `set`, `easeTo`, `flyTo`, `bounds`, `firstPerson` and `setFirstPerson`
-     * (street level), `project`, `unproject`; the same as the map's own (`getCamera`, `setCamera`…)
-     */
-    camera = {
-        get: () => this.getCamera(),
-        set: (camera) => this.setCamera(camera),
-        easeTo: (camera, options) => this.easeTo(camera, options),
-        flyTo: (camera, options) => this.flyTo(camera, options),
-        bounds: () => this.getBounds(),
-        firstPerson: () => this.firstPerson,
-        setFirstPerson: (view) => this.setFirstPerson(view),
-        project: (lonLat, height) => this.project(lonLat, height),
-        unproject: (point) => this.unproject(point),
-    };
-    /**
-     * What lies under a point or at a position, together: `feature` (`pickFeature`), `surface` (`pickSurface`),
-     * `surfaceAt`, `elevationAt`, `metersPerPixel`
-     */
-    query = {
-        feature: (point, options) => this.pickFeature(point, options),
-        surface: (point) => this.pickSurface(point),
-        surfaceAt: (lonLat) => this.surfaceAt(lonLat),
-        elevationAt: (lonLat) => this.elevationAt(lonLat),
-        metersPerPixel: (point) => this.metersPerPixel(point),
-    };
-    /** What is drawn over the scene, together: `viewshed` (`setViewshed`), `sun` (`setSun`), `swipe` (`setSwipe`) */
-    effects = {
-        viewshed: (options) => this.setViewshed(options),
-        sun: (options) => this.setSun(options),
-        swipe: (options) => this.setSwipe(options),
-    };
     getCamera() {
         return this.frames.camera ?? this.engine.camera();
     }
@@ -524,7 +509,7 @@ export class GeoMap {
      * offscreen picking pass, whatever the number of features, but waits for the GPU to finish the frame (a stall): for
      * clicks and one-off queries. On hover, listen to 'hoverfeature' instead, which picks without waiting.
      */
-    pick(point, radius = 0, layers) {
+    pick(point, { radius = 0, layers } = {}) {
         const only = layers && Uint32Array.from(layers.map((l) => l.id));
         return this.engine.pick(point[0], point[1], radius, only);
     }
@@ -534,7 +519,7 @@ export class GeoMap {
      * search to some layers (the others hide nothing).
      */
     pickFeature(point, options = {}) {
-        const hit = this.pick(point, options.radius ?? 0, options.layers);
+        const hit = this.pick(point, options);
         return hit && this.featureHit(hit);
     }
     /** A hit with its layer handle and feature; undefined if the layer is gone */
@@ -569,6 +554,9 @@ export class GeoMap {
         const host = panoramaHost(this, (lon, lat) => this.engines.geoidHeight(lon, lat));
         const panoramas = await loadPanoramas(host, options);
         this.panoramaSets.add(panoramas);
+        panoramas.whenRemoved.push(() => {
+            this.panoramaSets.delete(panoramas);
+        });
         return panoramas;
     }
     /** The panorama sets, their panorama shown again in a new engine */
@@ -587,9 +575,8 @@ export class GeoMap {
         if (!a || !b)
             return undefined;
         // Haversine, on the mean radius of the body
-        const rad = Math.PI / 180;
-        const [dLat, dLon] = [(b[1] - a[1]) * rad, (b[0] - a[0]) * rad];
-        const h = Math.sin(dLat / 2) ** 2 + Math.cos(a[1] * rad) * Math.cos(b[1] * rad) * Math.sin(dLon / 2) ** 2;
+        const [dLat, dLon] = [(b[1] - a[1]) * RAD, (b[0] - a[0]) * RAD];
+        const h = Math.sin(dLat / 2) ** 2 + Math.cos(a[1] * RAD) * Math.cos(b[1] * RAD) * Math.sin(dLon / 2) ** 2;
         return 2 * this.settings.body.radius * Math.asin(Math.min(1, Math.sqrt(h)));
     }
     /** Whether a double click zooms in (Shift: out), on by default: off while a drawing takes double clicks */
@@ -662,16 +649,16 @@ export class GeoMap {
      * `url` with or without `pmtiles://`, relative to the page, or a `blob:` URL. `addRaster({ url: 'pmtiles://…' })` and
      * a style source `pmtiles://…` in `vectorTiles` read archives too
      */
-    addPmtiles(url, options = {}) {
-        return pmtilesLayer(this, url, options);
+    addPmtiles(options) {
+        return pmtilesLayer(this, options);
     }
     /** Line network colored by a value per node; `layer.setValues` recolors it in one texture upload */
     addNetwork(options) {
-        const { nodes, edges, lines, costs, edgeWidths, width = 2, max = 1800, contour = 0, opacity = 1 } = options;
-        const { halo = 0, haloOpacity = 0.11, ramp, unreachedColor = 'rgba(140, 140, 140, 0.25)', fade = 0 } = options;
+        const { nodes, edges, lines, costs, edgeWidths, width = 2, max = NETWORK_MAX, contour = 0, opacity = 1 } = options;
+        const { halo = 0, haloOpacity = NETWORK_HALO_OPACITY, ramp, unreachedColor = 'rgba(140, 140, 140, 0.25)', fade = 0, } = options;
         const style = { width, max, contour, opacity, halo, haloOpacity, ramp, unreachedColor, fade };
         validateNetwork(nodes, edges);
-        return this.addLayer(new NetworkLayer(this, { nodes, edges, lines }, costs, style, edgeWidths));
+        return this.place(new NetworkLayer(this, { nodes, edges, lines }, costs, style, edgeWidths), options.before);
     }
     /**
      * A layer from its description, as an application's configuration gives it: `{ type, ...options }`, the options of
@@ -804,12 +791,12 @@ export class GeoMap {
     /** Textured meshes in 3D Tiles (photogrammetry, buildings), drawn with depth over the basemap */
     addTiles3d(options) {
         const { url, maxScreenSpaceError = 16, opacity = 1, pointSize, color, geoid = false } = options;
-        return this.addLayer(new Tiles3dLayer(this, url, geoid, {
+        return this.place(new Tiles3dLayer(this, url, geoid, {
             maxScreenSpaceError,
             opacity,
             ...(pointSize !== undefined ? { pointSize } : {}),
             ...(color !== undefined ? { color } : {}),
-        }));
+        }), options.before);
     }
     /**
      * A point cloud (see `PointCloudOptions`): a COPC file read by range requests (IGN's LiDAR HD…), or 3D Tiles
@@ -900,7 +887,7 @@ export class GeoMap {
         this.hoverPick.cancel();
         this.basemaps.destroy();
         [...this.vectorSets].forEach((tiles) => {
-            tiles.destroy();
+            tiles.remove();
         });
         this.vectorSets.clear();
         this.workers.terminate();