bruce-cesium 7.4.3 → 7.4.5

package/dist/bruce-cesium.umd.js

@@ -5387,8 +5387,16 @@
         // so a row of labels reads as one size rather than a set of differently shaped pills.
         const ICON_BACKGROUND_UNIFORM_TOLERANCE = 0.3;
         const TEXT_MAX_WIDTH = 200;
+        // Distinct icons a cluster shows, the representative's included.
+        const ICON_STACK_LIMIT = 3;
+        // Size of every icon in a cluster's arrangement, relative to the representative's own.
+        const ICON_STACK_SCALE = 0.6;
         // How far an angled leader runs sideways before the label starts.
         const ANGLED_LEADER_RUN = 28;
+        // Clearance between a point or billboard glyph and the ring drawn around it.
+        const ICON_RING_PADDING = 4;
+        // Small points still get a ring as large as the default near ring.
+        const ICON_RING_MIN = 10;
         // One per tinted icon, since an SVG mask is addressed by id across the whole document.
         let tintCounter = 0;
         // Key where the label instance is stored within the cesium entity.
@@ -5570,6 +5578,28 @@
          * Prefer declared semantics; only infers from recognisable glyphs and filename tokens, never image pixels.
          */
         EntityLabel.IconPriority = GetClusterIconPriority;
+        function iconLook(options) {
+            return {
+                icon: options.icon || undefined,
+                iconUrl: options.iconUrl || undefined,
+                iconClass: typeof options.iconClass === "string" && options.iconClass ? options.iconClass : undefined,
+                iconColor: typeof options.iconColor === "string" && options.iconColor ? options.iconColor : undefined,
+                iconBackground: options.iconBackground || undefined
+            };
+        }
+        /*
+         * Everything that makes two labels look alike, so labels from different groups only merge when they would read the same.
+         */
+        function clusterLook(options) {
+            var _a;
+            const presentation = options.presentation || "text";
+            return JSON.stringify([
+                presentation,
+                (_a = options.leader) !== null && _a !== void 0 ? _a : null,
+                options.leaderStyle || "default", options.leaderColor || "",
+                presentation === "text" ? null : iconLook(options)
+            ]);
+        }
         /*
          * Resolves clustering and stable text placement before depth fading; highlighted labels receive priority.
          */
@@ -5591,7 +5621,8 @@
                 if (!((_b = (_a = frame.options) === null || _a === void 0 ? void 0 : _a.cluster) === null || _b === void 0 ? void 0 : _b.enabled) || frame.priority > 0) {
                     continue;
                 }
-                const key = JSON.stringify([frame.group || "", frame.options.presentation || "text"]);
+                // Groups meet inside a presentation; which of them may merge is decided pairwise below.
+                const key = frame.options.presentation || "text";
                 if (!groups.has(key)) {
                     groups.set(key, []);
                 }
@@ -5603,32 +5634,54 @@
                     frame.options.cluster.pixelRange == null ? { ...frame, x: frame.anchorX, y: frame.anchorY, width: 1, height: 1 } :
                     frame.clusterBounds ? { ...frame, ...frame.clusterBounds } : frame);
                 const index = new ScreenIndex();
-                for (const frame of candidates) {
+                const rank = new Map();
+                const looks = new Map();
+                candidates.forEach((frame, i) => {
                     index.Add(frame);
-                }
+                    rank.set(frame.id, i);
+                    looks.set(frame.id, clusterLook(frame.options));
+                });
                 const clusters = ClusterItems({
                     items: candidates,
                     id: frame => frame.id,
                     minSize: group[0].options.cluster.minSize,
                     neighbours: frame => {
                         var _a;
-                        return (index.Query(frame, (_a = frame.options.cluster.pixelRange) !== null && _a !== void 0 ? _a : (frame.options.presentation === "icon" ? 24 : 8)));
+                        const nearby = index.Query(frame, (_a = frame.options.cluster.pixelRange) !== null && _a !== void 0 ? _a : (frame.options.presentation === "icon" ? 24 : 8)).sort((a, b) => rank.get(a.id) - rank.get(b.id));
+                        return compatibleMembers(frame, nearby, other => other.group || "", other => looks.get(other.id));
                     }
                 });
                 for (const cluster of clusters) {
                     let chosen = cluster.representative;
-                    if ((chosen.options.presentation || "text") !== "text" && chosen.options.cluster.representative !== "nearest") {
-                        let priority = EntityLabel.IconPriority(chosen.options);
-                        for (const member of cluster.members) {
-                            const candidate = EntityLabel.IconPriority(member.options);
-                            if (candidate > priority) {
-                                chosen = member;
-                                priority = candidate;
-                            }
-                        }
+                    const iconic = (chosen.options.presentation || "text") !== "text";
+                    // Members in the order they would win representation; the seed is the nearest.
+                    let ordered = [chosen, ...cluster.members.filter(member => member !== chosen)];
+                    if (iconic && chosen.options.cluster.representative !== "nearest") {
+                        ordered = ordered.map((member, i) => ({ member, i, priority: EntityLabel.IconPriority(member.options) }))
+                            .sort((a, b) => b.priority - a.priority || a.i - b.i).map(entry => entry.member);
+                        chosen = ordered[0];
                     }
                     const representative = result.get(chosen.id);
                     representative.members = cluster.members.map(frame => frame.id);
+                    if (iconic && chosen.options.iconScale !== 0) {
+                        const seen = new Set();
+                        const icons = [];
+                        for (const member of ordered) {
+                            const look = iconLook(member.options);
+                            const key = JSON.stringify(look);
+                            if (seen.has(key)) {
+                                continue;
+                            }
+                            seen.add(key);
+                            if (member !== ordered[0])
+                                icons.push(look);
+                            if (seen.size >= ICON_STACK_LIMIT) {
+                                break;
+                            }
+                        }
+                        if (icons.length)
+                            representative.icons = icons;
+                    }
                     representative.entityIds = Array.from(new Set(cluster.members.map(frame => frame.entityId).filter(Boolean)));
                     if (chosen.options.presentation !== "icon") {
                         const values = new Set();
@@ -5681,6 +5734,34 @@
             return Array.from(result.values());
         }
         EntityLabel.Layout = Layout;
+        /*
+         * The seed plus every neighbour, in order, that shares a group or a look with each member accepted so far.
+         *
+         * Checking against the whole accepted set stops a group with mixed icons bridging two groups that look different.
+         */
+        function compatibleMembers(seed, nearby, group, look) {
+            const accepted = [seed];
+            const byGroup = new Map([[group(seed), 1]]);
+            const byLook = new Map([[look(seed), 1]]);
+            const byBoth = new Map([[JSON.stringify([group(seed), look(seed)]), 1]]);
+            for (const item of nearby) {
+                if (item === seed) {
+                    continue;
+                }
+                const itemGroup = group(item), itemLook = look(item), both = JSON.stringify([itemGroup, itemLook]);
+                // Accepted members in another group with another look are the ones this item may not sit beside.
+                const conflicting = accepted.length - (byGroup.get(itemGroup) || 0) - (byLook.get(itemLook) || 0) + (byBoth.get(both) || 0);
+                if (conflicting > 0) {
+                    continue;
+                }
+                accepted.push(item);
+                byGroup.set(itemGroup, (byGroup.get(itemGroup) || 0) + 1);
+                byLook.set(itemLook, (byLook.get(itemLook) || 0) + 1);
+                byBoth.set(both, (byBoth.get(both) || 0) + 1);
+            }
+            return accepted;
+        }
+        EntityLabel.compatibleMembers = compatibleMembers;
         const layers = new WeakMap();
         const containers = new WeakMap();
         /*
@@ -6078,7 +6159,7 @@
              * @param starterPos3d optional position to create label at. Ignored for billboard labels.
              */
             async createLabel(starterPos3d) {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
                 this.removeLabel();
                 let pos3d = starterPos3d ? starterPos3d.clone() : null;
                 const counter = ++this.counter;
@@ -6400,125 +6481,28 @@
                 let iconElement;
                 let iconContainer;
                 let fitIconBackground;
+                let iconStack;
+                let stackedFits = [];
+                let displayedStack = "[]";
                 content.className = "entity-label-content";
                 content.style.cssText = "display:flex;align-items:center;gap:6px;";
                 if (presentation === "icon-text-above") {
                     content.style.flexDirection = "column-reverse";
                 }
                 if (presentation !== "text") {
-                    const icon = document.createElement("span");
-                    iconElement = icon;
-                    icon.className = "entity-label-icon";
-                    icon.style.cssText = `font-size:${(this.options.iconSize || 24) * ((_m = this.options.iconScale) !== null && _m !== void 0 ? _m : 1)}px;line-height:1;`;
-                    icon.style.textShadow = "0 1px 2px rgba(0, 0, 0, 0.25)";
-                    const iconColor = typeof this.options.iconColor === "string" ? this.options.iconColor : undefined;
-                    const iconBackground = this.options.iconBackground && this.options.iconScale !== 0;
-                    if (iconColor) {
-                        icon.style.color = iconColor;
-                    }
-                    if (this.options.iconUrl) {
-                        const image = document.createElement("img");
-                        image.draggable = false;
-                        image.alt = this.options.icon || "";
-                        const scale = (_o = this.options.iconScale) !== null && _o !== void 0 ? _o : 1;
-                        const size = this.options.iconSize;
-                        const svgNs = "http://www.w3.org/2000/svg";
-                        const tint = iconColor ? document.createElementNS(svgNs, "svg") : null;
-                        const painted = tint ? document.createElementNS(svgNs, "image") : null;
-                        const inked = tint ? document.createElementNS(svgNs, "rect") : null;
-                        if (tint) {
-                            const maskId = `entity-label-tint-${++tintCounter}`;
-                            const mask = document.createElementNS(svgNs, "mask");
-                            mask.setAttribute("id", maskId);
-                            mask.setAttribute("maskUnits", "userSpaceOnUse");
-                            painted.setAttribute("href", this.options.iconUrl);
-                            painted.setAttribute("preserveAspectRatio", "xMidYMid meet");
-                            mask.appendChild(painted);
-                            inked.setAttribute("fill", iconColor);
-                            inked.setAttribute("mask", `url(#${maskId})`);
-                            tint.append(mask, inked);
-                            tint.style.display = "block";
-                            icon.style.display = "inline-flex";
-                            icon.appendChild(tint);
-                        }
-                        const resize = () => {
-                            if (this.disposed || this.counter !== counter) {
-                                return;
-                            }
-                            const intrinsic = this.options.iconScale != null && size == null;
-                            const width = (intrinsic ? image.naturalWidth || 24 : size || 24) * scale;
-                            const height = (intrinsic ? image.naturalHeight || 24 : size || 24) * scale;
-                            if (tint) {
-                                tint.setAttribute("viewBox", `0 0 ${width} ${height}`);
-                                for (const node of [tint, painted, inked]) {
-                                    node.setAttribute("width", String(width));
-                                    node.setAttribute("height", String(height));
-                                }
-                            }
-                            else {
-                                image.style.width = `${width}px`;
-                                image.style.height = `${height}px`;
-                            }
-                            this.viewer.scene.requestRender();
-                        };
-                        image.onload = resize;
-                        resize();
-                        image.src = this.options.iconUrl;
-                        if (!tint) {
-                            icon.appendChild(image);
-                        }
-                    }
-                    else if (typeof this.options.iconClass === "string" && this.options.iconClass) {
-                        icon.className = `entity-label-icon ${this.options.iconClass}`;
-                    }
-                    else {
-                        icon.textContent = this.options.icon || "●";
-                    }
-                    if (iconBackground) {
-                        const color = Cesium.Color.fromCssColorString(iconColor || "white") || Cesium.Color.WHITE;
-                        const luminance = 0.2126 * color.red + 0.7152 * color.green + 0.0722 * color.blue;
-                        const background = (luminance > 0.5 ? color.darken(ICON_BACKGROUND_BLEND, new Cesium.Color()) :
-                            color.brighten(ICON_BACKGROUND_BLEND, new Cesium.Color()));
-                        const size = (this.options.iconSize || 24) * ((_p = this.options.iconScale) !== null && _p !== void 0 ? _p : 1);
-                        icon.style.backgroundColor = background.withAlpha(ICON_BACKGROUND_ALPHA).toCssColorString();
-                        icon.style.borderRadius = "50%";
-                        icon.style.padding = `${size / 3}px`;
-                        icon.style.display = "inline-flex";
-                        icon.style.alignItems = "center";
-                        icon.style.justifyContent = "center";
-                        icon.style.minWidth = `${size}px`;
-                        icon.style.minHeight = `${size}px`;
-                        icon.style.boxSizing = "content-box";
-                        let fitted = false;
-                        fitIconBackground = () => {
-                            if (fitted) {
-                                return;
-                            }
-                            const padding = size / 3;
-                            const width = icon.offsetWidth - padding * 2;
-                            const height = icon.offsetHeight - padding * 2;
-                            if (width <= 0 || height <= 0) {
-                                return;
-                            }
-                            fitted = true;
-                            const longest = Math.max(width, height);
-                            const difference = (longest - Math.min(width, height)) / longest;
-                            if (difference > ICON_BACKGROUND_UNIFORM_TOLERANCE) {
-                                return;
-                            }
-                            icon.style.minWidth = `${longest}px`;
-                            icon.style.minHeight = `${longest}px`;
-                            this.viewer.scene.requestRender();
-                        };
-                    }
-                    if (this.options.iconScale === 0) {
-                        icon.style.display = "none";
-                    }
+                    const built = this.buildIcon(this.options, counter);
+                    const icon = iconElement = built.icon;
+                    fitIconBackground = built.fit;
                     makeClickable(icon);
                     // Keep badges outside the glyph so font classes and image masks cannot affect them.
                     iconContainer = document.createElement("span");
-                    iconContainer.style.cssText = "position:relative;display:inline-flex;flex:none;";
-                    iconContainer.appendChild(icon);
+                    iconContainer.style.cssText = "position:relative;display:inline-flex;flex:none;align-items:center;";
+                    icon.style.position = "relative";
+                    iconStack = document.createElement("span");
+                    iconStack.className = "entity-label-icon-stack";
+                    iconStack.style.cssText = "display:none;gap:2px;align-items:center;justify-items:center;flex:none;";
+                    makeClickable(iconStack);
+                    iconContainer.append(iconStack, icon);
                     content.appendChild(iconContainer);
                 }
                 if (presentation !== "icon") {
@@ -6530,7 +6514,7 @@
                     if (presentation === "text")
                         makeClickable(textElement);
                     content.appendChild(textElement);
-                    if ((_q = this.options.cluster) === null || _q === void 0 ? void 0 : _q.enabled) {
+                    if ((_m = this.options.cluster) === null || _m === void 0 ? void 0 : _m.enabled) {
                         sourceText = document.createElement("span");
                         sourceText.className = "entity-label-source-text";
                         sourceText.setAttribute("aria-hidden", "true");
@@ -6571,7 +6555,7 @@
                         ele.appendChild(countElement);
                     }
                     ele.className = "entity-label";
-                    ele.dataset.entityId = ((_r = this.rego) === null || _r === void 0 ? void 0 : _r.entityId) || "";
+                    ele.dataset.entityId = ((_o = this.rego) === null || _o === void 0 ? void 0 : _o.entityId) || "";
                     ele.dataset.presentation = presentation;
                     if (this.groupId) {
                         ele.dataset.groupId = this.groupId;
@@ -6687,6 +6671,41 @@
                         run, side: (rightwards ? "right" : "left")
                     };
                 };
+                /*
+                 * The on-screen centre and half-size of a point or billboard glyph, relative to its projected position.
+                 * Read every frame, since styling and selection can rescale a billboard in place.
+                 */
+                const measureIcon = () => {
+                    var _a;
+                    if (!normalLeader || !(visual instanceof Cesium.Entity)) {
+                        return null;
+                    }
+                    if (visual.point) {
+                        const size = EnsureNumber(getValue(this.viewer, visual.point.pixelSize), 1) +
+                            EnsureNumber(getValue(this.viewer, visual.point.outlineWidth), 0) * 2;
+                        return size > 0 ? { x: 0, y: 0, radius: size / 2 } : null;
+                    }
+                    if (!visual.billboard) {
+                        return null;
+                    }
+                    const billboard = visual.billboard;
+                    const scale = EnsureNumber(getValue(this.viewer, billboard.scale), 1);
+                    // Icon billboards only record their image height; generated circles set both sides.
+                    const height = EnsureNumber((_a = getValue(this.viewer, billboard.height)) !== null && _a !== void 0 ? _a : billboard._billboardSize, 0) * scale;
+                    const width = EnsureNumber(getValue(this.viewer, billboard.width), height / scale) * scale;
+                    if (!(height > 0) || !(width > 0)) {
+                        return null;
+                    }
+                    const vertical = getValue(this.viewer, billboard.verticalOrigin);
+                    const horizontal = getValue(this.viewer, billboard.horizontalOrigin);
+                    const offset = getValue(this.viewer, billboard.pixelOffset);
+                    return {
+                        x: ((offset === null || offset === void 0 ? void 0 : offset.x) || 0) + (horizontal === Cesium.HorizontalOrigin.LEFT ? width / 2 : horizontal === Cesium.HorizontalOrigin.RIGHT ? -width / 2 : 0),
+                        y: ((offset === null || offset === void 0 ? void 0 : offset.y) || 0) + (vertical === Cesium.VerticalOrigin.BOTTOM || vertical === Cesium.VerticalOrigin.BASELINE ? -height / 2 :
+                            vertical === Cesium.VerticalOrigin.TOP ? height / 2 : 0),
+                        radius: Math.max(width, height) / 2
+                    };
+                };
                 let cursorMotion = this.cursorMotion;
                 const project = () => {
                     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
@@ -6714,8 +6733,10 @@
                     const relative = Cesium.Cartesian3.subtract(this._pos3d, cameraPosition, new Cesium.Cartesian3());
                     const depth = Cesium.Cartesian3.dot(relative, camera.directionWC || camera.direction);
                     const distance = Cesium.Cartesian3.magnitude(relative);
+                    // If we're labelling from a temp label (mouse hover) don't drive opacity by cam distance.
+                    const hoverOnly = this.Transient && !this.Persistent;
                     if (!Number.isFinite(distance) || depth <= 0 || distance < ((_c = this.options.near) !== null && _c !== void 0 ? _c : 0) ||
-                        distance > ((_d = this.options.far) !== null && _d !== void 0 ? _d : Infinity) || (!this.prePositioned && distance >= MAX_DISTANCE)) {
+                        distance > ((_d = this.options.far) !== null && _d !== void 0 ? _d : Infinity) || (!this.prePositioned && !hoverOnly && distance >= MAX_DISTANCE)) {
                         return null;
                     }
                     const transforms = Cesium.SceneTransforms;
@@ -6753,9 +6774,13 @@
                     this.cursorMotion = cursorMotion;
                     const cursorAmount = cursorMotion.amount;
                     leader = normalLeader || cursorAmount > 0;
-                    let x = ((_l = transientPivot === null || transientPivot === void 0 ? void 0 : transientPivot.x) !== null && _l !== void 0 ? _l : anchor.x) + pixelOffset.x;
-                    let y = ((_m = transientPivot === null || transientPivot === void 0 ? void 0 : transientPivot.y) !== null && _m !== void 0 ? _m : anchor.y) + pixelOffset.y;
-                    if (cursorAmount > 0) {
+                    // An icon keeps its callout centred on the glyph rather than following the cursor across it.
+                    const icon = measureIcon();
+                    const iconRing = icon ? Math.max(ICON_RING_MIN, icon.radius + ICON_RING_PADDING) : 0;
+                    const pivot = icon ? undefined : transientPivot;
+                    let x = ((_l = pivot === null || pivot === void 0 ? void 0 : pivot.x) !== null && _l !== void 0 ? _l : anchor.x) + (icon || pixelOffset).x;
+                    let y = ((_m = pivot === null || pivot === void 0 ? void 0 : pivot.y) !== null && _m !== void 0 ? _m : anchor.y) + (icon || pixelOffset).y;
+                    if (cursorAmount > 0 && !icon) {
                         // A leader-less label starts centred on its anchor; preserve that box as it lifts away.
                         if (!normalLeader) {
                             x -= ele.offsetWidth / layer.coordinates.scaleX / 2;
@@ -6793,9 +6818,11 @@
                         if (cursorAmount > 0) {
                             leaderLength += (96 - leaderLength) * cursorAmount;
                         }
+                        // Measured from the ring, so the visible stem is the same length whatever the glyph's size.
+                        leaderLength += iconRing;
                         y = anchorY - leaderLength;
                     }
-                    else if (hover && !reused) {
+                    else if (hover && !reused && !icon) {
                         x = hover.x + pixelOffset.x;
                         y = hover.y + pixelOffset.y - 24;
                     }
@@ -6838,7 +6865,7 @@
                         return null;
                     }
                     const state = (_p = this.visualRegister) === null || _p === void 0 ? void 0 : _p.GetState({ entityId: (_q = this.rego) === null || _q === void 0 ? void 0 : _q.entityId, menuItemId: (_r = this.rego) === null || _r === void 0 ? void 0 : _r.menuItemId });
-                    const opacity = this.prePositioned || MAX_DISTANCE === Infinity ? 1 : 1 - distance / MAX_DISTANCE;
+                    const opacity = this.prePositioned || hoverOnly || MAX_DISTANCE === Infinity ? 1 : 1 - distance / MAX_DISTANCE;
                     return {
                         canFlip: leader && presentation !== "icon", hasLeader: leader,
                         textWrapped: ((sourceNaturalText === null || sourceNaturalText === void 0 ? void 0 : sourceNaturalText.offsetWidth) || 0) > TEXT_MAX_WIDTH,
@@ -6847,6 +6874,7 @@
                         viewportWidth: this.viewer.canvas.clientWidth,
                         id: this.id, entityKey: ((_s = this.rego) === null || _s === void 0 ? void 0 : _s.entityId) ? JSON.stringify([this.rego.entityId, this.rego.menuItemId || "", this.Transient && !this.Persistent ? "hover" : ""]) : undefined,
                         entityId: (_t = this.rego) === null || _t === void 0 ? void 0 : _t.entityId, group: this.groupId, x, y, width, height, anchorX, anchorY, depth, leaderLength, leaderRun, leaderSide, distance,
+                        iconRadius: icon === null || icon === void 0 ? void 0 : icon.radius,
                         // Priority shows the hovered member individually without dragging its cluster along.
                         opacity, priority: hover || cursorAmount > 0 || (state === null || state === void 0 ? void 0 : state.highlighted) ? 1 : 0, options: this.options, text: originalText, clusterBounds
                     };
@@ -6854,7 +6882,7 @@
                 let displacement = { x: 0, y: 0 };
                 let nudge = { x: 0, y: 0, fromX: 0, fromY: 0, targetX: 0, targetY: 0, start: 0 };
                 const apply = (placement) => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
                     const show = (placement === null || placement === void 0 ? void 0 : placement.visible) && placement.opacity > 0;
                     clickEntityIds = show ? placement.entityIds : [];
                     ele.style.visibility = show ? "visible" : "hidden";
@@ -6891,6 +6919,29 @@
                         this.viewer.scene.requestRender();
                     }
                     fitIconBackground === null || fitIconBackground === void 0 ? void 0 : fitIconBackground();
+                    const stack = JSON.stringify(placement.icons || []);
+                    if (iconStack && stack !== displayedStack) {
+                        displayedStack = stack;
+                        const looks = ((_b = placement.icons) === null || _b === void 0 ? void 0 : _b.length) ? [iconLook(this.options), ...placement.icons] : [];
+                        // One small size for all, so no icon in the arrangement reads as more important than another.
+                        const size = (this.options.iconSize || 24) * ((_c = this.options.iconScale) !== null && _c !== void 0 ? _c : 1) * ICON_STACK_SCALE;
+                        const built = looks.map(look => this.buildIcon({ ...look, iconSize: size }, counter));
+                        // Two sit side by side; three make a triangle with the representative on top.
+                        iconStack.style.gridTemplateColumns = built.length === 3 ? "auto auto" : `repeat(${built.length}, auto)`;
+                        if (built.length === 3) {
+                            built[0].icon.style.gridColumn = "1 / span 2";
+                        }
+                        iconStack.replaceChildren(...built.map(({ icon }) => icon));
+                        iconStack.style.display = built.length ? "inline-grid" : "none";
+                        // The glyph stays measurable, since cluster membership is taken from its footprint.
+                        iconElement.style.visibility = built.length ? "hidden" : "";
+                        iconElement.style.position = built.length ? "absolute" : "relative";
+                        stackedFits = built.map(({ fit }) => fit).filter(Boolean);
+                        // The stack widens the label, which the next frame has to measure.
+                        this.viewer.scene.requestRender();
+                    }
+                    for (const fit of stackedFits)
+                        fit();
                     if (iconContainer) {
                         const badgeWidth = countElement.offsetWidth;
                         const iconWidth = iconElement.offsetWidth;
@@ -6906,36 +6957,43 @@
                     // Summary and badge changes must fit on their first visible frame, including after resize.
                     const ring = this.options.anchorRing;
                     const pointer = (layer.pointer || (cursorMotion.target ? cursorMotion.position : undefined) || (this.Transient && !this.Persistent ?
-                        (this.hoverFade.to === 0 ? this.retainedHoverPosition : (_b = this.visualRegister) === null || _b === void 0 ? void 0 : _b.GetLabelHoverPosition((_c = this.rego) === null || _c === void 0 ? void 0 : _c.entityId, (_d = this.rego) === null || _d === void 0 ? void 0 : _d.menuItemId)) : undefined));
-                    const hovered = pointer && Math.hypot(pointer.x - frame.anchorX, pointer.y - frame.anchorY) <= ((_e = ring === null || ring === void 0 ? void 0 : ring.hoverDistance) !== null && _e !== void 0 ? _e : 24);
-                    const normalRadius = (!leader || (ring === null || ring === void 0 ? void 0 : ring.enabled) === false ? 0 : Math.max(frame.distance <= ((_f = ring === null || ring === void 0 ? void 0 : ring.nearDistance) !== null && _f !== void 0 ? _f : 100) ? ((_g = ring === null || ring === void 0 ? void 0 : ring.nearRadius) !== null && _g !== void 0 ? _g : 10) : 0, hovered ? ((_h = ring === null || ring === void 0 ? void 0 : ring.hoverRadius) !== null && _h !== void 0 ? _h : (this.Transient && !this.Persistent ? 15.4 : 22)) : 0));
+                        (this.hoverFade.to === 0 ? this.retainedHoverPosition : (_d = this.visualRegister) === null || _d === void 0 ? void 0 : _d.GetLabelHoverPosition((_e = this.rego) === null || _e === void 0 ? void 0 : _e.entityId, (_f = this.rego) === null || _f === void 0 ? void 0 : _f.menuItemId)) : undefined));
+                    const iconRing = frame.iconRadius ? Math.max(ICON_RING_MIN, frame.iconRadius + ICON_RING_PADDING) : 0;
+                    const hovered = pointer && Math.hypot(pointer.x - frame.anchorX, pointer.y - frame.anchorY) <= Math.max((_g = ring === null || ring === void 0 ? void 0 : ring.hoverDistance) !== null && _g !== void 0 ? _g : 24, iconRing);
+                    const normalRadius = (!leader || (ring === null || ring === void 0 ? void 0 : ring.enabled) === false ? 0 : Math.max(frame.distance <= ((_h = ring === null || ring === void 0 ? void 0 : ring.nearDistance) !== null && _h !== void 0 ? _h : 100) ? ((_j = ring === null || ring === void 0 ? void 0 : ring.nearRadius) !== null && _j !== void 0 ? _j : 10) : 0, hovered ? ((_k = ring === null || ring === void 0 ? void 0 : ring.hoverRadius) !== null && _k !== void 0 ? _k : (this.Transient && !this.Persistent ? 15.4 : 22)) : 0));
                     const targetRadius = normalRadius + (15.4 - normalRadius) * cursorMotion.amount;
+                    // Around a glyph the ring keeps the glyph's size and only fades its stroke in, so it never covers the icon.
+                    const targetOuter = iconRing || targetRadius || 2.5;
+                    const targetInner = iconRing ? (targetRadius > 0 ? iconRing - 2 : iconRing) : Math.max(0, targetRadius - 2);
                     const now = Date.now();
-                    const duration = (_j = ring === null || ring === void 0 ? void 0 : ring.transitionDuration) !== null && _j !== void 0 ? _j : 200;
+                    const duration = (_l = ring === null || ring === void 0 ? void 0 : ring.transitionDuration) !== null && _l !== void 0 ? _l : 200;
                     const sharedRing = this.Transient && !this.Persistent && this.hoverFade.to === 1 ? this.hoverRingState : undefined;
                     let ringAnimation = sharedRing ? sharedRing.animation : this.ringAnimation;
                     if (!ringAnimation) {
-                        ringAnimation = { target: 0, start: now, outer: 2.5, inner: 0, fromOuter: 2.5, fromInner: 0 };
+                        const outer = iconRing || 2.5;
+                        const inner = iconRing;
+                        ringAnimation = { target: outer, targetInner: inner, start: now, outer, inner, fromOuter: outer, fromInner: inner };
                     }
                     const animateRing = () => {
                         const progress = duration > 0 ? Math.min(1, Math.max(0, (now - ringAnimation.start) / duration)) : 1;
                         const eased = progress * progress * (3 - 2 * progress);
-                        ringAnimation.outer = ringAnimation.fromOuter + ((ringAnimation.target || 2.5) - ringAnimation.fromOuter) * eased;
-                        ringAnimation.inner = ringAnimation.fromInner + (Math.max(0, ringAnimation.target - 2) - ringAnimation.fromInner) * eased;
+                        ringAnimation.outer = ringAnimation.fromOuter + (ringAnimation.target - ringAnimation.fromOuter) * eased;
+                        ringAnimation.inner = ringAnimation.fromInner + (ringAnimation.targetInner - ringAnimation.fromInner) * eased;
                         return progress;
                     };
                     animateRing();
-                    if (ringAnimation.target !== targetRadius) {
+                    if (ringAnimation.target !== targetOuter || ringAnimation.targetInner !== targetInner) {
                         ringAnimation = {
                             ...ringAnimation,
-                            target: targetRadius,
+                            target: targetOuter,
+                            targetInner,
                             start: now,
                             fromOuter: ringAnimation.outer,
                             fromInner: ringAnimation.inner
                         };
                     }
                     // Animate the hole and stem together; no CSS transition may lag behind a moving world anchor.
-                    if (animateRing() < 1 && (ringAnimation.fromOuter !== (targetRadius || 2.5) || ringAnimation.fromInner !== Math.max(0, targetRadius - 2))) {
+                    if (animateRing() < 1 && (ringAnimation.fromOuter !== targetOuter || ringAnimation.fromInner !== targetInner)) {
                         this.viewer.scene.requestRender();
                     }
                     this.ringAnimation = ringAnimation;
@@ -6950,19 +7008,19 @@
                     if (leader && angled) {
                         // The declutter owns the side; the fit only says which one had the room to begin with.
                         const run = Math.max(ANGLED_LEADER_RUN, radius + 4);
-                        const side = (_l = (_k = placement.textSide) !== null && _k !== void 0 ? _k : frame.leaderSide) !== null && _l !== void 0 ? _l : "right";
+                        const side = (_o = (_m = placement.textSide) !== null && _m !== void 0 ? _m : frame.leaderSide) !== null && _o !== void 0 ? _o : "right";
                         const beside = side === "left" ? frame.anchorX - run - width : frame.anchorX + run;
                         position.x = Math.max(0, Math.min(beside, this.viewer.canvas.clientWidth - width));
                     }
                     else if (leader && placement.textSide === "left") {
                         position.x = Math.max(0, Math.min(frame.anchorX - width, this.viewer.canvas.clientWidth - width));
                     }
-                    const gap = (_o = (_m = this.options.pointerAvoidance) === null || _m === void 0 ? void 0 : _m.gap) !== null && _o !== void 0 ? _o : 12;
+                    const gap = (_q = (_p = this.options.pointerAvoidance) === null || _p === void 0 ? void 0 : _p.gap) !== null && _q !== void 0 ? _q : 12;
                     const containsPointer = (x, y, margin) => {
                         return pointer && pointer.x >= x - margin && pointer.x <= x + width + margin && pointer.y >= y - margin && pointer.y <= y + height + margin;
                     };
                     const passive = !selectOnClick || !this.visualRegister;
-                    if (passive && ((_p = this.options.pointerAvoidance) === null || _p === void 0 ? void 0 : _p.enabled) !== false && pointer &&
+                    if (passive && ((_r = this.options.pointerAvoidance) === null || _r === void 0 ? void 0 : _r.enabled) !== false && pointer &&
                         (containsPointer(position.x, position.y, gap) || containsPointer(position.x + displacement.x, position.y + displacement.y, gap))) {
                         if (containsPointer(position.x + displacement.x, position.y + displacement.y, 0)) {
                             // Choose against the original box and retain the offset until the pointer leaves both boxes.
@@ -6980,7 +7038,7 @@
                     else {
                         displacement = { x: 0, y: 0 };
                     }
-                    const nudgeDuration = (_r = (_q = this.options.pointerAvoidance) === null || _q === void 0 ? void 0 : _q.transitionDuration) !== null && _r !== void 0 ? _r : 200;
+                    const nudgeDuration = (_t = (_s = this.options.pointerAvoidance) === null || _s === void 0 ? void 0 : _s.transitionDuration) !== null && _t !== void 0 ? _t : 200;
                     const animateNudge = () => {
                         const progress = now < nudge.start ? 0 : nudgeDuration > 0 ? Math.min(1, (now - nudge.start) / nudgeDuration) : 1;
                         const eased = progress * progress * (3 - 2 * progress);
@@ -6996,7 +7054,7 @@
                             fromY: nudge.y,
                             targetX: displacement.x,
                             targetY: displacement.y,
-                            start: now + ((_t = (_s = this.options.pointerAvoidance) === null || _s === void 0 ? void 0 : _s.delay) !== null && _t !== void 0 ? _t : 180)
+                            start: now + ((_v = (_u = this.options.pointerAvoidance) === null || _u === void 0 ? void 0 : _u.delay) !== null && _v !== void 0 ? _v : 180)
                         };
                     }
                     if (animateNudge() < 1 && (nudge.fromX !== nudge.targetX || nudge.fromY !== nudge.targetY)) {
@@ -7006,9 +7064,8 @@
                     position.y += nudge.y;
                     ele.style.left = `${coordinates.x + position.x * coordinates.scaleX}px`;
                     ele.style.top = `${coordinates.y + position.y * coordinates.scaleY}px`;
-                    const clickTarget = content.querySelector('[role="button"]');
-                    if (clickTarget) {
-                        clickTarget.setAttribute("aria-label", placement.members.length ? `Select ${placement.entityIds.length} entities` : `Select ${(_v = (_u = this.options.text) !== null && _u !== void 0 ? _u : text) !== null && _v !== void 0 ? _v : (_w = this.rego) === null || _w === void 0 ? void 0 : _w.entityId}`);
+                    for (const clickTarget of Array.from(content.querySelectorAll('[role="button"]'))) {
+                        clickTarget.setAttribute("aria-label", placement.members.length ? `Select ${placement.entityIds.length} entities` : `Select ${(_x = (_w = this.options.text) !== null && _w !== void 0 ? _w : text) !== null && _x !== void 0 ? _x : (_y = this.rego) === null || _y === void 0 ? void 0 : _y.entityId}`);
                     }
                     if (leader) {
                         const nodeRadius = ringAnimation.outer;
@@ -7048,13 +7105,13 @@
                         // Keep the stem inside the 126-degree arc, away from antialiased endpoints.
                         const arcFraction = 0.35;
                         const rotationLimit = Math.PI * arcFraction - Math.PI / 30;
-                        const targetOffset = hovered ? Math.max(-rotationLimit, Math.min(rotationLimit, wrappedAngle)) : ((_x = ringAnimation.arcOffset) !== null && _x !== void 0 ? _x : 0);
+                        const targetOffset = hovered ? Math.max(-rotationLimit, Math.min(rotationLimit, wrappedAngle)) : ((_z = ringAnimation.arcOffset) !== null && _z !== void 0 ? _z : 0);
                         const targetOpen = cursorMotion.target || (hovered && (ring === null || ring === void 0 ? void 0 : ring.enabled) !== false && targetRadius > 0) ? 1 : 0;
-                        const elapsed = Math.min(32, Math.max(0, now - ((_y = ringAnimation.arcTime) !== null && _y !== void 0 ? _y : now)));
+                        const elapsed = Math.min(32, Math.max(0, now - ((_0 = ringAnimation.arcTime) !== null && _0 !== void 0 ? _0 : now)));
                         const blend = duration > 0 ? 1 - Math.exp(-elapsed / (duration / 3)) : 1;
                         const approach = (value, target) => Math.abs(value - target) < 0.001 ? target : value + (target - value) * blend;
-                        ringAnimation.arcOffset = approach((_z = ringAnimation.arcOffset) !== null && _z !== void 0 ? _z : 0, targetOffset);
-                        ringAnimation.arcOpen = approach((_0 = ringAnimation.arcOpen) !== null && _0 !== void 0 ? _0 : 0, targetOpen);
+                        ringAnimation.arcOffset = approach((_1 = ringAnimation.arcOffset) !== null && _1 !== void 0 ? _1 : 0, targetOffset);
+                        ringAnimation.arcOpen = approach((_2 = ringAnimation.arcOpen) !== null && _2 !== void 0 ? _2 : 0, targetOpen);
                         ringAnimation.arcTime = now;
                         if (ringAnimation.arcOffset !== targetOffset || ringAnimation.arcOpen !== targetOpen) {
                             this.viewer.scene.requestRender();
@@ -7107,6 +7164,123 @@
                     }, 2500);
                 });
             }
+            /*
+             * Builds one icon glyph from label options, with its background chip when asked for.
+             *
+             * The returned fit squares the chip off once the glyph has a measurable size.
+             */
+            buildIcon(options, counter) {
+                var _a, _b, _c;
+                let fit;
+                const icon = document.createElement("span");
+                icon.className = "entity-label-icon";
+                icon.style.cssText = `font-size:${(options.iconSize || 24) * ((_a = options.iconScale) !== null && _a !== void 0 ? _a : 1)}px;line-height:1;`;
+                icon.style.textShadow = "0 1px 2px rgba(0, 0, 0, 0.25)";
+                const iconColor = typeof options.iconColor === "string" ? options.iconColor : undefined;
+                const iconBackground = options.iconBackground && options.iconScale !== 0;
+                if (iconColor) {
+                    icon.style.color = iconColor;
+                }
+                if (options.iconUrl) {
+                    const image = document.createElement("img");
+                    image.draggable = false;
+                    image.alt = options.icon || "";
+                    const scale = (_b = options.iconScale) !== null && _b !== void 0 ? _b : 1;
+                    const size = options.iconSize;
+                    const svgNs = "http://www.w3.org/2000/svg";
+                    const tint = iconColor ? document.createElementNS(svgNs, "svg") : null;
+                    const painted = tint ? document.createElementNS(svgNs, "image") : null;
+                    const inked = tint ? document.createElementNS(svgNs, "rect") : null;
+                    if (tint) {
+                        const maskId = `entity-label-tint-${++tintCounter}`;
+                        const mask = document.createElementNS(svgNs, "mask");
+                        mask.setAttribute("id", maskId);
+                        mask.setAttribute("maskUnits", "userSpaceOnUse");
+                        painted.setAttribute("href", options.iconUrl);
+                        painted.setAttribute("preserveAspectRatio", "xMidYMid meet");
+                        mask.appendChild(painted);
+                        inked.setAttribute("fill", iconColor);
+                        inked.setAttribute("mask", `url(#${maskId})`);
+                        tint.append(mask, inked);
+                        tint.style.display = "block";
+                        icon.style.display = "inline-flex";
+                        icon.appendChild(tint);
+                    }
+                    const resize = () => {
+                        if (this.disposed || this.counter !== counter) {
+                            return;
+                        }
+                        const intrinsic = options.iconScale != null && size == null;
+                        const width = (intrinsic ? image.naturalWidth || 24 : size || 24) * scale;
+                        const height = (intrinsic ? image.naturalHeight || 24 : size || 24) * scale;
+                        if (tint) {
+                            tint.setAttribute("viewBox", `0 0 ${width} ${height}`);
+                            for (const node of [tint, painted, inked]) {
+                                node.setAttribute("width", String(width));
+                                node.setAttribute("height", String(height));
+                            }
+                        }
+                        else {
+                            image.style.width = `${width}px`;
+                            image.style.height = `${height}px`;
+                        }
+                        this.viewer.scene.requestRender();
+                    };
+                    image.onload = resize;
+                    resize();
+                    image.src = options.iconUrl;
+                    if (!tint) {
+                        icon.appendChild(image);
+                    }
+                }
+                else if (typeof options.iconClass === "string" && options.iconClass) {
+                    icon.className = `entity-label-icon ${options.iconClass}`;
+                }
+                else {
+                    icon.textContent = options.icon || "●";
+                }
+                if (iconBackground) {
+                    const color = Cesium.Color.fromCssColorString(iconColor || "white") || Cesium.Color.WHITE;
+                    const luminance = 0.2126 * color.red + 0.7152 * color.green + 0.0722 * color.blue;
+                    const background = (luminance > 0.5 ? color.darken(ICON_BACKGROUND_BLEND, new Cesium.Color()) :
+                        color.brighten(ICON_BACKGROUND_BLEND, new Cesium.Color()));
+                    const size = (options.iconSize || 24) * ((_c = options.iconScale) !== null && _c !== void 0 ? _c : 1);
+                    icon.style.backgroundColor = background.withAlpha(ICON_BACKGROUND_ALPHA).toCssColorString();
+                    icon.style.borderRadius = "50%";
+                    icon.style.padding = `${size / 3}px`;
+                    icon.style.display = "inline-flex";
+                    icon.style.alignItems = "center";
+                    icon.style.justifyContent = "center";
+                    icon.style.minWidth = `${size}px`;
+                    icon.style.minHeight = `${size}px`;
+                    icon.style.boxSizing = "content-box";
+                    let fitted = false;
+                    fit = () => {
+                        if (fitted) {
+                            return;
+                        }
+                        const padding = size / 3;
+                        const width = icon.offsetWidth - padding * 2;
+                        const height = icon.offsetHeight - padding * 2;
+                        if (width <= 0 || height <= 0) {
+                            return;
+                        }
+                        fitted = true;
+                        const longest = Math.max(width, height);
+                        const difference = (longest - Math.min(width, height)) / longest;
+                        if (difference > ICON_BACKGROUND_UNIFORM_TOLERANCE) {
+                            return;
+                        }
+                        icon.style.minWidth = `${longest}px`;
+                        icon.style.minHeight = `${longest}px`;
+                        this.viewer.scene.requestRender();
+                    };
+                }
+                if (options.iconScale === 0) {
+                    icon.style.display = "none";
+                }
+                return { icon, fit };
+            }
             /**
              * Removes label from the viewer and unsubscribes from events.
              */
@@ -50260,7 +50434,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.4.3";
+    const VERSION = "7.4.5";
     /**
      * Updates the environment instance used by bruce-cesium to one specified.
      * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.