bruce-cesium 7.5.9 → 7.6.1

package/dist/lib/bruce-cesium.js

@@ -89,7 +89,7 @@ __exportStar(require("./widgets/widget-info-view"), exports);
 __exportStar(require("./widgets/widget-left-panel"), exports);
 __exportStar(require("./widgets/widget-nav-compass"), exports);
 __exportStar(require("./widgets/widget-view-bar"), exports);
-exports.VERSION = "7.5.9";
+exports.VERSION = "7.6.1";
 /**
  * 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.

package/dist/lib/rendering/render-managers/common/entity-label.js

@@ -953,6 +953,22 @@ var EntityLabel;
         return centre && half && (axes === null || axes === void 0 ? void 0 : axes.every(Boolean)) ? { centre, axes, half } : null;
     }
     EntityLabel.ReadOrientedBox = ReadOrientedBox;
+    /*
+     * Whether a placement turns what it places. Scale alone does not count.
+     */
+    function isRotated(matrix) {
+        for (let column = 0; column < 3; column++) {
+            const axis = [0, 1, 2].map(row => Number(matrix[row][column]));
+            const length = Math.hypot(...axis);
+            if (!(length > 0)) {
+                return false;
+            }
+            if (axis.some((value, row) => Math.abs(value / length - Number(row === column)) > 1e-5)) {
+                return true;
+            }
+        }
+        return false;
+    }
     /*
      * The eight padded world corners of an assembly Entity's geometry box, or null when the record cannot give one.
      *
@@ -971,6 +987,10 @@ var EntityLabel;
         if ((matrix === null || matrix === void 0 ? void 0 : matrix.length) !== 4 || !matrix.every(row => (row === null || row === void 0 ? void 0 : row.length) === 4) || !Number.isFinite(+(root === null || root === void 0 ? void 0 : root.latitude)) || !Number.isFinite(+(root === null || root === void 0 ? void 0 : root.longitude))) {
             return null;
         }
+        // A pure translation can hide a rotation baked into the vertices, which leaves the extents loose.
+        if (!shape && !isRotated(matrix)) {
+            return null;
+        }
         const pivot = ((_c = bruce.GeometryPivot) === null || _c === void 0 ? void 0 : _c.length) >= 3 ? bruce.GeometryPivot.slice(0, 3).map(Number) : [0, 0, 0];
         // Without an oriented box the record's own extents are an axis-aligned box about the pivot.
         const box = shape || { centre: pivot, axes: [[1, 0, 0], [0, 1, 0], [0, 0, 1]], half: half };
@@ -2421,6 +2441,22 @@ var EntityLabel;
                     radius: Math.max(width, height) / 2
                 };
             };
+            /*
+             * The on-screen centre and half-size of a model too small for its box, so the box is ringed like a glyph.
+             */
+            const measureModel = (anchor) => {
+                const hull = layer.modelBoxes.Hull(this.id);
+                if (!(hull === null || hull === void 0 ? void 0 : hull.length)) {
+                    return null;
+                }
+                const xs = hull.map(point => point.x), ys = hull.map(point => point.y);
+                const left = Math.min(...xs), top = Math.min(...ys);
+                const width = Math.max(...xs) - left, height = Math.max(...ys) - top;
+                if (Math.max(width, height) >= MODEL_BOX_MIN_SIZE) {
+                    return null;
+                }
+                return { x: left + width / 2 - anchor.x, y: top + height / 2 - anchor.y, radius: Math.max(width, height) / 2 };
+            };
             // Only CAD tilesets and model Entities are assembly parts with a geometry box; anything else stays a point.
             const boxable = Boolean(normalLeader && ((_r = this.rego) === null || _r === void 0 ? void 0 : _r.entityId) && ((visual instanceof Cesium.Cesium3DTileFeature && this.rego.tilesetType === bruce_models_1.Tileset.EType.Cad) ||
                 (visual instanceof Cesium.Entity && Boolean(visual.model))));
@@ -2479,7 +2515,7 @@ var EntityLabel;
             }
             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, _u, _v, _w, _x;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
                 if (this.disposed || !this.viewer || this.viewer.isDestroyed() || ((_a = this.visible) === null || _a === void 0 ? void 0 : _a.call(this)) === false ||
                     (presentation === "icon" && this.options.iconScale === 0)) {
                     return null;
@@ -2522,7 +2558,8 @@ var EntityLabel;
                 const boxBlend = this.morphToBox(boxed, shownOnce ? (_f = (_e = this.options.anchorRing) === null || _e === void 0 ? void 0 : _e.transitionDuration) !== null && _f !== void 0 ? _f : 200 : 0);
                 // Eased between the ring and where the stem meets the box, so gaining or losing a box never jumps.
                 const boxTarget = this.boxMorph.anchor;
-                const ringPoint = { x: anchor.x + pixelOffset.x, y: anchor.y + pixelOffset.y };
+                const model = ((_g = this.modelBox) === null || _g === void 0 ? void 0 : _g.corners) ? measureModel(anchor) : null;
+                const ringPoint = { x: anchor.x + (model || pixelOffset).x, y: anchor.y + (model || pixelOffset).y };
                 const boxAnchor = boxBlend > 0 && boxTarget ? {
                     x: ringPoint.x + (boxTarget.x - ringPoint.x) * boxBlend,
                     y: ringPoint.y + (boxTarget.y - ringPoint.y) * boxBlend
@@ -2533,13 +2570,13 @@ var EntityLabel;
                     return null;
                 if (onScreen && !this.imageAsked && this.groupId && !HasIcon(this.options) && !this.options.photo) {
                     this.imageAsked = true;
-                    (_g = this.visualRegister) === null || _g === void 0 ? void 0 : _g.RequestLabelImage((_h = this.rego) === null || _h === void 0 ? void 0 : _h.entityId);
+                    (_h = this.visualRegister) === null || _h === void 0 ? void 0 : _h.RequestLabelImage((_j = this.rego) === null || _j === void 0 ? void 0 : _j.entityId);
                 }
                 const transientPivot = (this.Transient && !this.Persistent ?
-                    (this.hoverFade.to === 0 ? this.retainedHoverPosition : (_j = this.visualRegister) === null || _j === void 0 ? void 0 : _j.GetLabelHoverPosition((_k = this.rego) === null || _k === void 0 ? void 0 : _k.entityId, (_l = this.rego) === null || _l === void 0 ? void 0 : _l.menuItemId)) : undefined);
+                    (this.hoverFade.to === 0 ? this.retainedHoverPosition : (_k = this.visualRegister) === null || _k === void 0 ? void 0 : _k.GetLabelHoverPosition((_l = this.rego) === null || _l === void 0 ? void 0 : _l.entityId, (_m = this.rego) === null || _m === void 0 ? void 0 : _m.menuItemId)) : undefined);
                 const hover = (presentation !== "icon" ?
                     (this.Transient && !this.Persistent && this.hoverFade.to === 0 ? this.retainedHoverPosition :
-                        (_m = this.visualRegister) === null || _m === void 0 ? void 0 : _m.GetLabelHoverPosition((_o = this.rego) === null || _o === void 0 ? void 0 : _o.entityId, (_p = this.rego) === null || _p === void 0 ? void 0 : _p.menuItemId)) : undefined);
+                        (_o = this.visualRegister) === null || _o === void 0 ? void 0 : _o.GetLabelHoverPosition((_p = this.rego) === null || _p === void 0 ? void 0 : _p.entityId, (_q = this.rego) === null || _q === void 0 ? void 0 : _q.menuItemId)) : undefined);
                 const reused = !this.Transient || this.Persistent;
                 const now = Date.now();
                 const animateCursor = () => {
@@ -2566,13 +2603,13 @@ var EntityLabel;
                 const cursorAmount = cursorMotion.amount;
                 leader = normalLeader || cursorAmount > 0;
                 // An icon keeps its callout centred on the glyph rather than following the cursor across it.
-                const icon = boxAnchor ? null : measureIcon();
+                const icon = boxAnchor ? null : measureIcon() || model;
                 const iconRing = icon ? Math.max(ICON_RING_MIN, icon.radius + ICON_RING_PADDING) : 0;
                 // A boxed model is pinned the same way, with its stem leaving the top of the box outline.
                 const pinned = Boolean(icon || boxAnchor);
                 const pivot = pinned ? undefined : transientPivot;
-                let x = boxAnchor ? boxAnchor.x : ((_q = pivot === null || pivot === void 0 ? void 0 : pivot.x) !== null && _q !== void 0 ? _q : anchor.x) + (icon || pixelOffset).x;
-                let y = boxAnchor ? boxAnchor.y : ((_r = pivot === null || pivot === void 0 ? void 0 : pivot.y) !== null && _r !== void 0 ? _r : anchor.y) + (icon || pixelOffset).y;
+                let x = boxAnchor ? boxAnchor.x : ((_r = pivot === null || pivot === void 0 ? void 0 : pivot.x) !== null && _r !== void 0 ? _r : anchor.x) + (icon || pixelOffset).x;
+                let y = boxAnchor ? boxAnchor.y : ((_s = pivot === null || pivot === void 0 ? void 0 : pivot.y) !== null && _s !== void 0 ? _s : anchor.y) + (icon || pixelOffset).y;
                 if (cursorAmount > 0 && !pinned) {
                     // A leader-less label starts centred on its anchor; preserve that box as it lifts away.
                     if (!normalLeader) {
@@ -2628,7 +2665,7 @@ var EntityLabel;
                 const width = ele.offsetWidth / coordinates.scaleX;
                 const height = ele.offsetHeight / coordinates.scaleY;
                 let clusterBounds;
-                if ((_s = this.options.cluster) === null || _s === void 0 ? void 0 : _s.enabled) {
+                if ((_t = this.options.cluster) === null || _t === void 0 ? void 0 : _t.enabled) {
                     const textWidth = (sourceText === null || sourceText === void 0 ? void 0 : sourceText.offsetWidth) || 0;
                     const textHeight = (sourceText === null || sourceText === void 0 ? void 0 : sourceText.offsetHeight) || 0;
                     // A photo is never part of the footprint, so its arrival cannot change which cluster a label joins.
@@ -2662,7 +2699,7 @@ var EntityLabel;
                 if (!leader && (bounds.x + bounds.width < 0 || bounds.y + bounds.height < 0 || bounds.x > this.viewer.canvas.clientWidth || bounds.y > this.viewer.canvas.clientHeight)) {
                     return null;
                 }
-                const state = (_t = this.visualRegister) === null || _t === void 0 ? void 0 : _t.GetState({ entityId: (_u = this.rego) === null || _u === void 0 ? void 0 : _u.entityId, menuItemId: (_v = this.rego) === null || _v === void 0 ? void 0 : _v.menuItemId });
+                const state = (_u = this.visualRegister) === null || _u === void 0 ? void 0 : _u.GetState({ entityId: (_v = this.rego) === null || _v === void 0 ? void 0 : _v.entityId, menuItemId: (_w = this.rego) === null || _w === void 0 ? void 0 : _w.menuItemId });
                 const opacity = this.prePositioned || hoverOnly || MAX_DISTANCE === Infinity ? 1 : 1 - distance / MAX_DISTANCE;
                 return {
                     canFlip: leader && presentation !== "icon", hasLeader: leader,
@@ -2670,9 +2707,9 @@ var EntityLabel;
                     transient: this.Transient || Boolean(hover) || cursorAmount > 0,
                     extendedGeometry: visual instanceof Cesium.Entity && Boolean(visual.polygon || visual.polyline || visual.corridor),
                     viewportWidth: this.viewer.canvas.clientWidth,
-                    id: this.id, entityKey: ((_w = this.rego) === null || _w === void 0 ? void 0 : _w.entityId) ? JSON.stringify([this.rego.entityId, this.rego.menuItemId || "", this.Transient && !this.Persistent ? "hover" : ""]) : undefined,
-                    entityId: (_x = this.rego) === null || _x === void 0 ? void 0 : _x.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, modelBox: boxed || undefined, boxBlend,
+                    id: this.id, entityKey: ((_x = this.rego) === null || _x === void 0 ? void 0 : _x.entityId) ? JSON.stringify([this.rego.entityId, this.rego.menuItemId || "", this.Transient && !this.Persistent ? "hover" : ""]) : undefined,
+                    entityId: (_y = this.rego) === null || _y === void 0 ? void 0 : _y.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, modelBox: boxed || undefined, boxBlend, follows: !pinned && Boolean(transientPivot || cursorMotion.target),
                     // Priority shows the hovered member individually without dragging its cluster along.
                     opacity: waiting ? 0 : opacity, priority: hover || cursorAmount > 0 || (state === null || state === void 0 ? void 0 : state.highlighted) ? 1 : 0, options: this.options, text: originalText, clusterBounds
                 };
@@ -2799,15 +2836,16 @@ var EntityLabel;
                 const normalRadius = (!leader || (ring === null || ring === void 0 ? void 0 : ring.enabled) === false ? 0 : Math.max(frame.distance <= ((_l = ring === null || ring === void 0 ? void 0 : ring.nearDistance) !== null && _l !== void 0 ? _l : 100) ? ((_m = ring === null || ring === void 0 ? void 0 : ring.nearRadius) !== null && _m !== void 0 ? _m : 10) : 0, hovered ? ((_o = ring === null || ring === void 0 ? void 0 : ring.hoverRadius) !== null && _o !== void 0 ? _o : (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);
+                // A ring around the cursor marks nothing, so a riding label keeps only its leader.
+                const targetOuter = frame.follows ? 0 : iconRing || targetRadius || 2.5;
+                const targetInner = frame.follows ? 0 : iconRing ? (targetRadius > 0 ? iconRing - 2 : iconRing) : Math.max(0, targetRadius - 2);
                 const now = Date.now();
                 const duration = (_p = ring === null || ring === void 0 ? void 0 : ring.transitionDuration) !== null && _p !== void 0 ? _p : 200;
                 const sharedRing = this.Transient && !this.Persistent && this.hoverFade.to === 1 ? this.hoverRingState : undefined;
                 let ringAnimation = sharedRing ? sharedRing.animation : this.ringAnimation;
                 if (!ringAnimation) {
-                    const outer = iconRing || 2.5;
-                    const inner = iconRing;
+                    const outer = frame.follows ? 0 : iconRing || 2.5;
+                    const inner = frame.follows ? 0 : iconRing;
                     ringAnimation = { target: outer, targetInner: inner, start: now, outer, inner, fromOuter: outer, fromInner: inner };
                 }
                 ;