bruce-cesium 7.6.6 → 7.6.7

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, PixelDatatype, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, JulianDate, Quaternion, HeadingPitchRoll, HeightReference, ConstantPositionProperty, DistanceDisplayCondition, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Rectangle, SceneMode, IntersectionTests, Ray, SceneTransforms, FeatureDetection, Matrix3, NearFarScalar, KmlDataSource, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, OrthographicFrustum, EasingFunction, Intersect, CustomDataSource, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, GeometryInstance, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, LRUCache, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, Entity as Entity$1, EntityLod, EntityTag, EntityType, ObjectUtils, Style, UrlUtils, Api, Bounds, ClientFileValueMap, Color as Color$1, Geometry as Geometry$1, Carto, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, ProjectViewBookmarkGroup, EntityRelationType, EntityHistoricData } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, PixelDatatype, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, JulianDate, Quaternion, HeadingPitchRoll, HeightReference, ConstantPositionProperty, DistanceDisplayCondition, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ArcType, CornerType, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneMode, IntersectionTests, Ray, SceneTransforms, FeatureDetection, Matrix3, NearFarScalar, KmlDataSource, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, CustomDataSource, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, LRUCache, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, Entity as Entity$1, EntityLod, EntityTag, EntityType, ObjectUtils, Style, UrlUtils, Api, Carto, Geometry as Geometry$1, Bounds, ClientFileValueMap, Color as Color$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, AccountConcept, BruceApi, EntityRelation, RecordChangeFeed, Camera, ProgramKey, ProjectViewLegacyTile, EntitySource, Account, AccountLimits, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, ProjectViewBookmarkGroup, EntityRelationType, EntityHistoricData } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -16432,6 +16432,163 @@ class HistoricGatherer {
 // whatever the writer's clock and this one disagree by.
 HistoricGatherer.LIVE_TAIL_MS = 15000;
 
+/**
+ * Lays one style over every menu item that can take it, changing only what that style sets.
+ */
+var MenuItemStyleOverlay;
+(function (MenuItemStyleOverlay) {
+    // Tileset items whose render manager runs a Styler, given the item settings that make it run one.
+    const TILESET_TYPES = [
+        MenuItem.EType.CadTileset,
+        MenuItem.EType.ArbTileset,
+        MenuItem.EType.IonTileset,
+        MenuItem.EType.EntityTileset
+    ];
+    // Items whose style resolves per Entity from their zoom control rows.
+    const ZOOM_CONTROL_TYPES = [
+        MenuItem.EType.Entities,
+        MenuItem.EType.Entity,
+        MenuItem.EType.EntitiesIds,
+        MenuItem.EType.EntitiesLoaded,
+        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 === MenuItem.EType.ArbTileset || item.Type === 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 true when the two items differ by nothing but their overlay.
+     */
+    function IsChangeOnly(from, to) {
+        if (!from || !to || from.Type !== to.Type) {
+            return false;
+        }
+        const toOverlay = Get(to);
+        if (JSON.stringify(Get(from)) === JSON.stringify(toOverlay)) {
+            return false;
+        }
+        // A false mismatch only costs the in-place swap, so key order is not normalized.
+        return JSON.stringify(With(from, toOverlay)) === JSON.stringify(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;
+    }
+})(MenuItemStyleOverlay || (MenuItemStyleOverlay = {}));
+
 const BATCH_SIZE = 500;
 const CHECK_BATCH_SIZE = 250;
 function getValue$2(viewer, obj) {
@@ -16492,6 +16649,8 @@ var EntitiesRenderManager;
             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.
@@ -16586,6 +16745,7 @@ var EntitiesRenderManager;
                     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) {
@@ -16896,6 +17056,7 @@ var EntitiesRenderManager;
             (_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++) {
@@ -16984,7 +17145,8 @@ var EntitiesRenderManager;
             }
             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);
@@ -17135,12 +17297,22 @@ var EntitiesRenderManager;
             }
             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;
@@ -17276,6 +17448,7 @@ var EntitiesRenderManager;
                     console.error(e);
                 }
             }
+            style = 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;
@@ -17567,7 +17740,7 @@ var EntitiesRenderManager;
             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 = ViewUtils.GetTimeDetails({
@@ -17671,8 +17844,9 @@ var EntitiesRenderManager;
                         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) {
@@ -17702,7 +17876,7 @@ var EntitiesRenderManager;
                         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();
@@ -17781,6 +17955,7 @@ var EntitiesRenderManager;
             clearInterval(this.renderQueueInterval);
             this.renderQueueInterval = null;
             this.renderQueue = [];
+            this.renderQueueForced.clear();
             this.disposed = true;
             return payload;
         }
@@ -18143,7 +18318,8 @@ var EntitiesLoadedRenderManager;
                 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);
@@ -18377,6 +18553,7 @@ var EntitiesLoadedRenderManager;
             if (!style) {
                 style = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.Style;
             }
+            style = 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;
@@ -18621,7 +18798,7 @@ var EntitiesLoadedRenderManager;
             return next;
         }
         async doRenderAsIndividuals(entities, force = false) {
-            var _a;
+            var _a, _b, _c;
             const { updated, entities: cEntities } = await EntityRenderEngine.Render({
                 viewer: this.viewer,
                 apiGetter: this.apiGetter,
@@ -18675,7 +18852,9 @@ var EntitiesLoadedRenderManager;
                                 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
                         });
@@ -18683,6 +18862,8 @@ var EntitiesLoadedRenderManager;
                     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({
@@ -18862,7 +19043,8 @@ var EntitiesIdsRenderManager;
                 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);
@@ -19074,7 +19256,7 @@ var EntitiesIdsRenderManager;
          * @returns
          */
         async renderAsIndividuals(entities, force = false) {
-            var _a;
+            var _a, _b, _c;
             if (this.disposed || this.viewer.isDestroyed() || !entities.length) {
                 return;
             }
@@ -19133,7 +19315,9 @@ var EntitiesIdsRenderManager;
                                 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
                         });
@@ -19141,6 +19325,8 @@ var EntitiesIdsRenderManager;
                     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({
@@ -19156,7 +19342,7 @@ var EntitiesIdsRenderManager;
                         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) {
@@ -19306,7 +19492,8 @@ var EntityRenderManager;
                 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);
@@ -19380,6 +19567,7 @@ var EntityRenderManager;
             return next;
         }
         async doRenderEntity(entity, force = false) {
+            var _a, _b;
             try {
                 if (this.disposed || this.viewer.isDestroyed()) {
                     return;
@@ -19412,7 +19600,9 @@ var EntityRenderManager;
                                 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
                         });
@@ -19420,6 +19610,8 @@ var EntityRenderManager;
                     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({
@@ -20490,6 +20682,8 @@ class TilesetStyler {
         // 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;
         this.styleFallbackLoaded = false;
         this.loadingCounter = 0;
         // Entity IDs -> boolean to indicate if we should override the feature colour.
@@ -20542,8 +20736,9 @@ class TilesetStyler {
         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;
@@ -20571,7 +20766,7 @@ class TilesetStyler {
             // 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;
@@ -20611,7 +20806,7 @@ class TilesetStyler {
         });
         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: [AccountConcept.EConcept.ENTITY],
@@ -20676,6 +20871,10 @@ class TilesetStyler {
         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;
+        }
         if (params.scenario != null) {
             if (!this.shouldUpdateRegoStates && !!this.scenario) {
                 this.shouldUpdateRegoStates = true;
@@ -21178,12 +21377,11 @@ class TilesetStyler {
                 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 = 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;
@@ -21229,6 +21427,7 @@ class TilesetStyler {
             style = (_b = this.fallbackStyle) === null || _b === void 0 ? void 0 : _b.Settings;
             styleId = this.fallbackStyleId != null ? Number(this.fallbackStyleId) : null;
         }
+        style = 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 };
         }
@@ -22420,6 +22619,7 @@ var TilesetCadRenderManager;
                             api: this.getters.GetBruceApi(),
                             cTileset: this.cTileset,
                             fallbackStyleId: this.item.styleId,
+                            styleOverlay: 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,
@@ -22634,6 +22834,7 @@ var TilesetCadRenderManager;
                 api: this.getters.GetBruceApi(),
                 cTileset: this.cTileset,
                 fallbackStyleId: this.item.styleId,
+                styleOverlay: 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,
@@ -23255,7 +23456,8 @@ var TilesetCadRenderManager;
             // 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: MenuItemStyleOverlay.Get(item)
             });
         }
         Dispose() {
@@ -24739,6 +24941,8 @@ var DataLabRenderManager;
             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;
@@ -24767,6 +24971,7 @@ var DataLabRenderManager;
             clearInterval(this.renderQueueInterval);
             this.renderQueueInterval = null;
             this.renderQueue = [];
+            this.renderQueueForced.clear();
             this.renderedEntities = {};
             this.ensureSettings();
             this.visualsManager.RemoveRegos({
@@ -24929,6 +25134,7 @@ var DataLabRenderManager;
             clearInterval(this.renderQueueInterval);
             this.renderQueueInterval = null;
             this.renderQueue = [];
+            this.renderQueueForced.clear();
             this.entityCheckQueueIds = [];
             this.visualsManager.RemoveRegos({
                 menuItemId: this.item.id
@@ -24971,7 +25177,8 @@ var DataLabRenderManager;
                     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 {
@@ -25094,15 +25301,28 @@ var DataLabRenderManager;
                 }
             }
         }
-        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;
@@ -25134,7 +25354,7 @@ var DataLabRenderManager;
             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;
             }
@@ -25183,7 +25403,9 @@ var DataLabRenderManager;
                                     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
                             });
@@ -25192,10 +25414,12 @@ var DataLabRenderManager;
                             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({
@@ -25271,6 +25495,7 @@ var DataLabRenderManager;
                 renderSignature: Manager.GetRenderSignature(this.item)
             };
             this.renderQueue = [];
+            this.renderQueueForced.clear();
             this.queryLoadId += 1;
             this.disposed = true;
             return payload;
@@ -26709,6 +26934,7 @@ var TilesetEntitiesRenderManager;
                                     api: api,
                                     cTileset: this.cTileset,
                                     fallbackStyleId: this.item.styleId,
+                                    styleOverlay: MenuItemStyleOverlay.Get(this.item),
                                     styleMapping: [],
                                     expandSources: false,
                                     menuItemId: this.item.id,
@@ -26931,7 +27157,8 @@ var TilesetEntitiesRenderManager;
             if (Manager.NeedsStyler(item)) {
                 this.styler.UpdateStyleMapping({
                     styleMapping: [],
-                    fallbackStyleId: item.styleId
+                    fallbackStyleId: item.styleId,
+                    styleOverlay: MenuItemStyleOverlay.Get(item)
                 });
             }
         }
@@ -27082,6 +27309,7 @@ var TilesetEntitiesRenderManager;
                     api: this.getters.GetBruceApi(),
                     cTileset: this.cTileset,
                     fallbackStyleId: this.item.styleId,
+                    styleOverlay: MenuItemStyleOverlay.Get(this.item),
                     styleMapping: [],
                     expandSources: false,
                     menuItemId: this.item.id,
@@ -28009,6 +28237,7 @@ var TilesetArbRenderManager;
                                     api: api,
                                     cTileset: this.cTileset,
                                     fallbackStyleId: this.item.styleId,
+                                    styleOverlay: MenuItemStyleOverlay.Get(this.item),
                                     styleMapping: this.item.StyleMapping,
                                     expandSources: false,
                                     menuItemId: this.item.id,
@@ -28204,7 +28433,8 @@ var TilesetArbRenderManager;
             if (this.item.ApplyStyles || this.item.Type == 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: MenuItemStyleOverlay.Get(this.item)
                 });
             }
         }
@@ -32076,6 +32306,9 @@ var MenuItemManager;
         get Viewer() {
             return this.viewer;
         }
+        get StyleOverlay() {
+            return this.styleOverlay;
+        }
         get VisualsRegister() {
             return this.visualsRegister;
         }
@@ -32136,6 +32369,9 @@ var MenuItemManager;
             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;
             this.onUpdate = null;
             // Segments discovered so far per menu item ID.
             this.seriesSegments = new Map();
@@ -32217,12 +32453,17 @@ var MenuItemManager;
             }
             // An item with a style set renders its first style unless the caller already picked one of them.
             params = { ...params, item: MenuItemStyles.Resolve(params.item) };
+            // The overlay rides on the rendered copy, so the view's item never carries it.
+            params = { ...params, item: MenuItemStyleOverlay.With(params.item, this.styleOverlay) };
             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 (MenuItemStyles.IsStyleChangeOnly(rItem.item, params.item) && this.isStyleSwapCapable(rItem.renderManager)) {
+                // Only the style pick or overlay changed, so the drawn graphics are restyled, not rebuilt.
+                const aligned = MenuItemStyleOverlay.With(rItem.item, MenuItemStyleOverlay.Get(params.item));
+                const pickOnly = MenuItemStyles.IsStyleChangeOnly(aligned, params.item);
+                const restyleOnly = pickOnly || MenuItemStyleOverlay.IsChangeOnly(rItem.item, params.item);
+                if (restyleOnly && this.isStyleSwapCapable(rItem.renderManager)) {
                     rItem.renderManager.SwapStyle(params.item);
                     rItem.item = params.item;
                     create = false;
@@ -32669,6 +32910,45 @@ var MenuItemManager;
             (_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 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 = MenuItemStyleOverlay.With(rItem.item, overlay);
+                // Setting the same overlay again would otherwise restyle every feature for nothing.
+                const unchanged = JSON.stringify(MenuItemStyleOverlay.Get(next)) === JSON.stringify(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 });
+            }
+        }
         /*
          * Picks the child the caller asked for, else the one already enabled, else the first.
          */
@@ -46598,15 +46878,16 @@ var RenderManager;
      */
     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
             });
         }));
     }
@@ -47876,7 +48157,8 @@ var EntityRenderEnginePoint;
         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 = MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
             // Pass through tags that may be needed for styling.
             const tagIds = entity.Bruce["Layer.ID"];
             const tags = [];
@@ -48709,6 +48991,10 @@ var EntityRenderEngineModel3d;
             trackEntity._parentEntity = cEntity;
         }
         cEntity._siblingGraphics = siblings;
+        cEntity.styleEffective = StyleEffective.Combine([
+            { key: "color", effective: fillColorTrace.effective },
+            { key: "scale", effective: scaleTrace.effective }
+        ]);
         return cEntity;
     }
     EntityRenderEngineModel3d.Render = Render;
@@ -48719,7 +49005,7 @@ var EntityRenderEngineModel3d;
      * @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();
@@ -48756,7 +49042,8 @@ var EntityRenderEngineModel3d;
         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 = MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
             // Pass through tags that may be needed for styling.
             const tagIds = entity.Bruce["Layer.ID"];
             const tags = [];
@@ -48795,8 +49082,8 @@ var EntityRenderEngineModel3d;
         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 = 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;
@@ -48815,21 +49102,21 @@ var EntityRenderEngineModel3d;
             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 : ClientFile.GetUrl({
+                lodUrl: (_h = lod.url) !== null && _h !== void 0 ? _h : ClientFile.GetUrl({
                     api,
                     fileId: lod.clientFileId,
                     viaCdn: true
@@ -48845,7 +49132,8 @@ var EntityRenderEngineModel3d;
                 const name = await getName$1(api, entity, params.offline);
                 cEntity.name = name;
                 cEntity._renderGroup = 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);
             }
         }
@@ -49284,7 +49572,8 @@ var EntityRenderEnginePolyline;
         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 = MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
             // Pass through tags that may be needed for styling.
             const tagIds = entity.Bruce["Layer.ID"];
             const tags = [];
@@ -53962,7 +54251,8 @@ var EntityRenderEnginePolygon;
         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 = MenuItemStyleOverlay.ApplyRow(ownStyle, zoomItem);
             // Pass through tags that may be needed for styling.
             const tagIds = entity.Bruce["Layer.ID"];
             const tags = [];
@@ -56233,7 +56523,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.6.6";
+const VERSION = "7.6.7";
 /**
  * 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.
@@ -56250,5 +56540,5 @@ const getENVIRONMENT = () => {
     return ENVIRONMENT;
 };
 
-export { VERSION, setENVIRONMENT, getENVIRONMENT, ClusterItems, PointClustering, PointClusterSize, CesiumAnimatedInOut, DisplacedSurfacePrimitive, CesiumAnimatedProperty, isStyleChanged, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, extractMetadataFromFileUrl, EntityRenderEnginePolygon, EntityRenderEnginePolyline, TextureFrameSeriesAnimator, TextureValueLabels, MenuItemCreator, MenuItemManager, MenuItemStyles, CesiumParabola, EntityLabel, EntityLabelGroup, LiveCursor, SharedGetters, EntitySimulation, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, createTileset, TilesetRenderEngine, ViewRenderEngine, VisualRegisterCuller, VisualsRegister, XGridsRenderEngine, CesiumEntityStyler, DrawingUtils, EntityUtils, MeasureUtils, StyleUtils, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_KEY, DEFAULT_LIVE_PADDING_SECONDS, DEFAULT_BRIGHTNESS_SHIFT, DEFAULT_LIGHT_INTENSITY, LIGHTING_SETTINGS_VERSION, LIGHT_INTENSITY_COMPENSATION, MAX_COMPENSATED_LIGHT_INTENSITY, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, WidgetLeftPanelTabDashboard, EMenuItemState, WidgetLeftPanelTabMenuItems, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, ECursor, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, CreateTabIconSvg, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
+export { VERSION, setENVIRONMENT, getENVIRONMENT, ClusterItems, PointClustering, PointClusterSize, CesiumAnimatedInOut, DisplacedSurfacePrimitive, CesiumAnimatedProperty, isStyleChanged, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, extractMetadataFromFileUrl, EntityRenderEnginePolygon, EntityRenderEnginePolyline, TextureFrameSeriesAnimator, TextureValueLabels, MenuItemCreator, MenuItemManager, MenuItemStyles, MenuItemStyleOverlay, CesiumParabola, EntityLabel, EntityLabelGroup, LiveCursor, SharedGetters, EntitySimulation, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, createTileset, TilesetRenderEngine, ViewRenderEngine, VisualRegisterCuller, VisualsRegister, XGridsRenderEngine, CesiumEntityStyler, DrawingUtils, EntityUtils, MeasureUtils, StyleUtils, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_KEY, DEFAULT_LIVE_PADDING_SECONDS, DEFAULT_BRIGHTNESS_SHIFT, DEFAULT_LIGHT_INTENSITY, LIGHTING_SETTINGS_VERSION, LIGHT_INTENSITY_COMPENSATION, MAX_COMPENSATED_LIGHT_INTENSITY, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, WidgetLeftPanelTabDashboard, EMenuItemState, WidgetLeftPanelTabMenuItems, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, ECursor, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, CreateTabIconSvg, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
 //# sourceMappingURL=bruce-cesium.es5.js.map