isard 1.5.0 → 1.7.0

package/dist/basemap/trees.d.ts

@@ -1,20 +1,31 @@
 /**
- * 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`) */
+/** 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];
 }
+/** 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;
+};
 /**
- * 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 +35,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,129 +1,83 @@
 /**
- * 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 { glb, join, revolve } from "./meshes.js";
+/** 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;
+/** The models' heights (metres): a tree's height from its data scales them by it */
+export const TREE_METRES = { broadleaved: 10.2, conifer: 11 };
 const DEFAULT_COLORS = {
     trunk: [0.2, 0.12, 0.07, 1],
     crown: [0.12, 0.27, 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) => {
-    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 };
-};
-/** 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)) };
+    conifer: [0.05, 0.16, 0.08, 1],
 };
 /**
- * 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 const treeModel = (colors = {}) => {
+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],
+            [TREE_METRES.broadleaved, 0],
+        ], FAR_SIDES);
+        return glb([stem, top], [trunk, crown]);
+    }
     const parts = [
         revolve([
             [0, 0.28],
             [3.2, 0.2],
-        ]),
+        ], SIDES),
         revolve([
             [2.4, 0.6],
             [3.6, 2.4],
             [5.6, 2.9],
             [7.8, 2.3],
             [9.4, 1.1],
-            [10.2, 0],
-        ]),
+            [TREE_METRES.broadleaved, 0],
+        ], SIDES),
     ];
-    // 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: [trunk, crown].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 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],
+], SIDES);
+/**
+ * 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],
+            [TREE_METRES.conifer, 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, TREE_METRES.conifer)];
+    const crown = join(...tiers);
+    const stem = revolve([
+        [0, 0.24],
+        [2, 0.18],
+    ], SIDES);
+    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 +92,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 { glb, join, revolve } from './meshes.ts';\nimport type { Value } from './mvt.ts';\nimport type { StyleLayer } from './vectorstyle.ts';\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\n/** The models' heights (metres): a tree's height from its data scales them by it */\nexport const TREE_METRES = { broadleaved: 10.2, conifer: 11 } as const;\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/**\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        [TREE_METRES.broadleaved, 0],\n      ],\n      FAR_SIDES,\n    );\n\n    return glb([stem, top], [trunk, crown]);\n  }\n\n  const parts = [\n    revolve(\n      [\n        [0, 0.28],\n        [3.2, 0.2],\n      ],\n      SIDES,\n    ),\n    revolve(\n      [\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        [TREE_METRES.broadleaved, 0],\n      ],\n      SIDES,\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    [\n      [base, radius],\n      [top, 0],\n    ],\n    SIDES,\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        [TREE_METRES.conifer, 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, TREE_METRES.conifer)];\n  const crown = join(...tiers);\n  const stem = revolve(\n    [\n      [0, 0.24],\n      [2, 0.18],\n    ],\n    SIDES,\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 */

package/dist/basemap/vectorstyle.js

@@ -396,17 +396,14 @@ export const evaluate = (e, ctx) => {
 // ── Filters ──
 const LEGACY_COMPARISONS = new Set(['==', '!=', '<', '<=', '>', '>=']);
 /** 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) */
+ * into blocks, circles); undefined for the others (symbols, rasters) */
 export const vectorKind = (layer) => {
-    const paint = layer.paint ?? {};
-    if (['fill-pattern', 'line-pattern', 'fill-extrusion-pattern', 'background-pattern'].some((k) => k in paint)) {
-        return undefined;
-    }
     if (layer.type === 'line')
         return 'line';
     if (layer.type === 'fill-extrusion')
         return 'extrusion';
+    if (layer.type === 'circle')
+        return 'circle';
     return layer.type === 'fill' || layer.type === 'background' ? 'fill' : undefined;
 };
 /** Whether a filter (not `all`, `any`, `none`) is in the legacy form: `["==", "key", value]`, `["in", "key", a, b]`,
@@ -478,6 +475,8 @@ export const filter = (f, ctx) => {
         return true;
     return compile(f)(ctx);
 };
+/** Whether an expression reads the zoom (a filter that does holds at some zooms only) */
+export const usesZoom = (e) => Array.isArray(e) && (e[0] === 'zoom' || e.some(usesZoom));
 /** The operators that read the feature */
 const FEATURE_OPERATORS = new Set(['get', 'has', '!has', 'geometry-type', 'properties', 'id']);
 /** Whether a value depends on the feature (else only on the zoom, evaluated once per tile) */