isard 1.5.0 → 1.6.0

package/CHANGELOG.md

@@ -1,8 +1,172 @@
 # Changelog
 
-Every notable change of `isard` (published as `@ign-junn/isard` up to 0.1.1). The format follows [Keep a Changelog](https://keepachangelog.com), the
+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).
 
+## [1.6.0] - 2026-10-26
+
+### Added
+
+- IFC models, further: each storey meshed when asked (`storey.load()`, `storey.elements`): a large model's storeys
+  one at a time, those in view only; `model.place`, where the model stands, from its `IfcMapConversion` in a projected
+  CRS isard knows (the conversion's rotation and scale, the project's unit, the grid's convergence) or else its site's
+  latitude and longitude turned by its true north; `ModelLayer.setHighlight(feature, color)` tints a feature (an IFC
+  element picked). The IFC models example meshes its storeys one after the other, places FZK-Haus by its true north and
+  highlights the element clicked; the georeferenced BIM scene example (TypeScript and React): buildingSMART's scene, one
+  IFC file per discipline, each placed by its own map conversion, fitting together.
+- IFC models (BIM): `loadIfc(url | bytes)` of `isard/formats` reads an IFC file with web-ifc (ThatOpen, MPL-2.0;
+  fetched on first use from jsDelivr, or `webIfc`: a folder of yours) in a worker of its own: each storey a glTF binary
+  for `addModels`, each element a feature of it (its IFC class, name, storey), its properties on demand
+  (`model.properties(element)`: attributes, property and quantity sets), its site (`IfcSite`'s latitude and
+  longitude). A model with features (`_BATCHID`, `EXT_mesh_features`) is picked by feature: the hit's `index` is the
+  element under the point. The IFC models example (TypeScript and React): the KIT's FZK-Haus at its site in Karlsruhe
+  and buildingSMART's Duplex, storey by storey, an element's properties on a click.
+- COLLADA models (BIM and CAD exports): `loadCollada(url)` and `parseCollada(text, images)` of `isard/formats` read a
+  `.dae` into a glTF binary for `addModels({ data })`: its meshes where its scene's nodes put them, in metres and turned
+  from its up axis to glTF's, its materials' colors, transparencies and textures. The examples' new BIM section: A
+  BIM building (iTowns' sample building on the IGN's orthophotos and relief, in TypeScript and React), and Inside a
+  shopping mall moved there.
+- Panoramax, the open street-level photos of the IGN and OpenStreetMap France: `panoramaxStyle()` gives its MapLibre
+  style (its sequences and a dot at each photo, drawn as any style by `vectorTiles().vectors()`), `panoramaxPicture(id)`
+  a photo's data from its STAC API (where and when, its heading, its field of view, its images, its producer and
+  licence, the photos before and after it), `panoramaxPhoto` the photo for `addPhoto`. `map.addPhoto` stands any photo
+  where it was taken, facing its way (a glTF of the photo made by the page: flat on a frame across its field of view, a
+  360° one on a band round its camera, each pixel where the camera saw it); from its place (`setFirstPerson`) it lies
+  over the buildings it shows. The Panoramax example (TypeScript and React): a dot clicked, its photo in 3D, the photos
+  before and after it, the eye in its place with the photo left of a line dragged and the 3D map right of it.
+- `labels({ occluded: true })`: the labels hidden by buildings another `vectorTiles()` raises (a `<VectorGeometry>` of
+  the same style, as in the React examples).
+- Street lamps: `tiles.lamps()` places them along the style's streets (30 m apart, every other one on the other side,
+  as far from the middle as the street's class says), their heads lit at night; `ModelLayer.setGlow(from, color)`
+  lights any model from a height up at night (an additive pass of the model layer). The 3D vector examples show them.
+  About 0.3 KB gzipped more for the basemap worker.
+- `<VectorGeometry roofs facades>` in React (the roofs make the layer anew, the facades do not); `{ type: 'trees' }`
+  for `map.add` and `<Layer>` (`map.addTrees`, its handle a `ModelLayer`).
+- Landmarks: in `vectors()`, a building holding a theatre, a museum, a place of worship, a castle, a monument, an
+  attraction or a town hall (OpenMapTiles' points of interest in its tile) has no office windows, and is floodlit at
+  night (a warm light from the foot of its walls fading up them, each face as lit as it faces the lights): the Opéra
+  Garnier no longer reads as offices in Paris by night. About 0.1 KB gzipped more for the basemap worker.
+- The trees simplified far away instead of thinned: `trees()` draws every tree in full near the camera and, farther,
+  a simplified model (a few faces: some 30 triangles instead of 100), thinned four times more gently, up to three times
+  as many as the full ones (`treeModel` and `coniferModel` take `far`); the forest stays dense to the horizon.
+- The models' instances placed by the GPU: uploaded once (until they or the relief under them change), each put in its
+  east-north-up frame by the vertex shader, instead of each one's matrix made on the main thread at every frame the
+  view moved. The trees example: four times as many trees for 3.6 ms a frame (2.7 for a quarter of them before).
+- Trees of two kinds: `trees()` grows conifers among the broadleaved trees by their wood's data (OpenStreetMap's
+  `leaf_type`, PLAN IGN's `nature`; OpenMapTiles' forests a third conifers), drawn on a layer that goes with the one
+  returned (`coniferModel`, `TreeColors.conifer`); `map.addTrees({ data })` stands trees at the points of a source that
+  has them (a city's street trees), conifers by their leaf type or genus, scaled to their height.
+- The buildings' facades: `vectors({ facades: true })`, `addExtrusions({ facades: true })` (`VectorLayer.setFacades`)
+  draw the windows on the walls, a grid of bays and floors along each wall and up from its foot, glass by day (some
+  panes lighter, some darker), the same windows lit at night; far away, the walls' even tone. The 3D vector examples
+  show them. About 0.7 KB gzipped more for the engines, no frame cost measured.
+- The labels hidden by the buildings, as Mapbox GL's Standard style hides them: `labels()` of a `vectorTiles()` that
+  raises its buildings (`vectors()` with a `fill-extrusion` layer, or `extrusions()`) hides a label whole when a
+  building, a tree or a model stands before its anchor, and lifts a label in a building onto its roof (its style's
+  `fill-extrusion-height`). `addSymbols({ occluded: true })` for any symbol layer. The solid scene's depth is read at
+  five pixels around each label's anchor (taken from the sun's shadows when they drew it, no cost, else drawn once a
+  frame), the label hidden where three stand nearer than it by more than some metres: no wavering on a roof or
+  between close walls. About 1.1 KB gzipped more for the engines, 0.5 KB for the basemap worker.
+- `addExtrusions({ roof, roofHeight })`: the extrusion layers' roofs, as `vectors()` builds them: flat by default, one
+  of OpenStreetMap's `roof:shape` per building (hipped, gabled, pyramidal, mansard; the others as the nearest of them),
+  or `generated` from its outline; their height as their slopes make it unless given. Changing them with `setStyle`
+  builds the blocks again. `VectorTiles.extrusions({ roofs })` makes them as `vectors()` does (`'data'`,
+  `'generated'`, `'flat'` by default). The buildings example generates the BD TOPO's roofs.
+- `vectors({ roofs })`: the buildings' roofs, flat by default; as their data says when the tiles have it (`roof:shape`:
+  hipped, gabled, pyramidal, mansard; `roof:height`), or generated from their outline (`'generated'`: hipped or gabled
+  under 450 m², a mansard under 3000 m², flat past that and for courtyards). A roof is the lower envelope of planes
+  rising from its outline's edges, built over the whole building and cut to each tile (its ridges go on across the
+  tiles), fitted into the building's height. A concave outline (an L, a T, an H) is cut into wings where a wall carried
+  on from an inward corner meets it, each wing roofed and closed by a gable against the next, their eaves level (a
+  narrower wing's ridge lower); past six wings, flat. The 3D vector examples use the generated roofs. About 8 KB gzipped more
+  for the engines and the tessellation module.
+- `vectors()`: the lines' and buildings' patterns (`line-pattern` as tall as the line, repeated along it;
+  `fill-extrusion-pattern` on the roofs as the fills' and along the walls), and the fills' patterns over the relief
+  (the ground under each pixel from its depth, drawn once a frame when a patterned layer needs it; on the globe, their
+  average color still).
+- `vectors()`: the lines' `line-blur` (each feature's, their edges fading over it) and the fills' and lines'
+  translations (`fill-translate`, `line-translate`, turning with the map unless `*-translate-anchor` is `viewport`;
+  the fills picked where they are drawn).
+- `vectors()`: the style's circle layers, their points drawn as circles facing the screen (`circle-color`,
+  `circle-radius`, `circle-stroke-width` and `circle-stroke-color` with their opacities; picked by feature), and the
+  fills' patterns (`fill-pattern`, `background-pattern`) from the style's sprite, anchored to the world and fading from
+  one zoom's to the next's as MapLibre's (over the relief, a pattern's average color). The sprite's images go to the
+  workers only for the raster path.
+- `vectors()`: the lines joined as their `line-join` says (`miter`, MapLibre's default, bevelled past
+  `line-miter-limit`; `bevel`; `round`, the only join before) and offset by `line-offset` (each feature's own,
+  following the zoom; the ends of the pieces moved along their miters, so that offset lines still meet). Each line
+  piece carries the directions of the line around it, 8 bytes more; about 2 KB gzipped more for the engines, 0.6 KB
+  for the tessellation module.
+
+- Texts along lines follow their bends (`placement: 'line'`, a vector style's `symbol-placement: line`): each glyph
+  placed along the line from the anchor and turned with it, read left to right, its own box in the collision grid; not
+  shown round a bend sharper than 45° between two glyphs or off the line's ends; on one line of text. A vector
+  basemap's texts along lines repeat every `symbol-spacing`. Labels fade in and out (300 ms), keeping their opacity
+  as their tiles come again. About 4 KB gzipped more for the engines.
+- The labels' collisions worked out again every 300 ms while the map moves (and at once when it stops), as MapLibre's:
+  in between the labels shown follow the map, their boxes as they were. The collision grid in cells of 16 pixels,
+  reaching past the screen. A vector basemap's main thread as before its texts along lines (1.7 ms a frame over the
+  3D vector example's drag).
+- GRIB2 packed with CCSDS (data template 5.42), as Météo-France's AROME and ECMWF's open data come: `map.readGrids`
+  decodes it in the grid module (CCSDS 121.0-B, as libaec codes it; tested against ecCodes, fuzzed). About 2.4 KB
+  gzipped more for the grid module. The example Wind over France (AROME every 2.5 km through the hours of a run), in
+  TypeScript and React.
+
+### Changed
+
+- The examples regrouped by what they show: Getting started, Data layers, Basemaps and terrain, 3D city (the vector
+  maps), 3D data (3D Tiles, point clouds, models, panels, three.js), Street level (panoramas, Panoramax), BIM and
+  indoor (IFC, COLLADA, a shopping mall), Flows, Analysis and comparison.
+- Zooming a pitched 3D city with Panoramax over it jerked: a far tile's buildings (10 MB and more) went to the GPU in
+  one upload, tens of milliseconds, and Panoramax's sequences (a point every few metres, most segments under a pixel,
+  each drawn as wide as the line) loaded the GPU until it stalled the page. A large tile's blocks now go a part at a
+  time over several frames (2 MB a part, the tile drawn once they all are there, the one it replaces until then), and
+  the lines are simplified in the workers to a quarter of a pixel at the tile's zoom (no change on screen). Zooming
+  the Panoramax example: 4 frames over 25 ms a zoom instead of 12, the long tasks' time divided by 2.5; the other 3D
+  vector maps as before (vector-3d: no frame over 25 ms). The Panoramax example's line between the photo and the 3D
+  map is dragged (it followed the cursor).
+- Lines and circles (of `vectors()`, `addLines`, `addCircles`) drawn after buildings, trees or models are hidden
+  behind them on a flat map too, as Mapbox GL's buildings hide its lines and circles (in relief they already were by
+  the hills); a second style over a 3D city (Panoramax's) no longer shows through its buildings.
+- The sun's light takes the color of its altitude (nearly white high up, golden under 15°, orange at the horizon) and
+  the shadows the sky's bluer light, as dark as their opacity; the shadows soften far from the camera (their samples
+  spreading up to three times as wide).
+- `vectors()`: a filter reading the zoom holds as MapLibre evaluates it, at the whole zoom under the camera's, not at
+  the level of the tile drawn (drawn from half a level under it, a tile of level 15 showed `['>=', ['zoom'], 15]`
+  from 14.5): each feature styled with the zooms its filter holds over, which the engine checks at the camera's zoom.
+- At night, the ground is darker where the buildings around hide the sky: the streets and courtyards read under the
+  roofs, which kept the same blue (the sun's map drawn from straight above, its heights giving each pixel's share of
+  the sky within 25 metres). Two depth passes more a frame at night, as by day with shadows.
+
+### Fixed
+
+- The floodlit landmarks flickered at night as the view moved: the lights were drawn a hair nearer than the walls
+  they light, so a wall just behind another (the parts of a monument inside one another) caught light in streaks that
+  came and went. The blocks' lights are now drawn only on the surfaces drawn (`invariant gl_Position`, depth `EQUAL`):
+  at the Opéra Garnier, a third of the pixels changing as the view moves by a quarter pixel.
+- A paint property set as a `vectors()` style loads (`setPaintProperty` right after `vectors()`, or `paint` of a
+  `<VectorGeometry>`) was lost: the tiles cut under the former style before it came were never restyled.
+- Paris by night flickered as the view moved: the parts of a landmark's building (the Opéra Garnier's stage tower,
+  the Louvre's wings) were not landmarks unless they held its point of interest, and their dark walls with lit windows
+  fought the floodlit walls along them; a building inside a landmark's, or holding its middle, is now one too (a
+  neighbour against its wall is not). The lit windows, bright points on dark walls, sparkled far away where they shrank
+  to a pixel: they now fade from bays of 6 pixels to 2 (the glass by day as before), a faint even glow in their place.
+- `map.rebuildLayer` (a `<Layer>` or a bound layer made anew) moves the new layer's companions with it (the
+  conifers of `addTrees`), and no longer places it under the old one's companions, removed with it.
+- Zooming in a 3D vector map jerked as tiles came in: their meshes were all uploaded as they arrived, several in one
+  frame (copying their buffers to the GPU, tens of milliseconds each), and the frames after waited on the GPU.
+  `vectors()` now uploads them over several frames, 4 ms a frame (a tile out of view still drawn until its
+  replacements are uploaded): zooming in and out of the 3D vector examples, 0 to 3 frames over 25 ms instead of 5 to 27.
+- `vectors()` over the relief with no raster layer under it (`basemap: 'none'`): its fills showed nowhere, the shadow
+  volumes they are drawn with finding no ground in the depth buffer. The relief's ground is now drawn (its depth
+  alone) when no raster layer draws it first, over the tiles a raster layer would draw (#42).
+- Zooming jerked and tiles blinked out: `vectors()` dropped a tile out of view once the tiles its own update asked for
+  were there, not those an earlier update was still waiting for, leaving a hole for a frame or more; the labels of new
+  tiles (thousands of features past the source's deepest level, shaped again at each whole zoom) held the main thread
+  up to 200 ms. A tile out of view now stays drawn until every tile of the view is there, and the labels are shaped a
+  slice at a time, a frame let through every 6 ms: zooming in and out of the 3D vector example, no frame over 50 ms
+  (217 before), two long tasks instead of thirteen.
+
 ## [1.5.0] - 2026-10-24
 
 ### Added

package/README.md

@@ -179,8 +179,9 @@ More in [Develop and release](https://ideal-adventure-zqn6y6p.pages.github.io/gu
 
 ## Roadmap
 
-The whole MapLibre style drawn as vectors, a 3D vector map to walk through, fluids on the globe (wakes behind the
-buildings, more of the models' files), several projections on the globe, and smaller items: see
+The whole MapLibre style drawn as vectors, a 3D vector map to walk through, Panoramax's street-level photos on the map
+and at street level, fluids on the globe (wakes behind the buildings, more of the models' files), several projections
+on the globe, and smaller items: see
 [Roadmap](https://ideal-adventure-zqn6y6p.pages.github.io/guide/roadmap).
 
 ## Licence

package/dist/basemap/furniture.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 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).
+ */
+/** 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>;

package/dist/basemap/furniture.js

@@ -0,0 +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).
+ */
+import { glb, revolve } from "./trees.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];
+/** Metres from a lamp's foot to its head: the part lit at night */
+export const LAMP_HEAD = 4.6;
+/** A street lamp as a glTF binary, some 5 metres high: a thin pole, a lantern on top */
+export const lampModel = () => {
+    const pole = revolve([
+        [0, 0.14],
+        [0.6, 0.1],
+        [LAMP_HEAD, 0.06],
+    ], 5);
+    const head = revolve([
+        [LAMP_HEAD, 0.12],
+        [4.95, 0.32],
+        [5.25, 0.26],
+        [5.45, 0],
+    ], 6);
+    return glb([pole, head], [POLE, HEAD]);
+};
+//# sourceMappingURL=furniture.js.map

package/dist/basemap/furniture.js.map

@@ -0,0 +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"]}

package/dist/basemap/trees.d.ts

@@ -1,20 +1,41 @@
 /**
- * The trees of a vector map (`VectorTiles.trees`): a low-poly tree made here as a glTF binary (no file to download),
- * its trunk and its crown flat-shaded in their colors, and the style layers they grow on by default.
+ * The trees of a vector map (`VectorTiles.trees`): low-poly trees made here as glTF binaries (no file to download), a
+ * broadleaved one and a conifer, their trunk and crown flat-shaded in their colors; the style layers they grow on by
+ * default, and the share of conifers in a wood from its data.
  */
+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 */
-export declare const TREE_NUMBERS = 5;
-/** Colors of the trunk and of the crown (linear RGBA, as glTF's `baseColorFactor`) */
+/** 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[];
+};
+/** 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 tree as a glTF binary, about 10 metres high: a trunk and a rounded crown in `colors`, one mesh of two primitives,
- * its front +Z (`ModelInstance.heading` turns it), standing on its origin
+ * 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)
  */
-export declare const treeModel: (colors?: Partial<TreeColors>) => Uint8Array<ArrayBuffer>;
+export declare const treeModel: (colors?: Partial<TreeColors>, far?: boolean) => Uint8Array<ArrayBuffer>;
+/**
+ * A conifer as a glTF binary, about 11 metres high: a trunk and three cones one over the other in `colors`; `far`: one
+ * pyramid on a trunk of three faces for far away (some 17 triangles instead of 63)
+ */
+export declare const coniferModel: (colors?: Partial<TreeColors>, far?: boolean) => Uint8Array<ArrayBuffer>;
 /**
  * Whether trees grow on a style layer by default: the woods and forests of the style's fills (OpenMapTiles'
  * `landcover` wood, PLAN IGN's forests) and the grass of its parks and gardens; not the wooded relief of PLAN IGN,
@@ -24,3 +45,9 @@ export declare const treeModel: (colors?: Partial<TreeColors>) => Uint8Array<Arr
 export declare const isWoodland: (layer: StyleLayer) => boolean;
 /** Default spacing of the trees of a layer (metres): close in woods and forests, apart on grass */
 export declare const treeSpacing: (layer: StyleLayer) => number;
+/**
+ * The share of conifers in a wood from its properties: OpenStreetMap's `leaf_type` (needleleaved, broadleaved,
+ * mixed), PLAN IGN's `nature` (« conifères », « feuillus », « mixte »); without them, OpenMapTiles' forests a third
+ * conifers and its other woods some, the grass of parks none
+ */
+export declare const coniferShare: (properties: Record<string, Value>) => number;

package/dist/basemap/trees.js

@@ -1,20 +1,26 @@
 /**
- * The trees of a vector map (`VectorTiles.trees`): a low-poly tree made here as a glTF binary (no file to download),
- * its trunk and its crown flat-shaded in their colors, and the style layers they grow on by default.
+ * The trees of a vector map (`VectorTiles.trees`): low-poly trees made here as glTF binaries (no file to download), a
+ * broadleaved one and a conifer, their trunk and crown flat-shaded in their colors; the style layers they grow on by
+ * default, and the share of conifers in a wood from its data.
  */
-/** Numbers of a tree in the workers' answer: longitude, latitude, scale, heading, rank */
-export const TREE_NUMBERS = 5;
-/** Sides of the trunk and of the crown */
+import { bounds, glbOf } from "../util/gltf.js";
+/** Numbers of a tree in the workers' answer: longitude, latitude, scale, heading, rank, kind (0 broadleaved, 1
+ * conifer) */
+export const TREE_NUMBERS = 6;
+/** Sides of the trunk and of the crown near the view; of the crown far away (a pyramid), of the trunk there */
 const SIDES = 7;
+const FAR_SIDES = 4;
+const FAR_TRUNK_SIDES = 3;
 const DEFAULT_COLORS = {
     trunk: [0.2, 0.12, 0.07, 1],
     crown: [0.12, 0.27, 0.08, 1],
+    conifer: [0.05, 0.16, 0.08, 1],
 };
 /** 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 */
-const revolve = (rings) => {
+export const revolve = (rings, sides = SIDES) => {
     const at = (k, [h, r]) => {
-        const a = (k / SIDES) * Math.PI * 2;
+        const a = (k / sides) * Math.PI * 2;
         return [Math.cos(a) * r, h, Math.sin(a) * r];
     };
     const positions = [];
@@ -34,7 +40,7 @@ const revolve = (rings) => {
     };
     rings.slice(1).forEach((ring, i) => {
         const below = rings[i] ?? ring;
-        Array.from({ length: SIDES }, (_, k) => k).forEach((k) => {
+        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
@@ -45,37 +51,15 @@ const revolve = (rings) => {
     // The bottom closed: seen from below
     const base = rings[0];
     if (base && base[1] > 0) {
-        Array.from({ length: SIDES }, (_, k) => k).forEach((k) => {
+        Array.from({ length: sides }, (_, k) => k).forEach((k) => {
             face([0, base[0], 0], at(k, base), at(k + 1, base));
         });
     }
     return { positions, normals };
 };
-/** Lowest and highest of interleaved x, y, z (glTF needs them on positions) */
-const bounds = (xyz) => {
-    const axes = [0, 1, 2].map((a) => xyz.filter((_, i) => i % 3 === a));
-    return { min: axes.map((v) => Math.min(...v)), max: axes.map((v) => Math.max(...v)) };
-};
-/**
- * A tree as a glTF binary, about 10 metres high: a trunk and a rounded crown in `colors`, one mesh of two primitives,
- * its front +Z (`ModelInstance.heading` turns it), standing on its origin
- */
-export const treeModel = (colors = {}) => {
-    const { trunk, crown } = { ...DEFAULT_COLORS, ...colors };
-    const parts = [
-        revolve([
-            [0, 0.28],
-            [3.2, 0.2],
-        ]),
-        revolve([
-            [2.4, 0.6],
-            [3.6, 2.4],
-            [5.6, 2.9],
-            [7.8, 2.3],
-            [9.4, 1.1],
-            [10.2, 0],
-        ]),
-    ];
+/** 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);
@@ -100,30 +84,81 @@ export const treeModel = (colors = {}) => {
                 primitives: parts.map((_, i) => ({ attributes: { POSITION: i * 2, NORMAL: i * 2 + 1 }, material: i })),
             },
         ],
-        materials: [trunk, crown].map((color) => ({
+        materials: colors.map((color) => ({
             pbrMetallicRoughness: { baseColorFactor: color, metallicFactor: 0, roughnessFactor: 1 },
         })),
         accessors,
         bufferViews: views,
         buffers: [{ byteLength: bin.byteLength }],
     };
-    // The chunks padded to 4 bytes: the JSON with spaces, the binary with zeros
-    const json = new TextEncoder().encode(JSON.stringify(gltf));
-    const jsonLength = Math.ceil(json.length / 4) * 4;
-    const binLength = Math.ceil(bin.byteLength / 4) * 4;
-    const out = new Uint8Array(12 + 8 + jsonLength + 8 + binLength);
-    const view = new DataView(out.buffer);
-    view.setUint32(0, 0x46546c67, true);
-    view.setUint32(4, 2, true);
-    view.setUint32(8, out.length, true);
-    view.setUint32(12, jsonLength, true);
-    view.setUint32(16, 0x4e4f534a, true);
-    out.fill(0x20, 20, 20 + jsonLength);
-    out.set(json, 20);
-    view.setUint32(20 + jsonLength, binLength, true);
-    view.setUint32(24 + jsonLength, 0x004e4942, true);
-    out.set(new Uint8Array(bin.buffer), 28 + jsonLength);
-    return out;
+    return glbOf(gltf, new Uint8Array(bin.buffer));
+};
+/**
+ * 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)
+ */
+export const treeModel = (colors = {}, far = false) => {
+    const { trunk, crown } = { ...DEFAULT_COLORS, ...colors };
+    if (far) {
+        const stem = revolve([
+            [0, 0.3],
+            [3, 0.22],
+        ], FAR_TRUNK_SIDES);
+        const top = revolve([
+            [2.4, 0.8],
+            [5.6, 2.9],
+            [10.2, 0],
+        ], FAR_SIDES);
+        return glb([stem, top], [trunk, crown]);
+    }
+    const parts = [
+        revolve([
+            [0, 0.28],
+            [3.2, 0.2],
+        ]),
+        revolve([
+            [2.4, 0.6],
+            [3.6, 2.4],
+            [5.6, 2.9],
+            [7.8, 2.3],
+            [9.4, 1.1],
+            [10.2, 0],
+        ]),
+    ];
+    return glb(parts, [trunk, crown]);
+};
+/** A cone of the conifers' crown: from `base` metres up, `radius` wide, to its point at `top` */
+const cone = (base, radius, top) => revolve([
+    [base, radius],
+    [top, 0],
+]);
+/**
+ * A conifer as a glTF binary, about 11 metres high: a trunk and three cones one over the other in `colors`; `far`: one
+ * pyramid on a trunk of three faces for far away (some 17 triangles instead of 63)
+ */
+export const coniferModel = (colors = {}, far = false) => {
+    const { trunk, conifer } = { ...DEFAULT_COLORS, ...colors };
+    if (far) {
+        const stem = revolve([
+            [0, 0.24],
+            [2, 0.18],
+        ], FAR_TRUNK_SIDES);
+        const top = revolve([
+            [1.4, 2.3],
+            [11, 0],
+        ], FAR_SIDES);
+        return glb([stem, top], [trunk, conifer]);
+    }
+    const tiers = [cone(1.4, 2.4, 5.4), cone(3.6, 1.9, 8), cone(6, 1.3, 11)];
+    const crown = {
+        positions: tiers.flatMap((t) => t.positions),
+        normals: tiers.flatMap((t) => t.normals),
+    };
+    const stem = revolve([
+        [0, 0.24],
+        [2, 0.18],
+    ]);
+    return glb([stem, crown], [trunk, conifer]);
 };
 /** Whether a style layer is OpenMapTiles' grass (the lawns of parks and gardens among it) */
 const isGrass = (layer) => layer['source-layer'] === 'landcover' && /grass/i.test(layer.id);
@@ -138,4 +173,22 @@ export const isWoodland = (layer) => layer.type === 'fill' &&
     (/wood|forest|for[eê]t/i.test(layer.id) || isGrass(layer));
 /** Default spacing of the trees of a layer (metres): close in woods and forests, apart on grass */
 export const treeSpacing = (layer) => (isGrass(layer) ? 25 : 9);
+/**
+ * The share of conifers in a wood from its properties: OpenStreetMap's `leaf_type` (needleleaved, broadleaved,
+ * mixed), PLAN IGN's `nature` (« conifères », « feuillus », « mixte »); without them, OpenMapTiles' forests a third
+ * conifers and its other woods some, the grass of parks none
+ */
+export const coniferShare = (properties) => {
+    const leaf = properties.leaf_type;
+    const nature = typeof properties.nature === 'string' ? properties.nature : '';
+    if (leaf === 'needleleaved' || /conif/i.test(nature))
+        return 1;
+    if (leaf === 'broadleaved' || /feuillu/i.test(nature))
+        return 0;
+    if (leaf === 'mixed' || /mixte/i.test(nature))
+        return 0.5;
+    if (properties.class === 'wood')
+        return properties.subclass === 'forest' ? 0.35 : 0.15;
+    return 0;
+};
 //# sourceMappingURL=trees.js.map

package/dist/basemap/trees.js.map

@@ -1 +1 @@
-{"version":3,"file":"trees.js","sourceRoot":"","sources":["../../src/basemap/trees.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The trees of a vector map (`VectorTiles.trees`): a low-poly tree made here as a glTF binary (no file to download),\n * its trunk and its crown flat-shaded in their colors, and the style layers they grow on by default.\n */\n\nimport type { StyleLayer } from './vectorstyle.ts';\n\n/** Numbers of a tree in the workers' answer: longitude, latitude, scale, heading, rank */\nexport const TREE_NUMBERS = 5;\n\n/** A point or a vector: x, y, z */\ntype Vec3 = [number, number, number];\n\n/** Sides of the trunk and of the crown */\nconst SIDES = 7;\n\n/** Colors of the trunk and of the crown (linear RGBA, as glTF's `baseColorFactor`) */\nexport interface TreeColors {\n  trunk: [number, number, number, number];\n  crown: [number, number, number, number];\n}\n\nconst DEFAULT_COLORS: TreeColors = {\n  trunk: [0.2, 0.12, 0.07, 1],\n  crown: [0.12, 0.27, 0.08, 1],\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 */\nconst revolve = (rings: [height: number, radius: number][]): { positions: number[]; normals: number[] } => {\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/** Lowest and highest of interleaved x, y, z (glTF needs them on positions) */\nconst bounds = (xyz: number[]): { min: number[]; max: number[] } => {\n  const axes = [0, 1, 2].map((a) => xyz.filter((_, i) => i % 3 === a));\n\n  return { min: axes.map((v) => Math.min(...v)), max: axes.map((v) => Math.max(...v)) };\n};\n\n/**\n * A tree as a glTF binary, about 10 metres high: a trunk and a rounded crown in `colors`, one mesh of two primitives,\n * its front +Z (`ModelInstance.heading` turns it), standing on its origin\n */\nexport const treeModel = (colors: Partial<TreeColors> = {}): Uint8Array<ArrayBuffer> => {\n  const { trunk, crown } = { ...DEFAULT_COLORS, ...colors };\n  const parts = [\n    revolve([\n      [0, 0.28],\n      [3.2, 0.2],\n    ]),\n    revolve([\n      [2.4, 0.6],\n      [3.6, 2.4],\n      [5.6, 2.9],\n      [7.8, 2.3],\n      [9.4, 1.1],\n      [10.2, 0],\n    ]),\n  ];\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: [trunk, crown].map((color) => ({\n      pbrMetallicRoughness: { baseColorFactor: color, metallicFactor: 0, roughnessFactor: 1 },\n    })),\n    accessors,\n    bufferViews: views,\n    buffers: [{ byteLength: bin.byteLength }],\n  };\n  // The chunks padded to 4 bytes: the JSON with spaces, the binary with zeros\n  const json = new TextEncoder().encode(JSON.stringify(gltf));\n  const jsonLength = Math.ceil(json.length / 4) * 4;\n  const binLength = Math.ceil(bin.byteLength / 4) * 4;\n  const out = new Uint8Array(12 + 8 + jsonLength + 8 + binLength);\n  const view = new DataView(out.buffer);\n\n  view.setUint32(0, 0x46546c67, true);\n  view.setUint32(4, 2, true);\n  view.setUint32(8, out.length, true);\n  view.setUint32(12, jsonLength, true);\n  view.setUint32(16, 0x4e4f534a, true);\n  out.fill(0x20, 20, 20 + jsonLength);\n  out.set(json, 20);\n  view.setUint32(20 + jsonLength, binLength, true);\n  view.setUint32(24 + jsonLength, 0x004e4942, true);\n  out.set(new Uint8Array(bin.buffer), 28 + jsonLength);\n\n  return out;\n};\n\n/** Whether a style layer is OpenMapTiles' grass (the lawns of parks and gardens among it) */\nconst isGrass = (layer: StyleLayer): boolean => layer['source-layer'] === 'landcover' && /grass/i.test(layer.id);\n\n/**\n * Whether trees grow on a style layer by default: the woods and forests of the style's fills (OpenMapTiles'\n * `landcover` wood, PLAN IGN's forests) and the grass of its parks and gardens; not the wooded relief of PLAN IGN,\n * which repeats its forests, nor OpenMapTiles' `park` layer (protected areas and historic sites: a river's banks\n * among them)\n */\nexport const isWoodland = (layer: StyleLayer): boolean =>\n  layer.type === 'fill' &&\n  layer['source-layer'] !== 'oro_relief' &&\n  (/wood|forest|for[eê]t/i.test(layer.id) || isGrass(layer));\n\n/** Default spacing of the trees of a layer (metres): close in woods and forests, apart on grass */\nexport const treeSpacing = (layer: StyleLayer): number => (isGrass(layer) ? 25 : 9);\n"]}
+{"version":3,"file":"trees.js","sourceRoot":"","sources":["../../src/basemap/trees.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The trees of a vector map (`VectorTiles.trees`): low-poly trees made here as glTF binaries (no file to download), a\n * broadleaved one and a conifer, their trunk and crown flat-shaded in their colors; the style layers they grow on by\n * default, and the share of conifers in a wood from its data.\n */\n\nimport { bounds, glbOf } from '../util/gltf.ts';\nimport type { Value } from './mvt.ts';\nimport type { StyleLayer } from './vectorstyle.ts';\n\n/** Numbers of a tree in the workers' answer: longitude, latitude, scale, heading, rank, kind (0 broadleaved, 1\n * conifer) */\nexport const TREE_NUMBERS = 6;\n\n/** A point or a vector: x, y, z */\ntype Vec3 = [number, number, number];\n\n/** Sides of the trunk and of the crown near the view; of the crown far away (a pyramid), of the trunk there */\nconst SIDES = 7;\nconst FAR_SIDES = 4;\nconst FAR_TRUNK_SIDES = 3;\n\n/** Colors of the trunk, of the broadleaved crown and of the conifers' (linear RGBA, as glTF's `baseColorFactor`) */\nexport interface TreeColors {\n  trunk: [number, number, number, number];\n  crown: [number, number, number, number];\n  conifer: [number, number, number, number];\n}\n\nconst DEFAULT_COLORS: TreeColors = {\n  trunk: [0.2, 0.12, 0.07, 1],\n  crown: [0.12, 0.27, 0.08, 1],\n  conifer: [0.05, 0.16, 0.08, 1],\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 = (\n  rings: [height: number, radius: number][],\n  sides = SIDES,\n): { positions: number[]; normals: number[] } => {\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/** 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 = (\n  parts: { positions: number[]; normals: number[] }[],\n  colors: TreeColors[keyof TreeColors][],\n): 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    })),\n    accessors,\n    bufferViews: views,\n    buffers: [{ byteLength: bin.byteLength }],\n  };\n  return glbOf(gltf, new Uint8Array(bin.buffer));\n};\n\n/**\n * A broadleaved tree as a glTF binary, about 10 metres high: a trunk and a rounded crown in `colors`; `far`: the\n * same simplified for far away, a few faces (some 30 triangles instead of 100)\n */\nexport const treeModel = (colors: Partial<TreeColors> = {}, far = false): Uint8Array<ArrayBuffer> => {\n  const { trunk, crown } = { ...DEFAULT_COLORS, ...colors };\n\n  if (far) {\n    const stem = revolve(\n      [\n        [0, 0.3],\n        [3, 0.22],\n      ],\n      FAR_TRUNK_SIDES,\n    );\n    const top = revolve(\n      [\n        [2.4, 0.8],\n        [5.6, 2.9],\n        [10.2, 0],\n      ],\n      FAR_SIDES,\n    );\n\n    return glb([stem, top], [trunk, crown]);\n  }\n\n  const parts = [\n    revolve([\n      [0, 0.28],\n      [3.2, 0.2],\n    ]),\n    revolve([\n      [2.4, 0.6],\n      [3.6, 2.4],\n      [5.6, 2.9],\n      [7.8, 2.3],\n      [9.4, 1.1],\n      [10.2, 0],\n    ]),\n  ];\n\n  return glb(parts, [trunk, crown]);\n};\n\n/** A cone of the conifers' crown: from `base` metres up, `radius` wide, to its point at `top` */\nconst cone = (base: number, radius: number, top: number) =>\n  revolve([\n    [base, radius],\n    [top, 0],\n  ]);\n\n/**\n * A conifer as a glTF binary, about 11 metres high: a trunk and three cones one over the other in `colors`; `far`: one\n * pyramid on a trunk of three faces for far away (some 17 triangles instead of 63)\n */\nexport const coniferModel = (colors: Partial<TreeColors> = {}, far = false): Uint8Array<ArrayBuffer> => {\n  const { trunk, conifer } = { ...DEFAULT_COLORS, ...colors };\n\n  if (far) {\n    const stem = revolve(\n      [\n        [0, 0.24],\n        [2, 0.18],\n      ],\n      FAR_TRUNK_SIDES,\n    );\n    const top = revolve(\n      [\n        [1.4, 2.3],\n        [11, 0],\n      ],\n      FAR_SIDES,\n    );\n\n    return glb([stem, top], [trunk, conifer]);\n  }\n  const tiers = [cone(1.4, 2.4, 5.4), cone(3.6, 1.9, 8), cone(6, 1.3, 11)];\n  const crown = {\n    positions: tiers.flatMap((t) => t.positions),\n    normals: tiers.flatMap((t) => t.normals),\n  };\n  const stem = revolve([\n    [0, 0.24],\n    [2, 0.18],\n  ]);\n\n  return glb([stem, crown], [trunk, conifer]);\n};\n\n/** Whether a style layer is OpenMapTiles' grass (the lawns of parks and gardens among it) */\nconst isGrass = (layer: StyleLayer): boolean => layer['source-layer'] === 'landcover' && /grass/i.test(layer.id);\n\n/**\n * Whether trees grow on a style layer by default: the woods and forests of the style's fills (OpenMapTiles'\n * `landcover` wood, PLAN IGN's forests) and the grass of its parks and gardens; not the wooded relief of PLAN IGN,\n * which repeats its forests, nor OpenMapTiles' `park` layer (protected areas and historic sites: a river's banks\n * among them)\n */\nexport const isWoodland = (layer: StyleLayer): boolean =>\n  layer.type === 'fill' &&\n  layer['source-layer'] !== 'oro_relief' &&\n  (/wood|forest|for[eê]t/i.test(layer.id) || isGrass(layer));\n\n/** Default spacing of the trees of a layer (metres): close in woods and forests, apart on grass */\nexport const treeSpacing = (layer: StyleLayer): number => (isGrass(layer) ? 25 : 9);\n\n/**\n * The share of conifers in a wood from its properties: OpenStreetMap's `leaf_type` (needleleaved, broadleaved,\n * mixed), PLAN IGN's `nature` (« conifères », « feuillus », « mixte »); without them, OpenMapTiles' forests a third\n * conifers and its other woods some, the grass of parks none\n */\nexport const coniferShare = (properties: Record<string, Value>): number => {\n  const leaf = properties.leaf_type;\n  const nature = typeof properties.nature === 'string' ? properties.nature : '';\n\n  if (leaf === 'needleleaved' || /conif/i.test(nature)) return 1;\n  if (leaf === 'broadleaved' || /feuillu/i.test(nature)) return 0;\n  if (leaf === 'mixed' || /mixte/i.test(nature)) return 0.5;\n  if (properties.class === 'wood') return properties.subclass === 'forest' ? 0.35 : 0.15;\n\n  return 0;\n};\n"]}

package/dist/basemap/vectorstyle.d.ts

@@ -70,10 +70,15 @@ export interface LabelCandidate {
     lat: number;
     /** On a line: the direction there (degrees of longitude and latitude) */
     along?: [number, number];
+    /** A text along a line: the line around it (longitudes and latitudes interleaved), as long before it as after it,
+     * for the text to follow its bends */
+    path?: number[];
     /** Its text runs along the line (`symbol-placement: line`, `text-rotation-alignment` not `viewport`) */
     textAlong?: boolean;
     textOptional?: boolean;
     icon?: CandidateIcon;
+    /** Metres over the ground: a point in a building of the style's, on its roof */
+    height?: number;
     font: string;
     size: Json;
     color: string;
@@ -100,10 +105,11 @@ export declare const css: ([r, g, b, a]: [number, number, number, number]) => st
 export declare const isExpression: (e: unknown) => e is Json[];
 export declare const evaluate: (e: Json, ctx: Context) => unknown;
 /** The kind of geometry a style layer is drawn with as vectors (`vectors()`: backgrounds as fills, extrusions raised
- * into blocks); undefined for the others (symbols, circles, rasters) and for the layers drawn with a pattern (their
- * images are the raster path's) */
-export declare const vectorKind: (layer: StyleLayer) => "fill" | "line" | "extrusion" | undefined;
+ * into blocks, circles); undefined for the others (symbols, rasters) */
+export declare const vectorKind: (layer: StyleLayer) => "fill" | "line" | "extrusion" | "circle" | undefined;
 export declare const filter: (f: Json | undefined, ctx: Context) => boolean;
+/** Whether an expression reads the zoom (a filter that does holds at some zooms only) */
+export declare const usesZoom: (e: Json | undefined) => boolean;
 /** Whether a value depends on the feature (else only on the zoom, evaluated once per tile) */
 export declare const isFeatureDependent: (e: Json | undefined) => boolean;
 /** A `{token}` text field (or an expression) to the text of a feature */