isard 1.6.0 → 1.8.0

package/CHANGELOG.md

@@ -3,6 +3,76 @@
 Every notable change of `isard`. The format follows [Keep a Changelog](https://keepachangelog.com), the
 versions [Semantic Versioning](https://semver.org) (before 1.0.0, a minor version may change an API).
 
+## [Unreleased]
+
+### Fixed
+
+- React: the layers of the components are drawn in their declared order even when one comes later than another: a
+  `<Geometry>` waits for its tiles, so a `<Layer type="tiles3d">` declared after it came first and the ground of the
+  geometry was drawn over the buildings. Each component takes its place when it first renders (`LayerOrder.rank`);
+  the Bâtiments 3D example drops its `order={1}`.
+
+## [1.8.0] - 2026-10-26
+
+### Added
+
+- `panoramaxSequence(sequence, { around, max, api })` reads a long sequence around a photo (the page holding it, then
+  half before and half after): a survey car's day is thousands of photos, the 2000 first of them far from the one
+  clicked. The Panoramax example walks a 360° photo's sequence from that photo.
+- The Panoramax 360° example (TypeScript and React): a walk in a survey car's 360° photos along the Louvre, each
+  projected onto the city around.
+- The Bâtiments 3D example (TypeScript and React): the IGN's buildings of France in 3D (a beta, its server now
+  answering isard's documentation) over the 3D vector map in place of its raised buildings, picked with their BD TOPO
+  attributes, by day and by night.
+
+## [1.7.0] - 2026-10-26
+
+### Added
+
+- 360° photos at street level: `addPanoramas({ photos })` takes equirectangular images (where each was taken, the way
+  its middle faces), projected onto the scene around and walked along as a vehicle's panoramas are (the engine's
+  panorama pass: a camera without focal read as equirectangular). `panoramaxSequence` reads a Panoramax sequence's
+  photos in their order, `panoramaxPanoramas` gives its 360° ones; in the Panoramax example, From there on a 360° photo
+  walks in its sequence (the wheel, Z and S).
+- The BD TOPO's roofs at their height: `bdtopoRoofs()` raises a building to its ridge under a roof from its eaves to
+  its ridge (`altitude_minimale_toit`, `altitude_maximale_toit`; flat under half a metre) where the BD TOPO gives them
+  (most of the towns, not Paris yet), else to its `hauteur` (its eaves) under a roof generated within;
+  `bdtopoBuildings` uses it, as the Buildings examples do (the React one now with roofs too).
+- Street furniture: `tiles.furniture()` places, from OpenMapTiles' points of interest of the street, a bus shelter at
+  each bus stop, waste baskets, post boxes, drinking fountains (Wallace's) and bicycle racks, each facing the nearest
+  street, and benches along the pedestrian streets and the paths of the parks and gardens; made here as glTF models
+  (no file to download), one instanced draw a kind, all of them near the camera and fewer away from it. The street lamps and the furniture share their placing
+  (`placed`: the workers' things around the view); a model's translucent color is blended. The 3D vector examples show
+  them. About 0.7 KB gzipped more for the basemap worker.
+
+- React: `<VectorTiles>` holds the vector tiles of a style, its children drawing from them with one set of tiles and
+  workers: `<Geometry>`, `<Trees>`, `<Lamps>`, `<Furniture>`, `<Extrusions>`, `<Labels>`, their options as props
+  (compared by value: an object written inline keeps the layer); `useVectorTiles()` for a part of your own. The React
+  examples drop their components of an effect and a second `vectorTiles()` of the same style (its tiles fetched and
+  cut twice); `<VectorGeometry>` stays, a `<Geometry>` with tiles of its own.
+- `Layer.removed`; a layer of a `VectorTiles` removed stops following the view (its tiles no longer asked for), the
+  others going on.
+
+### Fixed
+
+- A map could be idle before its vector tiles were there: the engine knows only the tiles it holds, so once the
+  engine with 3D Tiles came (a model, trees, street lamps added) and the tiles were cut again from the workers' cache
+  (nothing on the network meanwhile), 'idle' came with no city drawn (`whenIdle`, the visual tests: Paris by night
+  blank now and then on the CI). The map now waits on the work of its vector tiles (the workers' cuts, the uploads
+  over frames).
+- An IFC model's worker failing once the model is open rejects the answers awaited (a storey's meshes, an element's
+  properties), which hung.
+- A vector layer removed no longer uploads the tiles still waiting (it reached a freed engine after `map.destroy()`).
+- The labels' workers read the buildings' heights only when the labels hide behind them (`occluded`).
+- A `roof:shape` the engine does not know is generated with `roofs: 'generated'` on `extrusions()` too, as on
+  `vectors()`; an explicitly flat roof no longer sends its building's whole outline.
+
+### Changed
+
+- The trees run on the street lamps' and furniture's placing (`placed`, the simplified trees far away an option of
+  it); the code of the vector tiles' workers and of the engine tidied (helpers shared, the style's floats and the
+  engine's texture units named). The engine and the basemap worker 0.1 KB gzipped more each.
+
 ## [1.6.0] - 2026-10-26
 
 ### Added

package/dist/basemap/furniture.d.ts

@@ -1,8 +1,26 @@
 /**
- * The street furniture of a vector map (`VectorTiles.lamps`): a street lamp made here as a glTF binary (no file to
- * download), its pole and its head flat-shaded, the head lit at night (`ModelLayer.setGlow` from `LAMP_HEAD` up).
+ * The street furniture of a vector map (`VectorTiles.lamps`, `VectorTiles.furniture`), each made here as a glTF binary
+ * (no file to download), flat-shaded: a street lamp (its head lit at night: `ModelLayer.setGlow` from `LAMP_HEAD` up),
+ * a bus shelter, a waste basket, a post box, a Wallace fountain, bicycle racks, a bench.
  */
 /** Metres from a lamp's foot to its head: the part lit at night */
 export declare const LAMP_HEAD = 4.6;
 /** A street lamp as a glTF binary, some 5 metres high: a thin pole, a lantern on top */
 export declare const lampModel: () => Uint8Array<ArrayBuffer>;
+/** A bus shelter, 3.6 metres wide, 2.5 high: a back and two sides of glass in a steel frame, a roof, an advert at one
+ * end; open toward the street (its front) */
+export declare const shelterModel: () => Uint8Array<ArrayBuffer>;
+/** A waste basket of Paris, about a metre high: a green hoop on a post */
+export declare const binModel: () => Uint8Array<ArrayBuffer>;
+/** A post box of La Poste, 1.3 metres high: a yellow box on a foot */
+export declare const postboxModel: () => Uint8Array<ArrayBuffer>;
+/** A Wallace fountain, 2.7 metres high: a base, a column (its four caryatids), a dome, all dark green cast iron */
+export declare const fountainModel: () => Uint8Array<ArrayBuffer>;
+/** Bicycle racks: three steel hoops a metre apart, 0.8 metres high, across the front */
+export declare const rackModel: () => Uint8Array<ArrayBuffer>;
+/** A bench, 1.8 metres wide: a wooden seat and back on dark green feet, facing its front */
+export declare const benchModel: () => Uint8Array<ArrayBuffer>;
+/** The kinds of furniture placed by the workers, in the order of their numbers (`PLACED_KIND`) */
+export declare const FURNITURE: readonly ["shelter", "bin", "postbox", "fountain", "rack", "bench"];
+/** The model of each kind of furniture */
+export declare const FURNITURE_MODELS: Readonly<Record<(typeof FURNITURE)[number], () => Uint8Array<ArrayBuffer>>>;

package/dist/basemap/furniture.js

@@ -1,8 +1,9 @@
 /**
- * The street furniture of a vector map (`VectorTiles.lamps`): a street lamp made here as a glTF binary (no file to
- * download), its pole and its head flat-shaded, the head lit at night (`ModelLayer.setGlow` from `LAMP_HEAD` up).
+ * The street furniture of a vector map (`VectorTiles.lamps`, `VectorTiles.furniture`), each made here as a glTF binary
+ * (no file to download), flat-shaded: a street lamp (its head lit at night: `ModelLayer.setGlow` from `LAMP_HEAD` up),
+ * a bus shelter, a waste basket, a post box, a Wallace fountain, bicycle racks, a bench.
  */
-import { glb, revolve } from "./trees.js";
+import { box, glb, join, revolve } from "./meshes.js";
 /** Colors of a street lamp (linear RGBA, as glTF's `baseColorFactor`): Paris's dark green cast iron */
 const POLE = [0.04, 0.07, 0.05, 1];
 const HEAD = [0.55, 0.52, 0.42, 1];
@@ -23,4 +24,72 @@ export const lampModel = () => {
     ], 6);
     return glb([pole, head], [POLE, HEAD]);
 };
+/** Colors of the street furniture (linear RGBA): Paris's dark green cast iron, steel, wood, glass, La Poste's yellow */
+const GREEN = [0.03, 0.08, 0.05, 1];
+const STEEL = [0.32, 0.33, 0.34, 1];
+const WOOD = [0.36, 0.2, 0.09, 1];
+const GLASS = [0.55, 0.7, 0.75, 0.35];
+const POSTER = [0.85, 0.82, 0.72, 1];
+const YELLOW = [0.95, 0.7, 0.02, 1];
+/** A bus shelter, 3.6 metres wide, 2.5 high: a back and two sides of glass in a steel frame, a roof, an advert at one
+ * end; open toward the street (its front) */
+export const shelterModel = () => {
+    const [w, d, h] = [1.8, 0.7, 2.5];
+    const frame = join(box(-w, 0, -d, -w + 0.08, h, -d + 0.08), box(w - 0.08, 0, -d, w, h, -d + 0.08), box(-w, 0, d - 0.08, -w + 0.08, h, d), box(w - 0.08, 0, d - 0.08, w, h, d), box(-w - 0.1, h, -d - 0.1, w + 0.1, h + 0.12, d + 0.25));
+    const glass = join(box(-w, 0.15, -d, w, h - 0.1, -d + 0.03), box(-w, 0.15, -d, -w + 0.03, h - 0.1, d - 0.1));
+    const advert = box(w - 0.12, 0.3, -d + 0.1, w - 0.04, 2.1, d - 0.1);
+    const seat = box(-0.9, 0.42, -d + 0.05, 0.9, 0.48, -d + 0.4);
+    return glb([frame, glass, advert, seat], [STEEL, GLASS, POSTER, STEEL]);
+};
+/** A waste basket of Paris, about a metre high: a green hoop on a post */
+export const binModel = () => {
+    const post = box(-0.04, 0, -0.32, 0.04, 1.05, -0.24);
+    const hoop = revolve([
+        [0.35, 0],
+        [0.38, 0.2],
+        [0.95, 0.24],
+        [0.98, 0.25],
+    ], 8);
+    return glb([post, hoop], [GREEN, GREEN]);
+};
+/** A post box of La Poste, 1.3 metres high: a yellow box on a foot */
+export const postboxModel = () => glb([box(-0.08, 0, -0.08, 0.08, 0.6, 0.08), box(-0.25, 0.6, -0.18, 0.25, 1.3, 0.18)], [STEEL, YELLOW]);
+/** A Wallace fountain, 2.7 metres high: a base, a column (its four caryatids), a dome, all dark green cast iron */
+export const fountainModel = () => glb([
+    revolve([
+        [0, 0.42],
+        [0.35, 0.36],
+        [0.5, 0.22],
+        [1.9, 0.22],
+        [2.05, 0.38],
+        [2.3, 0.34],
+        [2.55, 0.18],
+        [2.75, 0],
+    ], 8),
+], [GREEN]);
+/** Bicycle racks: three steel hoops a metre apart, 0.8 metres high, across the front */
+export const rackModel = () => glb([
+    join(...[-1, 0, 1].flatMap((k) => [
+        box(k - 0.03, 0, -0.38, k + 0.03, 0.8, -0.32),
+        box(k - 0.03, 0, 0.32, k + 0.03, 0.8, 0.38),
+        box(k - 0.03, 0.74, -0.38, k + 0.03, 0.8, 0.38),
+    ])),
+], [STEEL]);
+/** A bench, 1.8 metres wide: a wooden seat and back on dark green feet, facing its front */
+export const benchModel = () => {
+    const feet = join(box(-0.85, 0, -0.25, -0.75, 0.45, 0.2), box(0.75, 0, -0.25, 0.85, 0.45, 0.2));
+    const wood = join(box(-0.9, 0.42, -0.25, 0.9, 0.48, 0.22), box(-0.9, 0.5, -0.3, 0.9, 0.85, -0.25));
+    return glb([feet, wood], [GREEN, WOOD]);
+};
+/** The kinds of furniture placed by the workers, in the order of their numbers (`PLACED_KIND`) */
+export const FURNITURE = ['shelter', 'bin', 'postbox', 'fountain', 'rack', 'bench'];
+/** The model of each kind of furniture */
+export const FURNITURE_MODELS = {
+    shelter: shelterModel,
+    bin: binModel,
+    postbox: postboxModel,
+    fountain: fountainModel,
+    rack: rackModel,
+    bench: benchModel,
+};
 //# sourceMappingURL=furniture.js.map

package/dist/basemap/furniture.js.map

@@ -1 +1 @@
-{"version":3,"file":"furniture.js","sourceRoot":"","sources":["../../src/basemap/furniture.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,uGAAuG;AACvG,MAAM,IAAI,GAAqC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACrE,MAAM,IAAI,GAAqC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAErE,mEAAmE;AACnE,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAC;AAE7B,wFAAwF;AACxF,MAAM,CAAC,MAAM,SAAS,GAAG,GAA4B,EAAE;IACrD,MAAM,IAAI,GAAG,OAAO,CAClB;QACE,CAAC,CAAC,EAAE,IAAI,CAAC;QACT,CAAC,GAAG,EAAE,GAAG,CAAC;QACV,CAAC,SAAS,EAAE,IAAI,CAAC;KAClB,EACD,CAAC,CACF,CAAC;IACF,MAAM,IAAI,GAAG,OAAO,CAClB;QACE,CAAC,SAAS,EAAE,IAAI,CAAC;QACjB,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,CAAC,CAAC;KACV,EACD,CAAC,CACF,CAAC;IAEF,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC","sourcesContent":["/**\n * The street furniture of a vector map (`VectorTiles.lamps`): a street lamp made here as a glTF binary (no file to\n * download), its pole and its head flat-shaded, the head lit at night (`ModelLayer.setGlow` from `LAMP_HEAD` up).\n */\n\nimport { glb, revolve } from './trees.ts';\n\n/** Colors of a street lamp (linear RGBA, as glTF's `baseColorFactor`): Paris's dark green cast iron */\nconst POLE: [number, number, number, number] = [0.04, 0.07, 0.05, 1];\nconst HEAD: [number, number, number, number] = [0.55, 0.52, 0.42, 1];\n\n/** Metres from a lamp's foot to its head: the part lit at night */\nexport const LAMP_HEAD = 4.6;\n\n/** A street lamp as a glTF binary, some 5 metres high: a thin pole, a lantern on top */\nexport const lampModel = (): Uint8Array<ArrayBuffer> => {\n  const pole = revolve(\n    [\n      [0, 0.14],\n      [0.6, 0.1],\n      [LAMP_HEAD, 0.06],\n    ],\n    5,\n  );\n  const head = revolve(\n    [\n      [LAMP_HEAD, 0.12],\n      [4.95, 0.32],\n      [5.25, 0.26],\n      [5.45, 0],\n    ],\n    6,\n  );\n\n  return glb([pole, head], [POLE, HEAD]);\n};\n"]}
+{"version":3,"file":"furniture.js","sourceRoot":"","sources":["../../src/basemap/furniture.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,GAAG,EAAc,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAElE,uGAAuG;AACvG,MAAM,IAAI,GAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC1C,MAAM,IAAI,GAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAE1C,mEAAmE;AACnE,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAC;AAE7B,wFAAwF;AACxF,MAAM,CAAC,MAAM,SAAS,GAAG,GAA4B,EAAE;IACrD,MAAM,IAAI,GAAG,OAAO,CAClB;QACE,CAAC,CAAC,EAAE,IAAI,CAAC;QACT,CAAC,GAAG,EAAE,GAAG,CAAC;QACV,CAAC,SAAS,EAAE,IAAI,CAAC;KAClB,EACD,CAAC,CACF,CAAC;IACF,MAAM,IAAI,GAAG,OAAO,CAClB;QACE,CAAC,SAAS,EAAE,IAAI,CAAC;QACjB,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,CAAC,CAAC;KACV,EACD,CAAC,CACF,CAAC;IAEF,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,wHAAwH;AACxH,MAAM,KAAK,GAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC3C,MAAM,KAAK,GAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC3C,MAAM,IAAI,GAAU,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzC,MAAM,KAAK,GAAU,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC7C,MAAM,MAAM,GAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5C,MAAM,MAAM,GAAU,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAE3C;6CAC6C;AAC7C,MAAM,CAAC,MAAM,YAAY,GAAG,GAA4B,EAAE;IACxD,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,CAChB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EACvC,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EACrC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EACrC,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACnC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CACxD,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAC7G,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;IAE7D,OAAO,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,0EAA0E;AAC1E,MAAM,CAAC,MAAM,QAAQ,GAAG,GAA4B,EAAE;IACpD,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,OAAO,CAClB;QACE,CAAC,IAAI,EAAE,CAAC,CAAC;QACT,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,IAAI,CAAC;KACb,EACD,CAAC,CACF,CAAC;IAEF,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;AAC3C,CAAC,CAAC;AAEF,sEAAsE;AACtE,MAAM,CAAC,MAAM,YAAY,GAAG,GAA4B,EAAE,CACxD,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AAEzG,mHAAmH;AACnH,MAAM,CAAC,MAAM,aAAa,GAAG,GAA4B,EAAE,CACzD,GAAG,CACD;IACE,OAAO,CACL;QACE,CAAC,CAAC,EAAE,IAAI,CAAC;QACT,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,GAAG,EAAE,IAAI,CAAC;QACX,CAAC,GAAG,EAAE,IAAI,CAAC;QACX,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,GAAG,EAAE,IAAI,CAAC;QACX,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,CAAC,CAAC;KACV,EACD,CAAC,CACF;CACF,EACD,CAAC,KAAK,CAAC,CACR,CAAC;AAEJ,wFAAwF;AACxF,MAAM,CAAC,MAAM,SAAS,GAAG,GAA4B,EAAE,CACrD,GAAG,CACD;IACE,IAAI,CACF,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC3B,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC;QAC7C,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC;QAC3C,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC;KAChD,CAAC,CACH;CACF,EACD,CAAC,KAAK,CAAC,CACR,CAAC;AAEJ,4FAA4F;AAC5F,MAAM,CAAC,MAAM,UAAU,GAAG,GAA4B,EAAE;IACtD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAChG,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnG,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC,CAAC;AAEF,kGAAkG;AAClG,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAE7F,0CAA0C;AAC1C,MAAM,CAAC,MAAM,gBAAgB,GAAgF;IAC3G,OAAO,EAAE,YAAY;IACrB,GAAG,EAAE,QAAQ;IACb,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,aAAa;IACvB,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,UAAU;CAClB,CAAC","sourcesContent":["/**\n * The street furniture of a vector map (`VectorTiles.lamps`, `VectorTiles.furniture`), each made here as a glTF binary\n * (no file to download), flat-shaded: a street lamp (its head lit at night: `ModelLayer.setGlow` from `LAMP_HEAD` up),\n * a bus shelter, a waste basket, a post box, a Wallace fountain, bicycle racks, a bench.\n */\n\nimport { box, type Color, glb, join, revolve } from './meshes.ts';\n\n/** Colors of a street lamp (linear RGBA, as glTF's `baseColorFactor`): Paris's dark green cast iron */\nconst POLE: Color = [0.04, 0.07, 0.05, 1];\nconst HEAD: Color = [0.55, 0.52, 0.42, 1];\n\n/** Metres from a lamp's foot to its head: the part lit at night */\nexport const LAMP_HEAD = 4.6;\n\n/** A street lamp as a glTF binary, some 5 metres high: a thin pole, a lantern on top */\nexport const lampModel = (): Uint8Array<ArrayBuffer> => {\n  const pole = revolve(\n    [\n      [0, 0.14],\n      [0.6, 0.1],\n      [LAMP_HEAD, 0.06],\n    ],\n    5,\n  );\n  const head = revolve(\n    [\n      [LAMP_HEAD, 0.12],\n      [4.95, 0.32],\n      [5.25, 0.26],\n      [5.45, 0],\n    ],\n    6,\n  );\n\n  return glb([pole, head], [POLE, HEAD]);\n};\n\n/** Colors of the street furniture (linear RGBA): Paris's dark green cast iron, steel, wood, glass, La Poste's yellow */\nconst GREEN: Color = [0.03, 0.08, 0.05, 1];\nconst STEEL: Color = [0.32, 0.33, 0.34, 1];\nconst WOOD: Color = [0.36, 0.2, 0.09, 1];\nconst GLASS: Color = [0.55, 0.7, 0.75, 0.35];\nconst POSTER: Color = [0.85, 0.82, 0.72, 1];\nconst YELLOW: Color = [0.95, 0.7, 0.02, 1];\n\n/** A bus shelter, 3.6 metres wide, 2.5 high: a back and two sides of glass in a steel frame, a roof, an advert at one\n * end; open toward the street (its front) */\nexport const shelterModel = (): Uint8Array<ArrayBuffer> => {\n  const [w, d, h] = [1.8, 0.7, 2.5];\n  const frame = join(\n    box(-w, 0, -d, -w + 0.08, h, -d + 0.08),\n    box(w - 0.08, 0, -d, w, h, -d + 0.08),\n    box(-w, 0, d - 0.08, -w + 0.08, h, d),\n    box(w - 0.08, 0, d - 0.08, w, h, d),\n    box(-w - 0.1, h, -d - 0.1, w + 0.1, h + 0.12, d + 0.25),\n  );\n  const glass = join(box(-w, 0.15, -d, w, h - 0.1, -d + 0.03), box(-w, 0.15, -d, -w + 0.03, h - 0.1, d - 0.1));\n  const advert = box(w - 0.12, 0.3, -d + 0.1, w - 0.04, 2.1, d - 0.1);\n  const seat = box(-0.9, 0.42, -d + 0.05, 0.9, 0.48, -d + 0.4);\n\n  return glb([frame, glass, advert, seat], [STEEL, GLASS, POSTER, STEEL]);\n};\n\n/** A waste basket of Paris, about a metre high: a green hoop on a post */\nexport const binModel = (): Uint8Array<ArrayBuffer> => {\n  const post = box(-0.04, 0, -0.32, 0.04, 1.05, -0.24);\n  const hoop = revolve(\n    [\n      [0.35, 0],\n      [0.38, 0.2],\n      [0.95, 0.24],\n      [0.98, 0.25],\n    ],\n    8,\n  );\n\n  return glb([post, hoop], [GREEN, GREEN]);\n};\n\n/** A post box of La Poste, 1.3 metres high: a yellow box on a foot */\nexport const postboxModel = (): Uint8Array<ArrayBuffer> =>\n  glb([box(-0.08, 0, -0.08, 0.08, 0.6, 0.08), box(-0.25, 0.6, -0.18, 0.25, 1.3, 0.18)], [STEEL, YELLOW]);\n\n/** A Wallace fountain, 2.7 metres high: a base, a column (its four caryatids), a dome, all dark green cast iron */\nexport const fountainModel = (): Uint8Array<ArrayBuffer> =>\n  glb(\n    [\n      revolve(\n        [\n          [0, 0.42],\n          [0.35, 0.36],\n          [0.5, 0.22],\n          [1.9, 0.22],\n          [2.05, 0.38],\n          [2.3, 0.34],\n          [2.55, 0.18],\n          [2.75, 0],\n        ],\n        8,\n      ),\n    ],\n    [GREEN],\n  );\n\n/** Bicycle racks: three steel hoops a metre apart, 0.8 metres high, across the front */\nexport const rackModel = (): Uint8Array<ArrayBuffer> =>\n  glb(\n    [\n      join(\n        ...[-1, 0, 1].flatMap((k) => [\n          box(k - 0.03, 0, -0.38, k + 0.03, 0.8, -0.32),\n          box(k - 0.03, 0, 0.32, k + 0.03, 0.8, 0.38),\n          box(k - 0.03, 0.74, -0.38, k + 0.03, 0.8, 0.38),\n        ]),\n      ),\n    ],\n    [STEEL],\n  );\n\n/** A bench, 1.8 metres wide: a wooden seat and back on dark green feet, facing its front */\nexport const benchModel = (): Uint8Array<ArrayBuffer> => {\n  const feet = join(box(-0.85, 0, -0.25, -0.75, 0.45, 0.2), box(0.75, 0, -0.25, 0.85, 0.45, 0.2));\n  const wood = join(box(-0.9, 0.42, -0.25, 0.9, 0.48, 0.22), box(-0.9, 0.5, -0.3, 0.9, 0.85, -0.25));\n\n  return glb([feet, wood], [GREEN, WOOD]);\n};\n\n/** The kinds of furniture placed by the workers, in the order of their numbers (`PLACED_KIND`) */\nexport const FURNITURE = ['shelter', 'bin', 'postbox', 'fountain', 'rack', 'bench'] as const;\n\n/** The model of each kind of furniture */\nexport const FURNITURE_MODELS: Readonly<Record<(typeof FURNITURE)[number], () => Uint8Array<ArrayBuffer>>> = {\n  shelter: shelterModel,\n  bin: binModel,\n  postbox: postboxModel,\n  fountain: fountainModel,\n  rack: rackModel,\n  bench: benchModel,\n};\n"]}

package/dist/basemap/meshes.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Small flat-shaded meshes made in the page (the trees, the street furniture) and their glTF binaries: solids of
+ * revolution, boxes, parts joined.
+ */
+/** A color: linear RGBA, as glTF's `baseColorFactor` */
+export type Color = [number, number, number, number];
+/** A mesh's triangles: their positions and normals (x, y, z each; one normal per face) */
+export interface Mesh {
+    positions: number[];
+    normals: number[];
+}
+/** A solid of revolution around the vertical (glTF +Y up), flat-shaded: rings of (height, radius), a point at the
+ * top when its radius is 0; the triangles' positions and normals, one normal per face */
+export declare const revolve: (rings: [height: number, radius: number][], sides: number) => Mesh;
+/** A box from (x0, y0, z0) to (x1, y1, z1) (glTF axes: y up, z the model's front, x its left), its faces outward */
+export declare const box: (x0: number, y0: number, z0: number, x1: number, y1: number, z1: number) => Mesh;
+/** Parts of one color joined into one */
+export declare const join: (...parts: Mesh[]) => Mesh;
+/** Parts flat-shaded in their colors as a glTF binary: one mesh of a primitive each, its front +Z
+ * (`ModelInstance.heading` turns it), standing on its origin */
+export declare const glb: (parts: Mesh[], colors: Color[]) => Uint8Array<ArrayBuffer>;

package/dist/basemap/meshes.js

@@ -0,0 +1,159 @@
+/**
+ * Small flat-shaded meshes made in the page (the trees, the street furniture) and their glTF binaries: solids of
+ * revolution, boxes, parts joined.
+ */
+import { bounds, glbOf } from "../util/gltf.js";
+/** A solid of revolution around the vertical (glTF +Y up), flat-shaded: rings of (height, radius), a point at the
+ * top when its radius is 0; the triangles' positions and normals, one normal per face */
+export const revolve = (rings, sides) => {
+    const at = (k, [h, r]) => {
+        const a = (k / sides) * Math.PI * 2;
+        return [Math.cos(a) * r, h, Math.sin(a) * r];
+    };
+    const positions = [];
+    const normals = [];
+    const face = (a, b, c) => {
+        const u = [b[0] - a[0], b[1] - a[1], b[2] - a[2]];
+        const v = [c[0] - a[0], c[1] - a[1], c[2] - a[2]];
+        const n = [u[1] * v[2] - u[2] * v[1], u[2] * v[0] - u[0] * v[2], u[0] * v[1] - u[1] * v[0]];
+        const length = Math.hypot(...n);
+        // A degenerate face (two points at the apex) is left out
+        if (length === 0)
+            return;
+        positions.push(...a, ...b, ...c);
+        [0, 1, 2].forEach(() => {
+            normals.push(n[0] / length, n[1] / length, n[2] / length);
+        });
+    };
+    rings.slice(1).forEach((ring, i) => {
+        const below = rings[i] ?? ring;
+        Array.from({ length: sides }, (_, k) => k).forEach((k) => {
+            const [a, b] = [at(k, below), at(k + 1, below)];
+            const [c, d] = [at(k, ring), at(k + 1, ring)];
+            // Counter-clockwise seen from outside
+            face(a, c, b);
+            face(b, c, d);
+        });
+    });
+    // The bottom closed: seen from below
+    const base = rings[0];
+    if (base && base[1] > 0) {
+        Array.from({ length: sides }, (_, k) => k).forEach((k) => {
+            face([0, base[0], 0], at(k, base), at(k + 1, base));
+        });
+    }
+    return { positions, normals };
+};
+/** A box from (x0, y0, z0) to (x1, y1, z1) (glTF axes: y up, z the model's front, x its left), its faces outward */
+export const box = (x0, y0, z0, x1, y1, z1) => {
+    const positions = [];
+    const normals = [];
+    // Each face: its normal and its four corners, counter-clockwise seen from outside
+    const faces = [
+        [
+            [1, 0, 0],
+            [
+                [x1, y0, z0],
+                [x1, y1, z0],
+                [x1, y1, z1],
+                [x1, y0, z1],
+            ],
+        ],
+        [
+            [-1, 0, 0],
+            [
+                [x0, y0, z1],
+                [x0, y1, z1],
+                [x0, y1, z0],
+                [x0, y0, z0],
+            ],
+        ],
+        [
+            [0, 1, 0],
+            [
+                [x0, y1, z0],
+                [x0, y1, z1],
+                [x1, y1, z1],
+                [x1, y1, z0],
+            ],
+        ],
+        [
+            [0, -1, 0],
+            [
+                [x0, y0, z0],
+                [x1, y0, z0],
+                [x1, y0, z1],
+                [x0, y0, z1],
+            ],
+        ],
+        [
+            [0, 0, 1],
+            [
+                [x0, y0, z1],
+                [x1, y0, z1],
+                [x1, y1, z1],
+                [x0, y1, z1],
+            ],
+        ],
+        [
+            [0, 0, -1],
+            [
+                [x1, y0, z0],
+                [x0, y0, z0],
+                [x0, y1, z0],
+                [x1, y1, z0],
+            ],
+        ],
+    ];
+    faces.forEach(([n, [a, b, c, d]]) => {
+        [a, b, c, a, c, d].forEach((p) => {
+            positions.push(...(p ?? [0, 0, 0]));
+            normals.push(...n);
+        });
+    });
+    return { positions, normals };
+};
+/** Parts of one color joined into one */
+export const join = (...parts) => ({
+    positions: parts.flatMap((p) => p.positions),
+    normals: parts.flatMap((p) => p.normals),
+});
+/** Parts flat-shaded in their colors as a glTF binary: one mesh of a primitive each, its front +Z
+ * (`ModelInstance.heading` turns it), standing on its origin */
+export const glb = (parts, colors) => {
+    // The buffer: each part's positions then normals, 4-byte floats
+    const floats = parts.flatMap((p) => [...p.positions, ...p.normals]);
+    const bin = new Float32Array(floats);
+    const views = parts.flatMap((p, i) => {
+        const before = parts.slice(0, i).reduce((n, q) => n + (q.positions.length + q.normals.length) * 4, 0);
+        return [
+            { buffer: 0, byteOffset: before, byteLength: p.positions.length * 4, target: 34962 },
+            { buffer: 0, byteOffset: before + p.positions.length * 4, byteLength: p.normals.length * 4, target: 34962 },
+        ];
+    });
+    const accessors = parts.flatMap((p, i) => [
+        { bufferView: i * 2, componentType: 5126, count: p.positions.length / 3, type: 'VEC3', ...bounds(p.positions) },
+        { bufferView: i * 2 + 1, componentType: 5126, count: p.normals.length / 3, type: 'VEC3' },
+    ]);
+    const gltf = {
+        asset: { version: '2.0', generator: 'isard' },
+        scene: 0,
+        scenes: [{ nodes: [0] }],
+        nodes: [{ mesh: 0 }],
+        meshes: [
+            {
+                primitives: parts.map((_, i) => ({ attributes: { POSITION: i * 2, NORMAL: i * 2 + 1 }, material: i })),
+            },
+        ],
+        materials: colors.map((color) => ({
+            pbrMetallicRoughness: { baseColorFactor: color, metallicFactor: 0, roughnessFactor: 1 },
+            // Translucent (a shelter's glass): blended, seen from both sides
+            ...(color[3] < 1 && { alphaMode: 'BLEND', doubleSided: true }),
+        })),
+        accessors,
+        bufferViews: views,
+        buffers: [{ byteLength: bin.byteLength }],
+    };
+    return glbOf(gltf, new Uint8Array(bin.buffer));
+};
+//# sourceMappingURL=meshes.js.map

package/dist/basemap/meshes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"meshes.js","sourceRoot":"","sources":["../../src/basemap/meshes.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Small flat-shaded meshes made in the page (the trees, the street furniture) and their glTF binaries: solids of\n * revolution, boxes, parts joined.\n */\n\nimport { bounds, glbOf } from '../util/gltf.ts';\n\n/** A point or a vector: x, y, z */\ntype Vec3 = [number, number, number];\n\n/** A color: linear RGBA, as glTF's `baseColorFactor` */\nexport type Color = [number, number, number, number];\n\n/** A mesh's triangles: their positions and normals (x, y, z each; one normal per face) */\nexport interface Mesh {\n  positions: number[];\n  normals: number[];\n}\n\n/** A solid of revolution around the vertical (glTF +Y up), flat-shaded: rings of (height, radius), a point at the\n * top when its radius is 0; the triangles' positions and normals, one normal per face */\nexport const revolve = (rings: [height: number, radius: number][], sides: number): Mesh => {\n  const at = (k: number, [h, r]: [number, number]): Vec3 => {\n    const a = (k / sides) * Math.PI * 2;\n\n    return [Math.cos(a) * r, h, Math.sin(a) * r];\n  };\n  const positions: number[] = [];\n  const normals: number[] = [];\n  const face = (a: Vec3, b: Vec3, c: Vec3) => {\n    const u: Vec3 = [b[0] - a[0], b[1] - a[1], b[2] - a[2]];\n    const v: Vec3 = [c[0] - a[0], c[1] - a[1], c[2] - a[2]];\n    const n: Vec3 = [u[1] * v[2] - u[2] * v[1], u[2] * v[0] - u[0] * v[2], u[0] * v[1] - u[1] * v[0]];\n    const length = Math.hypot(...n);\n\n    // A degenerate face (two points at the apex) is left out\n    if (length === 0) return;\n    positions.push(...a, ...b, ...c);\n    [0, 1, 2].forEach(() => {\n      normals.push(n[0] / length, n[1] / length, n[2] / length);\n    });\n  };\n\n  rings.slice(1).forEach((ring, i) => {\n    const below = rings[i] ?? ring;\n\n    Array.from({ length: sides }, (_, k) => k).forEach((k) => {\n      const [a, b] = [at(k, below), at(k + 1, below)];\n      const [c, d] = [at(k, ring), at(k + 1, ring)];\n\n      // Counter-clockwise seen from outside\n      face(a, c, b);\n      face(b, c, d);\n    });\n  });\n  // The bottom closed: seen from below\n  const base = rings[0];\n\n  if (base && base[1] > 0) {\n    Array.from({ length: sides }, (_, k) => k).forEach((k) => {\n      face([0, base[0], 0], at(k, base), at(k + 1, base));\n    });\n  }\n\n  return { positions, normals };\n};\n\n/** A box from (x0, y0, z0) to (x1, y1, z1) (glTF axes: y up, z the model's front, x its left), its faces outward */\nexport const box = (x0: number, y0: number, z0: number, x1: number, y1: number, z1: number): Mesh => {\n  const positions: number[] = [];\n  const normals: number[] = [];\n  // Each face: its normal and its four corners, counter-clockwise seen from outside\n  const faces: [Vec3, Vec3[]][] = [\n    [\n      [1, 0, 0],\n      [\n        [x1, y0, z0],\n        [x1, y1, z0],\n        [x1, y1, z1],\n        [x1, y0, z1],\n      ],\n    ],\n    [\n      [-1, 0, 0],\n      [\n        [x0, y0, z1],\n        [x0, y1, z1],\n        [x0, y1, z0],\n        [x0, y0, z0],\n      ],\n    ],\n    [\n      [0, 1, 0],\n      [\n        [x0, y1, z0],\n        [x0, y1, z1],\n        [x1, y1, z1],\n        [x1, y1, z0],\n      ],\n    ],\n    [\n      [0, -1, 0],\n      [\n        [x0, y0, z0],\n        [x1, y0, z0],\n        [x1, y0, z1],\n        [x0, y0, z1],\n      ],\n    ],\n    [\n      [0, 0, 1],\n      [\n        [x0, y0, z1],\n        [x1, y0, z1],\n        [x1, y1, z1],\n        [x0, y1, z1],\n      ],\n    ],\n    [\n      [0, 0, -1],\n      [\n        [x1, y0, z0],\n        [x0, y0, z0],\n        [x0, y1, z0],\n        [x1, y1, z0],\n      ],\n    ],\n  ];\n\n  faces.forEach(([n, [a, b, c, d]]) => {\n    [a, b, c, a, c, d].forEach((p) => {\n      positions.push(...(p ?? [0, 0, 0]));\n      normals.push(...n);\n    });\n  });\n\n  return { positions, normals };\n};\n\n/** Parts of one color joined into one */\nexport const join = (...parts: Mesh[]): Mesh => ({\n  positions: parts.flatMap((p) => p.positions),\n  normals: parts.flatMap((p) => p.normals),\n});\n\n/** Parts flat-shaded in their colors as a glTF binary: one mesh of a primitive each, its front +Z\n * (`ModelInstance.heading` turns it), standing on its origin */\nexport const glb = (parts: Mesh[], colors: Color[]): Uint8Array<ArrayBuffer> => {\n  // The buffer: each part's positions then normals, 4-byte floats\n  const floats = parts.flatMap((p) => [...p.positions, ...p.normals]);\n  const bin = new Float32Array(floats);\n  const views = parts.flatMap((p, i) => {\n    const before = parts.slice(0, i).reduce((n, q) => n + (q.positions.length + q.normals.length) * 4, 0);\n\n    return [\n      { buffer: 0, byteOffset: before, byteLength: p.positions.length * 4, target: 34962 },\n      { buffer: 0, byteOffset: before + p.positions.length * 4, byteLength: p.normals.length * 4, target: 34962 },\n    ];\n  });\n  const accessors = parts.flatMap((p, i) => [\n    { bufferView: i * 2, componentType: 5126, count: p.positions.length / 3, type: 'VEC3', ...bounds(p.positions) },\n    { bufferView: i * 2 + 1, componentType: 5126, count: p.normals.length / 3, type: 'VEC3' },\n  ]);\n  const gltf = {\n    asset: { version: '2.0', generator: 'isard' },\n    scene: 0,\n    scenes: [{ nodes: [0] }],\n    nodes: [{ mesh: 0 }],\n    meshes: [\n      {\n        primitives: parts.map((_, i) => ({ attributes: { POSITION: i * 2, NORMAL: i * 2 + 1 }, material: i })),\n      },\n    ],\n    materials: colors.map((color) => ({\n      pbrMetallicRoughness: { baseColorFactor: color, metallicFactor: 0, roughnessFactor: 1 },\n      // Translucent (a shelter's glass): blended, seen from both sides\n      ...(color[3] < 1 && { alphaMode: 'BLEND', doubleSided: true }),\n    })),\n    accessors,\n    bufferViews: views,\n    buffers: [{ byteLength: bin.byteLength }],\n  };\n\n  return glbOf(gltf, new Uint8Array(bin.buffer));\n};\n"]}

package/dist/basemap/placed.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Things placed by a vector basemap's workers in its tiles (trees, street lamps, street furniture), as they send them
+ * to the page: so many numbers each.
+ */
+/** Numbers of a thing placed: longitude, latitude, scale, heading (degrees), rank (in [0, 1): far from the view, the
+ * page keeps the lowest) and kind (its model among those of its kinds) */
+export declare const PLACED_NUMBERS = 6;
+/** Where its rank is among its numbers */
+export declare const PLACED_RANK = 4;
+/** Where its kind is among its numbers */
+export declare const PLACED_KIND = 5;
+/** A heading for a number, the same each time, near numbers turned far apart (7919, a prime) */
+export declare const turned: (n: number) => number;

package/dist/basemap/placed.js

@@ -0,0 +1,14 @@
+/**
+ * Things placed by a vector basemap's workers in its tiles (trees, street lamps, street furniture), as they send them
+ * to the page: so many numbers each.
+ */
+/** Numbers of a thing placed: longitude, latitude, scale, heading (degrees), rank (in [0, 1): far from the view, the
+ * page keeps the lowest) and kind (its model among those of its kinds) */
+export const PLACED_NUMBERS = 6;
+/** Where its rank is among its numbers */
+export const PLACED_RANK = 4;
+/** Where its kind is among its numbers */
+export const PLACED_KIND = 5;
+/** A heading for a number, the same each time, near numbers turned far apart (7919, a prime) */
+export const turned = (n) => (n * 7919) % 360;
+//# sourceMappingURL=placed.js.map

package/dist/basemap/placed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"placed.js","sourceRoot":"","sources":["../../src/basemap/placed.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;0EAC0E;AAC1E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC;AAEhC,0CAA0C;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC;AAE7B,0CAA0C;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC;AAE7B,gGAAgG;AAChG,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC","sourcesContent":["/**\n * Things placed by a vector basemap's workers in its tiles (trees, street lamps, street furniture), as they send them\n * to the page: so many numbers each.\n */\n\n/** Numbers of a thing placed: longitude, latitude, scale, heading (degrees), rank (in [0, 1): far from the view, the\n * page keeps the lowest) and kind (its model among those of its kinds) */\nexport const PLACED_NUMBERS = 6;\n\n/** Where its rank is among its numbers */\nexport const PLACED_RANK = 4;\n\n/** Where its kind is among its numbers */\nexport const PLACED_KIND = 5;\n\n/** A heading for a number, the same each time, near numbers turned far apart (7919, a prime) */\nexport const turned = (n: number): number => (n * 7919) % 360;\n"]}

package/dist/basemap/trees.d.ts

@@ -5,27 +5,17 @@
  */
 import type { Value } from './mvt.ts';
 import type { StyleLayer } from './vectorstyle.ts';
-/** Numbers of a tree in the workers' answer: longitude, latitude, scale, heading, rank, kind (0 broadleaved, 1
- * conifer) */
-export declare const TREE_NUMBERS = 6;
 /** Colors of the trunk, of the broadleaved crown and of the conifers' (linear RGBA, as glTF's `baseColorFactor`) */
 export interface TreeColors {
     trunk: [number, number, number, number];
     crown: [number, number, number, number];
     conifer: [number, number, number, number];
 }
-/** A solid of revolution around the vertical (glTF +Y up), flat-shaded: rings of (height, radius), a point at the
- * top when its radius is 0; the triangles' positions and normals, one normal per face */
-export declare const revolve: (rings: [height: number, radius: number][], sides?: number) => {
-    positions: number[];
-    normals: number[];
+/** The models' heights (metres): a tree's height from its data scales them by it */
+export declare const TREE_METRES: {
+    readonly broadleaved: 10.2;
+    readonly conifer: 11;
 };
-/** Parts flat-shaded in their colors as a glTF binary: one mesh of a primitive each, its front +Z
- * (`ModelInstance.heading` turns it), standing on its origin */
-export declare const glb: (parts: {
-    positions: number[];
-    normals: number[];
-}[], colors: TreeColors[keyof TreeColors][]) => Uint8Array<ArrayBuffer>;
 /**
  * A broadleaved tree as a glTF binary, about 10 metres high: a trunk and a rounded crown in `colors`; `far`: the
  * same simplified for far away, a few faces (some 30 triangles instead of 100)