bruce-cesium 5.9.0 → 5.9.2

package/dist/bruce-cesium.umd.js

@@ -13926,56 +13926,32 @@
              * @returns
              */
             async renderAsIndividuals(entities, force = false) {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var _a, _b, _c, _d, _e, _f;
+                // 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({
+                    viewer: this.viewer
+                }).isLive;
                 // Entity ID -> historic records array.
                 // We load this as extra information when rendering historic records.
                 // This way we know what to animate towards as time changes.
                 let entitiesHistoric = {};
-                if ((((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historic) || ((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.historicAttrKey)) && entities.length) {
-                    // Interpolating.
-                    // We will allow non-historic Entities as long as they have historic data in the range.
-                    if (this.item.historicInterpolation) {
-                        // We'll add/remove 1 second to ensure we cover all records.
-                        const startTmp = Cesium.JulianDate.toDate(this.viewer.clock.startTime);
-                        const stopTmp = Cesium.JulianDate.toDate(this.viewer.clock.stopTime);
-                        const startStr = new Date(startTmp.getTime() - 1000).toISOString();
-                        const stopStr = new Date(stopTmp.getTime() + 1000).toISOString();
-                        const historicData = await BModels.EntityHistoricData.GetList({
-                            attrKey: this.item.BruceEntity.historicAttrKey,
-                            dateTimeFrom: startStr,
-                            dateTimeTo: stopStr,
-                            entityIds: entities.map(x => x.Bruce.ID),
-                            api: this.apiGetter.getApi()
-                        });
-                        entitiesHistoric = historicData.recordsByIds;
-                        // Remove ones with no historicAttrKey and no historic data.
-                        const toRemoveIds = entities.filter(x => { var _a, _b; return !((_b = (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.Outline) === null || _b === void 0 ? void 0 : _b.length) && !entitiesHistoric[x.Bruce.ID]; }).map(x => x.Bruce.ID);
-                        for (let i = 0; i < toRemoveIds.length; i++) {
-                            const removeId = toRemoveIds[i];
-                            this.visualsManager.RemoveRegos({
-                                entityId: removeId,
-                                menuItemId: this.item.id,
-                                requestRender: false
-                            });
-                            (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.RemoveEntity(removeId, false);
-                        }
-                        entities = entities.filter(x => !toRemoveIds.includes(x.Bruce.ID));
-                    }
-                    // Not interpolating.
-                    // So we'll see if the Entities have a historic key or not.
-                    else {
-                        const toRemoveIds = entities.filter(x => { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.Outline); }).map(x => x.Bruce.ID);
-                        for (let i = 0; i < toRemoveIds.length; i++) {
-                            const removeId = toRemoveIds[i];
-                            this.visualsManager.RemoveRegos({
-                                entityId: removeId,
-                                menuItemId: this.item.id,
-                                requestRender: false
-                            });
-                            (_d = this.clustering) === null || _d === void 0 ? void 0 : _d.RemoveEntity(removeId, false);
-                        }
-                        entities = entities.filter(x => !toRemoveIds.includes(x.Bruce.ID));
-                    }
+                const isHistoric = ((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historic) || ((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.historicAttrKey);
+                // If we're interpolating then we request additional records to quickly swap between.
+                if (!isLive && isHistoric && entities.length && this.item.historicInterpolation) {
+                    // We'll add/remove 1 second to ensure we cover all records.
+                    const startTmp = Cesium.JulianDate.toDate(this.viewer.clock.startTime);
+                    const stopTmp = Cesium.JulianDate.toDate(this.viewer.clock.stopTime);
+                    const startStr = new Date(startTmp.getTime() - 1000).toISOString();
+                    const stopStr = new Date(stopTmp.getTime() + 1000).toISOString();
+                    const historicData = await BModels.EntityHistoricData.GetList({
+                        attrKey: this.item.BruceEntity.historicAttrKey,
+                        dateTimeFrom: startStr,
+                        dateTimeTo: stopStr,
+                        entityIds: entities.map(x => x.Bruce.ID),
+                        api: this.apiGetter.getApi()
+                    });
+                    entitiesHistoric = historicData.recordsByIds;
                 }
                 if (this.disposed) {
                     this.doDispose();
@@ -14010,7 +13986,7 @@
                             menuItemId: this.item.id
                         });
                         // The baseline data source must be editable.
-                        const canEdit = !((_e = entity.Bruce.Outline) === null || _e === void 0 ? void 0 : _e.find(x => x.Baseline && !x.Editable));
+                        const canEdit = !((_c = entity.Bruce.Outline) === null || _c === void 0 ? void 0 : _c.find(x => x.Baseline && !x.Editable));
                         const visual = rego === null || rego === void 0 ? void 0 : rego.visual;
                         if (!visual || visual != cEntity) {
                             const wasClustered = this.clustering ? this.clustering.AddEntity(id, cEntity, false) : false;
@@ -14041,9 +14017,9 @@
                             rego.visual = cEntity;
                             rego.entityTypeId = entity.Bruce["EntityType.ID"];
                             rego.tagIds = entity.Bruce["Layer.ID"] ? [].concat(entity.Bruce["Layer.ID"]) : [];
-                            rego.outline = (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.Outline;
+                            rego.outline = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.Outline;
                             rego.cdn = this.item.cdnEnabled;
-                            rego.schema = (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.Schema;
+                            rego.schema = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.Schema;
                             rego.canEdit = canEdit;
                             // 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.
@@ -14074,7 +14050,7 @@
                             menuItemId: this.item.id,
                             requestRender: false
                         });
-                        (_h = this.clustering) === null || _h === void 0 ? void 0 : _h.RemoveEntity(id, false);
+                        (_f = this.clustering) === null || _f === void 0 ? void 0 : _f.RemoveEntity(id, false);
                     }
                 }
                 this.viewer.scene.requestRender();
@@ -15134,9 +15110,14 @@
                 if (this.disposed || this.viewer.isDestroyed() || !entities.length) {
                     return;
                 }
+                // 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({
+                    viewer: this.viewer,
+                }).isLive;
                 let entitiesHistoric = {};
                 let changed = false;
-                if ((this.item.BruceEntity.historic || this.item.BruceEntity.historicAttrKey) && entities.length) {
+                if (!isLive && (this.item.BruceEntity.historic || this.item.BruceEntity.historicAttrKey) && entities.length) {
                     const res = await this.getHistoricInfo(entities);
                     changed = res[0];
                     entitiesHistoric = res[1];
@@ -15634,7 +15615,13 @@
                     tickDelay = null;
                 });
                 // React to clock changes and request new Entities.
+                let prevTime = null;
                 this.hDisposals.push(this.viewer.clock.onTick.addEventListener(() => {
+                    const curTime = this.viewer.clock.currentTime.toString();
+                    if (curTime === prevTime) {
+                        return;
+                    }
+                    prevTime = curTime;
                     if (tickDelay) {
                         tickDelay.Call();
                     }
@@ -18339,7 +18326,7 @@
             mapTilesetFeature(feature, add) {
                 var _a, _b, _c, _d, _e, _f;
                 const accountId = (_b = ((_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID)) !== null && _b !== void 0 ? _b : this.getters.GetAccountId();
-                const canEdit = accountId === this.getters.GetAccountId() && !this.modelSpace && !((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historic);
+                const canEdit = accountId === this.getters.GetAccountId() && !((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historic);
                 let rego = {
                     canEdit: canEdit,
                     entityId: null,
@@ -19019,6 +19006,7 @@
                     return await this.historicPossesLoadingProm;
                 };
                 // Last known timeline range. Helps us detect changes.
+                let lastTime = this.viewer.clock.currentTime.toString();
                 let lastStartTime = this.viewer.clock.startTime.toString();
                 let lastStopTime = this.viewer.clock.stopTime.toString();
                 let clockTickRemoval;
@@ -19058,9 +19046,11 @@
                     clockTickRemoval = this.viewer.clock.onTick.addEventListener(() => {
                         const startTime = this.viewer.clock.startTime.toString();
                         const stopTime = this.viewer.clock.stopTime.toString();
-                        if (startTime !== lastStartTime || stopTime !== lastStopTime) {
+                        const curTime = this.viewer.clock.currentTime.toString();
+                        if (startTime !== lastStartTime || stopTime !== lastStopTime || curTime !== lastTime) {
                             lastStartTime = startTime;
                             lastStopTime = stopTime;
+                            lastTime = curTime;
                             this.historicAnimation.onRangeChange();
                         }
                     });
@@ -21488,7 +21478,13 @@
                 if (this.viewer.clock) {
                     const pHeadingIndex = pHeaders.findIndex(x => x.toLowerCase().includes("head"));
                     let errorsInARow = 0;
+                    let prevTime = null;
                     const removal = this.viewer.clock.onTick.addEventListener(() => {
+                        const curTime = this.viewer.clock.currentTime.toString();
+                        if (curTime === prevTime) {
+                            return;
+                        }
+                        prevTime = curTime;
                         const vehicle = source.entities.getById(vehicleCesiumId);
                         if (vehicle) {
                             try {
@@ -22381,7 +22377,7 @@
                                 }
                             };
                             if (hierarchy === null || hierarchy === void 0 ? void 0 : hierarchy.Root) {
-                                traverseHierarchy(hierarchy.Root, true);
+                                traverseHierarchy(hierarchy.Root, false);
                                 rootId = hierarchy.Root.ID;
                             }
                         }
@@ -22405,14 +22401,14 @@
              * @returns
              */
             async processEntityIds(entityIds) {
-                var _a, _b, _c;
+                var _a, _b;
                 if (!entityIds || !entityIds.length) {
                     return;
                 }
                 else if (this.disposed) {
                     return;
                 }
-                const BATCH_SIZE = 200;
+                const BATCH_SIZE = 50;
                 let batches = Math.ceil(entityIds.length / BATCH_SIZE);
                 for (let i = 0; i < batches; i++) {
                     const batch = entityIds.slice(i * BATCH_SIZE, (i + 1) * BATCH_SIZE);
@@ -22429,8 +22425,24 @@
                         return;
                     }
                     for (const entity of fetched) {
-                        const lod = entity.Bruce.LOD ? entity.Bruce.LOD[0] : null;
-                        if (!lod || !((_a = lod["ClientFile"]) === null || _a === void 0 ? void 0 : _a.URL)) {
+                        // Filter for valid LODs then take the highest quality one (lowest level).
+                        let lods = entity.Bruce.LOD || [];
+                        lods = lods.filter(lod => { var _a; return ((_a = lod["ClientFile"]) === null || _a === void 0 ? void 0 : _a.URL) && lod["LODCategory.Key"] && lod["LODCategory.Key"].toLowerCase() == "glb"; });
+                        let lod = lods.sort((a, b) => {
+                            const aLevel = a.Level;
+                            const bLevel = b.Level;
+                            if (aLevel == null && bLevel == null) {
+                                return 0;
+                            }
+                            else if (aLevel == null) {
+                                return 1;
+                            }
+                            else if (bLevel == null) {
+                                return -1;
+                            }
+                            return aLevel - bLevel;
+                        })[0];
+                        if (!lod) {
                             // Won't bother with vector data for this experiment.
                             continue;
                         }
@@ -22471,7 +22483,7 @@
                                 entityTypeId: entity.Bruce["EntityType.ID"],
                                 name: entity.Bruce.Name,
                                 rootId: this.rootId,
-                                parentId: (_c = (_b = this.hierarchyNodeByEntityId) === null || _b === void 0 ? void 0 : _b[entity.Bruce.ID]) === null || _c === void 0 ? void 0 : _c.parentId
+                                parentId: (_b = (_a = this.hierarchyNodeByEntityId) === null || _a === void 0 ? void 0 : _a[entity.Bruce.ID]) === null || _b === void 0 ? void 0 : _b.parentId
                             },
                             requestRender: false
                         });
@@ -33011,7 +33023,7 @@
         }
     }
 
-    const VERSION = "5.9.0";
+    const VERSION = "5.9.2";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;