bruce-cesium 7.5.3 → 7.5.4

package/dist/bruce-cesium.umd.js

@@ -17255,6 +17255,9 @@
                 }
             };
         }
+        HasEntityDataOverride(eId) {
+            return this.entityDataOverrides.has(eId);
+        }
         SetEntityDataOverride(eId, entity) {
             if (this.disposed) {
                 return;
@@ -17951,6 +17954,24 @@
         }
         return style;
     }
+    /**
+     * Reads the baked attribute declaration from a loaded tileset, keyed by path.
+     * @param cTileset
+     */
+    function getBakedAttributes(cTileset) {
+        var _a, _b;
+        const result = new Map();
+        const declared = (_b = (_a = cTileset === null || cTileset === void 0 ? void 0 : cTileset.extras) === null || _a === void 0 ? void 0 : _a.bruce) === null || _b === void 0 ? void 0 : _b.bakedAttributes;
+        if (!Array.isArray(declared)) {
+            return result;
+        }
+        for (const baked of declared) {
+            if (Array.isArray(baked === null || baked === void 0 ? void 0 : baked.path) && baked.path.length && typeof baked.property == "string") {
+                result.set(JSON.stringify(baked.path), baked);
+            }
+        }
+        return result;
+    }
     function colorToCColor$3(color) {
         return new Cesium.Color(color.red ? color.red / 255 : 0, color.green ? color.green / 255 : 0, color.blue ? color.blue / 255 : 0, color.alpha);
     }
@@ -18021,6 +18042,10 @@
             // When false the Entity data is still gathered and the regos still updated, but no colour is
             // applied. A historic item that did not ask for styling needs the first without the second.
             this.applyStyles = true;
+            // Attribute values the tiles carry per feature, keyed by JSON path. Empty for a tileset without them.
+            this.bakedAttributes = new Map();
+            // Entities changed since the tileset was generated, so their baked values can no longer be trusted.
+            this.bakedStaleIds = new Set();
             this.reRenderState = new EntityReRenderMaintainState();
             // More expensive process.
             // When an Entity is styled, the rego is reviewed and updated if needed.
@@ -18062,6 +18087,7 @@
             this.viewer = viewer;
             this.api = api;
             this.cTileset = cTileset;
+            this.bakedAttributes = getBakedAttributes(cTileset);
             this.register = register;
             this.menuItemId = menuItemId;
             this.historic = Boolean(historic);
@@ -18140,6 +18166,7 @@
                     for (const [internalId, entityId] of this.styledByInternalId) {
                         if (BModels.RecordChangeFeed.isEntityInternalIdInRangeString(rangeStr, internalId)) {
                             this.feedPendingRestyleIds.add(entityId);
+                            this.bakedStaleIds.add(entityId);
                         }
                     }
                     if (this.feedPendingRestyleIds.size && !this.feedRestyleThrottleTimer) {
@@ -18460,17 +18487,7 @@
                 for (const key of pendingKeys) {
                     const relatedIds = this.stylePendingEntityIds.get(key);
                     if (relatedIds) {
-                        if (this.getTilesetFeatureNeedsFullData(key)) {
-                            this.entityGatherer.Queue(Array.from(relatedIds));
-                        }
-                        else {
-                            relatedIds.forEach(id => {
-                                const rego = this.getEntityRego(id);
-                                if (rego) {
-                                    this.styleTilesetFeature(rego);
-                                }
-                            });
-                        }
+                        this.styleOrGatherIds(key, relatedIds);
                     }
                 }
                 this.stylePendingEntityIds.clear();
@@ -18485,17 +18502,7 @@
             if (!relatedIds) {
                 return;
             }
-            if (this.getTilesetFeatureNeedsFullData(entityTypeId)) {
-                this.entityGatherer.Queue(Array.from(relatedIds));
-            }
-            else {
-                relatedIds.forEach(id => {
-                    const rego = this.getEntityRego(id);
-                    if (rego) {
-                        this.styleTilesetFeature(rego);
-                    }
-                });
-            }
+            this.styleOrGatherIds(entityTypeId, relatedIds);
             this.stylePendingEntityIds.delete(entityTypeId);
         }
         hasMappingRow(entityTypeId) {
@@ -18580,20 +18587,10 @@
                     this.loadEntityTypeDefaultStyle(typeId);
                 }
                 if (this.styleMappingsLoaded.get(typeId) || (this.styleMappingLoaded && !this.hasMappingRow(typeId))) {
-                    if (this.getTilesetFeatureNeedsFullData(typeId)) {
-                        needsDataIds.push(rego.entityId);
-                    }
-                    else {
-                        this.styleTilesetFeature(rego);
-                    }
+                    this.styleOrCollect(rego, typeId, needsDataIds);
                 }
                 else if (!this.styleMappingsLoaded.has(typeId) && this.styleFallbackLoaded) {
-                    if (this.getTilesetFeatureNeedsFullData(typeId)) {
-                        needsDataIds.push(rego.entityId);
-                    }
-                    else {
-                        this.styleTilesetFeature(rego);
-                    }
+                    this.styleOrCollect(rego, typeId, needsDataIds);
                 }
                 else {
                     if (!this.stylePendingEntityIds.has(typeId)) {
@@ -18606,6 +18603,96 @@
                 this.entityGatherer.Queue(needsDataIds, highPriority);
             }
         }
+        /**
+         * Styles each Entity waiting on a type's style, gathering the records of those that need one.
+         * @param entityTypeId
+         * @param entityIds
+         */
+        styleOrGatherIds(entityTypeId, entityIds) {
+            const gatherIds = [];
+            for (const id of entityIds) {
+                const rego = this.getEntityRego(id);
+                if (rego) {
+                    this.styleOrCollect(rego, entityTypeId, gatherIds);
+                }
+            }
+            if (gatherIds.length) {
+                this.entityGatherer.Queue(gatherIds);
+            }
+        }
+        /**
+         * Styles a feature now when its style reads no record, or reads only values its tile carries, and otherwise collects it for gathering.
+         * @param rego
+         * @param entityTypeId
+         * @param gatherIds Receives the Entity ID when its record is needed.
+         */
+        styleOrCollect(rego, entityTypeId, gatherIds) {
+            if (!this.getTilesetFeatureNeedsFullData(entityTypeId)) {
+                this.styleTilesetFeature(rego);
+                return;
+            }
+            const record = this.canStyleFromBaked(rego.entityId, entityTypeId) ? this.readBakedRecord(rego.visual) : null;
+            if (!record) {
+                gatherIds.push(rego.entityId);
+                return;
+            }
+            this.styleTilesetFeatureFullData(rego, record, []);
+            // A later edit has to reach the record path, and the change feed finds Entities by Internal ID.
+            if (rego.internalId != null) {
+                this.styledByInternalId.set(rego.internalId, rego.entityId);
+            }
+        }
+        /**
+         * Returns if the tile's baked values hold everything this Entity's style would read from its record.
+         * @param entityId
+         * @param entityTypeId
+         */
+        canStyleFromBaked(entityId, entityTypeId) {
+            var _a, _b, _c;
+            // Baked values are the base record at generation time, which a scenario, a point in time or merged sources all differ from.
+            if (!this.bakedAttributes.size || this.historic || !!this.scenario || this.expandSources) {
+                return false;
+            }
+            if (this.bakedStaleIds.has(entityId) || ((_a = this.entityGatherer) === null || _a === void 0 ? void 0 : _a.HasEntityDataOverride(entityId))) {
+                return false;
+            }
+            const paths = BModels.Calculator.GetFieldPaths((_c = (_b = this.getTilesetFeatureStyle(entityTypeId)) === null || _b === void 0 ? void 0 : _b.modelStyle) === null || _c === void 0 ? void 0 : _c.fillColor);
+            return paths != null && paths.every(path => this.bakedAttributes.has(JSON.stringify(path)));
+        }
+        /**
+         * Builds a stand-in record from a feature's baked values, holding only the attributes that have one.
+         * Returns null when the feature's tile lacks a declared column, so the record is gathered instead.
+         * @param visual
+         */
+        readBakedRecord(visual) {
+            if (!(visual instanceof Cesium.Cesium3DTileFeature)) {
+                return null;
+            }
+            const record = {};
+            for (const baked of this.bakedAttributes.values()) {
+                if (!visual.hasProperty(baked.property)) {
+                    return null;
+                }
+                let value = visual.getProperty(baked.property);
+                if (value == null) {
+                    continue;
+                }
+                // Booleans travel as 0/1 because a boolean column has no way to say "no value".
+                if (baked.type == "BOOLEAN") {
+                    value = value != 0;
+                }
+                let target = record;
+                for (let i = 0; i < baked.path.length - 1; i++) {
+                    const segment = baked.path[i];
+                    if (target[segment] == null || typeof target[segment] != "object") {
+                        target[segment] = {};
+                    }
+                    target = target[segment];
+                }
+                target[baked.path[baked.path.length - 1]] = value;
+            }
+            return record;
+        }
         styleTilesetFeature(rego) {
             this.styleTilesetFeatureFullData(rego, null, []);
         }
@@ -51083,7 +51170,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.5.3";
+    const VERSION = "7.5.4";
     /**
      * 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.