isard 1.6.0 → 1.8.0

package/dist/basemap/vectortiles/lamps.js

@@ -1,90 +1,25 @@
 /** The street lamps of a vector basemap (`VectorTiles.lamps`): 3D models placed by the workers along its streets, lit at
  * night */
 import { LAMP_HEAD, lampModel } from "../furniture.js";
-import { TREE_NUMBERS } from "../trees.js";
-import { TileRequests } from "./requests.js";
-import { nearPriority, tileKey, tilesAround } from "./tiles.js";
-import { followWhenMoved, groundUnderCamera, METRES_PER_DEGREE } from "./trees.js";
+import { placed } from "./placed.js";
 import { isStreet } from "./vectors.js";
 /** Metres around the ground under the camera where every lamp is drawn at zoom 17 (twice as far a zoom level out);
  * past them, fewer and fewer */
 const LAMPS_NEAR_METRES = 250;
 export const lamps = (context, options = {}) => {
-    const { map } = context;
     const { layers = isStreet, spacing = 30, minZoom = 16, maxTiles = 9, maxLamps = 20000, maxInstances = 15000, light = '#ffd9a0', } = options;
-    const layer = map.addModels({
-        data: lampModel(),
-        instances: [],
-        ...(options.before ? { before: options.before } : {}),
+    const [layer] = placed(context, {
+        models: [{ data: lampModel() }],
+        layers: (l) => l.type === 'line' && layers(l),
+        work: (key, z, x, y, priority) => ({ type: 'lamps', key, z, x, y, spacing, maxLamps, priority }),
+        read: (r) => ('lamps' in r ? r.lamps : undefined),
+        near: [LAMPS_NEAR_METRES, 17],
+        minZoom,
+        maxTiles,
+        maxInstances,
+        ...(options.before && { before: options.before }),
     });
-    const renderer = context.renderer((l) => l.type === 'line' && layers(l), []);
     layer.setGlow(LAMP_HEAD, light);
-    renderer.catch(() => undefined);
-    context.layers.push(layer);
-    const requests = new TileRequests();
-    const found = new Map();
-    /** The lamps drawn: all of them near the ground under the camera, past it those of a rank under (near / distance)²,
-     * at most `maxInstances` (past it, the rank kept lowered in proportion: no sort) */
-    const send = () => {
-        const { center, zoom } = map.getCamera();
-        const cos = Math.cos((center[1] * Math.PI) / 180);
-        const [ex, ey, back] = groundUnderCamera(map);
-        const near = LAMPS_NEAR_METRES * 2 ** (17 - zoom) + back;
-        const each = (keep) => {
-            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 - ex;
-                    const dy = ((t[i * TREE_NUMBERS + 1] ?? 0) - center[1]) * METRES_PER_DEGREE - ey;
-                    const score = (t[i * TREE_NUMBERS + 4] ?? 0) * Math.max(1, (dx * dx + dy * dy) / (near * near));
-                    if (score < 1)
-                        keep(t, i, score);
-                }
-            });
-        };
-        let count = 0;
-        each(() => {
-            count += 1;
-        });
-        const limit = Math.min(1, maxInstances / Math.max(count, 1));
-        const out = [];
-        each((t, i, score) => {
-            const at = i * TREE_NUMBERS;
-            if (score < limit)
-                out.push(t[at] ?? 0, t[at + 1] ?? 0, 0, t[at + 3] ?? 0, 0, 0, t[at + 2] ?? 1);
-        });
-        layer.setInstanceNumbers(Float64Array.from(out));
-    };
-    const update = async () => {
-        if (context.destroyed())
-            return;
-        const { key, maxzoom } = 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)));
-        // Out of view: dropped, or no longer asked for
-        requests
-            .keys()
-            .filter((k) => !keys.has(k))
-            .forEach((k) => {
-            requests.drop(k);
-            found.delete(k);
-        });
-        send();
-        wanted.forEach(([x, y], index) => {
-            const k = tileKey(z, x, y);
-            if (requests.has(k))
-                return;
-            const work = { type: 'lamps', key, z, x, y, spacing, maxLamps, priority: nearPriority(index) };
-            requests.ask(k, (signal) => context.request(z, x, y, work, signal), (r) => {
-                if (!('lamps' in r))
-                    return;
-                found.set(k, r.lamps);
-                send();
-            });
-        });
-    };
-    context.followView(update, requests, followWhenMoved(map, (zoom) => LAMPS_NEAR_METRES * 2 ** (17 - zoom), send));
     return layer;
 };
 //# sourceMappingURL=lamps.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"lamps.js","sourceRoot":"","sources":["../../../src/basemap/vectortiles/lamps.ts"],"names":[],"mappings":"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","sourcesContent":["/** The street lamps of a vector basemap (`VectorTiles.lamps`): 3D models placed by the workers along its streets, lit at\n * night */\n\nimport type { Layer, ModelLayer } from '../../layers/layers.ts';\nimport type { BasemapWork } from '../../workers/basemap.worker.ts';\nimport { LAMP_HEAD, lampModel } from '../furniture.ts';\nimport { TREE_NUMBERS } from '../trees.ts';\nimport type { StyleLayer } from '../vectorstyle.ts';\nimport type { VectorTilesContext } from './context.ts';\nimport { TileRequests } from './requests.ts';\nimport { nearPriority, tileKey, tilesAround } from './tiles.ts';\nimport { followWhenMoved, groundUnderCamera, METRES_PER_DEGREE } from './trees.ts';\nimport { isStreet } from './vectors.ts';\n\n/** Metres around the ground under the camera where every lamp is drawn at zoom 17 (twice as far a zoom level out);\n * past them, fewer and fewer */\nconst LAMPS_NEAR_METRES = 250;\n\n/** The options of `VectorTiles.lamps` */\nexport interface LampsOptions {\n  /** The line layers of the streets lit (default: the roads, as the streets glowing at night) */\n  layers?: (layer: StyleLayer) => boolean;\n  /** Metres between two lamps along a street (default 30, every other one on its other side) */\n  spacing?: number;\n  /** From this zoom on (default 16) */\n  minZoom?: number;\n  maxTiles?: number;\n  /** Lamps in a tile at most (default 20000) */\n  maxLamps?: number;\n  /** Lamps drawn at most (default 15000) */\n  maxInstances?: number;\n  /** The color of their light at night (CSS; default a warm white) */\n  light?: string;\n  before?: Layer;\n}\n\nexport const lamps = (context: VectorTilesContext, options: LampsOptions = {}): ModelLayer => {\n  const { map } = context;\n  const {\n    layers = isStreet,\n    spacing = 30,\n    minZoom = 16,\n    maxTiles = 9,\n    maxLamps = 20000,\n    maxInstances = 15000,\n    light = '#ffd9a0',\n  } = options;\n  const layer = map.addModels({\n    data: lampModel(),\n    instances: [],\n    ...(options.before ? { before: options.before } : {}),\n  });\n  const renderer = context.renderer((l) => l.type === 'line' && layers(l), []);\n\n  layer.setGlow(LAMP_HEAD, light);\n  renderer.catch(() => undefined);\n  context.layers.push(layer);\n\n  const requests = new TileRequests();\n  const found = new Map<string, Float64Array>();\n  /** The lamps drawn: all of them near the ground under the camera, past it those of a rank under (near / distance)²,\n   * at most `maxInstances` (past it, the rank kept lowered in proportion: no sort) */\n  const send = () => {\n    const { center, zoom } = map.getCamera();\n    const cos = Math.cos((center[1] * Math.PI) / 180);\n    const [ex, ey, back] = groundUnderCamera(map);\n    const near = LAMPS_NEAR_METRES * 2 ** (17 - zoom) + back;\n    const each = (keep: (t: Float64Array, i: number, score: number) => void) => {\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 - ex;\n          const dy = ((t[i * TREE_NUMBERS + 1] ?? 0) - center[1]) * METRES_PER_DEGREE - ey;\n          const score = (t[i * TREE_NUMBERS + 4] ?? 0) * Math.max(1, (dx * dx + dy * dy) / (near * near));\n\n          if (score < 1) keep(t, i, score);\n        }\n      });\n    };\n    let count = 0;\n\n    each(() => {\n      count += 1;\n    });\n\n    const limit = Math.min(1, maxInstances / Math.max(count, 1));\n    const out: number[] = [];\n\n    each((t, i, score) => {\n      const at = i * TREE_NUMBERS;\n\n      if (score < limit) out.push(t[at] ?? 0, t[at + 1] ?? 0, 0, t[at + 3] ?? 0, 0, 0, t[at + 2] ?? 1);\n    });\n    layer.setInstanceNumbers(Float64Array.from(out));\n  };\n  const update = async () => {\n    if (context.destroyed()) return;\n\n    const { key, maxzoom } = 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\n    // Out of view: dropped, or no longer asked for\n    requests\n      .keys()\n      .filter((k) => !keys.has(k))\n      .forEach((k) => {\n        requests.drop(k);\n        found.delete(k);\n      });\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 = { type: 'lamps', key, z, x, y, spacing, maxLamps, priority: nearPriority(index) };\n\n      requests.ask(\n        k,\n        (signal) => context.request(z, x, y, work, signal),\n        (r) => {\n          if (!('lamps' in r)) return;\n          found.set(k, r.lamps);\n          send();\n        },\n      );\n    });\n  };\n\n  context.followView(\n    update,\n    requests,\n    followWhenMoved(map, (zoom) => LAMPS_NEAR_METRES * 2 ** (17 - zoom), send),\n  );\n\n  return layer;\n};\n"]}
+{"version":3,"file":"lamps.js","sourceRoot":"","sources":["../../../src/basemap/vectortiles/lamps.ts"],"names":[],"mappings":"AAAA;WACW;AAGX,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC;gCACgC;AAChC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAoB9B,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,OAA2B,EAAE,UAAwB,EAAE,EAAc,EAAE;IAC3F,MAAM,EACJ,MAAM,GAAG,QAAQ,EACjB,OAAO,GAAG,EAAE,EACZ,OAAO,GAAG,EAAE,EACZ,QAAQ,GAAG,CAAC,EACZ,QAAQ,GAAG,KAAK,EAChB,YAAY,GAAG,KAAK,EACpB,KAAK,GAAG,SAAS,GAClB,GAAG,OAAO,CAAC;IACZ,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE;QAC9B,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;QAC/B,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;QAC7C,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;QAChG,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACjD,IAAI,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC;QAC7B,OAAO;QACP,QAAQ;QACR,YAAY;QACZ,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAEhC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC","sourcesContent":["/** The street lamps of a vector basemap (`VectorTiles.lamps`): 3D models placed by the workers along its streets, lit at\n * night */\n\nimport type { Layer, ModelLayer } from '../../layers/layers.ts';\nimport { LAMP_HEAD, lampModel } from '../furniture.ts';\nimport type { StyleLayer } from '../vectorstyle.ts';\nimport type { VectorTilesContext } from './context.ts';\nimport { placed } from './placed.ts';\nimport { isStreet } from './vectors.ts';\n\n/** Metres around the ground under the camera where every lamp is drawn at zoom 17 (twice as far a zoom level out);\n * past them, fewer and fewer */\nconst LAMPS_NEAR_METRES = 250;\n\n/** The options of `VectorTiles.lamps` */\nexport interface LampsOptions {\n  /** The line layers of the streets lit (default: the roads, as the streets glowing at night) */\n  layers?: (layer: StyleLayer) => boolean;\n  /** Metres between two lamps along a street (default 30, every other one on its other side) */\n  spacing?: number;\n  /** From this zoom on (default 16) */\n  minZoom?: number;\n  maxTiles?: number;\n  /** Lamps in a tile at most (default 20000) */\n  maxLamps?: number;\n  /** Lamps drawn at most (default 15000) */\n  maxInstances?: number;\n  /** The color of their light at night (CSS; default a warm white) */\n  light?: string;\n  before?: Layer;\n}\n\nexport const lamps = (context: VectorTilesContext, options: LampsOptions = {}): ModelLayer => {\n  const {\n    layers = isStreet,\n    spacing = 30,\n    minZoom = 16,\n    maxTiles = 9,\n    maxLamps = 20000,\n    maxInstances = 15000,\n    light = '#ffd9a0',\n  } = options;\n  const [layer] = placed(context, {\n    models: [{ data: lampModel() }],\n    layers: (l) => l.type === 'line' && layers(l),\n    work: (key, z, x, y, priority) => ({ type: 'lamps', key, z, x, y, spacing, maxLamps, priority }),\n    read: (r) => ('lamps' in r ? r.lamps : undefined),\n    near: [LAMPS_NEAR_METRES, 17],\n    minZoom,\n    maxTiles,\n    maxInstances,\n    ...(options.before && { before: options.before }),\n  });\n\n  layer.setGlow(LAMP_HEAD, light);\n\n  return layer;\n};\n"]}

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

@@ -0,0 +1,38 @@
+/**
+ * Things placed by the workers in a vector basemap's tiles around the view (trees, street lamps, street furniture),
+ * each kind one instanced model layer: all of them near the ground under the camera, fewer and fewer past it (a
+ * simplified model there when the kind has one), the tiles following the view.
+ */
+import type { Layer, ModelLayer, ModelOptions } from '../../layers/layers.ts';
+import type { BasemapResponse, BasemapWork, Priority } from '../../workers/basemap.worker.ts';
+import type { StyleLayer } from '../vectorstyle.ts';
+import type { VectorTilesContext } from './context.ts';
+/** A model: a glTF binary's URL or bytes */
+type Model = Pick<ModelOptions, 'url' | 'data'>;
+interface PlacedOptions {
+    /** A model per kind (`PLACED_KIND`); a kind past them drawn with the first */
+    models: [Model, ...Model[]];
+    /** Past `near`, the kinds' simplified models (as many), drawn `density` times as densely as the full ones would
+     * be, at most `instances` times `maxInstances` */
+    far?: {
+        models: Model[];
+        density: number;
+        instances: number;
+    };
+    /** The style layers the renderer sends the workers (the tiles' source and its levels) */
+    layers: (layer: StyleLayer) => boolean;
+    /** The work asked of the worker of a tile (`layers`: the renderer's), and the things in its answer */
+    work: (key: string, z: number, x: number, y: number, priority: Priority, layers: StyleLayer[]) => BasemapWork;
+    read: (response: BasemapResponse) => Float64Array | undefined;
+    /** Metres around the ground under the camera where every one is drawn at a zoom (twice as far a zoom level out) */
+    near: [metres: number, zoom: number];
+    minZoom: number;
+    maxTiles: number;
+    /** Things drawn at most, all kinds together (and `far.instances` times as many simplified) */
+    maxInstances: number;
+    before?: Layer;
+}
+/** The layers of the things placed: one per kind, then one per kind's simplified model; the first holds the others
+ * (`Layer.companions`) */
+export declare const placed: (context: VectorTilesContext, options: PlacedOptions) => [ModelLayer, ...ModelLayer[]];
+export {};

package/dist/basemap/vectortiles/placed.js

@@ -0,0 +1,143 @@
+/**
+ * Things placed by the workers in a vector basemap's tiles around the view (trees, street lamps, street furniture),
+ * each kind one instanced model layer: all of them near the ground under the camera, fewer and fewer past it (a
+ * simplified model there when the kind has one), the tiles following the view.
+ */
+import { METRES_PER_DEGREE } from "../../util/geo.js";
+import { PLACED_KIND, PLACED_NUMBERS, PLACED_RANK } from "../placed.js";
+import { TileRequests } from "./requests.js";
+import { nearPriority, tileKey, tilesAround } from "./tiles.js";
+/** The engine's vertical field of view (radians, `camera::FOV`): where the camera stands behind the view's center */
+const FOV = 0.6435011087932844;
+/** While the camera moves, the things chosen again once it has gone this share of the near radius (or turned or
+ * zoomed as much): going through the tiles' things at every frame of a drag would hold the main thread */
+const RESEND_SHARE = 0.05;
+/** The ground under the camera: east and north metres from the view's center, and its distance from it (the camera
+ * stands behind the center of a tilted view, `FOV` its field of view) */
+const groundUnderCamera = (map) => {
+    const { pitch, bearing } = map.getCamera();
+    const back = ((0.5 * map.getCanvas().clientHeight) / Math.tan(FOV / 2)) *
+        Math.sin((pitch * Math.PI) / 180) *
+        (map.metersPerPixel() ?? 0);
+    return [-back * Math.sin((bearing * Math.PI) / 180), -back * Math.cos((bearing * Math.PI) / 180), back];
+};
+/** What follows the camera as it moves: `send` called again once it has gone `RESEND_SHARE` of `radius` metres (or
+ * turned or zoomed as much), not at every frame of a drag */
+const followWhenMoved = (map, radius, send) => {
+    /** The view of the last call: center (metres), zoom, bearing, pitch */
+    let sent;
+    return () => {
+        const { center, zoom, bearing, pitch } = map.getCamera();
+        const [x, y] = [
+            center[0] * METRES_PER_DEGREE * Math.cos((center[1] * Math.PI) / 180),
+            center[1] * METRES_PER_DEGREE,
+        ];
+        if (sent &&
+            Math.hypot(x - sent[0], y - sent[1]) < RESEND_SHARE * radius(zoom) &&
+            Math.abs(zoom - sent[2]) < RESEND_SHARE &&
+            Math.abs(bearing - sent[3]) < 45 * RESEND_SHARE &&
+            Math.abs(pitch - sent[4]) < 45 * RESEND_SHARE)
+            return;
+        sent = [x, y, zoom, bearing, pitch];
+        send();
+    };
+};
+/** The layers of the things placed: one per kind, then one per kind's simplified model; the first holds the others
+ * (`Layer.companions`) */
+export const placed = (context, options) => {
+    const { map } = context;
+    const { models, far, minZoom, maxTiles, maxInstances } = options;
+    const add = (model) => map.addModels({ ...model, instances: [], ...(options.before ? { before: options.before } : {}) });
+    const [model, ...more] = models;
+    const layers = [add(model), ...more.map(add), ...(far?.models ?? []).map(add)];
+    const renderer = context.renderer(options.layers, []);
+    const radius = (zoom) => options.near[0] * 2 ** (options.near[1] - zoom);
+    renderer.catch(() => undefined);
+    layers[0].companions.push(...layers.slice(1));
+    context.layers.push(...layers);
+    const requests = new TileRequests();
+    const found = new Map();
+    /** The things drawn: all of them near the ground under the camera; past it those of a rank under `density` (near /
+     * distance)², simplified; at most `maxInstances` near, `far.instances` times as many past (beyond, the rank kept
+     * lowered in proportion: no sort) */
+    const send = () => {
+        const { center, zoom } = map.getCamera();
+        const cos = Math.cos((center[1] * Math.PI) / 180);
+        const [ex, ey, back] = groundUnderCamera(map);
+        const near = radius(zoom) + back;
+        const density = far?.density ?? 1;
+        /** Each thing that may be drawn: in full (near, or every one without simplified models) or simplified, with its
+         * score (the lowest kept first) */
+        const visit = (each) => {
+            found.forEach((t) => {
+                for (let at = 0; at < t.length; at += PLACED_NUMBERS) {
+                    const dx = ((t[at] ?? 0) - center[0]) * METRES_PER_DEGREE * cos - ex;
+                    const dy = ((t[at + 1] ?? 0) - center[1]) * METRES_PER_DEGREE - ey;
+                    const distance = (dx * dx + dy * dy) / (near * near);
+                    const rank = t[at + PLACED_RANK] ?? 0;
+                    if (distance <= 1)
+                        each(t, at, true, rank);
+                    else if (rank * (distance / density) < 1)
+                        each(t, at, !far, rank * (distance / density));
+                }
+            });
+        };
+        let [fullCount, farCount] = [0, 0];
+        visit((_, __, full) => {
+            if (full)
+                fullCount += 1;
+            else
+                farCount += 1;
+        });
+        const limits = [
+            Math.min(1, maxInstances / Math.max(fullCount, 1)),
+            Math.min(1, (maxInstances * (far?.instances ?? 1)) / Math.max(farCount, 1)),
+        ];
+        // The engine's numbers: longitude, latitude, altitude, heading, pitch, roll, scale
+        const out = layers.map(() => []);
+        visit((t, at, full, score) => {
+            if (score >= (limits[full ? 0 : 1] ?? 1))
+                return;
+            const kind = t[at + PLACED_KIND] ?? 0;
+            const k = (full ? 0 : models.length) + (kind < models.length ? kind : 0);
+            out[k]?.push(t[at] ?? 0, t[at + 1] ?? 0, 0, t[at + 3] ?? 0, 0, 0, t[at + 2] ?? 1);
+        });
+        layers.forEach((layer, k) => {
+            layer.setInstanceNumbers(Float64Array.from(out[k] ?? []));
+        });
+    };
+    const update = async () => {
+        if (context.destroyed())
+            return;
+        const { key, maxzoom: z, layers: list } = await renderer;
+        const camera = map.getCamera();
+        const wanted = camera.zoom < minZoom ? [] : tilesAround(map, camera, z, maxTiles);
+        const keys = new Set(wanted.map(([x, y]) => tileKey(z, x, y)));
+        // Out of view: dropped, or no longer asked for
+        requests
+            .keys()
+            .filter((k) => !keys.has(k))
+            .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;
+            requests.ask(k, (signal) => context.request(z, x, y, options.work(key, z, x, y, nearPriority(index), list), signal), (r) => {
+                const things = options.read(r);
+                if (!things)
+                    return;
+                found.set(k, things);
+                send();
+            });
+        });
+    };
+    // While the camera moves, the things drawn follow it (dense near it), chosen again once it has gone far enough
+    context.followView(layers[0], update, requests, followWhenMoved(map, radius, send));
+    return layers;
+};
+//# sourceMappingURL=placed.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"placed.js","sourceRoot":"","sources":["../../../src/basemap/vectortiles/placed.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Things placed by the workers in a vector basemap's tiles around the view (trees, street lamps, street furniture),\n * each kind one instanced model layer: all of them near the ground under the camera, fewer and fewer past it (a\n * simplified model there when the kind has one), the tiles following the view.\n */\n\nimport type { Layer, ModelLayer, ModelOptions } from '../../layers/layers.ts';\nimport type { GeoMap } from '../../map.ts';\nimport { METRES_PER_DEGREE } from '../../util/geo.ts';\nimport type { BasemapResponse, BasemapWork, Priority } from '../../workers/basemap.worker.ts';\nimport { PLACED_KIND, PLACED_NUMBERS, PLACED_RANK } from '../placed.ts';\nimport type { StyleLayer } from '../vectorstyle.ts';\nimport type { VectorTilesContext } from './context.ts';\nimport { TileRequests } from './requests.ts';\nimport { nearPriority, tileKey, tilesAround } from './tiles.ts';\n\n/** The engine's vertical field of view (radians, `camera::FOV`): where the camera stands behind the view's center */\nconst FOV = 0.6435011087932844;\n\n/** While the camera moves, the things chosen again once it has gone this share of the near radius (or turned or\n * zoomed as much): going through the tiles' things at every frame of a drag would hold the main thread */\nconst RESEND_SHARE = 0.05;\n\n/** A model: a glTF binary's URL or bytes */\ntype Model = Pick<ModelOptions, 'url' | 'data'>;\n\ninterface PlacedOptions {\n  /** A model per kind (`PLACED_KIND`); a kind past them drawn with the first */\n  models: [Model, ...Model[]];\n  /** Past `near`, the kinds' simplified models (as many), drawn `density` times as densely as the full ones would\n   * be, at most `instances` times `maxInstances` */\n  far?: { models: Model[]; density: number; instances: number };\n  /** The style layers the renderer sends the workers (the tiles' source and its levels) */\n  layers: (layer: StyleLayer) => boolean;\n  /** The work asked of the worker of a tile (`layers`: the renderer's), and the things in its answer */\n  work: (key: string, z: number, x: number, y: number, priority: Priority, layers: StyleLayer[]) => BasemapWork;\n  read: (response: BasemapResponse) => Float64Array | undefined;\n  /** Metres around the ground under the camera where every one is drawn at a zoom (twice as far a zoom level out) */\n  near: [metres: number, zoom: number];\n  minZoom: number;\n  maxTiles: number;\n  /** Things drawn at most, all kinds together (and `far.instances` times as many simplified) */\n  maxInstances: number;\n  before?: Layer;\n}\n\n/** The ground under the camera: east and north metres from the view's center, and its distance from it (the camera\n * stands behind the center of a tilted view, `FOV` its field of view) */\nconst groundUnderCamera = (map: GeoMap): [east: number, north: number, distance: number] => {\n  const { pitch, bearing } = map.getCamera();\n  const back =\n    ((0.5 * map.getCanvas().clientHeight) / Math.tan(FOV / 2)) *\n    Math.sin((pitch * Math.PI) / 180) *\n    (map.metersPerPixel() ?? 0);\n\n  return [-back * Math.sin((bearing * Math.PI) / 180), -back * Math.cos((bearing * Math.PI) / 180), back];\n};\n\n/** What follows the camera as it moves: `send` called again once it has gone `RESEND_SHARE` of `radius` metres (or\n * turned or zoomed as much), not at every frame of a drag */\nconst followWhenMoved = (map: GeoMap, radius: (zoom: number) => number, send: () => void): (() => void) => {\n  /** The view of the last call: center (metres), zoom, bearing, pitch */\n  let sent: [number, number, number, number, number] | undefined;\n\n  return () => {\n    const { center, zoom, bearing, pitch } = map.getCamera();\n    const [x, y] = [\n      center[0] * METRES_PER_DEGREE * Math.cos((center[1] * Math.PI) / 180),\n      center[1] * METRES_PER_DEGREE,\n    ];\n\n    if (\n      sent &&\n      Math.hypot(x - sent[0], y - sent[1]) < RESEND_SHARE * radius(zoom) &&\n      Math.abs(zoom - sent[2]) < RESEND_SHARE &&\n      Math.abs(bearing - sent[3]) < 45 * RESEND_SHARE &&\n      Math.abs(pitch - sent[4]) < 45 * RESEND_SHARE\n    )\n      return;\n    sent = [x, y, zoom, bearing, pitch];\n    send();\n  };\n};\n\n/** The layers of the things placed: one per kind, then one per kind's simplified model; the first holds the others\n * (`Layer.companions`) */\nexport const placed = (context: VectorTilesContext, options: PlacedOptions): [ModelLayer, ...ModelLayer[]] => {\n  const { map } = context;\n  const { models, far, minZoom, maxTiles, maxInstances } = options;\n  const add = (model: Model) =>\n    map.addModels({ ...model, instances: [], ...(options.before ? { before: options.before } : {}) });\n  const [model, ...more] = models;\n  const layers: [ModelLayer, ...ModelLayer[]] = [add(model), ...more.map(add), ...(far?.models ?? []).map(add)];\n  const renderer = context.renderer(options.layers, []);\n  const radius = (zoom: number) => options.near[0] * 2 ** (options.near[1] - zoom);\n\n  renderer.catch(() => undefined);\n  layers[0].companions.push(...layers.slice(1));\n  context.layers.push(...layers);\n\n  const requests = new TileRequests();\n  const found = new Map<string, Float64Array>();\n  /** The things drawn: all of them near the ground under the camera; past it those of a rank under `density` (near /\n   * distance)², simplified; at most `maxInstances` near, `far.instances` times as many past (beyond, the rank kept\n   * lowered in proportion: no sort) */\n  const send = () => {\n    const { center, zoom } = map.getCamera();\n    const cos = Math.cos((center[1] * Math.PI) / 180);\n    const [ex, ey, back] = groundUnderCamera(map);\n    const near = radius(zoom) + back;\n    const density = far?.density ?? 1;\n    /** Each thing that may be drawn: in full (near, or every one without simplified models) or simplified, with its\n     * score (the lowest kept first) */\n    const visit = (each: (t: Float64Array, at: number, full: boolean, score: number) => void) => {\n      found.forEach((t) => {\n        for (let at = 0; at < t.length; at += PLACED_NUMBERS) {\n          const dx = ((t[at] ?? 0) - center[0]) * METRES_PER_DEGREE * cos - ex;\n          const dy = ((t[at + 1] ?? 0) - center[1]) * METRES_PER_DEGREE - ey;\n          const distance = (dx * dx + dy * dy) / (near * near);\n          const rank = t[at + PLACED_RANK] ?? 0;\n\n          if (distance <= 1) each(t, at, true, rank);\n          else if (rank * (distance / density) < 1) each(t, at, !far, rank * (distance / density));\n        }\n      });\n    };\n    let [fullCount, farCount] = [0, 0];\n\n    visit((_, __, full) => {\n      if (full) fullCount += 1;\n      else farCount += 1;\n    });\n\n    const limits = [\n      Math.min(1, maxInstances / Math.max(fullCount, 1)),\n      Math.min(1, (maxInstances * (far?.instances ?? 1)) / Math.max(farCount, 1)),\n    ];\n    // The engine's numbers: longitude, latitude, altitude, heading, pitch, roll, scale\n    const out: number[][] = layers.map(() => []);\n\n    visit((t, at, full, score) => {\n      if (score >= (limits[full ? 0 : 1] ?? 1)) return;\n\n      const kind = t[at + PLACED_KIND] ?? 0;\n      const k = (full ? 0 : models.length) + (kind < models.length ? kind : 0);\n\n      out[k]?.push(t[at] ?? 0, t[at + 1] ?? 0, 0, t[at + 3] ?? 0, 0, 0, t[at + 2] ?? 1);\n    });\n    layers.forEach((layer, k) => {\n      layer.setInstanceNumbers(Float64Array.from(out[k] ?? []));\n    });\n  };\n  const update = async () => {\n    if (context.destroyed()) return;\n\n    const { key, maxzoom: z, layers: list } = await renderer;\n    const camera = map.getCamera();\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\n    // Out of view: dropped, or no longer asked for\n    requests\n      .keys()\n      .filter((k) => !keys.has(k))\n      .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      requests.ask(\n        k,\n        (signal) => context.request(z, x, y, options.work(key, z, x, y, nearPriority(index), list), signal),\n        (r) => {\n          const things = options.read(r);\n\n          if (!things) return;\n          found.set(k, things);\n          send();\n        },\n      );\n    });\n  };\n\n  // While the camera moves, the things drawn follow it (dense near it), chosen again once it has gone far enough\n  context.followView(layers[0], update, requests, followWhenMoved(map, radius, send));\n\n  return layers;\n};\n"]}

package/dist/basemap/vectortiles/street-wind.js

@@ -1,10 +1,8 @@
 /** The wind through the streets of a vector basemap (`VectorTiles.streetWind`): a flow round its buildings */
-import { latitude, longitude, mercatorX, mercatorY } from "../../util/geo.js";
+import { EARTH_METRES, latitude, longitude, mercatorX, mercatorY } from "../../util/geo.js";
 import { TileRequests } from "./requests.js";
 import { isBuildings, isPolygonLayer } from "./style.js";
 import { STREET_ZOOM } from "./tiles.js";
-/** Earth's circumference at the equator (metres): the size of the Mercator square, 1 wide, at latitude 0 */
-const EARTH_CIRCUMFERENCE_METRES = 40_075_016.686;
 /** Pause before the first square that failed is asked for again (ms) */
 const RETRY_FIRST_MS = 1000;
 /** Longest pause before a square that failed again and again is asked for again (ms) */
@@ -46,7 +44,7 @@ export const streetWind = (context, options = {}) => {
         const camera = map.getCamera();
         const [x, y] = [mercatorX(camera.center[0]), mercatorY(camera.center[1])];
         // Half the square in Mercator, at its latitude
-        const half = size / 2 / (EARTH_CIRCUMFERENCE_METRES * Math.cos((camera.center[1] * Math.PI) / 180));
+        const half = size / 2 / (EARTH_METRES * Math.cos((camera.center[1] * Math.PI) / 180));
         const square = state.square;
         // Off street level: no square (its particles gone, asked for again back at street level)
         if (camera.zoom < minZoom) {
@@ -118,8 +116,8 @@ export const streetWind = (context, options = {}) => {
     };
     renderer.catch(() => undefined);
     context.layers.push(layer);
-    context.followView(update, requests, () => undefined);
-    context.cleanup.push(() => {
+    context.followView(layer, update, requests, () => undefined);
+    context.stopWith(layer, () => {
         clearTimeout(state.retry);
     });
     return Object.assign(layer, {

package/dist/basemap/vectortiles/street-wind.js.map

@@ -1 +1 @@
-{"version":3,"file":"street-wind.js","sourceRoot":"","sources":["../../../src/basemap/vectortiles/street-wind.ts"],"names":[],"mappings":"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","sourcesContent":["/** The wind through the streets of a vector basemap (`VectorTiles.streetWind`): a flow round its buildings */\n\nimport type { StreetFlows } from '../../grid-module.ts';\nimport type { FlowField, FlowLayer, FlowOptions } from '../../layers/flow.ts';\nimport { latitude, longitude, mercatorX, mercatorY } from '../../util/geo.ts';\nimport type { BasemapWork } from '../../workers/basemap.worker.ts';\nimport type { StyleLayer } from '../vectorstyle.ts';\nimport type { VectorTilesContext } from './context.ts';\nimport { TileRequests } from './requests.ts';\nimport { isBuildings, isPolygonLayer } from './style.ts';\nimport { STREET_ZOOM } from './tiles.ts';\n\n/** Earth's circumference at the equator (metres): the size of the Mercator square, 1 wide, at latitude 0 */\nconst EARTH_CIRCUMFERENCE_METRES = 40_075_016.686;\n\n/** Pause before the first square that failed is asked for again (ms) */\nconst RETRY_FIRST_MS = 1000;\n\n/** Longest pause before a square that failed again and again is asked for again (ms) */\nconst RETRY_MAX_MS = 30_000;\n\n/** The options of `VectorTiles.streetWind` */\nexport type StreetWindOptions = Omit<FlowOptions, 'field' | 'fields' | 'time'> & {\n  wind?: [u: number, v: number];\n  size?: number;\n  cell?: number;\n  iterations?: number;\n  layers?: (layer: StyleLayer) => boolean;\n  minZoom?: number;\n};\n\n/** The layer of `VectorTiles.streetWind` */\nexport type StreetWindLayer = FlowLayer & { setWind(wind: [u: number, v: number]): void; computed: Promise<void> };\n\nexport const streetWind = (context: VectorTilesContext, options: StreetWindOptions = {}): StreetWindLayer => {\n  const { map } = context;\n  const { size = 1200, cell = 4, iterations = 300, layers = isBuildings, minZoom = STREET_ZOOM, ...flow } = options;\n  const renderer = context.renderer(isPolygonLayer(layers), []);\n  /** No square: a field of no value at the view's center, where no particle is born nor moves (the map idles) */\n  const empty = (): FlowField => {\n    const [lon, lat] = map.getCamera().center;\n\n    return {\n      width: 2,\n      height: 2,\n      u: [NaN, NaN, NaN, NaN],\n      v: [NaN, NaN, NaN, NaN],\n      bounds: [lon, lat, lon + 1e-4, lat + 1e-4],\n    };\n  };\n  const layer = map.addFlow({ height: 3, ...flow, field: empty() });\n  const state: {\n    wind: [number, number];\n    /** The square solved (Mercator: west, north, east, south), its grid, the flows of its basis */\n    square?: [number, number, number, number] | undefined;\n    grid?: { width: number; height: number; bounds: [number, number, number, number] };\n    flows?: StreetFlows | undefined;\n    /** Bumped by each square asked for: only the last one's answer is taken */\n    asked: number;\n    /** After a failure, the square asked for again in `wait` ms (doubled each time) */\n    retry?: number;\n    wait: number;\n  } = { wind: options.wind ?? [3, 2], asked: 0, wait: RETRY_FIRST_MS };\n  /** The flow of the wind far away: `u` times the flow towards the east plus `v` times the one towards the north,\n   * mixed by the engine (the two flows sent once a square, a new wind two numbers) */\n  const send = () => {\n    const { flows, grid, wind } = state;\n\n    if (!flows || !grid) return;\n    layer.setBasis({ ...grid, u: flows.eastU, v: flows.eastV }, { ...grid, u: flows.northU, v: flows.northV }, wind);\n  };\n  /** The square asked for, its only request (under `square`) */\n  const requests = new TileRequests();\n  const first: { resolve?: () => void } = {};\n  const computed = new Promise<void>((resolve) => {\n    first.resolve = resolve;\n  });\n  const update = async () => {\n    if (context.destroyed()) return;\n\n    const camera = map.getCamera();\n    const [x, y] = [mercatorX(camera.center[0]), mercatorY(camera.center[1])];\n    // Half the square in Mercator, at its latitude\n    const half = size / 2 / (EARTH_CIRCUMFERENCE_METRES * Math.cos((camera.center[1] * Math.PI) / 180));\n    const square = state.square;\n\n    // Off street level: no square (its particles gone, asked for again back at street level)\n    if (camera.zoom < minZoom) {\n      if (state.square) {\n        state.asked++;\n        state.square = undefined;\n        state.flows = undefined;\n        requests.abortAll();\n        layer.setField(empty());\n      }\n\n      return;\n    }\n    // Still in the square's middle: nothing to compute\n    if (\n      square &&\n      Math.abs(x - (square[0] + square[2]) / 2) < half / 3 &&\n      Math.abs(y - (square[1] + square[3]) / 2) < half / 3\n    ) {\n      return;\n    }\n\n    const { key, maxzoom } = await renderer;\n    const bounds: [number, number, number, number] = [x - half, y - half, x + half, y + half];\n    const n = 2 ** maxzoom;\n    const tiles: number[] = [];\n\n    for (let ty = Math.floor(bounds[1] * n); ty <= Math.floor(bounds[3] * n); ty++) {\n      for (let tx = Math.floor(bounds[0] * n); tx <= Math.floor(bounds[2] * n); tx++) tiles.push(tx, ty);\n    }\n\n    const sides = Math.max(8, Math.round(size / cell));\n    const work: BasemapWork = {\n      type: 'street',\n      key,\n      module: map.gridUrl,\n      z: maxzoom,\n      tiles,\n      bounds,\n      width: sides,\n      height: sides,\n      iterations,\n    };\n    const asked = ++state.asked;\n\n    requests.abortAll();\n\n    const signal = requests.start('square');\n\n    state.square = bounds;\n\n    const answer = await context\n      .request(maxzoom, Math.floor(x * n), Math.floor(y * n), work, signal)\n      .catch((error: unknown) => ({ error }));\n\n    if (asked !== state.asked || signal.aborted) return;\n    // Failed (a tile or the grid module not fetched, a worker of an older build): the square asked for again later,\n    // a while after each failure\n    if (!('street' in answer)) {\n      console.warn(\"isard: the streets' wind not computed, tried again\", 'error' in answer ? answer.error : answer);\n      state.square = undefined;\n      clearTimeout(state.retry);\n      state.retry = window.setTimeout(() => {\n        update().catch(() => undefined);\n      }, state.wait);\n      state.wait = Math.min(state.wait * 2, RETRY_MAX_MS);\n\n      return;\n    }\n    state.wait = RETRY_FIRST_MS;\n    state.flows = answer.street;\n    state.grid = {\n      width: sides,\n      height: sides,\n      bounds: [longitude(bounds[0]), latitude(bounds[3]), longitude(bounds[2]), latitude(bounds[1])],\n    };\n    send();\n    first.resolve?.();\n  };\n\n  renderer.catch(() => undefined);\n  context.layers.push(layer);\n  context.followView(update, requests, () => undefined);\n  context.cleanup.push(() => {\n    clearTimeout(state.retry);\n  });\n\n  return Object.assign(layer, {\n    computed,\n    setWind: (wind: [u: number, v: number]) => {\n      state.wind = wind;\n      layer.setWeights(wind);\n    },\n  });\n};\n"]}
+{"version":3,"file":"street-wind.js","sourceRoot":"","sources":["../../../src/basemap/vectortiles/street-wind.ts"],"names":[],"mappings":"AAAA,8GAA8G;AAI9G,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAI5F,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,wEAAwE;AACxE,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B,wFAAwF;AACxF,MAAM,YAAY,GAAG,MAAM,CAAC;AAe5B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAA2B,EAAE,UAA6B,EAAE,EAAmB,EAAE;IAC1G,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACxB,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,UAAU,GAAG,GAAG,EAAE,MAAM,GAAG,WAAW,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAClH,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9D,+GAA+G;IAC/G,MAAM,KAAK,GAAG,GAAc,EAAE;QAC5B,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;QAE1C,OAAO;YACL,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;YACvB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;YACvB,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC;SAC3C,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,KAAK,GAWP,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IACrE;wFACoF;IACpF,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;QAEpC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI;YAAE,OAAO;QAC5B,KAAK,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IACnH,CAAC,CAAC;IACF,8DAA8D;IAC9D,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;IACpC,MAAM,KAAK,GAA6B,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAC7C,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,IAAI,OAAO,CAAC,SAAS,EAAE;YAAE,OAAO;QAEhC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,+CAA+C;QAC/C,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACtF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,yFAAyF;QACzF,IAAI,MAAM,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;YAC1B,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,KAAK,CAAC,KAAK,EAAE,CAAC;gBACd,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;gBACzB,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;gBACxB,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACpB,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YAC1B,CAAC;YAED,OAAO;QACT,CAAC;QACD,mDAAmD;QACnD,IACE,MAAM;YACN,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,EACpD,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,QAAQ,CAAC;QACxC,MAAM,MAAM,GAAqC,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAC1F,MAAM,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC;QACvB,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,KAAK,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC;YAC/E,KAAK,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;gBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACrG,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QACnD,MAAM,IAAI,GAAgB;YACxB,IAAI,EAAE,QAAQ;YACd,GAAG;YACH,MAAM,EAAE,GAAG,CAAC,OAAO;YACnB,CAAC,EAAE,OAAO;YACV,KAAK;YACL,MAAM;YACN,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,KAAK;YACb,UAAU;SACX,CAAC;QACF,MAAM,KAAK,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC;QAE5B,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAEpB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAExC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;QAEtB,MAAM,MAAM,GAAG,MAAM,OAAO;aACzB,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC;aACpE,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAE1C,IAAI,KAAK,KAAK,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO;YAAE,OAAO;QACpD,gHAAgH;QAChH,6BAA6B;QAC7B,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,oDAAoD,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC9G,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;YACzB,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1B,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;gBACnC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAClC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACf,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;YAEpD,OAAO;QACT,CAAC;QACD,KAAK,CAAC,IAAI,GAAG,cAAc,CAAC;QAC5B,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,KAAK,CAAC,IAAI,GAAG;YACX,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/F,CAAC;QACF,IAAI,EAAE,CAAC;QACP,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC7D,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;QAC3B,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;QAC1B,QAAQ;QACR,OAAO,EAAE,CAAC,IAA4B,EAAE,EAAE;YACxC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;YAClB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["/** The wind through the streets of a vector basemap (`VectorTiles.streetWind`): a flow round its buildings */\n\nimport type { StreetFlows } from '../../grid-module.ts';\nimport type { FlowField, FlowLayer, FlowOptions } from '../../layers/flow.ts';\nimport { EARTH_METRES, latitude, longitude, mercatorX, mercatorY } from '../../util/geo.ts';\nimport type { BasemapWork } from '../../workers/basemap.worker.ts';\nimport type { StyleLayer } from '../vectorstyle.ts';\nimport type { VectorTilesContext } from './context.ts';\nimport { TileRequests } from './requests.ts';\nimport { isBuildings, isPolygonLayer } from './style.ts';\nimport { STREET_ZOOM } from './tiles.ts';\n\n/** Pause before the first square that failed is asked for again (ms) */\nconst RETRY_FIRST_MS = 1000;\n\n/** Longest pause before a square that failed again and again is asked for again (ms) */\nconst RETRY_MAX_MS = 30_000;\n\n/** The options of `VectorTiles.streetWind` */\nexport type StreetWindOptions = Omit<FlowOptions, 'field' | 'fields' | 'time'> & {\n  wind?: [u: number, v: number];\n  size?: number;\n  cell?: number;\n  iterations?: number;\n  layers?: (layer: StyleLayer) => boolean;\n  minZoom?: number;\n};\n\n/** The layer of `VectorTiles.streetWind` */\nexport type StreetWindLayer = FlowLayer & { setWind(wind: [u: number, v: number]): void; computed: Promise<void> };\n\nexport const streetWind = (context: VectorTilesContext, options: StreetWindOptions = {}): StreetWindLayer => {\n  const { map } = context;\n  const { size = 1200, cell = 4, iterations = 300, layers = isBuildings, minZoom = STREET_ZOOM, ...flow } = options;\n  const renderer = context.renderer(isPolygonLayer(layers), []);\n  /** No square: a field of no value at the view's center, where no particle is born nor moves (the map idles) */\n  const empty = (): FlowField => {\n    const [lon, lat] = map.getCamera().center;\n\n    return {\n      width: 2,\n      height: 2,\n      u: [NaN, NaN, NaN, NaN],\n      v: [NaN, NaN, NaN, NaN],\n      bounds: [lon, lat, lon + 1e-4, lat + 1e-4],\n    };\n  };\n  const layer = map.addFlow({ height: 3, ...flow, field: empty() });\n  const state: {\n    wind: [number, number];\n    /** The square solved (Mercator: west, north, east, south), its grid, the flows of its basis */\n    square?: [number, number, number, number] | undefined;\n    grid?: { width: number; height: number; bounds: [number, number, number, number] };\n    flows?: StreetFlows | undefined;\n    /** Bumped by each square asked for: only the last one's answer is taken */\n    asked: number;\n    /** After a failure, the square asked for again in `wait` ms (doubled each time) */\n    retry?: number;\n    wait: number;\n  } = { wind: options.wind ?? [3, 2], asked: 0, wait: RETRY_FIRST_MS };\n  /** The flow of the wind far away: `u` times the flow towards the east plus `v` times the one towards the north,\n   * mixed by the engine (the two flows sent once a square, a new wind two numbers) */\n  const send = () => {\n    const { flows, grid, wind } = state;\n\n    if (!flows || !grid) return;\n    layer.setBasis({ ...grid, u: flows.eastU, v: flows.eastV }, { ...grid, u: flows.northU, v: flows.northV }, wind);\n  };\n  /** The square asked for, its only request (under `square`) */\n  const requests = new TileRequests();\n  const first: { resolve?: () => void } = {};\n  const computed = new Promise<void>((resolve) => {\n    first.resolve = resolve;\n  });\n  const update = async () => {\n    if (context.destroyed()) return;\n\n    const camera = map.getCamera();\n    const [x, y] = [mercatorX(camera.center[0]), mercatorY(camera.center[1])];\n    // Half the square in Mercator, at its latitude\n    const half = size / 2 / (EARTH_METRES * Math.cos((camera.center[1] * Math.PI) / 180));\n    const square = state.square;\n\n    // Off street level: no square (its particles gone, asked for again back at street level)\n    if (camera.zoom < minZoom) {\n      if (state.square) {\n        state.asked++;\n        state.square = undefined;\n        state.flows = undefined;\n        requests.abortAll();\n        layer.setField(empty());\n      }\n\n      return;\n    }\n    // Still in the square's middle: nothing to compute\n    if (\n      square &&\n      Math.abs(x - (square[0] + square[2]) / 2) < half / 3 &&\n      Math.abs(y - (square[1] + square[3]) / 2) < half / 3\n    ) {\n      return;\n    }\n\n    const { key, maxzoom } = await renderer;\n    const bounds: [number, number, number, number] = [x - half, y - half, x + half, y + half];\n    const n = 2 ** maxzoom;\n    const tiles: number[] = [];\n\n    for (let ty = Math.floor(bounds[1] * n); ty <= Math.floor(bounds[3] * n); ty++) {\n      for (let tx = Math.floor(bounds[0] * n); tx <= Math.floor(bounds[2] * n); tx++) tiles.push(tx, ty);\n    }\n\n    const sides = Math.max(8, Math.round(size / cell));\n    const work: BasemapWork = {\n      type: 'street',\n      key,\n      module: map.gridUrl,\n      z: maxzoom,\n      tiles,\n      bounds,\n      width: sides,\n      height: sides,\n      iterations,\n    };\n    const asked = ++state.asked;\n\n    requests.abortAll();\n\n    const signal = requests.start('square');\n\n    state.square = bounds;\n\n    const answer = await context\n      .request(maxzoom, Math.floor(x * n), Math.floor(y * n), work, signal)\n      .catch((error: unknown) => ({ error }));\n\n    if (asked !== state.asked || signal.aborted) return;\n    // Failed (a tile or the grid module not fetched, a worker of an older build): the square asked for again later,\n    // a while after each failure\n    if (!('street' in answer)) {\n      console.warn(\"isard: the streets' wind not computed, tried again\", 'error' in answer ? answer.error : answer);\n      state.square = undefined;\n      clearTimeout(state.retry);\n      state.retry = window.setTimeout(() => {\n        update().catch(() => undefined);\n      }, state.wait);\n      state.wait = Math.min(state.wait * 2, RETRY_MAX_MS);\n\n      return;\n    }\n    state.wait = RETRY_FIRST_MS;\n    state.flows = answer.street;\n    state.grid = {\n      width: sides,\n      height: sides,\n      bounds: [longitude(bounds[0]), latitude(bounds[3]), longitude(bounds[2]), latitude(bounds[1])],\n    };\n    send();\n    first.resolve?.();\n  };\n\n  renderer.catch(() => undefined);\n  context.layers.push(layer);\n  context.followView(layer, update, requests, () => undefined);\n  context.stopWith(layer, () => {\n    clearTimeout(state.retry);\n  });\n\n  return Object.assign(layer, {\n    computed,\n    setWind: (wind: [u: number, v: number]) => {\n      state.wind = wind;\n      layer.setWeights(wind);\n    },\n  });\n};\n"]}

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

@@ -1,11 +1,8 @@
 /** 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 { GeoMap } from '../../map.ts';
 import { type TreeColors } from '../trees.ts';
 import type { StyleLayer } from '../vectorstyle.ts';
 import type { VectorTilesContext } from './context.ts';
-/** Metres in a degree of latitude (and of longitude at the equator), near enough for the trees' distances */
-export declare const METRES_PER_DEGREE = 111320;
 /** The options of `VectorTiles.trees` */
 export interface TreesOptions {
     layers?: (layer: StyleLayer) => boolean;
@@ -19,10 +16,6 @@ export interface TreesOptions {
     data?: ArrayBuffer | ArrayBufferView<ArrayBuffer>;
     before?: Layer;
 }
-/** The ground under the camera: east and north metres from the view's center, and its distance from it (the camera
- * stands behind the center of a tilted view, `FOV` its field of view) */
-export declare const groundUnderCamera: (map: GeoMap) => [east: number, north: number, distance: number];
-/** What follows the camera as it moves: `send` called again once it has gone `RESEND_SHARE` of `radius` metres (or
- * turned or zoomed as much), not at every frame of a drag */
-export declare const followWhenMoved: (map: GeoMap, radius: (zoom: number) => number, send: () => void) => (() => void);
+/** The trees' layers: broadleaved in full (the one returned, holding the others), conifers, then both simplified far
+ * away; with a model of the page's (`url`, `data`), that one alone, every tree in full */
 export declare const trees: (context: VectorTilesContext, options?: TreesOptions) => ModelLayer;