bruce-cesium 6.7.5 → 6.7.6

package/dist/bruce-cesium.umd.js

@@ -7760,29 +7760,54 @@
             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 && !exports.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 [];
             }
             /**
@@ -10111,7 +10136,7 @@
              * @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 = exports.ViewUtils.GetTimeDetails({
@@ -10204,6 +10229,8 @@
                                 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,
@@ -10215,11 +10242,13 @@
                             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) {
@@ -10249,7 +10278,7 @@
                             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();
@@ -12809,13 +12838,14 @@
             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 Cesium.Cesium3DTileFeature)) {
                 return;
             }
-            const style = this.getTilesetFeatureStyle(rego.entityTypeId);
-            const bColor = style && ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? BModels.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)) ? BModels.Calculator.TraceGetColor(style.modelStyle.fillColor, data, tags) : { value: null, effective: null };
+            const bColor = fillColorTrace.value;
             let cColor = null;
             if (bColor == null) {
                 cColor = Cesium.Color.WHITE;
@@ -12835,6 +12865,12 @@
                 rego.internalId = data.Bruce.InternalID;
                 this.styledByInternalId.set(data.Bruce.InternalID, rego.entityId);
             }
+            if (resolvedStyleId != null) {
+                rego.styleId = resolvedStyleId;
+            }
+            rego.styleEffective = (_c = exports.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.
@@ -12843,7 +12879,7 @@
                 // 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.
@@ -12858,19 +12894,27 @@
             }
         }
         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;
@@ -32248,6 +32292,7 @@
             if (!params.entityHistoric) {
                 params.entityHistoric = [];
             }
+            const styleTraceParts = [];
             const style = params.style;
             let type = style.Type;
             if (type == null) {
@@ -32326,7 +32371,9 @@
                             row.type = BModels.Calculator.EValueType.Input;
                         }
                     });
-                    const icon = BModels.Calculator.GetString(iconUrlRows, entity, params.tags);
+                    const iconTrace = BModels.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;
@@ -32372,14 +32419,18 @@
                     imageKey = image ? iconUrl : null;
                 }
                 if (image) {
-                    let iconScale = (style === null || style === void 0 ? void 0 : style.iconScale) ? EnsureNumber(BModels.Calculator.GetNumber(style.iconScale, entity, params.tags)) : 1;
+                    const iconScaleTrace = (style === null || style === void 0 ? void 0 : style.iconScale) ? BModels.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 ? BModels.Calculator.GetColor(style.iconTintColor, entity, params.tags) : null;
+                        const iconTintTrace = style.iconTintColor ? BModels.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) : Cesium.Color.WHITE.clone();
                         heightRef = getHeightRef(style);
                         if (!params.rendered || !params.rendered.billboard) {
@@ -32724,9 +32775,13 @@
                 }
             }
             if (!cEntity) {
-                const bColor = style.color ? BModels.Calculator.GetColor(style.color, entity, params.tags) : null;
+                const pointColorTrace = style.color ? BModels.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) : Cesium.Color.fromCssColorString("rgba(33, 150, 243, 0.8)");
-                let size = style.size ? BModels.Calculator.GetNumber(style.size, entity, params.tags) : null;
+                const pointSizeTrace = style.size ? BModels.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;
                 }
@@ -32927,6 +32982,7 @@
                 trackEntity._parentEntity = cEntity;
             }
             cEntity._siblingGraphics = siblings;
+            cEntity.styleEffective = exports.StyleEffective.Combine(styleTraceParts);
             return cEntity;
         }
         EntityRenderEnginePoint.Render = Render;
@@ -33009,6 +33065,7 @@
                     const name = await getName(api, entity);
                     cEntity.name = name;
                     cEntity._renderGroup = exports.EntityRenderEngine.GetRenderGroupId(zoomItem);
+                    cEntity.styleId = zoomItem.StyleID == -1 ? -1 : (+zoomItem.StyleID || null);
                 }
                 cEntities.set(entity.Bruce.ID, cEntity);
             }
@@ -33302,7 +33359,8 @@
                 scale = 1;
             }
             const style = params.style;
-            let styleScale = (style === null || style === void 0 ? void 0 : style.scale) ? BModels.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) ? BModels.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;
@@ -33318,6 +33376,7 @@
             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) {
@@ -33329,7 +33388,8 @@
                         blendAmount = 0.5;
                     }
                 }
-                const bColor = BModels.Calculator.GetColor(style.fillColor, entity, params.tags);
+                fillColorTrace = style.fillColor ? BModels.Calculator.TraceGetColor(style.fillColor, entity, params.tags) : { value: null, effective: null };
+                const bColor = fillColorTrace.value;
                 if (bColor) {
                     color = ColorToCColor(bColor);
                 }
@@ -33818,7 +33878,7 @@
          * @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();
@@ -33894,7 +33954,8 @@
             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;
@@ -33913,17 +33974,17 @@
                 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,
@@ -33943,6 +34004,7 @@
                     const name = await getName$1(api, entity);
                     cEntity.name = name;
                     cEntity._renderGroup = exports.EntityRenderEngine.GetRenderGroupId(zoomItem);
+                    cEntity.styleId = zoomItem.StyleID == -1 ? -1 : styleRecord === null || styleRecord === void 0 ? void 0 : styleRecord.ID;
                     cEntities.set(entity.Bruce.ID, cEntity);
                 }
             }
@@ -34155,12 +34217,14 @@
                     posses = smoothed;
                 }
             }
-            const bColor = style.lineColor ? BModels.Calculator.GetColor(style.lineColor, entity, params.tags) : null;
+            const lineColorTrace = style.lineColor ? BModels.Calculator.TraceGetColor(style.lineColor, entity, params.tags) : { value: null, effective: null };
+            const bColor = lineColorTrace.value;
             const cColor = bColor ? ColorToCColor(bColor) : Cesium.Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
             if (cColor.alpha <= 0) {
                 return null;
             }
-            let width = style.lineWidth ? BModels.Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
+            const lineWidthTrace = style.lineWidth ? BModels.Calculator.TraceGetNumber(style.lineWidth, entity, params.tags) : { value: null, effective: null };
+            let width = lineWidthTrace.value;
             if (width == null) {
                 width = 2;
             }
@@ -34323,6 +34387,10 @@
                 cEntity.corridor._orgPosses = orgPosses;
                 cEntity.corridor._smoothen = style.smoothen;
             }
+            cEntity.styleEffective = exports.StyleEffective.Combine([
+                { key: "lineColor", effective: lineColorTrace.effective },
+                { key: "lineWidth", effective: lineWidthTrace.effective }
+            ]);
             return cEntity;
         }
         EntityRenderEnginePolyline.Render = Render;
@@ -34390,6 +34458,7 @@
                     const name = await getName$2(api, entity);
                     cEntity.name = name;
                     cEntity._renderGroup = exports.EntityRenderEngine.GetRenderGroupId(zoomItem);
+                    cEntity.styleId = zoomItem.StyleID == -1 ? -1 : (+zoomItem.StyleID || null);
                     cEntities.set(entity.Bruce.ID, cEntity);
                 }
             }
@@ -34530,11 +34599,14 @@
                 return null;
             }
             const style = params.style;
-            const bFillColor = BModels.Calculator.GetColor(style.fillColor, entity, params.tags);
+            const fillColorTrace = style.fillColor ? BModels.Calculator.TraceGetColor(style.fillColor, entity, params.tags) : { value: null, effective: null };
+            const bFillColor = fillColorTrace.value;
             const cFillColor = bFillColor ? ColorToCColor(bFillColor) : Cesium.Color.fromCssColorString("rgba(139, 195, 74, 0.8)");
-            const bLineColor = BModels.Calculator.GetColor(style.lineColor, entity, params.tags);
+            const lineColorTrace = style.lineColor ? BModels.Calculator.TraceGetColor(style.lineColor, entity, params.tags) : { value: null, effective: null };
+            const bLineColor = lineColorTrace.value;
             const cLineColor = bLineColor ? ColorToCColor(bLineColor) : Cesium.Color.fromCssColorString("rgba(80, 80, 80, 0.8)");
-            let width = style.lineWidth ? BModels.Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
+            const lineWidthTrace = style.lineWidth ? BModels.Calculator.TraceGetNumber(style.lineWidth, entity, params.tags) : { value: null, effective: null };
+            let width = lineWidthTrace.value;
             if (width == null) {
                 width = 1;
             }
@@ -34822,6 +34894,11 @@
             else {
                 cEntity._siblingGraphics = [];
             }
+            cEntity.styleEffective = exports.StyleEffective.Combine([
+                { key: "color", effective: fillColorTrace.effective },
+                { key: "lineColor", effective: lineColorTrace.effective },
+                { key: "lineWidth", effective: lineWidthTrace.effective }
+            ]);
             return cEntity;
         }
         EntityRenderEnginePolygon.Render = Render;
@@ -34886,6 +34963,7 @@
                     const name = await getName$3(api, entity);
                     cEntity.name = name;
                     cEntity._renderGroup = exports.EntityRenderEngine.GetRenderGroupId(zoomItem);
+                    cEntity.styleId = zoomItem.StyleID == -1 ? -1 : (+zoomItem.StyleID || null);
                     cEntities.set(entity.Bruce.ID, cEntity);
                 }
             }
@@ -35245,6 +35323,60 @@
         }
         return false;
     }
+    (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;
+        }
+    })(exports.StyleEffective || (exports.StyleEffective = {}));
     (function (EntityRenderEngine) {
         function GetRenderGroupId(zoomItem) {
             if (!zoomItem) {
@@ -36222,7 +36354,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "6.7.5";
+    const VERSION = "6.7.6";
     /**
      * 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.