isard 1.1.0 → 1.2.0

package/dist/basemap/terrain.js

@@ -6,7 +6,7 @@
 import { withHeaders } from "../engine/requests.js";
 const SIZE = 256;
 /** Altitudes (metres, rows from the north) of RGBA pixels in an encoding; below `floor` raised to it */
-export function decodeHeights(rgba, encoding, floor = Number.NEGATIVE_INFINITY) {
+export const decodeHeights = (rgba, encoding, floor = Number.NEGATIVE_INFINITY) => {
     const n = rgba.length >> 2;
     const out = new Float32Array(n);
     // A loop per encoding, without allocations: 65 536 pixels a tile
@@ -23,12 +23,12 @@ export function decodeHeights(rgba, encoding, floor = Number.NEGATIVE_INFINITY)
         }
     }
     return out;
-}
+};
 /**
  * The altitudes of the PNG tile at `url`: 256 × 256, null where the server has no tile; a network or server error
  * rejects (the engine retries). Where it runs: in a worker of the map, or in the page without workers
  */
-export async function fetchHeights(url, encoding, floor, signal, surface) {
+export const fetchHeights = async (url, encoding, floor, signal, surface) => {
     const response = await fetch(url, withHeaders(url, { signal }));
     if (response.status === 404 || response.status === 204 || response.status === 410)
         return null;
@@ -53,17 +53,17 @@ export async function fetchHeights(url, encoding, floor, signal, surface) {
     finally {
         bitmap.close();
     }
-}
+};
 /**
  * A loader of the engine's relief for PNG tiles of `url` ({z}, {x}, {y}) in an encoding: 256 × 256 altitudes, null
  * where the server has no tile; a network or server error rejects (retried). `floor`: the lowest altitude kept (the
  * sea floor of a worldwide model flattened at sea level). `remote`: decodes in a worker when it can
  */
-export function encodedTerrainLoader(url, encoding, floor, remote) {
+export const encodedTerrainLoader = (url, encoding, floor, remote) => {
     const surface = {};
     return (z, x, y, signal) => {
         const tile = url.replaceAll('{z}', String(z)).replaceAll('{x}', String(x)).replaceAll('{y}', String(y));
         return remote?.(tile, encoding, floor, [z, x, y], signal) ?? fetchHeights(tile, encoding, floor, signal, surface);
     };
-}
+};
 //# sourceMappingURL=terrain.js.map

package/dist/basemap/terrain.js.map

@@ -1 +1 @@
-{"version":3,"file":"terrain.js","sourceRoot":"","sources":["../../src/basemap/terrain.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Altitudes encoded in the colors of PNG tiles, for the relief: Terrarium (Mapzen, the Terrain Tiles of AWS) and\n * Terrain-RGB (Mapbox, MapTiler). The engine reads raw floats only; a loader gives it the altitudes of each tile,\n * decoded in a worker of the map's pool (OffscreenCanvas), or in the page when the map has no workers.\n */\nimport { withHeaders } from '../engine/requests.ts';\n\n/** The encodings of altitudes in the colors of PNG tiles */\nexport type PngEncoding = 'terrarium' | 'mapbox';\n\nconst SIZE = 256;\n\n/** Altitudes (metres, rows from the north) of RGBA pixels in an encoding; below `floor` raised to it */\nexport function decodeHeights(\n  rgba: Uint8ClampedArray | Uint8Array,\n  encoding: PngEncoding,\n  floor = Number.NEGATIVE_INFINITY,\n): Float32Array {\n  const n = rgba.length >> 2;\n  const out = new Float32Array(n);\n  // A loop per encoding, without allocations: 65 536 pixels a tile\n  if (encoding === 'terrarium') {\n    for (let i = 0, j = 0; i < n; i += 1, j += 4) {\n      const h = (rgba[j] as number) * 256 + (rgba[j + 1] as number) + (rgba[j + 2] as number) / 256 - 32768;\n      out[i] = h > floor ? h : floor;\n    }\n  } else {\n    for (let i = 0, j = 0; i < n; i += 1, j += 4) {\n      const h = -10000 + ((rgba[j] as number) * 65536 + (rgba[j + 1] as number) * 256 + (rgba[j + 2] as number)) * 0.1;\n      out[i] = h > floor ? h : floor;\n    }\n  }\n  return out;\n}\n\n/** Where the tiles are drawn and read back, made on first use and kept (each tile drawn and read at once) */\nexport interface Surface {\n  canvas?: OffscreenCanvas;\n}\n\n/**\n * The altitudes of the PNG tile at `url`: 256 × 256, null where the server has no tile; a network or server error\n * rejects (the engine retries). Where it runs: in a worker of the map, or in the page without workers\n */\nexport async function fetchHeights(\n  url: string,\n  encoding: PngEncoding,\n  floor: number | undefined,\n  signal: AbortSignal,\n  surface: Surface,\n): Promise<Float32Array | null> {\n  const response = await fetch(url, withHeaders(url, { signal }));\n  if (response.status === 404 || response.status === 204 || response.status === 410) return null;\n  if (!response.ok) throw new Error(`${response.url}: ${response.status}`);\n  // The colors as stored: no color management, no premultiplied alpha\n  const bitmap = await createImageBitmap(await response.blob(), {\n    premultiplyAlpha: 'none',\n    colorSpaceConversion: 'none',\n  });\n  try {\n    surface.canvas ??= new OffscreenCanvas(SIZE, SIZE);\n    const g = surface.canvas.getContext('2d', { willReadFrequently: true });\n    if (!g) throw new Error('no 2D context');\n    // Another size is resampled to the nearest pixel: an interpolated color is no altitude\n    g.imageSmoothingEnabled = false;\n    g.clearRect(0, 0, SIZE, SIZE);\n    g.drawImage(bitmap, 0, 0, SIZE, SIZE);\n    return decodeHeights(g.getImageData(0, 0, SIZE, SIZE).data, encoding, floor);\n  } finally {\n    bitmap.close();\n  }\n}\n\n/** `fetchHeights` run in a worker for tile `z`/`x`/`y`; undefined when the map has no workers (run in the page) */\nexport type RemoteHeights = (\n  url: string,\n  encoding: PngEncoding,\n  floor: number | undefined,\n  tile: [z: number, x: number, y: number],\n  signal: AbortSignal,\n) => Promise<Float32Array | null> | undefined;\n\n/**\n * A loader of the engine's relief for PNG tiles of `url` ({z}, {x}, {y}) in an encoding: 256 × 256 altitudes, null\n * where the server has no tile; a network or server error rejects (retried). `floor`: the lowest altitude kept (the\n * sea floor of a worldwide model flattened at sea level). `remote`: decodes in a worker when it can\n */\nexport function encodedTerrainLoader(\n  url: string,\n  encoding: PngEncoding,\n  floor?: number,\n  remote?: RemoteHeights,\n): (z: number, x: number, y: number, signal: AbortSignal) => Promise<Float32Array | null> {\n  const surface: Surface = {};\n  return (z, x, y, signal) => {\n    const tile = url.replaceAll('{z}', String(z)).replaceAll('{x}', String(x)).replaceAll('{y}', String(y));\n    return remote?.(tile, encoding, floor, [z, x, y], signal) ?? fetchHeights(tile, encoding, floor, signal, surface);\n  };\n}\n"]}
+{"version":3,"file":"terrain.js","sourceRoot":"","sources":["../../src/basemap/terrain.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Altitudes encoded in the colors of PNG tiles, for the relief: Terrarium (Mapzen, the Terrain Tiles of AWS) and\n * Terrain-RGB (Mapbox, MapTiler). The engine reads raw floats only; a loader gives it the altitudes of each tile,\n * decoded in a worker of the map's pool (OffscreenCanvas), or in the page when the map has no workers.\n */\nimport { withHeaders } from '../engine/requests.ts';\n\n/** The encodings of altitudes in the colors of PNG tiles */\nexport type PngEncoding = 'terrarium' | 'mapbox';\n\nconst SIZE = 256;\n\n/** Altitudes (metres, rows from the north) of RGBA pixels in an encoding; below `floor` raised to it */\nexport const decodeHeights = (\n  rgba: Uint8ClampedArray | Uint8Array,\n  encoding: PngEncoding,\n  floor = Number.NEGATIVE_INFINITY,\n): Float32Array => {\n  const n = rgba.length >> 2;\n  const out = new Float32Array(n);\n\n  // A loop per encoding, without allocations: 65 536 pixels a tile\n  if (encoding === 'terrarium') {\n    for (let i = 0, j = 0; i < n; i += 1, j += 4) {\n      const h = (rgba[j] as number) * 256 + (rgba[j + 1] as number) + (rgba[j + 2] as number) / 256 - 32768;\n\n      out[i] = h > floor ? h : floor;\n    }\n  } else {\n    for (let i = 0, j = 0; i < n; i += 1, j += 4) {\n      const h = -10000 + ((rgba[j] as number) * 65536 + (rgba[j + 1] as number) * 256 + (rgba[j + 2] as number)) * 0.1;\n\n      out[i] = h > floor ? h : floor;\n    }\n  }\n\n  return out;\n};\n\n/** Where the tiles are drawn and read back, made on first use and kept (each tile drawn and read at once) */\nexport interface Surface {\n  canvas?: OffscreenCanvas;\n}\n\n/**\n * The altitudes of the PNG tile at `url`: 256 × 256, null where the server has no tile; a network or server error\n * rejects (the engine retries). Where it runs: in a worker of the map, or in the page without workers\n */\nexport const fetchHeights = async (\n  url: string,\n  encoding: PngEncoding,\n  floor: number | undefined,\n  signal: AbortSignal,\n  surface: Surface,\n): Promise<Float32Array | null> => {\n  const response = await fetch(url, withHeaders(url, { signal }));\n\n  if (response.status === 404 || response.status === 204 || response.status === 410) return null;\n  if (!response.ok) throw new Error(`${response.url}: ${response.status}`);\n\n  // The colors as stored: no color management, no premultiplied alpha\n  const bitmap = await createImageBitmap(await response.blob(), {\n    premultiplyAlpha: 'none',\n    colorSpaceConversion: 'none',\n  });\n\n  try {\n    surface.canvas ??= new OffscreenCanvas(SIZE, SIZE);\n\n    const g = surface.canvas.getContext('2d', { willReadFrequently: true });\n\n    if (!g) throw new Error('no 2D context');\n    // Another size is resampled to the nearest pixel: an interpolated color is no altitude\n    g.imageSmoothingEnabled = false;\n    g.clearRect(0, 0, SIZE, SIZE);\n    g.drawImage(bitmap, 0, 0, SIZE, SIZE);\n\n    return decodeHeights(g.getImageData(0, 0, SIZE, SIZE).data, encoding, floor);\n  } finally {\n    bitmap.close();\n  }\n};\n\n/** `fetchHeights` run in a worker for tile `z`/`x`/`y`; undefined when the map has no workers (run in the page) */\nexport type RemoteHeights = (\n  url: string,\n  encoding: PngEncoding,\n  floor: number | undefined,\n  tile: [z: number, x: number, y: number],\n  signal: AbortSignal,\n) => Promise<Float32Array | null> | undefined;\n\n/**\n * A loader of the engine's relief for PNG tiles of `url` ({z}, {x}, {y}) in an encoding: 256 × 256 altitudes, null\n * where the server has no tile; a network or server error rejects (retried). `floor`: the lowest altitude kept (the\n * sea floor of a worldwide model flattened at sea level). `remote`: decodes in a worker when it can\n */\nexport const encodedTerrainLoader = (\n  url: string,\n  encoding: PngEncoding,\n  floor?: number,\n  remote?: RemoteHeights,\n): ((z: number, x: number, y: number, signal: AbortSignal) => Promise<Float32Array | null>) => {\n  const surface: Surface = {};\n\n  return (z, x, y, signal) => {\n    const tile = url.replaceAll('{z}', String(z)).replaceAll('{x}', String(x)).replaceAll('{y}', String(y));\n\n    return remote?.(tile, encoding, floor, [z, x, y], signal) ?? fetchHeights(tile, encoding, floor, signal, surface);\n  };\n};\n"]}

package/dist/basemap/vectorstyle.d.ts

@@ -31,6 +31,8 @@ export interface Style {
         url: string;
     }[];
 }
+/** A MapLibre style, as far as the basemap reads it: its sources and its layers (an id and a type each) */
+export declare const isStyle: (value: unknown) => value is Style;
 /** A raster source of a style: its tile URL, its deepest level and the CSS pixels of its tiles (MapLibre's
  * `tileSize`: 512 by default) */
 export interface RasterSource {
@@ -90,23 +92,23 @@ export interface Context {
     /** 'Point', 'LineString' or 'Polygon' */
     type: string;
 }
-export declare function context(feature: TileFeature, zoom: number): Context;
+export declare const context: (feature: TileFeature, zoom: number) => Context;
 /** A color to RGBA 0-1, undefined if it is not one */
-export declare function color(value: unknown): [number, number, number, number] | undefined;
-export declare function css([r, g, b, a]: [number, number, number, number]): string;
+export declare const color: (value: unknown) => [number, number, number, number] | undefined;
+export declare const css: ([r, g, b, a]: [number, number, number, number]) => string;
 /** Whether a value is an expression (an array starting with a known operator), not a literal array */
-export declare function isExpression(e: unknown): e is Json[];
-export declare function evaluate(e: Json, ctx: Context): unknown;
-export declare function filter(f: Json | undefined, ctx: Context): boolean;
+export declare const isExpression: (e: unknown) => e is Json[];
+export declare const evaluate: (e: Json, ctx: Context) => unknown;
+export declare const filter: (f: Json | undefined, ctx: Context) => boolean;
 /** Whether a value depends on the feature (else only on the zoom, evaluated once per tile) */
-export declare function isFeatureDependent(e: Json | undefined): boolean;
+export declare const isFeatureDependent: (e: Json | undefined) => boolean;
 /** A `{token}` text field (or an expression) to the text of a feature */
-export declare function text(field: Json | undefined, ctx: Context): string;
+export declare const text: (field: Json | undefined, ctx: Context) => string;
 /** The font of a label from the first of its `text-font`: a family without its weight takes the regular one */
-export declare function labelFont(font: string): string;
+export declare const labelFont: (font: string) => string;
 /**
  * A value of the zoom only (an expression: `interpolate`, `step` of `["zoom"]`) as stops `[[zoom, value], …]` for the
  * engine, which interpolates them linearly: evaluated at its own stops and at the whole zooms between (an exponential
  * curve followed closely), a step kept sharp just before its threshold
  */
-export declare function zoomStops(e: Json): [number, number][];
+export declare const zoomStops: (e: Json) => [number, number][];

package/dist/basemap/vectorstyle.js

@@ -7,42 +7,51 @@
  * interpolated in RGBA, `{token}` text fields.
  */
 import { parseCssColor } from "../util/color.js";
+import { isRecord } from "../util/guards.js";
+/** A MapLibre style, as far as the basemap reads it: its sources and its layers (an id and a type each) */
+export const isStyle = (value) => isRecord(value) &&
+    isRecord(value.sources) &&
+    Object.values(value.sources).every((s) => isRecord(s) && typeof s.type === 'string') &&
+    Array.isArray(value.layers) &&
+    value.layers.every((l) => isRecord(l) && typeof l.id === 'string' && typeof l.type === 'string');
 const TYPES = ['Unknown', 'Point', 'LineString', 'Polygon'];
-export function context(feature, zoom) {
+export const context = (feature, zoom) => {
     return { zoom, properties: feature.properties, type: TYPES[feature.type] ?? 'Unknown' };
-}
+};
 // ── Colors ──
 /** A color to RGBA 0-1, undefined if it is not one */
-export function color(value) {
+export const color = (value) => {
     return parseCssColor(value);
-}
-export function css([r, g, b, a]) {
+};
+export const css = ([r, g, b, a]) => {
     return `rgba(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)},${a})`;
-}
+};
 // ── Interpolation ──
 /** Factor between two stops: linear, or exponential of `base` */
-function factor(x, x0, x1, base = 1) {
+const factor = (x, x0, x1, base = 1) => {
     const d = x1 - x0;
     if (d === 0)
         return 0;
     const t = x - x0;
     return base === 1 ? t / d : (base ** t - 1) / (base ** d - 1);
-}
-function mix(a, b, t) {
+};
+const mix = (a, b, t) => {
     if (typeof a === 'number' && typeof b === 'number')
         return a + (b - a) * t;
     const ca = color(a);
     const cb = color(b);
-    if (ca && cb)
-        return css([0, 1, 2, 3].map((i) => (ca[i] ?? 0) + ((cb[i] ?? 0) - (ca[i] ?? 0)) * t));
+    if (ca && cb) {
+        const lerp = (i) => ca[i] + (cb[i] - ca[i]) * t;
+        return css([lerp(0), lerp(1), lerp(2), lerp(3)]);
+    }
     if (Array.isArray(a) && Array.isArray(b))
         return a.map((v, i) => mix(v, b[i], t));
     return t < 0.5 ? a : b;
-}
-function isFunction(v) {
+};
+const isFunction = (v) => {
     return typeof v === 'object' && v !== null && !Array.isArray(v) && Array.isArray(v.stops);
-}
-function legacy(f, ctx) {
+};
+const legacy = (f, ctx) => {
     const input = f.property === undefined ? ctx.zoom : ctx.properties[f.property];
     const stops = f.stops;
     const type = f.type ?? (f.property === undefined || typeof stops[0]?.[0] === 'number' ? 'exponential' : 'categorical');
@@ -53,30 +62,45 @@ function legacy(f, ctx) {
     if (typeof input !== 'number' || !stops.length)
         return f.default ?? stops[0]?.[1];
     // Zoom-and-property stops ({ zoom, value } keys) are taken at their zoom only
-    const key = (s) => typeof s[0] === 'object' && s[0] !== null ? Number(s[0].zoom) : Number(s[0]);
+    const key = ([k]) => {
+        if (Array.isArray(k))
+            return Number.NaN;
+        return isRecord(k) ? Number(k.zoom) : Number(k);
+    };
     const first = stops[0];
     if (!first)
         return f.default;
     if (input <= key(first))
         return first[1];
-    for (let i = 1; i < stops.length; i += 1) {
-        const [s0, s1] = [stops[i - 1], stops[i]];
-        if (!s0 || !s1)
-            continue;
-        if (input < key(s1)) {
-            if (type === 'interval')
-                return s0[1];
-            return mix(s0[1], s1[1], factor(input, key(s0), key(s1), f.base ?? 1));
-        }
-    }
-    return stops.at(-1)?.[1];
-}
+    const at = stops.findIndex((s1, i) => i > 0 && Boolean(stops[i - 1]) && Boolean(s1) && input < key(s1));
+    const [s0, s1] = [stops[at - 1], stops[at]];
+    if (at < 0 || !s0 || !s1)
+        return stops.at(-1)?.[1];
+    if (type === 'interval')
+        return s0[1];
+    return mix(s0[1], s1[1], factor(input, key(s0), key(s1), f.base ?? 1));
+};
 // ── Expressions ──
-function get(ctx, key) {
+/** A list of values to look a value up in (any value: `includes` compares with `===`) */
+const labels = (values) => values;
+const ORDERS = {
+    '<': (a, b) => a < b,
+    '<=': (a, b) => a <= b,
+    '>': (a, b) => a > b,
+    '>=': (a, b) => a >= b,
+};
+/** A comparison of any two values the way JavaScript's operators make it: two strings (lists and objects as their
+ * text) in text order, anything else as numbers */
+const compare = (op, a, b) => {
+    const text = (v) => (typeof v === 'object' && v !== null ? String(v) : v);
+    const [x, y] = [text(a), text(b)];
+    return typeof x === 'string' && typeof y === 'string' ? ORDERS[op](x, y) : ORDERS[op](Number(x), Number(y));
+};
+const get = (ctx, key) => {
     if (key === '$type')
         return ctx.type;
     return typeof key === 'string' ? ctx.properties[key] : undefined;
-}
+};
 /** The operators `evaluate` knows */
 const OPERATORS = new Set([
     'literal',
@@ -142,13 +166,13 @@ const OPERATORS = new Set([
     'e',
 ]);
 /** Whether a value is an expression (an array starting with a known operator), not a literal array */
-export function isExpression(e) {
+export const isExpression = (e) => {
     return Array.isArray(e) && typeof e[0] === 'string' && OPERATORS.has(e[0]);
-}
+};
 /** Operators already warned about */
 const warned = new Set();
 const str = (v) => (v === undefined || v === null ? '' : String(v));
-export function evaluate(e, ctx) {
+export const evaluate = (e, ctx) => {
     if (isFunction(e))
         return legacy(e, ctx);
     if (!Array.isArray(e))
@@ -184,13 +208,17 @@ export function evaluate(e, ctx) {
         case 'image':
             return ev(0);
         case 'number-format': {
-            const options = (args[1] ?? {});
+            const options = isRecord(args[1]) ? args[1] : {};
+            const option = (key) => {
+                const v = options[key];
+                return typeof v === 'number' ? v : undefined;
+            };
             const n = num(0);
             if (!Number.isFinite(n))
                 return '';
-            return n.toLocaleString(options.locale, {
-                minimumFractionDigits: options['min-fraction-digits'],
-                maximumFractionDigits: options['max-fraction-digits'],
+            return n.toLocaleString(typeof options.locale === 'string' ? options.locale : undefined, {
+                minimumFractionDigits: option('min-fraction-digits'),
+                maximumFractionDigits: option('max-fraction-digits'),
             });
         }
         case 'to-number': {
@@ -262,13 +290,10 @@ export function evaluate(e, ctx) {
         case '!=':
             return ev(0) !== ev(1);
         case '<':
-            return ev(0) < ev(1);
         case '<=':
-            return ev(0) <= ev(1);
         case '>':
-            return ev(0) > ev(1);
         case '>=':
-            return ev(0) >= ev(1);
+            return compare(op, ev(0), ev(1));
         case 'in': {
             const haystack = ev(1);
             const needle = ev(0);
@@ -277,19 +302,15 @@ export function evaluate(e, ctx) {
             return Array.isArray(haystack) && haystack.includes(needle);
         }
         case 'case': {
-            for (let i = 0; i + 1 < args.length; i += 2)
-                if (ev(i))
-                    return ev(i + 1);
-            return ev(args.length - 1);
+            const hit = args.findIndex((_, i) => i % 2 === 0 && i + 1 < args.length && Boolean(ev(i)));
+            return hit < 0 ? ev(args.length - 1) : ev(hit + 1);
         }
         case 'match': {
             const input = ev(0);
-            for (let i = 1; i + 1 < args.length; i += 2) {
-                const label = args[i];
-                if (Array.isArray(label) ? label.includes(input) : label === input)
-                    return ev(i + 1);
-            }
-            return ev(args.length - 1);
+            const hit = args.findIndex((label, i) => i % 2 === 1 &&
+                i + 1 < args.length &&
+                (Array.isArray(label) ? labels(label).includes(input) : label === input));
+            return hit < 0 ? ev(args.length - 1) : ev(hit + 1);
         }
         case 'step': {
             const input = num(0);
@@ -308,20 +329,20 @@ export function evaluate(e, ctx) {
             const kind = args[0];
             const input = num(1);
             const base = Array.isArray(kind) && kind[0] === 'exponential' ? Number(kind[1]) : 1;
-            const stops = [];
-            for (let i = 2; i + 1 < args.length; i += 2)
-                stops.push([Number(args[i]), args[i + 1] ?? null]);
+            const stops = Array.from({ length: Math.floor((args.length - 2) / 2) }, (_, k) => [
+                Number(args[2 + 2 * k]),
+                args[3 + 2 * k] ?? null,
+            ]);
             const first = stops[0];
             if (!first)
                 return null;
             if (input <= first[0])
                 return evaluate(first[1], ctx);
-            for (let i = 1; i < stops.length; i += 1) {
-                const [s0, s1] = [stops[i - 1], stops[i]];
-                if (s0 && s1 && input < s1[0])
-                    return mix(evaluate(s0[1], ctx), evaluate(s1[1], ctx), factor(input, s0[0], s1[0], base));
-            }
-            return evaluate(stops.at(-1)?.[1] ?? null, ctx);
+            const at = stops.findIndex((s1, i) => i > 0 && input < s1[0]);
+            const [s0, s1] = [stops[at - 1], stops[at]];
+            if (at < 0 || !s0 || !s1)
+                return evaluate(stops.at(-1)?.[1] ?? null, ctx);
+            return mix(evaluate(s0[1], ctx), evaluate(s1[1], ctx), factor(input, s0[0], s1[0], base));
         }
         case 'rgb':
         case 'rgba':
@@ -371,12 +392,12 @@ export function evaluate(e, ctx) {
             }
             return null;
     }
-}
+};
 // ── Filters ──
 const LEGACY_COMPARISONS = new Set(['==', '!=', '<', '<=', '>', '>=']);
 /** Whether a filter (not `all`, `any`, `none`) is in the legacy form: `["==", "key", value]`, `["in", "key", a, b]`,
  * `["has", "key"]`; a key and literal values, as MapLibre tells them from expressions */
-function isLegacyLeaf(f) {
+const isLegacyLeaf = (f) => {
     const [op, a, ...rest] = f;
     if (typeof op !== 'string' || typeof a !== 'string' || rest.some(Array.isArray))
         return false;
@@ -385,8 +406,8 @@ function isLegacyLeaf(f) {
     if (op === 'in')
         return f.length !== 3 || !Array.isArray(f[2]);
     return op === '!in' || op === 'has' || op === '!has';
-}
-function legacyFilter(f, ctx) {
+};
+const legacyFilter = (f, ctx) => {
     const [op, key, ...rest] = f;
     const v = get(ctx, key);
     switch (op) {
@@ -395,17 +416,14 @@ function legacyFilter(f, ctx) {
         case '!=':
             return v !== rest[0];
         case '<':
-            return v < rest[0];
         case '<=':
-            return v <= rest[0];
         case '>':
-            return v > rest[0];
         case '>=':
-            return v >= rest[0];
+            return compare(op, v, rest[0]);
         case 'in':
-            return rest.includes(v);
+            return labels(rest).includes(v);
         case '!in':
-            return !rest.includes(v);
+            return !labels(rest).includes(v);
         case 'has':
             return v !== undefined;
         case '!has':
@@ -413,53 +431,53 @@ function legacyFilter(f, ctx) {
         default:
             return true;
     }
-}
+};
 /** Compiled filters, by filter object */
 const compiled = new WeakMap();
 /** A filter as a function: `all`, `any`, `none` of their parts, each part legacy or an expression (they may mix) */
-function compile(f) {
+const compile = (f) => {
     if (!Array.isArray(f))
         return () => Boolean(f);
     const hit = compiled.get(f);
     if (hit)
         return hit;
-    let test;
-    const op = f[0];
-    if (op === 'all' || op === 'any' || op === 'none') {
-        const parts = f.slice(1).map(compile);
-        if (op === 'all')
-            test = (ctx) => parts.every((p) => p(ctx));
-        else if (op === 'any')
-            test = (ctx) => parts.some((p) => p(ctx));
-        else
-            test = (ctx) => !parts.some((p) => p(ctx));
-    }
-    else if (isLegacyLeaf(f)) {
-        test = (ctx) => legacyFilter(f, ctx);
-    }
-    else {
-        test = (ctx) => Boolean(evaluate(f, ctx));
-    }
+    const make = () => {
+        const op = f[0];
+        if (op === 'all' || op === 'any' || op === 'none') {
+            const parts = f.slice(1).map(compile);
+            if (op === 'all')
+                return (ctx) => parts.every((p) => p(ctx));
+            if (op === 'any')
+                return (ctx) => parts.some((p) => p(ctx));
+            return (ctx) => !parts.some((p) => p(ctx));
+        }
+        if (isLegacyLeaf(f))
+            return (ctx) => legacyFilter(f, ctx);
+        return (ctx) => Boolean(evaluate(f, ctx));
+    };
+    const test = make();
     compiled.set(f, test);
     return test;
-}
-export function filter(f, ctx) {
+};
+export const filter = (f, ctx) => {
     if (f === undefined || f === null)
         return true;
     return compile(f)(ctx);
-}
+};
+/** 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) */
-export function isFeatureDependent(e) {
+export const isFeatureDependent = (e) => {
     if (e !== undefined && isFunction(e))
         return e.property !== undefined;
     if (!Array.isArray(e))
         return false;
-    if (['get', 'has', '!has', 'geometry-type', 'properties', 'id'].includes(e[0]))
+    if (FEATURE_OPERATORS.has(e[0]))
         return true;
     return e.some((x) => isFeatureDependent(x));
-}
+};
 /** A `{token}` text field (or an expression) to the text of a feature */
-export function text(field, ctx) {
+export const text = (field, ctx) => {
     if (field === undefined || field === null)
         return '';
     if (typeof field === 'string') {
@@ -474,45 +492,45 @@ export function text(field, ctx) {
         return v.filter((x) => typeof x === 'string').join('');
     }
     return v === undefined || v === null ? '' : String(v);
-}
+};
 /** The font of a label from the first of its `text-font`: a family without its weight takes the regular one */
-export function labelFont(font) {
+export const labelFont = (font) => {
     return /Regular|Bold|Italic|Semibold|Light|Medium|Black/.test(font) ? font : `${font} Regular`;
-}
+};
 /**
  * A value of the zoom only (an expression: `interpolate`, `step` of `["zoom"]`) as stops `[[zoom, value], …]` for the
  * engine, which interpolates them linearly: evaluated at its own stops and at the whole zooms between (an exponential
  * curve followed closely), a step kept sharp just before its threshold
  */
-export function zoomStops(e) {
+export const zoomStops = (e) => {
     const zooms = new Set();
+    // The inputs of the stops of an `interpolate` or a `step` (from its fourth argument, one in two)
+    const stopInputs = (x) => x.filter((_, i) => i >= 3 && i % 2 === 1).map(Number);
     const walk = (x) => {
         if (!Array.isArray(x))
             return;
         const zoomInput = (input) => Array.isArray(input) && input[0] === 'zoom';
         if ((x[0] === 'interpolate' || x[0] === 'interpolate-hcl' || x[0] === 'interpolate-lab') && zoomInput(x[2])) {
-            for (let i = 3; i < x.length; i += 2)
-                zooms.add(Number(x[i]));
+            stopInputs(x).forEach((t) => {
+                zooms.add(t);
+            });
         }
         else if (x[0] === 'step' && zoomInput(x[1])) {
-            for (let i = 3; i < x.length; i += 2) {
-                const t = Number(x[i]);
+            stopInputs(x).forEach((t) => {
                 zooms.add(t);
                 zooms.add(t - 0.01);
-            }
+            });
         }
-        for (const y of x)
-            walk(y);
+        x.forEach(walk);
     };
     walk(e);
     const finite = [...zooms].filter(Number.isFinite);
     if (finite.length === 0)
         finite.push(0);
     const [lo, hi] = [Math.min(...finite), Math.max(...finite)];
-    for (let z = Math.ceil(lo); z <= Math.floor(hi); z += 1)
-        finite.push(z);
+    finite.push(...Array.from({ length: Math.floor(hi) - Math.ceil(lo) + 1 }, (_, i) => Math.ceil(lo) + i));
     return [...new Set(finite)]
         .sort((a, b) => a - b)
         .map((zoom) => [zoom, Number(evaluate(e, { zoom, properties: {}, type: 'Unknown' }))]);
-}
+};
 //# sourceMappingURL=vectorstyle.js.map