isard 1.3.0 → 1.5.0

package/dist/basemap/vectortiles/tiles.js

@@ -0,0 +1,62 @@
+/**
+ * The tiles of the vector layers (`VectorTiles`): the tiles around the view, their keys, the order they are asked
+ * for in, and the defaults the layers share.
+ */
+import { mercatorX, mercatorY } from "../../util/geo.js";
+/** Street level: the zoom the extrusions, the streets' wind and the trees start at by default */
+export const STREET_ZOOM = 15;
+/** Tiles of a layer that follows the view, by default (the extrusions', the labels') */
+export const MAX_TILES = 36;
+/** Tiles nearest to the center asked for first: the others wait (for the raster tiles, for instance) */
+export const NEAR_TILES = 4;
+/** Milliseconds between two updates of the tiles of a layer while the camera moves */
+export const VECTOR_MOVE_REFRESH_MS = 250;
+/** A tile's key, `z/x/y` */
+export const tileKey = (z, x, y) => `${z}/${x}/${y}`;
+/** The tile of a key `z/x/y` (zeros for the numbers it lacks) */
+export const parseTileKey = (key) => {
+    const [z = 0, x = 0, y = 0] = key.split('/').map(Number);
+    return [z, x, y];
+};
+/** The tiles of the engine's flat list of z, x, y triples */
+export const tileTriples = (list) => Array.from({ length: Math.floor(list.length / 3) }, (_, i) => [list[i * 3] ?? 0, list[i * 3 + 1] ?? 0, list[i * 3 + 2] ?? 0]);
+/** The priority of the `index`th tile asked for, the nearest first: `near` for the first `NEAR_TILES`, `far` after */
+export const nearPriority = (index, near = 'auto', far = 'low') => index < NEAR_TILES ? near : far;
+/** A tile's column at level `z` brought back into the world (the columns past the antimeridian are those of its other
+ * side) */
+export const wrapColumn = (x, z) => {
+    const n = 2 ** z;
+    return ((x % n) + n) % n;
+};
+/**
+ * The tiles of level `z` in view, within a window around the center (a tilted view's bounds reach far), the
+ * `maxTiles` nearest to the center first. Across the antimeridian, the window's columns go on round the world (the
+ * view's bounds, which stop at ±180°, no longer limit them)
+ */
+export const tilesAround = (map, camera, z, maxTiles) => {
+    const n = 2 ** z;
+    const [west, south, east, north] = map.getBounds();
+    const tx = (lon) => Math.floor(mercatorX(lon) * n);
+    const ty = (lat) => Math.floor(mercatorY(lat) * n);
+    const [cx, cy] = [mercatorX(camera.center[0]) * n, mercatorY(camera.center[1]) * n];
+    const reach = Math.ceil(Math.sqrt(maxTiles)) + 2;
+    const [left, right] = [Math.floor(cx) - reach, Math.floor(cx) + reach];
+    const across = left < 0 || right > n - 1;
+    const [x0, x1] = across ? [left, right] : [Math.max(left, tx(west)), Math.min(right, tx(east))];
+    const [y0, y1] = [Math.max(0, ty(north), Math.floor(cy) - reach), Math.min(n - 1, ty(south), Math.floor(cy) + reach)];
+    const wanted = Array.from({ length: Math.max(0, y1 - y0 + 1) }, (_, j) => y0 + j).flatMap((y) => Array.from({ length: Math.max(0, x1 - x0 + 1) }, (_, i) => [x0 + i, y]));
+    wanted.sort((a, b) => Math.hypot(a[0] + 0.5 - cx, a[1] + 0.5 - cy) - Math.hypot(b[0] + 0.5 - cx, b[1] + 0.5 - cy));
+    // Each tile once (at a low level, the window can go round the whole world)
+    const seen = new Set();
+    return wanted
+        .map(([x, y]) => [wrapColumn(x, z), y])
+        .filter(([x, y]) => {
+        const k = `${x}/${y}`;
+        if (seen.has(k))
+            return false;
+        seen.add(k);
+        return true;
+    })
+        .slice(0, maxTiles);
+};
+//# sourceMappingURL=tiles.js.map

package/dist/basemap/vectortiles/tiles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tiles.js","sourceRoot":"","sources":["../../../src/basemap/vectortiles/tiles.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The tiles of the vector layers (`VectorTiles`): the tiles around the view, their keys, the order they are asked\n * for in, and the defaults the layers share.\n */\n\nimport type { GeoMap } from '../../map.ts';\nimport { mercatorX, mercatorY } from '../../util/geo.ts';\nimport type { Camera } from '../../wasm/isard.js';\nimport type { Priority } from '../../workers/basemap.worker.ts';\n\n/** A tile: its level and its column and row at that level */\nexport type TileTriple = [z: number, x: number, y: number];\n\n/** Street level: the zoom the extrusions, the streets' wind and the trees start at by default */\nexport const STREET_ZOOM = 15;\n\n/** Tiles of a layer that follows the view, by default (the extrusions', the labels') */\nexport const MAX_TILES = 36;\n\n/** Tiles nearest to the center asked for first: the others wait (for the raster tiles, for instance) */\nexport const NEAR_TILES = 4;\n\n/** Milliseconds between two updates of the tiles of a layer while the camera moves */\nexport const VECTOR_MOVE_REFRESH_MS = 250;\n\n/** A tile's key, `z/x/y` */\nexport const tileKey = (z: number, x: number, y: number): string => `${z}/${x}/${y}`;\n\n/** The tile of a key `z/x/y` (zeros for the numbers it lacks) */\nexport const parseTileKey = (key: string): TileTriple => {\n  const [z = 0, x = 0, y = 0] = key.split('/').map(Number);\n\n  return [z, x, y];\n};\n\n/** The tiles of the engine's flat list of z, x, y triples */\nexport const tileTriples = (list: Uint32Array): TileTriple[] =>\n  Array.from(\n    { length: Math.floor(list.length / 3) },\n    (_, i): TileTriple => [list[i * 3] ?? 0, list[i * 3 + 1] ?? 0, list[i * 3 + 2] ?? 0],\n  );\n\n/** The priority of the `index`th tile asked for, the nearest first: `near` for the first `NEAR_TILES`, `far` after */\nexport const nearPriority = (index: number, near: Priority = 'auto', far: Priority = 'low'): Priority =>\n  index < NEAR_TILES ? near : far;\n\n/** A tile's column at level `z` brought back into the world (the columns past the antimeridian are those of its other\n * side) */\nexport const wrapColumn = (x: number, z: number): number => {\n  const n = 2 ** z;\n\n  return ((x % n) + n) % n;\n};\n\n/**\n * The tiles of level `z` in view, within a window around the center (a tilted view's bounds reach far), the\n * `maxTiles` nearest to the center first. Across the antimeridian, the window's columns go on round the world (the\n * view's bounds, which stop at ±180°, no longer limit them)\n */\nexport const tilesAround = (map: GeoMap, camera: Camera, z: number, maxTiles: number): [x: number, y: number][] => {\n  const n = 2 ** z;\n  const [west, south, east, north] = map.getBounds();\n  const tx = (lon: number) => Math.floor(mercatorX(lon) * n);\n  const ty = (lat: number) => Math.floor(mercatorY(lat) * n);\n  const [cx, cy] = [mercatorX(camera.center[0]) * n, mercatorY(camera.center[1]) * n];\n  const reach = Math.ceil(Math.sqrt(maxTiles)) + 2;\n  const [left, right] = [Math.floor(cx) - reach, Math.floor(cx) + reach];\n  const across = left < 0 || right > n - 1;\n  const [x0, x1] = across ? [left, right] : [Math.max(left, tx(west)), Math.min(right, tx(east))];\n  const [y0, y1] = [Math.max(0, ty(north), Math.floor(cy) - reach), Math.min(n - 1, ty(south), Math.floor(cy) + reach)];\n  const wanted = Array.from({ length: Math.max(0, y1 - y0 + 1) }, (_, j) => y0 + j).flatMap((y) =>\n    Array.from({ length: Math.max(0, x1 - x0 + 1) }, (_, i): [number, number] => [x0 + i, y]),\n  );\n\n  wanted.sort((a, b) => Math.hypot(a[0] + 0.5 - cx, a[1] + 0.5 - cy) - Math.hypot(b[0] + 0.5 - cx, b[1] + 0.5 - cy));\n\n  // Each tile once (at a low level, the window can go round the whole world)\n  const seen = new Set<string>();\n\n  return wanted\n    .map(([x, y]): [number, number] => [wrapColumn(x, z), y])\n    .filter(([x, y]) => {\n      const k = `${x}/${y}`;\n\n      if (seen.has(k)) return false;\n      seen.add(k);\n\n      return true;\n    })\n    .slice(0, maxTiles);\n};\n"]}

package/dist/basemap/vectortiles/trees.d.ts

@@ -0,0 +1,19 @@
+/** The trees of a vector basemap (`VectorTiles.trees`): 3D models scattered by the workers over its woods and grass */
+import type { Layer, ModelLayer } from '../../layers/layers.ts';
+import { type TreeColors } from '../trees.ts';
+import type { StyleLayer } from '../vectorstyle.ts';
+import type { VectorTilesContext } from './context.ts';
+/** The options of `VectorTiles.trees` */
+export interface TreesOptions {
+    layers?: (layer: StyleLayer) => boolean;
+    spacing?: number | ((layer: StyleLayer) => number);
+    minZoom?: number;
+    maxTiles?: number;
+    maxTrees?: number;
+    maxInstances?: number;
+    colors?: Partial<TreeColors>;
+    url?: string;
+    data?: ArrayBuffer | ArrayBufferView<ArrayBuffer>;
+    before?: Layer;
+}
+export declare const trees: (context: VectorTilesContext, options?: TreesOptions) => ModelLayer;

package/dist/basemap/vectortiles/trees.js

@@ -0,0 +1,93 @@
+/** The trees of a vector basemap (`VectorTiles.trees`): 3D models scattered by the workers over its woods and grass */
+import { isWoodland, TREE_NUMBERS, treeModel, treeSpacing } from "../trees.js";
+import { TileRequests } from "./requests.js";
+import { nearPriority, STREET_ZOOM, tileKey, tilesAround } from "./tiles.js";
+/** Metres around the view's center where every tree is drawn at zoom 16 (twice as far a zoom level out) */
+const TREES_NEAR_METRES = 350;
+/** Metres in a degree of latitude (and of longitude at the equator), near enough for the trees' distances */
+const METRES_PER_DEGREE = 111320;
+export const trees = (context, options = {}) => {
+    const { map } = context;
+    const { layers = isWoodland, spacing = treeSpacing, minZoom = STREET_ZOOM, maxTiles = 9, maxTrees = 30000, maxInstances = 25000, } = options;
+    const model = options.url ? { url: options.url } : { data: options.data ?? treeModel(options.colors) };
+    const layer = map.addModels({
+        ...model,
+        instances: [],
+        ...(options.before ? { before: options.before } : {}),
+    });
+    const renderer = context.renderer((l) => l.type === 'fill' && layers(l), []);
+    renderer.catch(() => undefined);
+    context.layers.push(layer);
+    /** The tiles held or asked for, by key, and the trees of those that came */
+    const requests = new TileRequests();
+    const found = new Map();
+    /** The trees drawn to the engine (longitude, latitude, altitude, heading, pitch, roll, scale each): all of them
+     * near the view's center, past `near` metres those of a rank under (near / distance)², at most `maxInstances` */
+    const send = () => {
+        const { center, zoom } = map.getCamera();
+        const near = TREES_NEAR_METRES * 2 ** (16 - zoom);
+        const cos = Math.cos((center[1] * Math.PI) / 180);
+        const chosen = [];
+        found.forEach((t) => {
+            for (let i = 0; i < t.length / TREE_NUMBERS; i += 1) {
+                const dx = ((t[i * TREE_NUMBERS] ?? 0) - center[0]) * METRES_PER_DEGREE * cos;
+                const dy = ((t[i * TREE_NUMBERS + 1] ?? 0) - center[1]) * METRES_PER_DEGREE;
+                const far = (dx * dx + dy * dy) / (near * near);
+                const score = (t[i * TREE_NUMBERS + 4] ?? 0) * Math.max(1, far);
+                if (score < 1)
+                    chosen.push([score, t, i]);
+            }
+        });
+        if (chosen.length > maxInstances)
+            chosen.sort((a, b) => a[0] - b[0]).splice(maxInstances);
+        const out = new Float64Array(chosen.length * 7);
+        chosen.forEach(([, t, i], k) => {
+            const at = i * TREE_NUMBERS;
+            out.set([t[at] ?? 0, t[at + 1] ?? 0, 0, t[at + 3] ?? 0, 0, 0, t[at + 2] ?? 1], k * 7);
+        });
+        layer.setInstanceNumbers(out);
+    };
+    const update = async () => {
+        if (context.destroyed())
+            return;
+        const { key, maxzoom, layers: list } = await renderer;
+        const camera = map.getCamera();
+        const z = maxzoom;
+        const wanted = camera.zoom < minZoom ? [] : tilesAround(map, camera, z, maxTiles);
+        const keys = new Set(wanted.map(([x, y]) => tileKey(z, x, y)));
+        const metres = list.map((l) => (typeof spacing === 'number' ? spacing : spacing(l)));
+        const dropped = requests.keys().filter((k) => !keys.has(k));
+        // Out of view: dropped, or no longer asked for
+        dropped.forEach((k) => {
+            requests.drop(k);
+            found.delete(k);
+        });
+        // Dense around the new center
+        send();
+        wanted.forEach(([x, y], index) => {
+            const k = tileKey(z, x, y);
+            if (requests.has(k))
+                return;
+            const work = {
+                type: 'trees',
+                key,
+                z,
+                x,
+                y,
+                spacing: metres,
+                maxTrees,
+                priority: nearPriority(index),
+            };
+            requests.ask(k, (signal) => context.request(z, x, y, work, signal), (r) => {
+                if (!('trees' in r))
+                    return;
+                found.set(k, r.trees);
+                send();
+            });
+        });
+    };
+    // While the camera moves, the trees drawn follow its center (dense near it)
+    context.followView(update, requests, send);
+    return layer;
+};
+//# sourceMappingURL=trees.js.map

package/dist/basemap/vectortiles/trees.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trees.js","sourceRoot":"","sources":["../../../src/basemap/vectortiles/trees.ts"],"names":[],"mappings":"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","sourcesContent":["/** The trees of a vector basemap (`VectorTiles.trees`): 3D models scattered by the workers over its woods and grass */\n\nimport type { Layer, ModelLayer } from '../../layers/layers.ts';\nimport type { BasemapWork } from '../../workers/basemap.worker.ts';\nimport { isWoodland, TREE_NUMBERS, type TreeColors, treeModel, treeSpacing } from '../trees.ts';\nimport type { StyleLayer } from '../vectorstyle.ts';\nimport type { VectorTilesContext } from './context.ts';\nimport { TileRequests } from './requests.ts';\nimport { nearPriority, STREET_ZOOM, tileKey, tilesAround } from './tiles.ts';\n\n/** Metres around the view's center where every tree is drawn at zoom 16 (twice as far a zoom level out) */\nconst TREES_NEAR_METRES = 350;\n\n/** Metres in a degree of latitude (and of longitude at the equator), near enough for the trees' distances */\nconst METRES_PER_DEGREE = 111320;\n\n/** The options of `VectorTiles.trees` */\nexport interface TreesOptions {\n  layers?: (layer: StyleLayer) => boolean;\n  spacing?: number | ((layer: StyleLayer) => number);\n  minZoom?: number;\n  maxTiles?: number;\n  maxTrees?: number;\n  maxInstances?: number;\n  colors?: Partial<TreeColors>;\n  url?: string;\n  data?: ArrayBuffer | ArrayBufferView<ArrayBuffer>;\n  before?: Layer;\n}\n\nexport const trees = (context: VectorTilesContext, options: TreesOptions = {}): ModelLayer => {\n  const { map } = context;\n  const {\n    layers = isWoodland,\n    spacing = treeSpacing,\n    minZoom = STREET_ZOOM,\n    maxTiles = 9,\n    maxTrees = 30000,\n    maxInstances = 25000,\n  } = options;\n  const model = options.url ? { url: options.url } : { data: options.data ?? treeModel(options.colors) };\n  const layer = map.addModels({\n    ...model,\n    instances: [],\n    ...(options.before ? { before: options.before } : {}),\n  });\n  const renderer = context.renderer((l) => l.type === 'fill' && layers(l), []);\n\n  renderer.catch(() => undefined);\n  context.layers.push(layer);\n\n  /** The tiles held or asked for, by key, and the trees of those that came */\n  const requests = new TileRequests();\n  const found = new Map<string, Float64Array>();\n  /** The trees drawn to the engine (longitude, latitude, altitude, heading, pitch, roll, scale each): all of them\n   * near the view's center, past `near` metres those of a rank under (near / distance)², at most `maxInstances` */\n  const send = () => {\n    const { center, zoom } = map.getCamera();\n    const near = TREES_NEAR_METRES * 2 ** (16 - zoom);\n    const cos = Math.cos((center[1] * Math.PI) / 180);\n    const chosen: [score: number, tile: Float64Array, i: number][] = [];\n\n    found.forEach((t) => {\n      for (let i = 0; i < t.length / TREE_NUMBERS; i += 1) {\n        const dx = ((t[i * TREE_NUMBERS] ?? 0) - center[0]) * METRES_PER_DEGREE * cos;\n        const dy = ((t[i * TREE_NUMBERS + 1] ?? 0) - center[1]) * METRES_PER_DEGREE;\n        const far = (dx * dx + dy * dy) / (near * near);\n        const score = (t[i * TREE_NUMBERS + 4] ?? 0) * Math.max(1, far);\n\n        if (score < 1) chosen.push([score, t, i]);\n      }\n    });\n    if (chosen.length > maxInstances) chosen.sort((a, b) => a[0] - b[0]).splice(maxInstances);\n\n    const out = new Float64Array(chosen.length * 7);\n\n    chosen.forEach(([, t, i], k) => {\n      const at = i * TREE_NUMBERS;\n\n      out.set([t[at] ?? 0, t[at + 1] ?? 0, 0, t[at + 3] ?? 0, 0, 0, t[at + 2] ?? 1], k * 7);\n    });\n    layer.setInstanceNumbers(out);\n  };\n  const update = async () => {\n    if (context.destroyed()) return;\n\n    const { key, maxzoom, layers: list } = await renderer;\n    const camera = map.getCamera();\n    const z = maxzoom;\n    const wanted = camera.zoom < minZoom ? [] : tilesAround(map, camera, z, maxTiles);\n    const keys = new Set(wanted.map(([x, y]) => tileKey(z, x, y)));\n    const metres = list.map((l) => (typeof spacing === 'number' ? spacing : spacing(l)));\n    const dropped = requests.keys().filter((k) => !keys.has(k));\n\n    // Out of view: dropped, or no longer asked for\n    dropped.forEach((k) => {\n      requests.drop(k);\n      found.delete(k);\n    });\n    // Dense around the new center\n    send();\n    wanted.forEach(([x, y], index) => {\n      const k = tileKey(z, x, y);\n\n      if (requests.has(k)) return;\n\n      const work: BasemapWork = {\n        type: 'trees',\n        key,\n        z,\n        x,\n        y,\n        spacing: metres,\n        maxTrees,\n        priority: nearPriority(index),\n      };\n\n      requests.ask(\n        k,\n        (signal) => context.request(z, x, y, work, signal),\n        (r) => {\n          if (!('trees' in r)) return;\n          found.set(k, r.trees);\n          send();\n        },\n      );\n    });\n  };\n  // While the camera moves, the trees drawn follow its center (dense near it)\n  context.followView(update, requests, send);\n\n  return layer;\n};\n"]}

package/dist/basemap/vectortiles/vectors.d.ts

@@ -0,0 +1,20 @@
+/**
+ * The vector layer of a vector basemap (`VectorTiles.vectors`): its fills, lines and buildings cut by the workers
+ * into geometry the engine draws, the tiles following the view, and how its style layers are read for the engine.
+ */
+import type { Layer } from '../../layers/layers.ts';
+import type { VectorLayer } from '../../layers/vectors.ts';
+import { type Json, type StyleLayer } from '../vectorstyle.ts';
+import type { VectorTilesContext } from './context.ts';
+/**
+ * A `line-dasharray` as the engine takes it: two dashes and gaps in line widths (an odd count repeated, as the
+ * canvas's `setLineDash`; past four, the first four), zeros for a solid line
+ */
+export declare const dashes: (value: Json | undefined, zoom: number) => [number, number, number, number];
+/** The options of `VectorTiles.vectors` */
+export interface VectorsOptions {
+    layers?: (layer: StyleLayer) => boolean;
+    streets?: (layer: StyleLayer) => boolean;
+    before?: Layer;
+}
+export declare const vectors: (context: VectorTilesContext, options?: VectorsOptions) => VectorLayer;

package/dist/basemap/vectortiles/vectors.js

@@ -0,0 +1,167 @@
+/**
+ * The vector layer of a vector basemap (`VectorTiles.vectors`): its fills, lines and buildings cut by the workers
+ * into geometry the engine draws, the tiles following the view, and how its style layers are read for the engine.
+ */
+import { evaluate, isExpression, vectorKind, zoomOnly } from "../vectorstyle.js";
+import { TileRequests } from "./requests.js";
+import { nearPriority, parseTileKey, tileKey, tileTriples } from "./tiles.js";
+/** The deepest level `vectors()` cuts its tiles at: past the source's deepest level, its tiles cut again into deeper
+ * ones (overzoom, as MapLibre does) down to level 18, their filters and styles those of their level, smaller tiles
+ * drawn in a closer view; past it, the tiles of that level stretched */
+const OVERZOOM_LEVEL = 18;
+/** The deepest level of the tiles of `vectors()` over a source whose deepest is `maxzoom` */
+const deepestLevel = (maxzoom) => Math.max(maxzoom, OVERZOOM_LEVEL);
+/**
+ * A `line-dasharray` as the engine takes it: two dashes and gaps in line widths (an odd count repeated, as the
+ * canvas's `setLineDash`; past four, the first four), zeros for a solid line
+ */
+export const dashes = (value, zoom) => {
+    const v = isExpression(value) ? evaluate(value, { zoom, properties: {}, type: 'Unknown' }) : value;
+    const list = Array.isArray(v) ? v.map(Number).filter((d) => Number.isFinite(d) && d >= 0) : [];
+    const even = list.length % 2 === 1 ? [...list, ...list] : list;
+    const [a = 0, b = 0, c = 0, d = 0] = even.length >= 2 && even.some((x) => x > 0) ? even : [];
+    return [a, b, c, d];
+};
+/** Whether a style layer draws streets, which glow at night: its id names a road (OpenMapTiles' styles, PLAN IGN's),
+ * not its casing, a railway, a path or a tunnel */
+const isStreet = (layer) => /road|highway|street|motorway|trunk|primary|secondary|tertiary|minor|routier/i.test(layer.id) &&
+    !/casing|outline|rail|path|track|ferry|tunnel|pier|area|pattern|label/i.test(layer.id);
+/** A `line-cap` as the engine draws it, at the camera's zoom (MapLibre's default: butt) */
+const lineCap = (value, zoom) => {
+    const v = isExpression(value) ? evaluate(value, { zoom, properties: {}, type: 'Unknown' }) : value;
+    return v === 'round' || v === 'square' ? v : 'butt';
+};
+export const vectors = (context, options = {}) => {
+    const { map } = context;
+    const { layers = () => true, streets = isStreet, before } = options;
+    const vector = map.addVectorLayer(before);
+    const state = { renderer: context.renderer((l) => vectorKind(l) !== undefined && layers(l), []), update: 0, style: 0 };
+    state.renderer.catch(() => undefined);
+    context.layers.push(vector);
+    const sublayers = (list) => {
+        const zoom = map.getCamera().zoom;
+        return list.map((l) => ({
+            id: l.id,
+            sourceLayer: l['source-layer'],
+            kind: vectorKind(l) ?? 'fill',
+            minZoom: l.minzoom ?? 0,
+            maxZoom: l.maxzoom ?? 24,
+            visible: l.layout?.visibility !== 'none',
+            opacity: zoomOnly(l.paint?.[`${l.type}-opacity`], 1) ?? 1,
+            cap: lineCap(l.layout?.['line-cap'], zoom),
+            lit: l.type === 'line' && streets(l),
+            dash: l.type === 'line' ? dashes(l.paint?.['line-dasharray'], zoom) : [0, 0, 0, 0],
+        }));
+    };
+    /** The tiles held or asked for, by `z/x/y` */
+    const requests = new TileRequests();
+    /** A tile's geometry, or its styles alone, asked of the worker of its tile of the source's level (which keeps the
+     * decoded tile its deeper tiles are cut from) */
+    const ask = ({ key, maxzoom }, [z, x, y], styles, priority, signal) => {
+        const d = Math.max(0, z - maxzoom);
+        const work = { type: 'vectors', key, z, x, y, deepest: deepestLevel(maxzoom), priority };
+        // The geometry made ready for the GPU in the workers, with the prisms the relief needs
+        return context.request(z - d, Math.floor(x / 2 ** d), Math.floor(y / 2 ** d), styles ? { ...work, styles } : { ...work, prism: map.hasRelief }, signal);
+    };
+    // The workers tessellate the tiles (the main thread only uploads them), once they know the module
+    context.broadcast({ type: 'tess', url: map.tessUrl });
+    /** Asks the workers again for the styles of a tile held, under the current style; the tile's geometry stays as it
+     * is */
+    const restyleTile = async (renderer, k) => {
+        const r = await ask(renderer, parseTileKey(k), true, 'auto').catch(() => undefined);
+        if (r && 'styles' in r)
+            vector.setTileStyles(k, r.styles);
+    };
+    const update = async () => {
+        if (context.destroyed())
+            return;
+        const generation = ++state.update;
+        const { key, maxzoom, layers: list } = await state.renderer;
+        vector.setSublayers(sublayers(state.own ?? list));
+        const wanted = tileTriples(map.engine.vectorTilesInView(0, deepestLevel(maxzoom)));
+        const keys = new Set(wanted.map((t) => tileKey(...t)));
+        const loads = wanted.flatMap((t, index) => {
+            const k = tileKey(...t);
+            if (requests.has(k))
+                return [];
+            const style = state.style;
+            return [
+                requests.ask(k, (signal) => ask({ key, maxzoom }, t, false, nearPriority(index, 'high', 'auto'), signal), async (r) => {
+                    if (!('vectors' in r))
+                        return;
+                    vector.setTile(k, r.vectors);
+                    // Cut under a style changed since: its styles asked for again
+                    if (style !== state.style)
+                        await restyleTile(await state.renderer, k);
+                }),
+            ];
+        });
+        // Out of view: those still asked for go at once, those drawn once their replacements are there (no hole). The
+        // drawn ones are those the engine shows, held or not (a recut forgets what it held, not what is drawn)
+        const drop = (drawn) => {
+            const shown = new Set(vector.tileKeys);
+            const known = new Set([...requests.keys(), ...(drawn ? shown : [])]);
+            known.forEach((k) => {
+                if (keys.has(k) || shown.has(k) !== drawn)
+                    return;
+                requests.drop(k);
+                vector.removeTile(k);
+            });
+        };
+        drop(false);
+        await Promise.all(loads);
+        // A later update (the view moved again meanwhile) drops for its own view: these keys are no longer the view
+        if (!context.destroyed() && generation === state.update)
+            drop(true);
+    };
+    const refresh = () => {
+        update().catch(() => undefined);
+    };
+    /** The style layers changed: the workers' copy, then the styles of the tiles held */
+    const restyle = async (list) => {
+        state.own = list;
+        state.style++;
+        state.renderer = state.renderer.then(({ key }) => context.renderer(() => false, list, key));
+        const renderer = await state.renderer;
+        vector.setSublayers(sublayers(list));
+        await Promise.all(vector.tileKeys.map((k) => restyleTile(renderer, k)));
+    };
+    vector.restyle = (id, group, name, value) => {
+        state.renderer
+            .then(({ layers: list }) => {
+            const next = (state.own ?? list).map((l) => l.id === id ? { ...l, [group]: { ...l[group], [name]: value } } : l);
+            // Visibility and dashes are the engine's: the tiles stay as they are
+            if ((group === 'layout' && name === 'visibility') || name === 'line-dasharray') {
+                state.own = next;
+                vector.setSublayers(sublayers(next));
+                return undefined;
+            }
+            // An outline added or taken away: a feature more or less in each tile, cut again
+            if (name === 'fill-outline-color' || name === 'fill-antialias') {
+                state.own = next;
+                state.style++;
+                state.renderer = state.renderer.then(({ key }) => context.renderer(() => false, next, key));
+                vector.setSublayers(sublayers(next));
+                vector.recut?.();
+                return undefined;
+            }
+            return restyle(next);
+        })
+            .catch(() => undefined);
+    };
+    vector.recut = () => {
+        requests.abortAll();
+        refresh();
+    };
+    vector.styled = state.renderer.then(({ layers: list }) => {
+        if (!context.destroyed())
+            vector.setSublayers(sublayers(state.own ?? list));
+    });
+    // Reported by the style's `ready`
+    vector.styled.catch(() => undefined);
+    // While the camera moves, the tiles follow it (as the labels do: a long drag or flight does not leave the view of
+    // its start drawn)
+    context.followView(update, requests, update);
+    return vector;
+};
+//# sourceMappingURL=vectors.js.map

package/dist/basemap/vectortiles/vectors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vectors.js","sourceRoot":"","sources":["../../../src/basemap/vectortiles/vectors.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The vector layer of a vector basemap (`VectorTiles.vectors`): its fills, lines and buildings cut by the workers\n * into geometry the engine draws, the tiles following the view, and how its style layers are read for the engine.\n */\n\nimport type { Layer } from '../../layers/layers.ts';\nimport type { VectorLayer, VectorSublayer } from '../../layers/vectors.ts';\nimport type { BasemapWork, Priority } from '../../workers/basemap.worker.ts';\nimport { evaluate, isExpression, type Json, type StyleLayer, vectorKind, zoomOnly } from '../vectorstyle.ts';\nimport type { Renderer, VectorTilesContext } from './context.ts';\nimport { TileRequests } from './requests.ts';\nimport { nearPriority, parseTileKey, type TileTriple, tileKey, tileTriples } from './tiles.ts';\n\n/** The deepest level `vectors()` cuts its tiles at: past the source's deepest level, its tiles cut again into deeper\n * ones (overzoom, as MapLibre does) down to level 18, their filters and styles those of their level, smaller tiles\n * drawn in a closer view; past it, the tiles of that level stretched */\nconst OVERZOOM_LEVEL = 18;\n\n/** The deepest level of the tiles of `vectors()` over a source whose deepest is `maxzoom` */\nconst deepestLevel = (maxzoom: number): number => Math.max(maxzoom, OVERZOOM_LEVEL);\n\n/**\n * A `line-dasharray` as the engine takes it: two dashes and gaps in line widths (an odd count repeated, as the\n * canvas's `setLineDash`; past four, the first four), zeros for a solid line\n */\nexport const dashes = (value: Json | undefined, zoom: number): [number, number, number, number] => {\n  const v = isExpression(value) ? evaluate(value, { zoom, properties: {}, type: 'Unknown' }) : value;\n  const list = Array.isArray(v) ? v.map(Number).filter((d) => Number.isFinite(d) && d >= 0) : [];\n  const even = list.length % 2 === 1 ? [...list, ...list] : list;\n  const [a = 0, b = 0, c = 0, d = 0] = even.length >= 2 && even.some((x) => x > 0) ? even : [];\n\n  return [a, b, c, d];\n};\n\n/** Whether a style layer draws streets, which glow at night: its id names a road (OpenMapTiles' styles, PLAN IGN's),\n * not its casing, a railway, a path or a tunnel */\nconst isStreet = (layer: StyleLayer): boolean =>\n  /road|highway|street|motorway|trunk|primary|secondary|tertiary|minor|routier/i.test(layer.id) &&\n  !/casing|outline|rail|path|track|ferry|tunnel|pier|area|pattern|label/i.test(layer.id);\n\n/** A `line-cap` as the engine draws it, at the camera's zoom (MapLibre's default: butt) */\nconst lineCap = (value: Json | undefined, zoom: number): 'butt' | 'round' | 'square' => {\n  const v = isExpression(value) ? evaluate(value, { zoom, properties: {}, type: 'Unknown' }) : value;\n\n  return v === 'round' || v === 'square' ? v : 'butt';\n};\n\n/** The options of `VectorTiles.vectors` */\nexport interface VectorsOptions {\n  layers?: (layer: StyleLayer) => boolean;\n  streets?: (layer: StyleLayer) => boolean;\n  before?: Layer;\n}\n\nexport const vectors = (context: VectorTilesContext, options: VectorsOptions = {}): VectorLayer => {\n  const { map } = context;\n  const { layers = () => true, streets = isStreet, before } = options;\n  const vector = map.addVectorLayer(before);\n  const state: {\n    renderer: Promise<Renderer>;\n    /** The style layers as the application changed them (`setPaintProperty`…): a copy, its style left as it is */\n    own?: StyleLayer[];\n    /** Bumped by each update: only the last one drops the tiles out of its view */\n    update: number;\n    /** Bumped by each restyle: a tile cut under an older style is restyled once it is there */\n    style: number;\n  } = { renderer: context.renderer((l) => vectorKind(l) !== undefined && layers(l), []), update: 0, style: 0 };\n\n  state.renderer.catch(() => undefined);\n  context.layers.push(vector);\n\n  const sublayers = (list: StyleLayer[]): VectorSublayer[] => {\n    const zoom = map.getCamera().zoom;\n\n    return list.map((l) => ({\n      id: l.id,\n      sourceLayer: l['source-layer'],\n      kind: vectorKind(l) ?? 'fill',\n      minZoom: l.minzoom ?? 0,\n      maxZoom: l.maxzoom ?? 24,\n      visible: l.layout?.visibility !== 'none',\n      opacity: zoomOnly(l.paint?.[`${l.type}-opacity`], 1) ?? 1,\n      cap: lineCap(l.layout?.['line-cap'], zoom),\n      lit: l.type === 'line' && streets(l),\n      dash: l.type === 'line' ? dashes(l.paint?.['line-dasharray'], zoom) : [0, 0, 0, 0],\n    }));\n  };\n\n  /** The tiles held or asked for, by `z/x/y` */\n  const requests = new TileRequests();\n  /** A tile's geometry, or its styles alone, asked of the worker of its tile of the source's level (which keeps the\n   * decoded tile its deeper tiles are cut from) */\n  const ask = (\n    { key, maxzoom }: { key: string; maxzoom: number },\n    [z, x, y]: TileTriple,\n    styles: boolean,\n    priority: Priority,\n    signal?: AbortSignal,\n  ) => {\n    const d = Math.max(0, z - maxzoom);\n    const work: BasemapWork = { type: 'vectors', key, z, x, y, deepest: deepestLevel(maxzoom), priority };\n\n    // The geometry made ready for the GPU in the workers, with the prisms the relief needs\n    return context.request(\n      z - d,\n      Math.floor(x / 2 ** d),\n      Math.floor(y / 2 ** d),\n      styles ? { ...work, styles } : { ...work, prism: map.hasRelief },\n      signal,\n    );\n  };\n\n  // The workers tessellate the tiles (the main thread only uploads them), once they know the module\n  context.broadcast({ type: 'tess', url: map.tessUrl });\n  /** Asks the workers again for the styles of a tile held, under the current style; the tile's geometry stays as it\n   * is */\n  const restyleTile = async (renderer: { key: string; maxzoom: number }, k: string) => {\n    const r = await ask(renderer, parseTileKey(k), true, 'auto').catch(() => undefined);\n\n    if (r && 'styles' in r) vector.setTileStyles(k, r.styles);\n  };\n  const update = async () => {\n    if (context.destroyed()) return;\n\n    const generation = ++state.update;\n    const { key, maxzoom, layers: list } = await state.renderer;\n\n    vector.setSublayers(sublayers(state.own ?? list));\n\n    const wanted = tileTriples(map.engine.vectorTilesInView(0, deepestLevel(maxzoom)));\n    const keys = new Set(wanted.map((t) => tileKey(...t)));\n    const loads = wanted.flatMap((t, index) => {\n      const k = tileKey(...t);\n\n      if (requests.has(k)) return [];\n\n      const style = state.style;\n\n      return [\n        requests.ask(\n          k,\n          (signal) => ask({ key, maxzoom }, t, false, nearPriority(index, 'high', 'auto'), signal),\n          async (r) => {\n            if (!('vectors' in r)) return;\n            vector.setTile(k, r.vectors);\n            // Cut under a style changed since: its styles asked for again\n            if (style !== state.style) await restyleTile(await state.renderer, k);\n          },\n        ),\n      ];\n    });\n    // Out of view: those still asked for go at once, those drawn once their replacements are there (no hole). The\n    // drawn ones are those the engine shows, held or not (a recut forgets what it held, not what is drawn)\n    const drop = (drawn: boolean) => {\n      const shown = new Set(vector.tileKeys);\n      const known = new Set([...requests.keys(), ...(drawn ? shown : [])]);\n\n      known.forEach((k) => {\n        if (keys.has(k) || shown.has(k) !== drawn) return;\n        requests.drop(k);\n        vector.removeTile(k);\n      });\n    };\n\n    drop(false);\n    await Promise.all(loads);\n    // A later update (the view moved again meanwhile) drops for its own view: these keys are no longer the view\n    if (!context.destroyed() && generation === state.update) drop(true);\n  };\n  const refresh = () => {\n    update().catch(() => undefined);\n  };\n  /** The style layers changed: the workers' copy, then the styles of the tiles held */\n  const restyle = async (list: StyleLayer[]) => {\n    state.own = list;\n    state.style++;\n    state.renderer = state.renderer.then(({ key }) => context.renderer(() => false, list, key));\n\n    const renderer = await state.renderer;\n\n    vector.setSublayers(sublayers(list));\n    await Promise.all(vector.tileKeys.map((k) => restyleTile(renderer, k)));\n  };\n\n  vector.restyle = (id, group, name, value) => {\n    state.renderer\n      .then(({ layers: list }) => {\n        const next = (state.own ?? list).map((l) =>\n          l.id === id ? { ...l, [group]: { ...l[group], [name]: value } } : l,\n        );\n\n        // Visibility and dashes are the engine's: the tiles stay as they are\n        if ((group === 'layout' && name === 'visibility') || name === 'line-dasharray') {\n          state.own = next;\n          vector.setSublayers(sublayers(next));\n\n          return undefined;\n        }\n        // An outline added or taken away: a feature more or less in each tile, cut again\n        if (name === 'fill-outline-color' || name === 'fill-antialias') {\n          state.own = next;\n          state.style++;\n          state.renderer = state.renderer.then(({ key }) => context.renderer(() => false, next, key));\n          vector.setSublayers(sublayers(next));\n          vector.recut?.();\n\n          return undefined;\n        }\n\n        return restyle(next);\n      })\n      .catch(() => undefined);\n  };\n  vector.recut = () => {\n    requests.abortAll();\n    refresh();\n  };\n  vector.styled = state.renderer.then(({ layers: list }) => {\n    if (!context.destroyed()) vector.setSublayers(sublayers(state.own ?? list));\n  });\n  // Reported by the style's `ready`\n  vector.styled.catch(() => undefined);\n\n  // While the camera moves, the tiles follow it (as the labels do: a long drag or flight does not leave the view of\n  // its start drawn)\n  context.followView(update, requests, update);\n\n  return vector;\n};\n"]}

package/dist/basemap/vectortiles.d.ts

@@ -7,34 +7,23 @@
  *
  * Any subset of the style can be drawn on its own raster layer (`raster({ layers })`), at its own place in the stack:
  * rivers from the basemap's data over a flood layer, for instance, restyled with `extraLayers`.
+ *
+ * The layers other than the raster ones are made in `vectortiles/` (one module each), from what they use of the
+ * instance (`VectorTilesContext`); the style's loading is in `vectortiles/style.ts`.
  */
-import type { ExtrusionLayer, ExtrusionOptions } from '../layers/extrusions.ts';
-import type { Feature, Size } from '../layers/features.ts';
-import type { Layer, ModelLayer, RasterLayer } from '../layers/layers.ts';
+import type { ExtrusionLayer } from '../layers/extrusions.ts';
+import type { ModelLayer, RasterLayer } from '../layers/layers.ts';
 import type { SymbolLayer } from '../layers/symbols.ts';
 import type { VectorLayer } from '../layers/vectors.ts';
 import type { GeoMap } from '../map.ts';
-import { type TreeColors } from './trees.ts';
-import { type Json, type LabelCandidate, type RasterSource, type Style, type StyleLayer } from './vectorstyle.ts';
-/** OpenFreeMap's styles: OpenStreetMap data in the OpenMapTiles schema, worldwide, free and without a key */
-export declare const OPENFREEMAP_STYLES: {
-    readonly positron: "https://tiles.openfreemap.org/styles/positron";
-    readonly liberty: "https://tiles.openfreemap.org/styles/liberty";
-    readonly bright: "https://tiles.openfreemap.org/styles/bright";
-};
-/** PLAN.IGN vector styles of the Géoplateforme (France) */
-export declare const PLAN_STYLES: {
-    readonly standard: "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json";
-    readonly grey: "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/gris.json";
-};
-/** Vector basemaps by name (see `BasemapName`) */
-export declare const VECTOR_BASEMAPS: {
-    readonly 'osm-positron': "https://tiles.openfreemap.org/styles/positron";
-    readonly 'osm-liberty': "https://tiles.openfreemap.org/styles/liberty";
-    readonly 'osm-bright': "https://tiles.openfreemap.org/styles/bright";
-    readonly 'ign-plan-vector': "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json";
-    readonly 'ign-plan-grey-vector': "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/gris.json";
-};
+import type { LabelCandidate, Style, StyleLayer } from './vectorstyle.ts';
+import { type VectorExtrusionOptions } from './vectortiles/extrusions.ts';
+import { type LabelsOptions, size, tileLabels } from './vectortiles/labels.ts';
+import { type StreetWindLayer, type StreetWindOptions } from './vectortiles/street-wind.ts';
+import { type LoadedStyle, OPENFREEMAP_STYLES, PLAN_STYLES, styleAttribution, VECTOR_BASEMAPS } from './vectortiles/style.ts';
+import { type TreesOptions } from './vectortiles/trees.ts';
+import { dashes, type VectorsOptions } from './vectortiles/vectors.ts';
+export { dashes, OPENFREEMAP_STYLES, PLAN_STYLES, size, styleAttribution, tileLabels, VECTOR_BASEMAPS };
 export interface VectorTilesOptions {
     /** A style URL or object (default OpenFreeMap's Positron) */
     style?: string | Style;
@@ -48,15 +37,6 @@ export interface VectorTilesOptions {
      * IGN's for PLAN.IGN's) */
     attribution?: string;
 }
-/** The credits of a known style: OpenFreeMap's, PLAN.IGN's */
-export declare const styleAttribution: (style: string | Style) => string | undefined;
-/** Text or icon size of a style (a number, legacy stops, or the stops of a zoom expression made by the worker) as a
- * size for the symbol layer */
-export declare const size: (value: Json, fallback?: number) => Size;
-/** The labels of a vector tile: features by style layer (its index in the style), the higher layers first */
-type TileLabels = [layer: number, features: Feature<LabelCandidate>[]][];
-/** A tile's label candidates as features, by style layer */
-export declare const tileLabels: (candidates: readonly LabelCandidate[]) => TileLabels;
 export declare class VectorTiles {
     private readonly map;
     private readonly pool;
@@ -75,23 +55,18 @@ export declare class VectorTiles {
     private readonly layers;
     /** Its first raster layer: the ground its labels follow */
     private ground;
+    /** What its layers made in `vectortiles/` use of it */
+    private readonly context;
     /** The style once loaded, with its source resolved */
-    readonly ready: Promise<{
-        style: Style;
-        tiles: string;
-        maxzoom: number;
-        rasters: Record<string, RasterSource>;
-    }>;
+    readonly ready: Promise<LoadedStyle>;
     /**
      * Its workers are the map's (shared by every `VectorTiles` of the map, a vector tile decoded once for all of them),
      * unless `workers` or `workerUrl` asks for others than the map's: then it has workers of its own
      */
     constructor(map: GeoMap, options?: VectorTilesOptions);
-    private load;
-    /** The fonts of the style's labels, for its glyphs (the first of each `text-font`, as the workers take it) */
-    private static fonts;
     /** The style's sprites (their JSON and their images), loaded once, for the fill patterns and the icons */
     private sprites;
+    /** The style's sprites, kept once all of them came: one that failed is asked for again by the next layer */
     private loadSprites;
     /** Prefix of the names of its sprites' images among the map's icons */
     private get iconPrefix();
@@ -118,11 +93,19 @@ export declare class VectorTiles {
      * the source's deepest level, the `maxTiles` nearest to the center, from `minZoom` on (15 by default); the tiles
      * leaving the view are dropped.
      */
-    extrusions<P = Record<string, unknown>>(options?: Omit<ExtrusionOptions<P>, 'data'> & {
-        layers?: (layer: StyleLayer) => boolean;
-        minZoom?: number;
-        maxTiles?: number;
-    }): ExtrusionLayer<P>;
+    extrusions<P = Record<string, unknown>>(options?: VectorExtrusionOptions<P>): ExtrusionLayer<P>;
+    /**
+     * The wind through the streets around the view, as particles at street level (`height`, default 3 metres) between
+     * the style's buildings (`layers`, default its `building` and `bati_surf` layers): their footprints laid on a grid of
+     * `cell` metres (default 4) over a square of `size` metres (default 1200) around the view's center, the flow of the
+     * air round them a potential flow (it goes round the blocks and faster through the narrow streets; no wake behind
+     * them), computed in a worker by the grid module from street level (`minZoom`, default 15) and again when the view
+     * leaves the square's middle. `wind` is the wind far away (east and north, m/s, default a light breeze from the
+     * south-west); `setWind` changes it at once (the flow is linear in it: nothing computed again), from a model's hour
+     * (`windAt`) for instance; `computed` resolves once the first square's flow is there. The other options are the flow
+     * layer's (`addFlow`)
+     */
+    streetWind(options?: StreetWindOptions): StreetWindLayer;
     /**
      * Trees on the style's woods, forests and grass (or the fill layers `layers` keeps) as 3D models, from street level
      * (`minZoom`, default 15): the workers scatter them over the polygons of the vector tiles around the view, `spacing`
@@ -133,18 +116,7 @@ export declare class VectorTiles {
      * 25000); at most `maxTiles` tiles (default 9) and `maxTrees` trees in each (default 30000). The models load the
      * engine with 3D Tiles.
      */
-    trees(options?: {
-        layers?: (layer: StyleLayer) => boolean;
-        spacing?: number | ((layer: StyleLayer) => number);
-        minZoom?: number;
-        maxTiles?: number;
-        maxTrees?: number;
-        maxInstances?: number;
-        colors?: Partial<TreeColors>;
-        url?: string;
-        data?: ArrayBuffer | ArrayBufferView<ArrayBuffer>;
-        before?: Layer;
-    }): ModelLayer;
+    trees(options?: TreesOptions): ModelLayer;
     /**
      * A layer drawing the style's fills, lines and buildings (or those `layers` keeps; backgrounds as fills, the
      * `fill-extrusion` layers raised into buildings by their height and base height) as geometry instead of images: the
@@ -160,11 +132,7 @@ export declare class VectorTiles {
      * styles and small devices. At night (`setSun`) the line layers `streets` keeps glow (by default those whose id names
      * a road, not its casing, a railway, a path or a tunnel).
      */
-    vectors(options?: {
-        layers?: (layer: StyleLayer) => boolean;
-        streets?: (layer: StyleLayer) => boolean;
-        before?: Layer;
-    }): VectorLayer;
+    vectors(options?: VectorsOptions): VectorLayer;
     /**
      * A symbol layer with the labels of the style's symbol layers (or those `layers` keeps), updated as the view
      * moves: the labels of the vector tiles in view, the higher style layers placed first. With a raster layer of
@@ -172,21 +140,12 @@ export declare class VectorTiles {
      * away, with the few labels of a lower zoom, as near the camera it takes the fine ones. Without, the tiles around
      * the center at the zoom of the view. It stays above the layers added after it unless one is moved over it.
      */
-    labels(options?: {
-        layers?: (layer: StyleLayer) => boolean;
-        maxTiles?: number;
-    }): SymbolLayer<LabelCandidate>;
+    labels(options?: LabelsOptions): SymbolLayer<LabelCandidate>;
     /**
      * Makes a layer's tiles follow the view: `update` now and where the camera stops (`moveend`), `moving` every
-     * `VECTOR_MOVE_REFRESH_MS` while it moves; the requests `held` aborted when destroyed
+     * `VECTOR_MOVE_REFRESH_MS` while it moves; the `requests` aborted when destroyed
      */
     private followView;
     /** Stops its workers' work and removes its raster and label layers from the map (those still there) */
     destroy(): void;
 }
-/**
- * A `line-dasharray` as the engine takes it: two dashes and gaps in line widths (an odd count repeated, as the
- * canvas's `setLineDash`; past four, the first four), zeros for a solid line
- */
-export declare const dashes: (value: Json | undefined, zoom: number) => [number, number, number, number];
-export {};