bruce-cesium 6.7.5 → 6.7.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, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Bounds, Geometry, Carto, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, Camera, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Bounds, Geometry, Carto, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, Camera, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -7780,29 +7780,54 @@ var VisualsRegister;
         GetRegos(params) {
             // TODO: refactor.
             // Currently this was made by merging two functions.
-            const { entityId, menuItemId } = params;
+            const { entityId, menuItemId, styleId, styleEffectiveFilter } = params;
+            const matchesStyleFilters = (rego) => {
+                if (styleId != null && rego.styleId !== styleId) {
+                    return false;
+                }
+                if (styleEffectiveFilter && !StyleEffective.MatchesFilter(rego.styleEffective, styleEffectiveFilter)) {
+                    return false;
+                }
+                return true;
+            };
             if (entityId) {
-                const entityId = params.entityId;
                 const entityRegos = this.rego[entityId];
                 if (!entityRegos) {
                     return [];
                 }
-                return menuItemId ? entityRegos.filter(x => x.menuItemId == menuItemId) : entityRegos;
+                let results = menuItemId ? entityRegos.filter(x => x.menuItemId == menuItemId) : entityRegos;
+                if (styleId != null || styleEffectiveFilter) {
+                    results = results.filter(matchesStyleFilters);
+                }
+                return results;
             }
             else if (menuItemId) {
-                const menuItemId = params.menuItemId;
                 const visuals = [];
-                for (const entityId in this.rego) {
-                    const entityRegos = this.rego[entityId];
+                for (const eId in this.rego) {
+                    const entityRegos = this.rego[eId];
                     if (entityRegos) {
                         const rego = entityRegos.find(r => r.menuItemId === menuItemId);
-                        if (rego) {
+                        if (rego && matchesStyleFilters(rego)) {
                             visuals.push(rego);
                         }
                     }
                 }
                 return visuals;
             }
+            else if (styleId != null || styleEffectiveFilter) {
+                const visuals = [];
+                for (const eId in this.rego) {
+                    const entityRegos = this.rego[eId];
+                    if (entityRegos) {
+                        for (const rego of entityRegos) {
+                            if (matchesStyleFilters(rego)) {
+                                visuals.push(rego);
+                            }
+                        }
+                    }
+                }
+                return visuals;
+            }
             return [];
         }
         /**
@@ -10136,7 +10161,7 @@ var EntitiesRenderManager;
          * @returns
          */
         async renderAsIndividuals(entities, force = false) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             // 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({
@@ -10229,6 +10254,8 @@ var EntitiesRenderManager;
                             cdn: this.item.cdnEnabled,
                             outline: entity.Bruce.Outline,
                             internalId: (_f = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.InternalID) !== null && _f !== void 0 ? _f : undefined,
+                            styleId: (_g = cEntity.styleId) !== null && _g !== void 0 ? _g : undefined,
+                            styleEffective: (_h = cEntity.styleEffective) !== null && _h !== void 0 ? _h : undefined,
                         };
                         this.visualsManager.AddRego({
                             rego,
@@ -10240,11 +10267,13 @@ var EntitiesRenderManager;
                         rego.visual = cEntity;
                         rego.entityTypeId = entity.Bruce["EntityType.ID"];
                         rego.tagIds = entity.Bruce["Layer.ID"] ? [].concat(entity.Bruce["Layer.ID"]) : [];
-                        rego.outline = (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.Outline;
+                        rego.outline = (_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j.Outline;
                         rego.cdn = this.item.cdnEnabled;
-                        rego.schema = (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.Schema;
+                        rego.schema = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.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.internalId = (_m = (_l = entity.Bruce) === null || _l === void 0 ? void 0 : _l.InternalID) !== null && _m !== void 0 ? _m : rego.internalId;
+                        rego.styleId = (_o = cEntity.styleId) !== null && _o !== void 0 ? _o : rego.styleId;
+                        rego.styleEffective = (_p = cEntity.styleEffective) !== null && _p !== void 0 ? _p : rego.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) {
@@ -10274,7 +10303,7 @@ var EntitiesRenderManager;
                         menuItemId: this.item.id,
                         requestRender: false
                     });
-                    (_l = this.clustering) === null || _l === void 0 ? void 0 : _l.RemoveEntity(id, false);
+                    (_q = this.clustering) === null || _q === void 0 ? void 0 : _q.RemoveEntity(id, false);
                 }
             }
             this.viewer.scene.requestRender();
@@ -12849,13 +12878,14 @@ class TilesetStyler {
         this.styleTilesetFeatureFullData(rego, null, []);
     }
     styleTilesetFeatureFullData(rego, data, tags) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const visual = rego.visual;
         if (!visual || !(visual instanceof Cesium3DTileFeature)) {
             return;
         }
-        const style = this.getTilesetFeatureStyle(rego.entityTypeId);
-        const bColor = style && ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? Calculator.GetColor(style.modelStyle.fillColor, data, tags) : null;
+        const { settings: style, styleId: resolvedStyleId } = this.getTilesetFeatureStyleWithId(rego.entityTypeId);
+        const fillColorTrace = (style && ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor)) ? Calculator.TraceGetColor(style.modelStyle.fillColor, data, tags) : { value: null, effective: null };
+        const bColor = fillColorTrace.value;
         let cColor = null;
         if (bColor == null) {
             cColor = Color.WHITE;
@@ -12875,6 +12905,12 @@ class TilesetStyler {
             rego.internalId = data.Bruce.InternalID;
             this.styledByInternalId.set(data.Bruce.InternalID, rego.entityId);
         }
+        if (resolvedStyleId != null) {
+            rego.styleId = resolvedStyleId;
+        }
+        rego.styleEffective = (_c = StyleEffective.Combine([
+            { key: "color", effective: fillColorTrace.effective }
+        ])) !== null && _c !== void 0 ? _c : rego.styleEffective;
         this.styledEntityIds.set(rego.entityId, true);
         this._styleProgressQueue.Call();
         // Since we only need to update it for scenarios right now.
@@ -12883,7 +12919,7 @@ class TilesetStyler {
             // Update the Entity's rego state.
             let changed = false;
             if (isOutlineChanged(rego, data)) {
-                rego.outline = (_c = data === null || data === void 0 ? void 0 : data.Bruce) === null || _c === void 0 ? void 0 : _c.Outline;
+                rego.outline = (_d = data === null || data === void 0 ? void 0 : data.Bruce) === null || _d === void 0 ? void 0 : _d.Outline;
                 changed = true;
             }
             // Something changed, trigger a rego update.
@@ -12898,19 +12934,27 @@ class TilesetStyler {
         }
     }
     getTilesetFeatureStyle(entityTypeId) {
-        var _a, _b, _c, _d;
-        // Locate what style is applicable to the feature.
+        return this.getTilesetFeatureStyleWithId(entityTypeId).settings;
+    }
+    getTilesetFeatureStyleWithId(entityTypeId) {
+        var _a, _b, _c;
         let style = null;
+        let styleId = null;
         if (entityTypeId) {
-            style = ((_b = (_a = this.styleMapping.find(x => x.EntityTypeID == entityTypeId)) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.Settings);
+            const mapping = this.styleMapping.find(x => x.EntityTypeID == entityTypeId);
+            if (mapping) {
+                style = (_a = mapping.style) === null || _a === void 0 ? void 0 : _a.Settings;
+                styleId = mapping.StyleID != null ? Number(mapping.StyleID) : null;
+            }
         }
         if (!style) {
-            style = ((_c = this.fallbackStyle) === null || _c === void 0 ? void 0 : _c.Settings);
+            style = (_b = this.fallbackStyle) === null || _b === void 0 ? void 0 : _b.Settings;
+            styleId = this.fallbackStyleId != null ? Number(this.fallbackStyleId) : null;
         }
-        if (!style || !((_d = style === null || style === void 0 ? void 0 : style.modelStyle) === null || _d === void 0 ? void 0 : _d.customize)) {
-            return null;
+        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 };
         }
-        return style;
+        return { settings: style, styleId };
     }
     getTilesetFeatureNeedsFullData(entityTypeId) {
         var _a;
@@ -19090,7 +19134,7 @@ var RelationsRenderManager;
 })(RelationsRenderManager || (RelationsRenderManager = {}));
 
 var TilesetGooglePhotosRenderManager;
-(function (TilesetGooglePhotosRenderManager) {
+(function (TilesetGooglePhotosRenderManager$$1) {
     class Manager {
         get Disposed() {
             return this.disposed;
@@ -19132,7 +19176,7 @@ var TilesetGooglePhotosRenderManager;
                 this.item = params.item;
             }
             (async () => {
-                var _a;
+                var _a, _b, _c;
                 // If the tileset already exists then we just need to update the style.
                 if (this.cTileset) {
                     const colorCss = this.item.colorMask;
@@ -19159,16 +19203,44 @@ var TilesetGooglePhotosRenderManager;
                         console.warn("Cesium version does not support 'createGooglePhotorealistic3DTileset' so Google Photos tileset will not be rendered.");
                         return;
                     }
+                    // Proxy path: key injected server-side.
                     if (api.IsVersionAtLeast(BruceApi.VERSION_WITH_PROXIES)) {
-                        // Proxy path: key injected server-side.
-                        const proxyRootUrl = api.GetBaseUrl() + "proxy/google-tiles/v1/3dtiles/root.json";
+                        // If we have a Google token we'll proxy through that.
+                        // Otherwise use Cesium Ion to load as a resource.
+                        const { programKeys } = await ProgramKey.GetList({
+                            api: this.getters.GetBruceApi()
+                        });
+                        const hasGoogleToken = Boolean((_a = programKeys.find(x => x.ProgramId === ProgramKey.EProgramId.GooglePhotogrammetry)) === null || _a === void 0 ? void 0 : _a.Available);
+                        // Must have own iot token, this ensures we don't use our template one for loading customer photogrammetry.
+                        const hasIonToken = Boolean((_b = programKeys.find(x => x.ProgramId === ProgramKey.EProgramId.CesiumIon)) === null || _b === void 0 ? void 0 : _b.Available);
                         if (this.disposed) {
                             this.doDispose();
                             return;
                         }
-                        this.cTileset = await CESIUM.Cesium3DTileset.fromUrl(proxyRootUrl, {
-                            showCreditsOnScreen: true
-                        });
+                        // WARNING: we are routing through ion first right now as it is faster.
+                        // Should be a user-decision and we should improve our google proxying.
+                        if (hasIonToken && Ion.defaultServer) {
+                            const loadUrl = await IonResource.fromAssetId(2275207, undefined);
+                            if (this.disposed) {
+                                this.doDispose();
+                                return;
+                            }
+                            this.cTileset = await createTileset(loadUrl, {}, true);
+                        }
+                        else if (hasGoogleToken) {
+                            const proxyRootUrl = api.GetBaseUrl() + "proxy/google-tiles/v1/3dtiles/root.json";
+                            if (this.disposed) {
+                                this.doDispose();
+                                return;
+                            }
+                            this.cTileset = await CESIUM.Cesium3DTileset.fromUrl(proxyRootUrl, {
+                                showCreditsOnScreen: true
+                            });
+                        }
+                        else {
+                            console.warn("No Google or Cesium Ion token available, so Google Photos tileset will not be rendered.");
+                            return;
+                        }
                     }
                     // Legacy path: fetch real Google key and use createGooglePhotorealistic3DTileset().
                     // Kill of whenever all API instances are migrated.
@@ -19196,7 +19268,7 @@ var TilesetGooglePhotosRenderManager;
                             this.doDispose();
                             return;
                         }
-                        this.cTileset = await ((_a = CESIUM.createGooglePhotorealistic3DTileset) === null || _a === void 0 ? void 0 : _a.call(CESIUM));
+                        this.cTileset = await ((_c = CESIUM.createGooglePhotorealistic3DTileset) === null || _c === void 0 ? void 0 : _c.call(CESIUM));
                     }
                     if (this.disposed) {
                         this.doDispose();
@@ -19224,7 +19296,7 @@ var TilesetGooglePhotosRenderManager;
         async ReRender(params) {
         }
     }
-    TilesetGooglePhotosRenderManager.Manager = Manager;
+    TilesetGooglePhotosRenderManager$$1.Manager = Manager;
 })(TilesetGooglePhotosRenderManager || (TilesetGooglePhotosRenderManager = {}));
 
 /**
@@ -32346,6 +32418,7 @@ var EntityRenderEnginePoint;
         if (!params.entityHistoric) {
             params.entityHistoric = [];
         }
+        const styleTraceParts = [];
         const style = params.style;
         let type = style.Type;
         if (type == null) {
@@ -32424,7 +32497,9 @@ var EntityRenderEnginePoint;
                         row.type = Calculator.EValueType.Input;
                     }
                 });
-                const icon = Calculator.GetString(iconUrlRows, entity, params.tags);
+                const iconTrace = Calculator.TraceGetString(iconUrlRows, entity, params.tags);
+                styleTraceParts.push({ key: "icon", effective: iconTrace.effective });
+                const icon = iconTrace.value;
                 let iconUrl = null;
                 if (typeof icon == "string") {
                     iconUrl = icon;
@@ -32470,14 +32545,18 @@ var EntityRenderEnginePoint;
                 imageKey = image ? iconUrl : null;
             }
             if (image) {
-                let iconScale = (style === null || style === void 0 ? void 0 : style.iconScale) ? EnsureNumber(Calculator.GetNumber(style.iconScale, entity, params.tags)) : 1;
+                const iconScaleTrace = (style === null || style === void 0 ? void 0 : style.iconScale) ? Calculator.TraceGetNumber(style.iconScale, entity, params.tags) : { value: null, effective: null };
+                let iconScale = (style === null || style === void 0 ? void 0 : style.iconScale) ? EnsureNumber(iconScaleTrace.value) : 1;
+                styleTraceParts.push({ key: "iconScale", effective: iconScaleTrace.effective });
                 if (!iconScale && iconScale != 0) {
                     iconScale = 1;
                 }
                 const disableDepthTest = Boolean(style.renderOnTop);
                 if (iconScale > 0) {
                     updateShouldShowTrack();
-                    const bColor = style.iconTintColor ? Calculator.GetColor(style.iconTintColor, entity, params.tags) : null;
+                    const iconTintTrace = style.iconTintColor ? Calculator.TraceGetColor(style.iconTintColor, entity, params.tags) : { value: null, effective: null };
+                    styleTraceParts.push({ key: "iconTint", effective: iconTintTrace.effective });
+                    const bColor = iconTintTrace.value;
                     const cColor = bColor ? ColorToCColor(bColor) : Color.WHITE.clone();
                     heightRef = getHeightRef(style);
                     if (!params.rendered || !params.rendered.billboard) {
@@ -32822,9 +32901,13 @@ var EntityRenderEnginePoint;
             }
         }
         if (!cEntity) {
-            const bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
+            const pointColorTrace = style.color ? Calculator.TraceGetColor(style.color, entity, params.tags) : { value: null, effective: null };
+            styleTraceParts.push({ key: "color", effective: pointColorTrace.effective });
+            const bColor = pointColorTrace.value;
             const cColor = bColor ? ColorToCColor(bColor) : Color.fromCssColorString("rgba(33, 150, 243, 0.8)");
-            let size = style.size ? Calculator.GetNumber(style.size, entity, params.tags) : null;
+            const pointSizeTrace = style.size ? Calculator.TraceGetNumber(style.size, entity, params.tags) : { value: null, effective: null };
+            styleTraceParts.push({ key: "size", effective: pointSizeTrace.effective });
+            let size = pointSizeTrace.value;
             if (size == null) {
                 size = 20;
             }
@@ -33025,6 +33108,7 @@ var EntityRenderEnginePoint;
             trackEntity._parentEntity = cEntity;
         }
         cEntity._siblingGraphics = siblings;
+        cEntity.styleEffective = StyleEffective.Combine(styleTraceParts);
         return cEntity;
     }
     EntityRenderEnginePoint.Render = Render;
@@ -33107,6 +33191,7 @@ var EntityRenderEnginePoint;
                 const name = await getName(api, entity);
                 cEntity.name = name;
                 cEntity._renderGroup = EntityRenderEngine.GetRenderGroupId(zoomItem);
+                cEntity.styleId = zoomItem.StyleID == -1 ? -1 : (+zoomItem.StyleID || null);
             }
             cEntities.set(entity.Bruce.ID, cEntity);
         }
@@ -33404,7 +33489,8 @@ var EntityRenderEngineModel3d;
             scale = 1;
         }
         const style = params.style;
-        let styleScale = (style === null || style === void 0 ? void 0 : style.scale) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.scale, entity, params.tags) : null;
+        const scaleTrace = (style === null || style === void 0 ? void 0 : style.scale) ? Calculator.TraceGetNumber(style.scale, entity, params.tags) : { value: null, effective: null };
+        let styleScale = scaleTrace.value;
         styleScale = EnsureNumber(styleScale ? styleScale : 1);
         if (styleScale <= 0) {
             styleScale = 1;
@@ -33420,6 +33506,7 @@ var EntityRenderEngineModel3d;
         let blendMode = null;
         let blendAmount = null;
         let color = null;
+        let fillColorTrace = { value: null, effective: null };
         if (style === null || style === void 0 ? void 0 : style.customize) {
             blendMode = style.fillColorBlendMode;
             if (!blendMode) {
@@ -33431,7 +33518,8 @@ var EntityRenderEngineModel3d;
                     blendAmount = 0.5;
                 }
             }
-            const bColor = Calculator.GetColor(style.fillColor, entity, params.tags);
+            fillColorTrace = style.fillColor ? Calculator.TraceGetColor(style.fillColor, entity, params.tags) : { value: null, effective: null };
+            const bColor = fillColorTrace.value;
             if (bColor) {
                 color = ColorToCColor(bColor);
             }
@@ -33920,7 +34008,7 @@ var EntityRenderEngineModel3d;
      * @returns
      */
     async function RenderGroup(params) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const api = params.apiGetter.getApi();
         await api.Loading;
         const cEntities = new Map();
@@ -33996,7 +34084,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 = zoomItem.StyleID != -1 ? (_c = (await getStyle$2(api, entity, zoomItem.StyleID))) === null || _c === void 0 ? void 0 : _c.Settings : zoomItem.Style;
+            const styleRecord = zoomItem.StyleID != -1 ? (await getStyle$2(api, entity, zoomItem.StyleID)) : null;
+            const style = zoomItem.StyleID != -1 ? styleRecord === null || styleRecord === void 0 ? void 0 : styleRecord.Settings : zoomItem.Style;
             const lod = lodData.find(x => x.entityId == entity.Bruce.ID);
             if (!(lod === null || lod === void 0 ? void 0 : lod.clientFileId)) {
                 continue;
@@ -34015,17 +34104,17 @@ 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 ((_d = params.entitiesHistoric) === null || _d === void 0 ? void 0 : _d[entity.Bruce.ID]) {
+            if ((_c = params.entitiesHistoric) === null || _c === void 0 ? void 0 : _c[entity.Bruce.ID]) {
                 rego = params.visualRegister.GetRego({
                     entityId: entity.Bruce.ID,
                     menuItemId: params.menuItemId
                 });
             }
-            const mStyle = (_e = style === null || style === void 0 ? void 0 : style.modelStyle) !== null && _e !== void 0 ? _e : {};
+            const mStyle = (_d = style === null || style === void 0 ? void 0 : style.modelStyle) !== null && _d !== void 0 ? _d : {};
             const cEntity = Render({
-                rendered: (_f = params.rendered) === null || _f === void 0 ? void 0 : _f.get(entity.Bruce.ID),
+                rendered: (_e = params.rendered) === null || _e === void 0 ? void 0 : _e.get(entity.Bruce.ID),
                 entity: entity,
-                entityHistoric: (_g = params.entitiesHistoric) === null || _g === void 0 ? void 0 : _g[entity.Bruce.ID],
+                entityHistoric: (_f = params.entitiesHistoric) === null || _f === void 0 ? void 0 : _f[entity.Bruce.ID],
                 style: mStyle,
                 tags: tags,
                 viewer: params.viewer,
@@ -34045,6 +34134,7 @@ var EntityRenderEngineModel3d;
                 const name = await getName$1(api, entity);
                 cEntity.name = name;
                 cEntity._renderGroup = EntityRenderEngine.GetRenderGroupId(zoomItem);
+                cEntity.styleId = zoomItem.StyleID == -1 ? -1 : styleRecord === null || styleRecord === void 0 ? void 0 : styleRecord.ID;
                 cEntities.set(entity.Bruce.ID, cEntity);
             }
         }
@@ -34261,12 +34351,14 @@ var EntityRenderEnginePolyline;
                 posses = smoothed;
             }
         }
-        const bColor = style.lineColor ? Calculator.GetColor(style.lineColor, entity, params.tags) : null;
+        const lineColorTrace = style.lineColor ? Calculator.TraceGetColor(style.lineColor, entity, params.tags) : { value: null, effective: null };
+        const bColor = lineColorTrace.value;
         const cColor = bColor ? ColorToCColor(bColor) : Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
         if (cColor.alpha <= 0) {
             return null;
         }
-        let width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
+        const lineWidthTrace = style.lineWidth ? Calculator.TraceGetNumber(style.lineWidth, entity, params.tags) : { value: null, effective: null };
+        let width = lineWidthTrace.value;
         if (width == null) {
             width = 2;
         }
@@ -34429,6 +34521,10 @@ var EntityRenderEnginePolyline;
             cEntity.corridor._orgPosses = orgPosses;
             cEntity.corridor._smoothen = style.smoothen;
         }
+        cEntity.styleEffective = StyleEffective.Combine([
+            { key: "lineColor", effective: lineColorTrace.effective },
+            { key: "lineWidth", effective: lineWidthTrace.effective }
+        ]);
         return cEntity;
     }
     EntityRenderEnginePolyline.Render = Render;
@@ -34496,6 +34592,7 @@ var EntityRenderEnginePolyline;
                 const name = await getName$2(api, entity);
                 cEntity.name = name;
                 cEntity._renderGroup = EntityRenderEngine.GetRenderGroupId(zoomItem);
+                cEntity.styleId = zoomItem.StyleID == -1 ? -1 : (+zoomItem.StyleID || null);
                 cEntities.set(entity.Bruce.ID, cEntity);
             }
         }
@@ -34637,11 +34734,14 @@ var EntityRenderEnginePolygon;
             return null;
         }
         const style = params.style;
-        const bFillColor = Calculator.GetColor(style.fillColor, entity, params.tags);
+        const fillColorTrace = style.fillColor ? Calculator.TraceGetColor(style.fillColor, entity, params.tags) : { value: null, effective: null };
+        const bFillColor = fillColorTrace.value;
         const cFillColor = bFillColor ? ColorToCColor(bFillColor) : Color.fromCssColorString("rgba(139, 195, 74, 0.8)");
-        const bLineColor = Calculator.GetColor(style.lineColor, entity, params.tags);
+        const lineColorTrace = style.lineColor ? Calculator.TraceGetColor(style.lineColor, entity, params.tags) : { value: null, effective: null };
+        const bLineColor = lineColorTrace.value;
         const cLineColor = bLineColor ? ColorToCColor(bLineColor) : Color.fromCssColorString("rgba(80, 80, 80, 0.8)");
-        let width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
+        const lineWidthTrace = style.lineWidth ? Calculator.TraceGetNumber(style.lineWidth, entity, params.tags) : { value: null, effective: null };
+        let width = lineWidthTrace.value;
         if (width == null) {
             width = 1;
         }
@@ -34929,6 +35029,11 @@ var EntityRenderEnginePolygon;
         else {
             cEntity._siblingGraphics = [];
         }
+        cEntity.styleEffective = StyleEffective.Combine([
+            { key: "color", effective: fillColorTrace.effective },
+            { key: "lineColor", effective: lineColorTrace.effective },
+            { key: "lineWidth", effective: lineWidthTrace.effective }
+        ]);
         return cEntity;
     }
     EntityRenderEnginePolygon.Render = Render;
@@ -34993,6 +35098,7 @@ var EntityRenderEnginePolygon;
                 const name = await getName$3(api, entity);
                 cEntity.name = name;
                 cEntity._renderGroup = EntityRenderEngine.GetRenderGroupId(zoomItem);
+                cEntity.styleId = zoomItem.StyleID == -1 ? -1 : (+zoomItem.StyleID || null);
                 cEntities.set(entity.Bruce.ID, cEntity);
             }
         }
@@ -35352,6 +35458,71 @@ function isOutlineChanged$1(rego, entity) {
     }
     return false;
 }
+/**
+ * Utilities for building and querying styleEffective strings.
+ *
+ * Format: comma-separated segments of the form "{key}={traceEffective}".
+ * Keys name the style property (e.g. "color", "scale", "icon").
+ * Values are effective strings produced by Calculator.TraceGet* calls.
+ * Keys must not contain "=" or ",". Effective values must not contain ",".
+ *
+ * Example: "color=f0:gradient:abc:123,scale=f1:input:def:456"
+ */
+var StyleEffective;
+(function (StyleEffective) {
+    /**
+     * Builds a styleEffective string from labelled trace results.
+     * Segments whose effective is null/empty are omitted.
+     */
+    function Combine(parts) {
+        const segments = [];
+        for (const part of parts) {
+            if (part.effective) {
+                segments.push(`${part.key}=${part.effective}`);
+            }
+        }
+        return segments.length ? segments.join(",") : null;
+    }
+    StyleEffective.Combine = Combine;
+    /**
+     * Returns true if every segment in the filter string appears in the subject effective string.
+     * A filter segment matches if the subject contains a segment starting with the same key,
+     * and either no value filter is given or the value matches exactly.
+     * Passing a partial effective value (e.g. just "f0:gradient") also matches.
+     */
+    function MatchesFilter(effective, filter) {
+        if (!filter) {
+            return true;
+        }
+        if (!effective) {
+            return false;
+        }
+        const subjectParts = parseSegments(effective);
+        const filterParts = parseSegments(filter);
+        for (const [fKey, fVal] of filterParts) {
+            const sVal = subjectParts.get(fKey);
+            if (sVal === undefined) {
+                return false;
+            }
+            if (fVal && !sVal.startsWith(fVal)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    StyleEffective.MatchesFilter = MatchesFilter;
+    function parseSegments(str) {
+        const map = new Map();
+        for (const seg of str.split(",")) {
+            const eq = seg.indexOf("=");
+            if (eq < 0) {
+                continue;
+            }
+            map.set(seg.slice(0, eq), seg.slice(eq + 1));
+        }
+        return map;
+    }
+})(StyleEffective || (StyleEffective = {}));
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function GetRenderGroupId(zoomItem) {
@@ -36333,7 +36504,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "6.7.5";
+const VERSION = "6.7.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.
@@ -36350,5 +36521,5 @@ const getENVIRONMENT = () => {
     return ENVIRONMENT;
 };
 
-export { VERSION, setENVIRONMENT, getENVIRONMENT, CesiumAnimatedInOut, CesiumAnimatedProperty, isOutlineChanged$1 as isOutlineChanged, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, EntityRenderEnginePolygon, EntityRenderEnginePolyline, MenuItemCreator, MenuItemManager, CesiumParabola, EntityLabel, LiveCursor, SharedGetters, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, TilesetRenderEngine, ViewRenderEngine, 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, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
+export { VERSION, setENVIRONMENT, getENVIRONMENT, CesiumAnimatedInOut, CesiumAnimatedProperty, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, EntityRenderEnginePolygon, EntityRenderEnginePolyline, MenuItemCreator, MenuItemManager, CesiumParabola, EntityLabel, LiveCursor, SharedGetters, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, createTileset, TilesetRenderEngine, ViewRenderEngine, 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, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
 //# sourceMappingURL=bruce-cesium.es5.js.map