bruce-cesium 7.6.6 → 7.6.8

package/dist/bruce-cesium.umd.js

@@ -16406,6 +16406,211 @@
     // whatever the writer's clock and this one disagree by.
     HistoricGatherer.LIVE_TAIL_MS = 15000;
 
+    (function (MenuItemStyleOverlay) {
+        // Tileset items whose render manager runs a Styler, given the item settings that make it run one.
+        const TILESET_TYPES = [
+            BModels.MenuItem.EType.CadTileset,
+            BModels.MenuItem.EType.ArbTileset,
+            BModels.MenuItem.EType.IonTileset,
+            BModels.MenuItem.EType.EntityTileset
+        ];
+        // Items whose style resolves per Entity from their zoom control rows.
+        const ZOOM_CONTROL_TYPES = [
+            BModels.MenuItem.EType.Entities,
+            BModels.MenuItem.EType.Entity,
+            BModels.MenuItem.EType.EntitiesIds,
+            BModels.MenuItem.EType.EntitiesLoaded,
+            BModels.MenuItem.EType.DataLab
+        ];
+        /**
+         * Returns the base style with each field the overlay sets laid over it.
+         */
+        function Merge(base, overlay) {
+            var _a, _b;
+            if (!overlay) {
+                return base;
+            }
+            const merged = { ...(base !== null && base !== void 0 ? base : {}) };
+            for (const key of Object.keys(overlay)) {
+                const value = overlay[key];
+                if (!isSet(value)) {
+                    continue;
+                }
+                if (isPlainObject(value)) {
+                    merged[key] = { ...((_a = merged[key]) !== null && _a !== void 0 ? _a : {}), ...pickSet(value) };
+                }
+                else {
+                    merged[key] = value;
+                }
+            }
+            // Tilesets only paint a customised model style, and an overlay that sets a colour wants painting.
+            if (isSet((_b = overlay.modelStyle) === null || _b === void 0 ? void 0 : _b.fillColor) && overlay.modelStyle.customize == null) {
+                merged.modelStyle = { ...merged.modelStyle, customize: true };
+            }
+            return merged;
+        }
+        MenuItemStyleOverlay.Merge = Merge;
+        /**
+         * Returns the overlay a zoom control row carries laid over the style it resolved.
+         */
+        function ApplyRow(style, row) {
+            return Merge(style, row === null || row === void 0 ? void 0 : row.StyleOverlay);
+        }
+        MenuItemStyleOverlay.ApplyRow = ApplyRow;
+        /**
+         * Returns true when the item renders through a path that honours an overlay.
+         */
+        function Supports(item) {
+            if (ZOOM_CONTROL_TYPES.includes(item === null || item === void 0 ? void 0 : item.Type)) {
+                return true;
+            }
+            if (!TILESET_TYPES.includes(item === null || item === void 0 ? void 0 : item.Type)) {
+                return false;
+            }
+            // These two only run a Styler when asked to.
+            if (item.Type === BModels.MenuItem.EType.ArbTileset || item.Type === BModels.MenuItem.EType.EntityTileset) {
+                return Boolean(item.ApplyStyles);
+            }
+            return true;
+        }
+        MenuItemStyleOverlay.Supports = Supports;
+        /**
+         * Returns the overlay laid on the item, or null when it carries none.
+         */
+        function Get(item) {
+            var _a, _b, _c;
+            if (TILESET_TYPES.includes(item === null || item === void 0 ? void 0 : item.Type)) {
+                return (_a = item.styleOverlay) !== null && _a !== void 0 ? _a : null;
+            }
+            if (ZOOM_CONTROL_TYPES.includes(item === null || item === void 0 ? void 0 : item.Type)) {
+                const rows = item.CameraZoomSettings;
+                return (_c = (_b = rows === null || rows === void 0 ? void 0 : rows.find(x => x === null || x === void 0 ? void 0 : x.StyleOverlay)) === null || _b === void 0 ? void 0 : _b.StyleOverlay) !== null && _c !== void 0 ? _c : null;
+            }
+            return null;
+        }
+        MenuItemStyleOverlay.Get = Get;
+        /**
+         * Returns a copy carrying the overlay, or the item itself when it cannot take one and carries none.
+         */
+        function With(item, overlay) {
+            var _a;
+            const target = Supports(item) ? overlay : null;
+            if (!target && !Get(item)) {
+                return item;
+            }
+            if (TILESET_TYPES.includes(item.Type)) {
+                const next = { ...item };
+                if (target) {
+                    next.styleOverlay = target;
+                }
+                else {
+                    delete next.styleOverlay;
+                }
+                return next;
+            }
+            const zItem = item;
+            return {
+                ...zItem,
+                CameraZoomSettings: ((_a = zItem.CameraZoomSettings) !== null && _a !== void 0 ? _a : []).map(row => {
+                    const next = { ...row };
+                    if (target) {
+                        next.StyleOverlay = target;
+                    }
+                    else {
+                        delete next.StyleOverlay;
+                    }
+                    return next;
+                })
+            };
+        }
+        MenuItemStyleOverlay.With = With;
+        /**
+         * Returns the style a bookmark laid on this one item, or null when it carries none.
+         */
+        function GetItemStyle(item) {
+            var _a, _b;
+            return (_b = (_a = item === null || item === void 0 ? void 0 : item.style) === null || _a === void 0 ? void 0 : _a.style) !== null && _b !== void 0 ? _b : null;
+        }
+        MenuItemStyleOverlay.GetItemStyle = GetItemStyle;
+        /**
+         * Returns the Style record a bookmark laid on this one item, or null when it names none.
+         */
+        function GetItemStyleId(item) {
+            var _a;
+            const styleId = (_a = item === null || item === void 0 ? void 0 : item.style) === null || _a === void 0 ? void 0 : _a.styleId;
+            return styleId == null || styleId === "" || styleId == -1 ? null : styleId;
+        }
+        MenuItemStyleOverlay.GetItemStyleId = GetItemStyleId;
+        /**
+         * Returns a copy carrying the given bookmark style, inline or by record, or without one for null.
+         */
+        function WithItemStyle(item, itemStyle) {
+            const has = Boolean(itemStyle === null || itemStyle === void 0 ? void 0 : itemStyle.style) || (itemStyle === null || itemStyle === void 0 ? void 0 : itemStyle.styleId) != null;
+            if (!item || (!has && !item.style)) {
+                return item;
+            }
+            const next = { ...item };
+            if (has) {
+                next.style = { ...itemStyle };
+            }
+            else {
+                delete next.style;
+            }
+            return next;
+        }
+        MenuItemStyleOverlay.WithItemStyle = WithItemStyle;
+        /**
+         * Returns the overlay an item renders with: its inline or loaded bookmark style, under the scene-wide one.
+         */
+        function Effective(item, overlay, record) {
+            var _a, _b;
+            const own = (_b = (_a = GetItemStyle(item)) !== null && _a !== void 0 ? _a : record) !== null && _b !== void 0 ? _b : null;
+            // Either alone is used as it is, so an unchanged overlay still compares equal.
+            return own ? Merge(own, overlay) : overlay;
+        }
+        MenuItemStyleOverlay.Effective = Effective;
+        /**
+         * Returns a copy without its overlay or bookmark style, so what else two items differ by can be compared.
+         */
+        function Strip(item) {
+            return With(WithItemStyle(item, null), null);
+        }
+        MenuItemStyleOverlay.Strip = Strip;
+        /**
+         * Returns true when the two items differ by nothing but their overlay or bookmark style.
+         */
+        function IsChangeOnly(from, to) {
+            if (!from || !to || from.Type !== to.Type) {
+                return false;
+            }
+            const sameOverlay = JSON.stringify(Get(from)) === JSON.stringify(Get(to));
+            if (sameOverlay && JSON.stringify(from.style) === JSON.stringify(to.style)) {
+                return false;
+            }
+            // Removing keys keeps the order of the rest, so the two compare as text.
+            return JSON.stringify(Strip(from)) === JSON.stringify(Strip(to));
+        }
+        MenuItemStyleOverlay.IsChangeOnly = IsChangeOnly;
+        /*
+         * Returns false for what leaves the base value in place: unset, null, or an empty Calculator field list.
+         */
+        function isSet(value) {
+            return value !== undefined && value !== null && !(Array.isArray(value) && !value.length);
+        }
+        function isPlainObject(value) {
+            return typeof value === "object" && !Array.isArray(value);
+        }
+        function pickSet(value) {
+            const picked = {};
+            for (const key of Object.keys(value)) {
+                if (isSet(value[key])) {
+                    picked[key] = value[key];
+                }
+            }
+            return picked;
+        }
+    })(exports.MenuItemStyleOverlay || (exports.MenuItemStyleOverlay = {}));
+
     const BATCH_SIZE = 500;
     const CHECK_BATCH_SIZE = 250;
     function getValue$2(viewer, obj) {
@@ -16461,6 +16666,8 @@
                 this.isRunningCheck = false;
                 this.viewMonitorRemoval = null;
                 this.renderQueue = [];
+                // Queued Entities a caller handed in, drawn even when the skip gate sees nothing changed.
+                this.renderQueueForced = new Set();
                 this.renderQueueInterval = null;
                 this.sources = [];
                 // Highly experimental flag to try improve rendering large sets of polygons and polylines.
@@ -16555,6 +16762,7 @@
                         clearInterval(this.renderQueueInterval);
                         this.renderQueueInterval = null;
                         this.renderQueue = [];
+                        this.renderQueueForced.clear();
                         // Remove just the ones that shouldn't be rendered.
                         // Eg: for a tag menu item we can see what tags are selected and only render those.
                         if (shouldRender) {
@@ -16865,6 +17073,7 @@
                 (_b = this.viewMonitorRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
                 clearInterval(this.renderQueueInterval);
                 this.renderQueue = [];
+                this.renderQueueForced.clear();
                 (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.Dispose();
                 this.clustering = null;
                 for (let i = 0; i < this.sources.length; i++) {
@@ -16953,7 +17162,8 @@
                 }
                 else {
                     if (entities === null || entities === void 0 ? void 0 : entities.length) {
-                        this.distributeForRender(entities);
+                        // The skip gate cannot see an edited copy, so handed-in Entities are drawn forced.
+                        this.distributeForRender(entities, true);
                     }
                     else {
                         await this.doEntityCheck(entityIds);
@@ -17104,12 +17314,22 @@
                 }
                 this.isRunningCheck = false;
             }
-            distributeForRender(entities) {
+            distributeForRender(entities, force = false) {
+                if (force) {
+                    entities.forEach(x => this.renderQueueForced.add(x));
+                }
                 this.renderQueue = this.renderQueue.concat(entities);
                 if (!this.renderQueueInterval && this.renderQueue.length) {
                     this.renderQueueInterval = setInterval(() => {
                         const batch = this.renderQueue.splice(0, BATCH_SIZE);
-                        this.renderEntities(batch);
+                        const forced = new Set(batch.filter(x => this.renderQueueForced.delete(x)));
+                        const rest = batch.filter(x => !forced.has(x));
+                        if (forced.size) {
+                            this.renderEntities(Array.from(forced), true);
+                        }
+                        if (rest.length) {
+                            this.renderEntities(rest);
+                        }
                         if (this.renderQueue.length <= 0) {
                             clearInterval(this.renderQueueInterval);
                             this.renderQueueInterval = null;
@@ -17245,6 +17465,7 @@
                         console.error(e);
                     }
                 }
+                style = exports.MenuItemStyleOverlay.ApplyRow(style, zoomItem);
                 const pStyle = (_g = style === null || style === void 0 ? void 0 : style.polygonStyle) !== null && _g !== void 0 ? _g : {};
                 const lStyle = (_h = style === null || style === void 0 ? void 0 : style.polylineStyle) !== null && _h !== void 0 ? _h : {};
                 const polygonsClamped = ((_j = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _j === void 0 ? void 0 : _j.id) == null ? true : ((_k = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _k === void 0 ? void 0 : _k.id) == 0;
@@ -17536,7 +17757,7 @@
                 return recordsByIds;
             }
             async doRenderAsIndividuals(entities, force = false) {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
                 // When live we just want to show the latest pos.
                 // When not live, the user might scroll the timeline and want to see it a fluid animation between points in time.
                 const isLive = exports.ViewUtils.GetTimeDetails({
@@ -17640,8 +17861,9 @@
                             rego.schema = (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.Schema;
                             rego.canEdit = canEdit;
                             rego.internalId = (_k = (_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j.InternalID) !== null && _k !== void 0 ? _k : rego.internalId;
-                            rego.styleId = (_l = cEntity.styleId) !== null && _l !== void 0 ? _l : rego.styleId;
-                            rego.styleEffective = (_m = cEntity.styleEffective) !== null && _m !== void 0 ? _m : rego.styleEffective;
+                            // Assigned outright, so a restyle that traces nothing clears the old key.
+                            rego.styleId = cEntity.styleId;
+                            rego.styleEffective = cEntity.styleEffective;
                             // Marked as stale meaning some change was performed that requires a refresh.
                             // This usually means a new sibling was added that we need to update.
                             if (rego.stale) {
@@ -17671,7 +17893,7 @@
                             menuItemId: this.item.id,
                             requestRender: false
                         });
-                        (_o = this.clustering) === null || _o === void 0 ? void 0 : _o.RemoveEntity(id, false);
+                        (_l = this.clustering) === null || _l === void 0 ? void 0 : _l.RemoveEntity(id, false);
                     }
                 }
                 this.viewer.scene.requestRender();
@@ -17750,6 +17972,7 @@
                 clearInterval(this.renderQueueInterval);
                 this.renderQueueInterval = null;
                 this.renderQueue = [];
+                this.renderQueueForced.clear();
                 this.disposed = true;
                 return payload;
             }
@@ -18106,7 +18329,8 @@
                     menuItemIds: [this.item.id]
                 });
                 if (entities === null || entities === void 0 ? void 0 : entities.length) {
-                    this.onGetterUpdate(entities, force);
+                    // The skip gate cannot see an edited copy, so handed-in Entities are drawn forced.
+                    this.onGetterUpdate(entities, true);
                 }
                 else {
                     this.doEntityCheck(entityIds, force);
@@ -18340,6 +18564,7 @@
                 if (!style) {
                     style = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.Style;
                 }
+                style = exports.MenuItemStyleOverlay.ApplyRow(style, zoomItem);
                 const pStyle = (_h = style === null || style === void 0 ? void 0 : style.polygonStyle) !== null && _h !== void 0 ? _h : {};
                 const lStyle = (_j = style === null || style === void 0 ? void 0 : style.polylineStyle) !== null && _j !== void 0 ? _j : {};
                 const polygonsClamped = ((_k = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _k === void 0 ? void 0 : _k.id) == null ? true : ((_l = pStyle === null || pStyle === void 0 ? void 0 : pStyle.altitudeOption) === null || _l === void 0 ? void 0 : _l.id) == 0;
@@ -18584,7 +18809,7 @@
                 return next;
             }
             async doRenderAsIndividuals(entities, force = false) {
-                var _a;
+                var _a, _b, _c;
                 const { updated, entities: cEntities } = await exports.EntityRenderEngine.Render({
                     viewer: this.viewer,
                     apiGetter: this.apiGetter,
@@ -18638,7 +18863,9 @@
                                     priority: this.renderPriority,
                                     entityTypeId: entity.Bruce["EntityType.ID"],
                                     accountId: this.apiGetter.accountId,
-                                    name: cEntity.name
+                                    name: cEntity.name,
+                                    styleId: (_b = cEntity.styleId) !== null && _b !== void 0 ? _b : undefined,
+                                    styleEffective: (_c = cEntity.styleEffective) !== null && _c !== void 0 ? _c : undefined
                                 },
                                 requestRender: false
                             });
@@ -18646,6 +18873,8 @@
                         else if (updated.get(id) && rego) {
                             rego.visual = cEntity;
                             rego.entityTypeId = entity.Bruce["EntityType.ID"];
+                            rego.styleId = cEntity.styleId;
+                            rego.styleEffective = cEntity.styleEffective;
                             rego.name = cEntity.name;
                             // We manually trigger an update event since the graphic was updated but not recreated.
                             this.visualsManager.OnUpdate.Trigger({
@@ -18820,7 +19049,8 @@
                     menuItemIds: [this.item.id]
                 });
                 if (entities === null || entities === void 0 ? void 0 : entities.length) {
-                    this.renderEntities(entities, force);
+                    // The skip gate cannot see an edited copy, so handed-in Entities are drawn forced.
+                    this.renderEntities(entities, true);
                 }
                 else {
                     this.onGetterUpdate(entityIds, force);
@@ -19032,7 +19262,7 @@
              * @returns
              */
             async renderAsIndividuals(entities, force = false) {
-                var _a;
+                var _a, _b, _c;
                 if (this.disposed || this.viewer.isDestroyed() || !entities.length) {
                     return;
                 }
@@ -19091,7 +19321,9 @@
                                     entityTypeId: entity.Bruce["EntityType.ID"],
                                     accountId: this.apiGetter.accountId,
                                     overrideShow: clustered ? false : null,
-                                    name: cEntity.name
+                                    name: cEntity.name,
+                                    styleId: (_a = cEntity.styleId) !== null && _a !== void 0 ? _a : undefined,
+                                    styleEffective: (_b = cEntity.styleEffective) !== null && _b !== void 0 ? _b : undefined
                                 },
                                 requestRender: false
                             });
@@ -19099,6 +19331,8 @@
                         else if (updated.get(id) && rego) {
                             rego.visual = cEntity;
                             rego.entityTypeId = entity.Bruce["EntityType.ID"];
+                            rego.styleId = cEntity.styleId;
+                            rego.styleEffective = cEntity.styleEffective;
                             rego.name = cEntity.name;
                             // We manually trigger an update event since the graphic was updated but not recreated.
                             this.visualsManager.OnUpdate.Trigger({
@@ -19114,7 +19348,7 @@
                             menuItemId: this.item.id,
                             requestRender: false
                         });
-                        (_a = this.clustering) === null || _a === void 0 ? void 0 : _a.RemoveEntity(id, false);
+                        (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.RemoveEntity(id, false);
                     }
                 }
                 if (!this.disposed) {
@@ -19260,7 +19494,8 @@
                     menuItemIds: [this.item.id]
                 });
                 if (incoming) {
-                    await this.renderEntity(incoming, force);
+                    // The skip gate cannot see an edited copy, so handed-in Entities are drawn forced.
+                    await this.renderEntity(incoming, true);
                 }
                 else {
                     await this.onGetterUpdate(itemEntityId, force);
@@ -19334,6 +19569,7 @@
                 return next;
             }
             async doRenderEntity(entity, force = false) {
+                var _a, _b;
                 try {
                     if (this.disposed || this.viewer.isDestroyed()) {
                         return;
@@ -19366,7 +19602,9 @@
                                     priority: this.renderPriority,
                                     entityTypeId: entity.Bruce["EntityType.ID"],
                                     accountId: this.apiGetter.accountId,
-                                    name: cEntity.name
+                                    name: cEntity.name,
+                                    styleId: (_a = cEntity.styleId) !== null && _a !== void 0 ? _a : undefined,
+                                    styleEffective: (_b = cEntity.styleEffective) !== null && _b !== void 0 ? _b : undefined
                                 },
                                 requestRender: false
                             });
@@ -19374,6 +19612,8 @@
                         else if (updated.get(id) && rego) {
                             rego.visual = cEntity;
                             rego.entityTypeId = entity.Bruce["EntityType.ID"];
+                            rego.styleId = cEntity.styleId;
+                            rego.styleEffective = cEntity.styleEffective;
                             rego.name = cEntity.name;
                             // We manually trigger an update event since the graphic was updated but not recreated.
                             this.visualsManager.OnUpdate.Trigger({
@@ -20444,6 +20684,10 @@
             // Once the style is loaded, we can queue the set for styling.
             this.stylePendingEntityIds = new Map();
             this.fallbackStyle = null;
+            // Laid over whichever style each feature resolves, so it only changes the fields it sets.
+            this.styleOverlay = null;
+            // The tileset's blend before an overlay's colours replaced it, put back once no overlay colours it.
+            this.blendBeforeOverlay = null;
             this.styleFallbackLoaded = false;
             this.loadingCounter = 0;
             // Entity IDs -> boolean to indicate if we should override the feature colour.
@@ -20496,12 +20740,18 @@
             return this._styleProgress;
         }
         Init(params) {
-            var _a, _b;
+            var _a, _b, _c;
             let { viewer, api, cTileset, fallbackStyleId, styleMapping, expandSources, menuItemId, register, scenario, historic, applyStyles, monitor } = params;
+            this.styleOverlay = (_a = params.styleOverlay) !== null && _a !== void 0 ? _a : null;
             this.monitor = monitor;
             this.viewer = viewer;
             this.api = api;
+            // A tileset handed in fresh still has its own blend, so nothing is left to put back on it.
+            if (cTileset !== this.cTileset) {
+                this.blendBeforeOverlay = null;
+            }
             this.cTileset = cTileset;
+            this.applyOverlayBlend();
             this.bakedAttributes = getBakedAttributes(cTileset);
             this.register = register;
             this.menuItemId = menuItemId;
@@ -20525,7 +20775,7 @@
                 // We have some evil hard-coded style mappings that need to be fixed.
                 // These exist within legacy project views.
                 // Update: This now also lets people have a style mapping without a real style record.
-                if ((_a = this.styleMapping) === null || _a === void 0 ? void 0 : _a.length) {
+                if ((_b = this.styleMapping) === null || _b === void 0 ? void 0 : _b.length) {
                     for (let i = 0; i < this.styleMapping.length; i++) {
                         const mapItem = this.styleMapping[i];
                         const mapStyle = mapItem.style ? mapItem.style : mapItem.Style;
@@ -20565,7 +20815,7 @@
             });
             this.loaded = true;
             this.loadStyles();
-            const feed = (_b = this.api) === null || _b === void 0 ? void 0 : _b.RecordChangeFeed;
+            const feed = (_c = this.api) === null || _c === void 0 ? void 0 : _c.RecordChangeFeed;
             if (feed) {
                 this.feedSub = feed.Subscribe({
                     concepts: [BModels.AccountConcept.EConcept.ENTITY],
@@ -20630,6 +20880,11 @@
             else {
                 this.fallbackStyle = null;
             }
+            // Left as it is when a caller omits it, so a mapping change keeps the scene-wide style.
+            if (params.styleOverlay !== undefined) {
+                this.styleOverlay = params.styleOverlay;
+                this.applyOverlayBlend();
+            }
             if (params.scenario != null) {
                 if (!this.shouldUpdateRegoStates && !!this.scenario) {
                     this.shouldUpdateRegoStates = true;
@@ -20718,6 +20973,25 @@
             }
             this.queueTilesetFeatureStyle(regos, highPriority);
         }
+        /*
+         * Replaces the tileset's own colours while an overlay sets a model fill, so features show exactly what it maps to.
+         */
+        applyOverlayBlend() {
+            var _a, _b, _c, _d;
+            if (!this.cTileset || ((_b = (_a = this.cTileset).isDestroyed) === null || _b === void 0 ? void 0 : _b.call(_a))) {
+                return;
+            }
+            const fill = (_d = (_c = this.styleOverlay) === null || _c === void 0 ? void 0 : _c.modelStyle) === null || _d === void 0 ? void 0 : _d.fillColor;
+            const colours = Array.isArray(fill) ? fill.length > 0 : fill != null;
+            if (colours && this.blendBeforeOverlay == null) {
+                this.blendBeforeOverlay = this.cTileset.colorBlendMode;
+                this.cTileset.colorBlendMode = Cesium.Cesium3DTileColorBlendMode.REPLACE;
+            }
+            else if (!colours && this.blendBeforeOverlay != null) {
+                this.cTileset.colorBlendMode = this.blendBeforeOverlay;
+                this.blendBeforeOverlay = null;
+            }
+        }
         /**
          * Calculates the current progress % and updates the progress if there is a change.
          */
@@ -21132,12 +21406,11 @@
                     override: override
                 });
                 this.overrideFeatureColor.set(rego.entityId, true);
-                if (resolvedStyleId != null) {
-                    rego.styleId = resolvedStyleId;
-                }
+                // Assigned outright, so a restyle that traces nothing clears the old key.
+                rego.styleId = resolvedStyleId !== null && resolvedStyleId !== void 0 ? resolvedStyleId : undefined;
                 rego.styleEffective = (_b = exports.StyleEffective.Combine([
                     { key: "color", effective: fillColorTrace.effective }
-                ])) !== null && _b !== void 0 ? _b : rego.styleEffective;
+                ])) !== null && _b !== void 0 ? _b : undefined;
             }
             if (((_c = data === null || data === void 0 ? void 0 : data.Bruce) === null || _c === void 0 ? void 0 : _c.InternalID) != null) {
                 rego.internalId = data.Bruce.InternalID;
@@ -21183,6 +21456,7 @@
                 style = (_b = this.fallbackStyle) === null || _b === void 0 ? void 0 : _b.Settings;
                 styleId = this.fallbackStyleId != null ? Number(this.fallbackStyleId) : null;
             }
+            style = exports.MenuItemStyleOverlay.Merge(style, this.styleOverlay);
             if (!style || !((_c = style === null || style === void 0 ? void 0 : style.modelStyle) === null || _c === void 0 ? void 0 : _c.customize)) {
                 return { settings: null, styleId: null };
             }
@@ -22368,6 +22642,7 @@
                                 api: this.getters.GetBruceApi(),
                                 cTileset: this.cTileset,
                                 fallbackStyleId: this.item.styleId,
+                                styleOverlay: exports.MenuItemStyleOverlay.Get(this.item),
                                 styleMapping: this.item.StyleMapping,
                                 expandSources: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandSources,
                                 menuItemId: this.item.id,
@@ -22582,6 +22857,7 @@
                     api: this.getters.GetBruceApi(),
                     cTileset: this.cTileset,
                     fallbackStyleId: this.item.styleId,
+                    styleOverlay: exports.MenuItemStyleOverlay.Get(this.item),
                     styleMapping: this.item.StyleMapping,
                     expandSources: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandSources,
                     menuItemId: this.item.id,
@@ -23203,7 +23479,8 @@
                 // Before the tileset loads this only stores the pick, and the styler's Init reads the new item.
                 this.styler.UpdateStyleMapping({
                     styleMapping: (_a = item.StyleMapping) !== null && _a !== void 0 ? _a : [],
-                    fallbackStyleId: item.styleId
+                    fallbackStyleId: item.styleId,
+                    styleOverlay: exports.MenuItemStyleOverlay.Get(item)
                 });
             }
             Dispose() {
@@ -24685,6 +24962,8 @@
                 this.isRunningCheck = false;
                 this.viewMonitorRemoval = null;
                 this.renderQueue = [];
+                // Queued Entities a caller handed in, drawn even when the skip gate sees nothing changed.
+                this.renderQueueForced = new Set();
                 this.renderQueueInterval = null;
                 this.zoomControl = [];
                 this.queryLoadId = 0;
@@ -24713,6 +24992,7 @@
                 clearInterval(this.renderQueueInterval);
                 this.renderQueueInterval = null;
                 this.renderQueue = [];
+                this.renderQueueForced.clear();
                 this.renderedEntities = {};
                 this.ensureSettings();
                 this.visualsManager.RemoveRegos({
@@ -24875,6 +25155,7 @@
                 clearInterval(this.renderQueueInterval);
                 this.renderQueueInterval = null;
                 this.renderQueue = [];
+                this.renderQueueForced.clear();
                 this.entityCheckQueueIds = [];
                 this.visualsManager.RemoveRegos({
                     menuItemId: this.item.id
@@ -24917,7 +25198,8 @@
                         await this.renderDataLabEntities(entities, true);
                     }
                     else {
-                        this.distributeForRender(entities);
+                        // The skip gate cannot see an edited copy, so handed-in Entities are drawn forced.
+                        this.distributeForRender(entities, true);
                     }
                 }
                 else {
@@ -25040,15 +25322,28 @@
                     }
                 }
             }
-            distributeForRender(entities) {
+            distributeForRender(entities, force = false) {
                 if (this.disposed || !(entities === null || entities === void 0 ? void 0 : entities.length)) {
                     return;
                 }
+                if (force) {
+                    entities.forEach(x => this.renderQueueForced.add(x));
+                }
                 this.renderQueue = this.renderQueue.concat(entities);
                 if (!this.renderQueueInterval && this.renderQueue.length) {
                     this.renderQueueInterval = setInterval(() => {
-                        const batch = this.deduplicateEntities(this.renderQueue.splice(0, BATCH_SIZE$3));
-                        this.renderDataLabEntities(batch);
+                        const taken = this.renderQueue.splice(0, BATCH_SIZE$3);
+                        // Read before de-duplicating, so a copy it drops does not stay in the set.
+                        const takenForced = new Set(taken.filter(x => this.renderQueueForced.delete(x)));
+                        const batch = this.deduplicateEntities(taken);
+                        const forced = batch.filter(x => takenForced.has(x));
+                        const rest = batch.filter(x => !takenForced.has(x));
+                        if (forced.length) {
+                            this.renderDataLabEntities(forced, true);
+                        }
+                        if (rest.length) {
+                            this.renderDataLabEntities(rest);
+                        }
                         if (this.renderQueue.length <= 0) {
                             clearInterval(this.renderQueueInterval);
                             this.renderQueueInterval = null;
@@ -25080,7 +25375,7 @@
                 return next;
             }
             async doRenderDataLabEntities(entities, force = false) {
-                var _a, _b, _c;
+                var _a, _b, _c, _d, _e;
                 if (this.disposed || this.viewer.isDestroyed() || !(entities === null || entities === void 0 ? void 0 : entities.length)) {
                     return;
                 }
@@ -25129,7 +25424,9 @@
                                         tagIds: entity.Bruce["Layer.ID"] ? [].concat(entity.Bruce["Layer.ID"]) : [],
                                         name: cEntity.name,
                                         cdn: this.item.cdnEnabled,
-                                        outline: entity.Bruce.Outline
+                                        outline: entity.Bruce.Outline,
+                                        styleId: (_b = cEntity.styleId) !== null && _b !== void 0 ? _b : undefined,
+                                        styleEffective: (_c = cEntity.styleEffective) !== null && _c !== void 0 ? _c : undefined
                                     },
                                     requestRender: false
                                 });
@@ -25138,10 +25435,12 @@
                                 rego.name = cEntity.name;
                                 rego.visual = cEntity;
                                 rego.entityTypeId = entity.Bruce["EntityType.ID"];
+                                rego.styleId = cEntity.styleId;
+                                rego.styleEffective = cEntity.styleEffective;
                                 rego.tagIds = entity.Bruce["Layer.ID"] ? [].concat(entity.Bruce["Layer.ID"]) : [];
-                                rego.outline = (_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.Outline;
+                                rego.outline = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.Outline;
                                 rego.cdn = this.item.cdnEnabled;
-                                rego.schema = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.Schema;
+                                rego.schema = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.Schema;
                                 rego.canEdit = canEdit;
                                 if (rego.stale) {
                                     this.visualsManager.RefreshMark({
@@ -25217,6 +25516,7 @@
                     renderSignature: Manager.GetRenderSignature(this.item)
                 };
                 this.renderQueue = [];
+                this.renderQueueForced.clear();
                 this.queryLoadId += 1;
                 this.disposed = true;
                 return payload;
@@ -26651,6 +26951,7 @@
                                         api: api,
                                         cTileset: this.cTileset,
                                         fallbackStyleId: this.item.styleId,
+                                        styleOverlay: exports.MenuItemStyleOverlay.Get(this.item),
                                         styleMapping: [],
                                         expandSources: false,
                                         menuItemId: this.item.id,
@@ -26873,7 +27174,8 @@
                 if (Manager.NeedsStyler(item)) {
                     this.styler.UpdateStyleMapping({
                         styleMapping: [],
-                        fallbackStyleId: item.styleId
+                        fallbackStyleId: item.styleId,
+                        styleOverlay: exports.MenuItemStyleOverlay.Get(item)
                     });
                 }
             }
@@ -27024,6 +27326,7 @@
                         api: this.getters.GetBruceApi(),
                         cTileset: this.cTileset,
                         fallbackStyleId: this.item.styleId,
+                        styleOverlay: exports.MenuItemStyleOverlay.Get(this.item),
                         styleMapping: [],
                         expandSources: false,
                         menuItemId: this.item.id,
@@ -27944,6 +28247,7 @@
                                         api: api,
                                         cTileset: this.cTileset,
                                         fallbackStyleId: this.item.styleId,
+                                        styleOverlay: exports.MenuItemStyleOverlay.Get(this.item),
                                         styleMapping: this.item.StyleMapping,
                                         expandSources: false,
                                         menuItemId: this.item.id,
@@ -28139,7 +28443,8 @@
                 if (this.item.ApplyStyles || this.item.Type == BModels.MenuItem.EType.IonTileset) {
                     this.styler.UpdateStyleMapping({
                         styleMapping: (_a = this.item.StyleMapping) !== null && _a !== void 0 ? _a : [],
-                        fallbackStyleId: this.item.styleId
+                        fallbackStyleId: this.item.styleId,
+                        styleOverlay: exports.MenuItemStyleOverlay.Get(this.item)
                     });
                 }
             }
@@ -31757,17 +32062,21 @@
         }
         MenuItemStyles.Resolve = Resolve;
         /**
-         * Returns a copy on the style a bookmark alternation picked, or the item itself when that is not an option.
+         * Returns a copy on the style a bookmark alternation picked and carrying any style it laid on the item.
          */
         function ApplyAlternation(item, alternation) {
             var _a, _b, _c;
             // Alternations are partial items and may carry no Type, so the pick is read from whichever field is present.
             const alt = alternation;
             const picked = (_a = alt === null || alt === void 0 ? void 0 : alt.styleId) !== null && _a !== void 0 ? _a : (_b = getVisibleRow(alt === null || alt === void 0 ? void 0 : alt.CameraZoomSettings)) === null || _b === void 0 ? void 0 : _b.StyleID;
-            if (picked == null) {
-                return item;
+            const next = picked == null ? item : ((_c = WithStyleId(item, picked)) !== null && _c !== void 0 ? _c : item);
+            // A style laid by record need not be one of the item's own, unlike the pick.
+            const itemStyle = alternation === null || alternation === void 0 ? void 0 : alternation.style;
+            const laid = exports.MenuItemStyleOverlay.GetItemStyle(alternation) || exports.MenuItemStyleOverlay.GetItemStyleId(alternation);
+            if (laid == null) {
+                return next;
             }
-            return (_c = WithStyleId(item, picked)) !== null && _c !== void 0 ? _c : item;
+            return exports.MenuItemStyleOverlay.WithItemStyle(next, itemStyle);
         }
         MenuItemStyles.ApplyAlternation = ApplyAlternation;
         /**
@@ -31993,6 +32302,9 @@
             get Viewer() {
                 return this.viewer;
             }
+            get StyleOverlay() {
+                return this.styleOverlay;
+            }
             get VisualsRegister() {
                 return this.visualsRegister;
             }
@@ -32053,6 +32365,12 @@
                 this.pendingHandoffPool = [];
                 // The settings bookmark alternations overwrite on a view's items, as that view authored them.
                 this.authoredAlternations = new WeakMap();
+                // Laid over each item's own style where it can take one, including items rendered after it was set.
+                this.styleOverlay = null;
+                this.styleOverlayCounter = 0;
+                // Style records bookmark styles name by ID, loaded once each; null for one that failed to load.
+                this.itemStyleRecords = new Map();
+                this.itemStyleRecordsLoading = new Set();
                 this.onUpdate = null;
                 // Segments discovered so far per menu item ID.
                 this.seriesSegments = new Map();
@@ -32134,12 +32452,18 @@
                 }
                 // An item with a style set renders its first style unless the caller already picked one of them.
                 params = { ...params, item: exports.MenuItemStyles.Resolve(params.item) };
+                // The overlay rides on the rendered copy, so the view's item never carries it.
+                const effective = this.getEffectiveOverlay(params.item, this.styleOverlay);
+                params = { ...params, item: exports.MenuItemStyleOverlay.With(params.item, effective) };
                 let rItem = this.items.find(x => x.id == params.item.id);
                 let create = true;
                 // Item already exists so we'll check if we should re-create it.
                 if (rItem) {
-                    // Only the picked style changed, so what is drawn gets restyled rather than rebuilt.
-                    if (exports.MenuItemStyles.IsStyleChangeOnly(rItem.item, params.item) && this.isStyleSwapCapable(rItem.renderManager)) {
+                    // Only the style pick, overlay or bookmark style changed, so the graphics are restyled, not rebuilt.
+                    const stripped = exports.MenuItemStyleOverlay.Strip(params.item);
+                    const pickOnly = exports.MenuItemStyles.IsStyleChangeOnly(exports.MenuItemStyleOverlay.Strip(rItem.item), stripped);
+                    const restyleOnly = pickOnly || exports.MenuItemStyleOverlay.IsChangeOnly(rItem.item, params.item);
+                    if (restyleOnly && this.isStyleSwapCapable(rItem.renderManager)) {
                         rItem.renderManager.SwapStyle(params.item);
                         rItem.item = params.item;
                         create = false;
@@ -32586,6 +32910,120 @@
                 (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({ isEnabling: true, itemId: rItem.id });
                 return true;
             }
+            /**
+             * Lays a style, inline or by record, over every item that can take one; null clears it.
+             */
+            async SetStyleOverlay(params) {
+                var _a, _b, _c;
+                const counter = ++this.styleOverlayCounter;
+                let overlay = (_a = params === null || params === void 0 ? void 0 : params.style) !== null && _a !== void 0 ? _a : null;
+                if (!overlay && (params === null || params === void 0 ? void 0 : params.styleId) != null && params.styleId !== "" && params.styleId != -1) {
+                    // A record that fails to load leaves every item on its own style.
+                    try {
+                        const { style } = await BModels.Style.Get({
+                            api: this.getters.GetBruceApi(),
+                            styleId: params.styleId
+                        });
+                        overlay = (_b = style === null || style === void 0 ? void 0 : style.Settings) !== null && _b !== void 0 ? _b : null;
+                    }
+                    catch (e) {
+                        console.error(e);
+                    }
+                }
+                // A later call won while the record loaded.
+                if (counter !== this.styleOverlayCounter) {
+                    return;
+                }
+                this.styleOverlay = overlay;
+                for (const rItem of this.items) {
+                    const next = exports.MenuItemStyleOverlay.With(rItem.item, this.getEffectiveOverlay(rItem.item, overlay));
+                    // Setting the same overlay again would otherwise restyle every feature for nothing.
+                    const unchanged = JSON.stringify(exports.MenuItemStyleOverlay.Get(next)) === JSON.stringify(exports.MenuItemStyleOverlay.Get(rItem.item));
+                    if (unchanged ||
+                        !this.isStyleSwapCapable(rItem.renderManager) ||
+                        rItem.renderManager.Disposed) {
+                        continue;
+                    }
+                    rItem.renderManager.SwapStyle(next);
+                    rItem.item = next;
+                    (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger({ isEnabling: true, itemId: rItem.id });
+                }
+            }
+            /**
+             * Lays an inline style or any Style record on one enabled item under the scene-wide one; neither clears it.
+             */
+            SetItemStyleOverlay(params) {
+                var _a;
+                const rItem = this.items.find(x => x.id === params.menuItemId);
+                let itemStyle = null;
+                if (params.style) {
+                    itemStyle = { style: params.style };
+                }
+                else if (params.styleId != null) {
+                    itemStyle = { styleId: params.styleId };
+                }
+                if (!rItem ||
+                    !this.isStyleSwapCapable(rItem.renderManager) ||
+                    rItem.renderManager.Disposed ||
+                    (itemStyle && !exports.MenuItemStyleOverlay.Supports(rItem.item))) {
+                    return false;
+                }
+                const styled = exports.MenuItemStyleOverlay.WithItemStyle(rItem.item, itemStyle);
+                const next = exports.MenuItemStyleOverlay.With(styled, this.getEffectiveOverlay(styled, this.styleOverlay));
+                rItem.renderManager.SwapStyle(next);
+                rItem.item = next;
+                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({ isEnabling: true, itemId: rItem.id });
+                return true;
+            }
+            /*
+             * Returns the overlay the item renders with, starting the load of a record it names that is not loaded yet.
+             */
+            getEffectiveOverlay(item, overlay) {
+                const styleId = exports.MenuItemStyleOverlay.GetItemStyle(item) ? null : exports.MenuItemStyleOverlay.GetItemStyleId(item);
+                if (styleId != null && !this.itemStyleRecords.has(String(styleId))) {
+                    this.loadItemStyleRecord(styleId);
+                }
+                const record = styleId != null ? this.itemStyleRecords.get(String(styleId)) : null;
+                return exports.MenuItemStyleOverlay.Effective(item, overlay, record !== null && record !== void 0 ? record : undefined);
+            }
+            /*
+             * Loads a record a bookmark style names, then restyles every enabled item that names it.
+             */
+            async loadItemStyleRecord(styleId) {
+                var _a, _b;
+                const key = String(styleId);
+                if (this.itemStyleRecordsLoading.has(key)) {
+                    return;
+                }
+                this.itemStyleRecordsLoading.add(key);
+                let settings = null;
+                // A record that fails to load leaves the item on its own style.
+                try {
+                    const { style } = await BModels.Style.Get({
+                        api: this.getters.GetBruceApi(),
+                        styleId
+                    });
+                    settings = (_a = style === null || style === void 0 ? void 0 : style.Settings) !== null && _a !== void 0 ? _a : null;
+                }
+                catch (e) {
+                    console.error(e);
+                }
+                this.itemStyleRecordsLoading.delete(key);
+                this.itemStyleRecords.set(key, settings);
+                for (const rItem of this.items) {
+                    if (String(exports.MenuItemStyleOverlay.GetItemStyleId(rItem.item)) !== key ||
+                        exports.MenuItemStyleOverlay.GetItemStyle(rItem.item) ||
+                        !this.isStyleSwapCapable(rItem.renderManager) ||
+                        rItem.renderManager.Disposed) {
+                        continue;
+                    }
+                    const effective = this.getEffectiveOverlay(rItem.item, this.styleOverlay);
+                    const next = exports.MenuItemStyleOverlay.With(rItem.item, effective);
+                    rItem.renderManager.SwapStyle(next);
+                    rItem.item = next;
+                    (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({ isEnabling: true, itemId: rItem.id });
+                }
+            }
             /*
              * Picks the child the caller asked for, else the one already enabled, else the first.
              */
@@ -46488,15 +46926,16 @@
          */
         function GetZoomControlSignature(zoomControl) {
             return JSON.stringify([].concat(zoomControl !== null && zoomControl !== void 0 ? zoomControl : []).map((zoomItem) => {
-                var _a, _b, _c, _d, _e, _f, _g;
+                var _a, _b, _c, _d, _e, _f, _g, _h;
                 return ({
                     MinZoom: (_a = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.MinZoom) !== null && _a !== void 0 ? _a : null,
                     MaxZoom: (_b = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.MaxZoom) !== null && _b !== void 0 ? _b : null,
                     DisplayType: (_c = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.DisplayType) !== null && _c !== void 0 ? _c : null,
                     StyleID: (_d = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) !== null && _d !== void 0 ? _d : null,
                     Style: (_e = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.Style) !== null && _e !== void 0 ? _e : null,
-                    LODCategoryID: (_f = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.LODCategoryID) !== null && _f !== void 0 ? _f : null,
-                    LODLevel: (_g = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.LODLevel) !== null && _g !== void 0 ? _g : null
+                    StyleOverlay: (_f = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleOverlay) !== null && _f !== void 0 ? _f : null,
+                    LODCategoryID: (_g = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.LODCategoryID) !== null && _g !== void 0 ? _g : null,
+                    LODLevel: (_h = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.LODLevel) !== null && _h !== void 0 ? _h : null
                 });
             }));
         }
@@ -47762,7 +48201,8 @@
             for (let i = 0; i < params.entities.length; i++) {
                 const entity = params.entities[i];
                 const zoomItem = params.zoomItems[entity.Bruce.ID];
-                const style = (!params.offline && zoomItem.StyleID != -1) ? (_a = (await getStyle$1(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+                const ownStyle = (!params.offline && zoomItem.StyleID != -1) ? (_a = (await getStyle$1(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+                const style = exports.MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
                 // Pass through tags that may be needed for styling.
                 const tagIds = entity.Bruce["Layer.ID"];
                 const tags = [];
@@ -48591,6 +49031,10 @@
                 trackEntity._parentEntity = cEntity;
             }
             cEntity._siblingGraphics = siblings;
+            cEntity.styleEffective = exports.StyleEffective.Combine([
+                { key: "color", effective: fillColorTrace.effective },
+                { key: "scale", effective: scaleTrace.effective }
+            ]);
             return cEntity;
         }
         EntityRenderEngineModel3d.Render = Render;
@@ -48601,7 +49045,7 @@
          * @returns
          */
         async function RenderGroup(params) {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             const api = params.apiGetter.getApi();
             await api.Loading;
             const cEntities = new Map();
@@ -48638,7 +49082,8 @@
             for (let i = 0; i < params.entities.length; i++) {
                 const entity = params.entities[i];
                 const zoomItem = params.zoomItems[entity.Bruce.ID];
-                const style = (!params.offline && zoomItem.StyleID != -1) ? (_a = (await getStyle$2(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+                const ownStyle = (!params.offline && zoomItem.StyleID != -1) ? (_a = (await getStyle$2(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+                const style = exports.MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
                 // Pass through tags that may be needed for styling.
                 const tagIds = entity.Bruce["Layer.ID"];
                 const tags = [];
@@ -48677,8 +49122,8 @@
             for (let i = 0; i < params.entities.length; i++) {
                 const entity = params.entities[i];
                 const zoomItem = params.zoomItems[entity.Bruce.ID];
-                const styleRecord = (!params.offline && zoomItem.StyleID != -1) ? (await getStyle$2(api, entity, zoomItem.StyleID)) : null;
-                const style = (!params.offline && zoomItem.StyleID != -1) ? styleRecord === null || styleRecord === void 0 ? void 0 : styleRecord.Settings : zoomItem.Style;
+                const ownStyle = (!params.offline && zoomItem.StyleID != -1) ? (_c = (await getStyle$2(api, entity, zoomItem.StyleID))) === null || _c === void 0 ? void 0 : _c.Settings : zoomItem.Style;
+                const style = exports.MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
                 const lod = lodData.find(x => x.entityId == entity.Bruce.ID);
                 if (!(lod === null || lod === void 0 ? void 0 : lod.clientFileId)) {
                     continue;
@@ -48697,21 +49142,21 @@
                 let rego = null;
                 // Only used for historic tracks right now.
                 // So won't bother getting it if we don't have historic data.
-                if ((_c = params.entitiesHistoric) === null || _c === void 0 ? void 0 : _c[entity.Bruce.ID]) {
+                if ((_d = params.entitiesHistoric) === null || _d === void 0 ? void 0 : _d[entity.Bruce.ID]) {
                     rego = params.visualRegister.GetRego({
                         entityId: entity.Bruce.ID,
                         menuItemId: params.menuItemId
                     });
                 }
-                const mStyle = (_d = style === null || style === void 0 ? void 0 : style.modelStyle) !== null && _d !== void 0 ? _d : {};
+                const mStyle = (_e = style === null || style === void 0 ? void 0 : style.modelStyle) !== null && _e !== void 0 ? _e : {};
                 const cEntity = Render({
-                    rendered: (_e = params.rendered) === null || _e === void 0 ? void 0 : _e.get(entity.Bruce.ID),
+                    rendered: (_f = params.rendered) === null || _f === void 0 ? void 0 : _f.get(entity.Bruce.ID),
                     entity: entity,
-                    entityHistoric: (_f = params.entitiesHistoric) === null || _f === void 0 ? void 0 : _f[entity.Bruce.ID],
+                    entityHistoric: (_g = params.entitiesHistoric) === null || _g === void 0 ? void 0 : _g[entity.Bruce.ID],
                     style: mStyle,
                     tags: tags,
                     viewer: params.viewer,
-                    lodUrl: (_g = lod.url) !== null && _g !== void 0 ? _g : BModels.ClientFile.GetUrl({
+                    lodUrl: (_h = lod.url) !== null && _h !== void 0 ? _h : BModels.ClientFile.GetUrl({
                         api,
                         fileId: lod.clientFileId,
                         viaCdn: true
@@ -48727,7 +49172,8 @@
                     const name = await getName$1(api, entity, params.offline);
                     cEntity.name = name;
                     cEntity._renderGroup = exports.EntityRenderEngine.GetRenderGroupId(zoomItem);
-                    cEntity.styleId = zoomItem.StyleID == -1 ? -1 : styleRecord === null || styleRecord === void 0 ? void 0 : styleRecord.ID;
+                    // The skip gate compares this with the zoom item, so it must not name the type default.
+                    cEntity.styleId = zoomItem.StyleID == -1 ? -1 : (+zoomItem.StyleID || null);
                     cEntities.set(entity.Bruce.ID, cEntity);
                 }
             }
@@ -49162,7 +49608,8 @@
             for (let i = 0; i < params.entities.length; i++) {
                 const entity = params.entities[i];
                 const zoomItem = params.zoomItems[entity.Bruce.ID];
-                const style = (!params.offline && zoomItem.StyleID != -1) ? (_a = (await getStyle$3(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+                const ownStyle = (!params.offline && zoomItem.StyleID != -1) ? (_a = (await getStyle$3(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+                const style = exports.MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
                 // Pass through tags that may be needed for styling.
                 const tagIds = entity.Bruce["Layer.ID"];
                 const tags = [];
@@ -53829,7 +54276,8 @@ void main() {
             for (let i = 0; i < params.entities.length; i++) {
                 const entity = params.entities[i];
                 const zoomItem = params.zoomItems[entity.Bruce.ID];
-                const style = (!params.offline && zoomItem.StyleID != -1) ? (_a = (await getStyle$4(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+                const ownStyle = (!params.offline && zoomItem.StyleID != -1) ? (_a = (await getStyle$4(api, entity, zoomItem.StyleID))) === null || _a === void 0 ? void 0 : _a.Settings : zoomItem.Style;
+                const style = exports.MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
                 // Pass through tags that may be needed for styling.
                 const tagIds = entity.Bruce["Layer.ID"];
                 const tags = [];
@@ -56085,7 +56533,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.6.6";
+    const VERSION = "7.6.8";
     /**
      * 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.