@react-x11/components 0.9.0 → 0.11.0

package/dist/maps/gl/cover.js

@@ -18,17 +18,25 @@
 // projection — markers, overlays, labels, `project()`. `tileCover` reads a
 // smaller tile one level deeper instead, which puts every image at its own
 // natural size on the one world everything shares.
-import { DEFAULT_TILE_SIZE, tileCover, transformFor } from '../proj.js';
+import { BELOW, DEFAULT_TILE_SIZE, FILL_DEPTH, fillFromBelow, tileCover, transformFor, } from '../proj.js';
 /** How far up the pyramid a hole looks for a stand-in. */
 const MAX_ANCESTOR = 8;
 /**
  * The frame's tiles, centre-out, each with its screen square and its clip.
  *
  * A hole — a tile still loading, or one the source has no data for — is
- * covered from whichever side has geometry: the nearest ancestor, drawn at
- * its own larger size and clipped to the hole; or, zooming out, the four
- * children, when all of them are in hand. `AGENTS.md`'s rule for the
- * retained cache holds here too: a pyramid has two neighbours.
+ * covered from whichever side has geometry. Zooming out, that is the tiles
+ * under it: each quarter from the nearest level that has it, down to
+ * `FILL_DEPTH`. Whatever they leave, and the whole of a hole with nothing
+ * under it, is the nearest ancestor's, drawn at its own larger size and
+ * clipped to each gap. `AGENTS.md`'s rule for the retained cache holds here
+ * too: a pyramid has two neighbours.
+ *
+ * The first cut tried the ancestor first, and the children only when all
+ * four of them were in hand. A zoom out leaves the level it came from in
+ * the middle of the view, covering only part of the tiles at the edges, and
+ * a quick one leaves it two or three levels down: both were the background,
+ * with the sharper tiles in hand.
  */
 export function renderCover(camera, pane, scale, pyramid, lookup, options = {}) {
     const transform = transformFor(camera, pane, DEFAULT_TILE_SIZE);
@@ -66,58 +74,63 @@ export function renderCover(camera, pane, scale, pyramid, lookup, options = {})
             own++;
             continue;
         }
-        // An ancestor: the same ground, `2^k` times the size, from `sub` cells
-        // above and to the left of this entry's square.
-        let found = false;
+        // Under it: a tile with no data has nothing under it either, and past
+        // the pyramid's depth there is nothing to find.
         const { z, x, y } = entry.tile;
+        const below = fillFromBelow(entry.tile, data === null ? 0 : Math.min(FILL_DEPTH, pyramid.maxZoom - z), (under) => {
+            const held = lookup.holds ? lookup.holds(under) : 'here';
+            if (held === undefined)
+                return undefined;
+            if (held === 'below')
+                return BELOW;
+            const got = lookup.get(under);
+            return got === undefined ? BELOW : got;
+        });
+        for (const piece of below.pieces) {
+            const size = clip.width / piece.span;
+            const px = clip.x + piece.x * size;
+            const py = clip.y + piece.y * size;
+            tiles.push({
+                data: piece.value,
+                x: px,
+                y: py,
+                size,
+                clip: { x: px, y: py, width: size, height: size },
+            });
+        }
+        if (below.covered)
+            descendants++;
+        if (below.gaps.length === 0)
+            continue;
+        // Over it: an ancestor, the same ground `2^k` times the size, from
+        // `sub` cells above and to the left of this entry's square — drawn once
+        // for each gap, clipped to it.
         for (let k = 1; k <= MAX_ANCESTOR && z - k >= pyramid.minZoom; k++) {
             const ancestor = { z: z - k, x: x >> k, y: y >> k };
             const stand = lookup.get(ancestor);
             if (!stand)
                 continue;
-            const span = 1 << k;
-            const size = clip.width * span;
-            tiles.push({
-                data: stand,
-                x: clip.x - (x - (ancestor.x << k)) * clip.width,
-                y: clip.y - (y - (ancestor.y << k)) * clip.width,
-                size,
-                clip,
-            });
+            const size = clip.width * (1 << k);
+            const sx = clip.x - (x - (ancestor.x << k)) * clip.width;
+            const sy = clip.y - (y - (ancestor.y << k)) * clip.width;
+            for (const gap of below.gaps) {
+                const edge = clip.width / gap.span;
+                tiles.push({
+                    data: stand,
+                    x: sx,
+                    y: sy,
+                    size,
+                    clip: {
+                        x: clip.x + gap.x * edge,
+                        y: clip.y + gap.y * edge,
+                        width: edge,
+                        height: edge,
+                    },
+                });
+            }
             ancestors++;
-            found = true;
             break;
         }
-        if (found || data === null || z + 1 > pyramid.maxZoom)
-            continue;
-        // Zooming out: the finer level is what is in hand. Only when all four
-        // children have answered, or the hole would be patched with holes.
-        const children = [];
-        for (let dy = 0; dy < 2; dy++) {
-            for (let dx = 0; dx < 2; dx++) {
-                const child = lookup.get({ z: z + 1, x: x * 2 + dx, y: y * 2 + dy });
-                if (child === undefined)
-                    break;
-                children.push(child);
-            }
-        }
-        if (children.length !== 4)
-            continue;
-        const half = clip.width / 2;
-        children.forEach((child, i) => {
-            if (!child)
-                return;
-            const cx = clip.x + (i % 2) * half;
-            const cy = clip.y + Math.floor(i / 2) * half;
-            tiles.push({
-                data: child,
-                x: cx,
-                y: cy,
-                size: half,
-                clip: { x: cx, y: cy, width: half, height: half },
-            });
-        });
-        descendants++;
     }
     return { tiles, missing, level, own, ancestors, descendants, inView };
 }

package/dist/maps/gl/cover.js.map

@@ -1 +1 @@
-{"version":3,"file":"cover.js","sourceRoot":"","sources":["../../../src/maps/gl/cover.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cover.js","sourceRoot":"","sources":["../../../src/maps/gl/cover.ts"],"names":[],"mappings":"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"}

package/dist/maps/gl/placement.d.ts

@@ -41,21 +41,23 @@ export interface PlacementFrame {
      *  must, and what the zoom uncovers is named once it stops — not labels
      *  arriving and leaving at every step of it. `true` by default. */
     admit?: boolean;
-    /** The camera is moving: a label keeps the raster it has, rather than
-     *  asking for one at each size its zoom ramp passes through. */
-    moving?: boolean;
 }
 /** Floats per label instance; the layout `renderer.ts` binds. */
-export declare const LABEL_INSTANCE = 18;
+export declare const LABEL_INSTANCE = 19;
 /** The frame's labels, ready to draw. */
 export interface LabelBatch {
     atlas: LabelAtlas;
     /** {@link LABEL_INSTANCE} floats per label: centre x, y (device
-     *  pixels); cos, sin of the baseline; the atlas rect x, y, w, h; ink
-     *  and halo colour, premultiplied and faded; halo radius; `1` to set
-     *  the label on whole pixels. */
+     *  pixels); cos, sin of the baseline; the field's rect in the atlas x,
+     *  y, w, h (texels); ink and halo colour, premultiplied and faded; halo
+     *  radius (device pixels); `1` to set the label on whole pixels; and
+     *  device pixels per field texel — the drawn size over the atlas's
+     *  base. */
     instances: Float32Array;
     count: number;
+    /** Labels drawn: fewer than `count` where an icon is two instances of
+     *  its own beside its name's. `count` where absent. */
+    labels?: number;
 }
 export interface PlacementStats {
     /** Anchors considered, labels placed, labels drawn (fading ones too). */
@@ -89,7 +91,7 @@ export declare class LabelPlacer {
     reset(): void;
     /**
      * Choose the frame's labels. Asks `atlas` for each contender's box, as
-     * the frame's budget allows, and for each winner's raster.
+     * the frame's budget allows, and for each winner's field.
      */
     place(frame: PlacementFrame, atlas: LabelAtlas): void;
     /**
@@ -98,13 +100,24 @@ export declare class LabelPlacer {
      * go of labels that have faded out.
      */
     batch(frame: PlacementFrame, atlas: LabelAtlas): LabelBatch;
+    /** One instance — a label's string, or a piece of its icon — written at
+     *  `count`: answers the count after it. Level (`angle` 0) is set on
+     *  whole pixels. */
+    private _put;
     /** One anchor as a contender, or null when it cannot be one at all at
      *  this zoom — off the view, or on a run too bent or too short for even
      *  a short name. `unit` is device pixels per unit of the lengths given. */
     private _candidate;
+    /** The icon a label of `layer` is set with: none for a name along a
+     *  street, and none where the atlas cannot draw it — the name is then set
+     *  alone rather than not at all. */
+    private _icon;
     /** Each symbol layer's labelling at this zoom, by layer index — null
      *  where it does not label. */
     private _layersAt;
+    /** A layer's icon at this zoom, or null where it sets none — or names
+     *  one this version does not draw, or a colour that does not parse. */
+    private _iconOf;
     private _color;
 }
 export {};

package/dist/maps/gl/placement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placement.d.ts","sourceRoot":"","sources":["../../../src/maps/gl/placement.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAcjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AAExD,oCAAoC;AACpC,UAAU,IAAI;IACZ,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;qCACqC;AACrC,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,CAAC;IAC/B,0DAA0D;IAC1D,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb;yEACqE;IACrE,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,MAAM,WAAW,cAAc;IAC7B,qBAAqB;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;IAC5B;sCACkC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ;;;uEAGmE;IACnE,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;oEACgE;IAChE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,iEAAiE;AACjE,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,yCAAyC;AACzC,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB;;;qCAGiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,8CAA8C;IAC9C,EAAE,EAAE,MAAM,CAAC;CACZ;AAQD,iDAAiD;AACjD,eAAO,MAAM,OAAO,MAAM,CAAC;AA0E3B;;;GAGG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,MAAM,CAA8B;IAC5C,4EAA4E;IAC5E,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;IAC1D;qCACiC;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6B;IAClD,OAAO,CAAC,UAAU,CAAyC;IAC3D,KAAK,EAAE,cAAc,CAAiD;IAEtE,wEAAwE;IACxE,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED,0EAA0E;IAC1E,KAAK,IAAI,IAAI,CAEZ;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAgOpD;IAED;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAuE1D;IAID;;+EAE2E;IAC3E,OAAO,CAAC,UAAU;IAsElB;mCAC+B;IAC/B,OAAO,CAAC,SAAS;IAyCjB,OAAO,CAAC,MAAM;CAQf"}
+{"version":3,"file":"placement.d.ts","sourceRoot":"","sources":["../../../src/maps/gl/placement.ts"],"names":[],"mappings":"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"}

package/dist/maps/gl/placement.js

@@ -2,9 +2,10 @@ import { resolveZoomed } from '../style.js';
 import { TILE_EXTENT } from './buckets.js';
 import { parseColor, premultiplied } from './color.js';
 import { LABEL_STRIDE, LEVEL_SNAP, LINE_MARGIN, LabelField, STRAIGHT_FRACTION, estimateWidth, } from '../anchors.js';
-import { haloReach } from './text.js';
+import { fieldReach } from './text.js';
+import { DEFAULT_ICON_COLOR, DEFAULT_ICON_GLYPH_COLOR, DEFAULT_ICON_SIZE, ICON_GAP, isMapIcon, } from '../icons.js';
 /** Floats per label instance; the layout `renderer.ts` binds. */
-export const LABEL_INSTANCE = 18;
+export const LABEL_INSTANCE = 19;
 /** Logical pixels between two labels, and the extra a newcomer needs. The
  *  extra is the hysteresis: the label already shown wins a tie by it. */
 const PADDING = 4;
@@ -48,7 +49,7 @@ export class LabelPlacer {
     }
     /**
      * Choose the frame's labels. Asks `atlas` for each contender's box, as
-     * the frame's budget allows, and for each winner's raster.
+     * the frame's budget allows, and for each winner's field.
      */
     place(frame, atlas) {
         const started = now();
@@ -165,18 +166,28 @@ export class LabelPlacer {
             const box = atlas.measure(c.text, c.size);
             if (!box || box.width === 0)
                 continue;
-            const w = box.width;
-            const h = box.height;
+            let w = box.width;
+            let h = box.height;
             if (!c.point) {
                 const need = w / 2 + h * LINE_MARGIN;
                 if (c.avail < (c.shown ? need * 0.9 : need))
                     continue;
             }
+            // An icon on the point and the name beside it are one box, placed
+            // and given way as one.
+            const icon = this._icon(layers[c.layer], c.point, atlas);
+            if (icon) {
+                const full = icon.size + icon.gap + w;
+                c.ox = (full - icon.size) / 2;
+                w = full;
+                h = Math.max(h, icon.size);
+            }
+            const bx = c.sx + c.ox;
             const hw = (Math.abs(c.cos) * w + Math.abs(c.sin) * h) / 2;
             const hh = (Math.abs(c.sin) * w + Math.abs(c.cos) * h) / 2;
-            if (c.sx - hw < inset ||
+            if (bx - hw < inset ||
                 c.sy - hh < inset ||
-                c.sx + hw > width - inset ||
+                bx + hw > width - inset ||
                 c.sy + hh > height - inset) {
                 continue;
             }
@@ -220,7 +231,6 @@ export class LabelPlacer {
                             size: c.size,
                             opacity: 0,
                             placed: false,
-                            drawn: 0,
                         };
                     fresh.mx = c.mx;
                     fresh.my = c.my;
@@ -237,8 +247,12 @@ export class LabelPlacer {
             }
             shown.placed = true;
             shown.size = c.size;
-            if (!frame.moving || shown.drawn === 0)
-                atlas.entry(shown.text, shown.size);
+            atlas.entry(shown.text);
+            const icon = this._icon(layers[shown.layer], shown.point, atlas);
+            if (icon) {
+                atlas.icon(icon.name, 'plate');
+                atlas.icon(icon.name, 'glyph');
+            }
         }
         this.stats = {
             candidates: candidates.length,
@@ -257,27 +271,26 @@ export class LabelPlacer {
         this._last = frame.now;
         const step = dt / FADE_MS;
         const layers = this._layersAt(frame.style, frame.zoom, frame.scale);
-        const reach = haloReach(atlas.pad);
+        // How far past its glyphs a field sees, in its own texels: the widest
+        // halo it can draw, times the label's scale.
+        const reach = fieldReach(atlas.pad);
         const halfW = frame.width / 2;
         const halfH = frame.height / 2;
         let count = 0;
+        let labels = 0;
         for (const shown of [...this._shown]) {
             const layer = layers[shown.layer];
-            let entry;
-            if (frame.moving && shown.drawn > 0 && shown.drawn !== shown.size) {
-                // Its zoom ramp has moved on; the size it has serves until the
-                // view is still.
-                entry = atlas.entry(shown.text, shown.drawn);
-            }
-            else {
-                entry = atlas.entry(shown.text, shown.size);
-                if (entry)
-                    shown.drawn = shown.size;
-                else if (shown.drawn > 0)
-                    entry = atlas.entry(shown.text, shown.drawn);
-            }
+            // One field for every size: a zoom ramp that grows the type draws the
+            // same raster larger, the frame it changes.
+            const entry = atlas.entry(shown.text);
+            // A name set beside an icon waits for the icon as well: the name
+            // alone is what the icon is there to explain.
+            const icon = this._icon(layer, shown.point, atlas);
+            const plate = icon ? atlas.icon(icon.name, 'plate') : null;
+            const glyph = icon ? atlas.icon(icon.name, 'glyph') : null;
+            const ready = entry !== null && (!icon || (plate !== null && glyph !== null));
             // Nothing to show yet: wait at zero rather than fade in unseen.
-            if (entry && layer) {
+            if (ready && layer) {
                 shown.opacity = shown.placed
                     ? Math.min(1, shown.opacity + step)
                     : Math.max(0, shown.opacity - step);
@@ -289,45 +302,71 @@ export class LabelPlacer {
                 this._shown.delete(shown);
                 continue;
             }
-            if (!entry || !layer || shown.opacity <= 0)
+            if (!ready || !entry || !layer || shown.opacity <= 0)
                 continue;
             let dx = shown.mx - frame.centerX;
             dx -= Math.round(dx);
             const sx = halfW + dx * frame.world;
             const sy = halfH + (shown.my - frame.centerY) * frame.world;
             const eased = shown.opacity * shown.opacity * (3 - 2 * shown.opacity);
-            if (this._instances.length < (count + 1) * LABEL_INSTANCE) {
-                const grown = new Float32Array(this._instances.length * 2);
-                grown.set(this._instances);
-                this._instances = grown;
-            }
-            const d = this._instances;
-            const at = count * LABEL_INSTANCE;
-            const level = shown.angle === 0;
-            d[at] = sx;
-            d[at + 1] = sy;
-            d[at + 2] = level ? 1 : Math.cos(shown.angle);
-            d[at + 3] = level ? 0 : Math.sin(shown.angle);
-            d[at + 4] = entry.x;
-            d[at + 5] = entry.y;
-            d[at + 6] = entry.width;
-            d[at + 7] = entry.height;
             const ink = premultiplied(layer.ink, eased);
-            d[at + 8] = ink[0];
-            d[at + 9] = ink[1];
-            d[at + 10] = ink[2];
-            d[at + 11] = ink[3];
             const halo = layer.halo ? premultiplied(layer.halo, eased) : ZERO;
-            d[at + 12] = halo[0];
-            d[at + 13] = halo[1];
-            d[at + 14] = halo[2];
-            d[at + 15] = halo[3];
-            d[at + 16] = layer.halo ? Math.min(layer.haloPx, reach) : 0;
-            d[at + 17] = level ? 1 : 0;
-            count++;
+            const k = shown.size / atlas.base;
+            const haloPx = layer.halo ? Math.min(layer.haloPx, reach * k) : 0;
+            if (icon && plate && glyph) {
+                // The plate under its halo, the glyph on it, and the name level
+                // beside it: the string is its field less the margin, and its
+                // left edge goes the gap past the plate's right.
+                const ki = icon.size / atlas.base;
+                const plateHalo = layer.halo ? Math.min(layer.haloPx, reach * ki) : 0;
+                count = this._put(count, sx, sy, 0, plate, premultiplied(icon.plate, eased), halo, plateHalo, ki);
+                count = this._put(count, sx, sy, 0, glyph, premultiplied(icon.glyph, eased), ZERO, 0, ki);
+                const tx = sx +
+                    icon.size / 2 +
+                    icon.gap +
+                    ((entry.width - 2 * atlas.pad) * k) / 2;
+                count = this._put(count, tx, sy, 0, entry, ink, halo, haloPx, k);
+            }
+            else {
+                count = this._put(count, sx, sy, shown.angle, entry, ink, halo, haloPx, k);
+            }
+            labels++;
         }
-        this.stats.drawn = count;
-        return { atlas, instances: this._instances, count };
+        this.stats.drawn = labels;
+        return { atlas, instances: this._instances, count, labels };
+    }
+    /** One instance — a label's string, or a piece of its icon — written at
+     *  `count`: answers the count after it. Level (`angle` 0) is set on
+     *  whole pixels. */
+    _put(count, x, y, angle, entry, ink, halo, haloPx, scale) {
+        if (this._instances.length < (count + 1) * LABEL_INSTANCE) {
+            const grown = new Float32Array(this._instances.length * 2);
+            grown.set(this._instances);
+            this._instances = grown;
+        }
+        const d = this._instances;
+        const at = count * LABEL_INSTANCE;
+        const level = angle === 0;
+        d[at] = x;
+        d[at + 1] = y;
+        d[at + 2] = level ? 1 : Math.cos(angle);
+        d[at + 3] = level ? 0 : Math.sin(angle);
+        d[at + 4] = entry.x;
+        d[at + 5] = entry.y;
+        d[at + 6] = entry.width;
+        d[at + 7] = entry.height;
+        d[at + 8] = ink[0];
+        d[at + 9] = ink[1];
+        d[at + 10] = ink[2];
+        d[at + 11] = ink[3];
+        d[at + 12] = halo[0];
+        d[at + 13] = halo[1];
+        d[at + 14] = halo[2];
+        d[at + 15] = halo[3];
+        d[at + 16] = haloPx;
+        d[at + 17] = level ? 1 : 0;
+        d[at + 18] = scale;
+        return count + 1;
     }
     // --- internals -------------------------------------------------------------
     /** One anchor as a contender, or null when it cannot be one at all at
@@ -370,6 +409,7 @@ export class LabelPlacer {
             point,
             sx,
             sy,
+            ox: 0,
             angle: a,
             cos: Math.cos(a),
             sin: Math.sin(a),
@@ -389,6 +429,13 @@ export class LabelPlacer {
             repeat: layer.repeat,
         };
     }
+    /** The icon a label of `layer` is set with: none for a name along a
+     *  street, and none where the atlas cannot draw it — the name is then set
+     *  alone rather than not at all. */
+    _icon(layer, point, atlas) {
+        const icon = point ? (layer?.icon ?? null) : null;
+        return icon && !atlas.iconFailed(icon.name) ? icon : null;
+    }
     /** Each symbol layer's labelling at this zoom, by layer index — null
      *  where it does not label. */
     _layersAt(style, zoom, scale) {
@@ -409,9 +456,11 @@ export class LabelPlacer {
             const haloWidth = symbol.textHaloWidth === undefined
                 ? 1
                 : resolveZoomed(symbol.textHaloWidth, zoom);
-            const size = Math.max(1, Math.round((symbol.textSize === undefined
+            // Not rounded: a field draws any size, so a ramp grows the type
+            // continuously rather than a whole pixel at a time.
+            const size = Math.max(1, (symbol.textSize === undefined
                 ? 12
-                : resolveZoomed(symbol.textSize, zoom)) * scale));
+                : resolveZoomed(symbol.textSize, zoom)) * scale);
             return {
                 id: layer.id,
                 rank: symbol.rank ?? 0,
@@ -420,9 +469,34 @@ export class LabelPlacer {
                 ink,
                 halo: halo && haloWidth > 0 ? halo : null,
                 haloPx: haloWidth * scale,
+                icon: this._iconOf(symbol, zoom, scale),
             };
         });
     }
+    /** A layer's icon at this zoom, or null where it sets none — or names
+     *  one this version does not draw, or a colour that does not parse. */
+    _iconOf(symbol, zoom, scale) {
+        if (!isMapIcon(symbol.icon))
+            return null;
+        const plate = this._color(symbol.iconColor
+            ? resolveZoomed(symbol.iconColor, zoom)
+            : DEFAULT_ICON_COLOR);
+        const glyph = this._color(symbol.iconGlyphColor
+            ? resolveZoomed(symbol.iconGlyphColor, zoom)
+            : DEFAULT_ICON_GLYPH_COLOR);
+        if (!plate || !glyph)
+            return null;
+        const size = symbol.iconSize === undefined
+            ? DEFAULT_ICON_SIZE
+            : resolveZoomed(symbol.iconSize, zoom);
+        return {
+            name: symbol.icon,
+            size: Math.max(1, Math.round(size * scale)),
+            gap: ICON_GAP * scale,
+            plate,
+            glyph,
+        };
+    }
     _color(value) {
         let color = this._colors.get(value);
         if (color === undefined) {
@@ -511,7 +585,8 @@ class CollisionGrid {
         const out = this._scratch;
         out.length = 0;
         if (c.angle === 0) {
-            out.push(0, c.sx - w / 2 - pad, c.sy - h / 2 - pad, c.sx + w / 2 + pad, c.sy + h / 2 + pad);
+            const x = c.sx + c.ox;
+            out.push(0, x - w / 2 - pad, c.sy - h / 2 - pad, x + w / 2 + pad, c.sy + h / 2 + pad);
             return out;
         }
         const r = h / 2 + pad;