bruce-cesium 4.6.2 → 4.6.4

package/dist/bruce-cesium.umd.js

@@ -8390,16 +8390,16 @@
                 min = 0;
             }
             // Adjusting slightly because I distrust our initial calculation vs Cesium's one.
-            max = (+max) * 1.2;
+            max = (+max) * 1.8;
             min = +min;
             if (min > 0) {
                 min = (+min) * 0.8;
             }
             meterSize = +meterSize;
             if (!isNaN(meterSize) && meterSize > 0) {
-                // A 1m thing at 2000m distance is barely visible, so we can cull it.
+                // A 1m thing at 3000m distance is barely visible, so we can cull it.
                 // So we'll multiply this magic distance by the size of the thing and determine when it'll be too small to see.
-                var METER_DISTANCE_PER_METER = isPolygon ? 100 : 2000;
+                var METER_DISTANCE_PER_METER = isPolygon ? 200 : 3000;
                 var newMax = meterSize * METER_DISTANCE_PER_METER;
                 // Enforcing a minimum max distance in case something goes wrong we want stuff to always be visible when close.
                 var MIN_MAX = 300;
@@ -11827,6 +11827,20 @@
     function colorToCColor$1(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);
     }
+    function getShowDebugBounds() {
+        if (!window) {
+            return false;
+        }
+        var showBounds = window === null || window === void 0 ? void 0 : window.ENTITIES_RENDER_MANAGER_SHOW_BOUNDS;
+        if (showBounds) {
+            return true;
+        }
+        if (window.location.search) {
+            var params = new URLSearchParams(window.location.search);
+            showBounds = params.get("debugScanBounds");
+        }
+        return showBounds == "true" || showBounds == "1" || showBounds == "yes";
+    }
     (function (EntitiesRenderManager) {
         var Manager = /** @class */ (function () {
             function Manager(params) {
@@ -11957,9 +11971,10 @@
                     // Unfortunately this searches as an "AND" rather than "OR" which does not meet our needs here.
                     // So for multiple tags we'll manually sort on UI end...
                     tagIds: (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [],
-                    debugShowBounds: Boolean(window === null || window === void 0 ? void 0 : window.ENTITIES_RENDER_MANAGER_SHOW_BOUNDS),
+                    debugShowBounds: getShowDebugBounds(),
                     cdn: this.item.cdnEnabled,
                     historicAttrKey: this.item.BruceEntity.historicAttrKey,
+                    historicInterpolation: this.item.historicInterpolation,
                     schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId
                 });
                 var minMax = exports.RenderManager.GetZoomMinMax({
@@ -12187,7 +12202,7 @@
                         switch (_b.label) {
                             case 0:
                                 _b.trys.push([0, 8, , 9]);
-                                if (this.disposed || this.viewer.isDestroyed()) {
+                                if (this.disposed || this.viewer.isDestroyed() || !(entities === null || entities === void 0 ? void 0 : entities.length)) {
                                     return [2 /*return*/];
                                 }
                                 typeId_1 = (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a["EntityType.ID"];
@@ -12583,28 +12598,16 @@
              * @returns
              */
             Manager.prototype.renderAsIndividuals = function (entities, force) {
-                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;
                 if (force === void 0) { force = false; }
                 return __awaiter(this, void 0, void 0, function () {
-                    var entitiesHistoric, toRemove, i, entity, startTmp, stopTmp, startStr, stopStr, historicData, _m, updated, cEntities, i, entity, id, cEntity, rego, visual, wasClustered, tagIds, rego_1;
-                    return __generator(this, function (_o) {
-                        switch (_o.label) {
+                    var entitiesHistoric, startTmp, stopTmp, startStr, stopStr, historicData, toRemoveIds_1, i, removeId, toRemoveIds_2, i, removeId, _o, updated, cEntities, i, entity, id, cEntity, rego, visual, wasClustered, tagIds, rego_1;
+                    return __generator(this, function (_p) {
+                        switch (_p.label) {
                             case 0:
                                 entitiesHistoric = {};
-                                if (!((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey)) return [3 /*break*/, 2];
-                                toRemove = entities.filter(function (x) { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricAttrKey); });
-                                for (i = 0; i < toRemove.length; i++) {
-                                    entity = toRemove[i];
-                                    this.visualsManager.RemoveRegos({
-                                        entityId: entity.Bruce.ID,
-                                        menuItemId: this.item.id,
-                                        requestRender: false
-                                    });
-                                    (_b = this.clustering) === null || _b === void 0 ? void 0 : _b.RemoveEntity(entity.Bruce.ID, false);
-                                }
-                                entities = entities.filter(function (x) { var _a; return !!((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricAttrKey); });
+                                if (!(((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey) && entities.length)) return [3 /*break*/, 3];
                                 if (!this.item.historicInterpolation) return [3 /*break*/, 2];
-                                if (!entities.length) return [3 /*break*/, 2];
                                 startTmp = Cesium.JulianDate.toDate(this.viewer.clock.startTime);
                                 stopTmp = Cesium.JulianDate.toDate(this.viewer.clock.stopTime);
                                 startStr = new Date(startTmp.getTime() - 1000).toISOString();
@@ -12617,29 +12620,54 @@
                                         api: this.apiGetter.getApi()
                                     })];
                             case 1:
-                                historicData = _o.sent();
+                                historicData = _p.sent();
+                                entitiesHistoric = historicData.recordsByIds;
+                                toRemoveIds_1 = entities.filter(function (x) { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricAttrKey) && !entitiesHistoric[x.Bruce.ID]; }).map(function (x) { return x.Bruce.ID; });
+                                for (i = 0; i < toRemoveIds_1.length; i++) {
+                                    removeId = toRemoveIds_1[i];
+                                    this.visualsManager.RemoveRegos({
+                                        entityId: removeId,
+                                        menuItemId: this.item.id,
+                                        requestRender: false
+                                    });
+                                    (_b = this.clustering) === null || _b === void 0 ? void 0 : _b.RemoveEntity(removeId, false);
+                                }
+                                entities = entities.filter(function (x) { return !toRemoveIds_1.includes(x.Bruce.ID); });
+                                return [3 /*break*/, 3];
+                            case 2:
+                                toRemoveIds_2 = entities.filter(function (x) { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricAttrKey); }).map(function (x) { return x.Bruce.ID; });
+                                for (i = 0; i < toRemoveIds_2.length; i++) {
+                                    removeId = toRemoveIds_2[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(function (x) { return !toRemoveIds_2.includes(x.Bruce.ID); });
+                                _p.label = 3;
+                            case 3:
                                 if (this.disposed) {
                                     this.doDispose();
                                     return [2 /*return*/];
                                 }
-                                entitiesHistoric = historicData.recordsByIds;
-                                _o.label = 2;
-                            case 2: return [4 /*yield*/, exports.EntityRenderEngine.Render({
-                                    viewer: this.viewer,
-                                    apiGetter: this.apiGetter,
-                                    entities: entities,
-                                    menuItemId: this.item.id,
-                                    visualRegister: this.visualsManager,
-                                    zoomControl: this.item.CameraZoomSettings,
-                                    entitiesHistoric: entitiesHistoric,
-                                    entityHistoricDrawTrack: this.item.historicDrawTrack,
-                                    force: force,
-                                    optimizeGeometry: this.item.optimizeGeometry,
-                                    optimizeMinPoints: this.item.optimizeMinPoints,
-                                    optimizeTolerance: this.item.optimizeTolerance,
-                                })];
-                            case 3:
-                                _m = _o.sent(), updated = _m.updated, cEntities = _m.entities;
+                                return [4 /*yield*/, exports.EntityRenderEngine.Render({
+                                        viewer: this.viewer,
+                                        apiGetter: this.apiGetter,
+                                        entities: entities,
+                                        menuItemId: this.item.id,
+                                        visualRegister: this.visualsManager,
+                                        zoomControl: this.item.CameraZoomSettings,
+                                        entitiesHistoric: entitiesHistoric,
+                                        entityHistoricDrawTrack: this.item.historicDrawTrack,
+                                        force: force,
+                                        optimizeGeometry: this.item.optimizeGeometry,
+                                        optimizeMinPoints: this.item.optimizeMinPoints,
+                                        optimizeTolerance: this.item.optimizeTolerance,
+                                    })];
+                            case 4:
+                                _o = _p.sent(), updated = _o.updated, cEntities = _o.entities;
                                 if (this.disposed) {
                                     this.doDispose();
                                     return [2 /*return*/];
@@ -12657,10 +12685,10 @@
                                         visual = rego === null || rego === void 0 ? void 0 : rego.visual;
                                         if (!visual || visual != cEntity) {
                                             wasClustered = this.clustering ? this.clustering.AddEntity(id, cEntity, false) : false;
-                                            tagIds = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c["Layer.ID"];
+                                            tagIds = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d["Layer.ID"];
                                             rego_1 = {
                                                 entityId: id,
-                                                schemaId: (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.SchemaID,
+                                                schemaId: (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.SchemaID,
                                                 menuItemId: this.item.id,
                                                 menuItemType: this.item.Type,
                                                 visual: cEntity,
@@ -12671,8 +12699,8 @@
                                                 overrideShow: wasClustered ? false : null,
                                                 name: cEntity.name,
                                                 cdn: this.item.cdnEnabled,
-                                                historicDateTime: (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.HistoricDateTime,
-                                                historicAttrKey: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.HistoricAttrKey
+                                                historicDateTime: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.HistoricDateTime,
+                                                historicAttrKey: (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.HistoricAttrKey
                                             };
                                             this.visualsManager.AddRego({
                                                 rego: rego_1,
@@ -12683,11 +12711,11 @@
                                             rego.name = cEntity.name;
                                             rego.visual = cEntity;
                                             rego.entityTypeId = entity.Bruce["EntityType.ID"];
-                                            rego.tagIds = ((_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
-                                            rego.historicDateTime = (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.HistoricDateTime;
-                                            rego.historicAttrKey = (_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j.HistoricAttrKey;
+                                            rego.tagIds = ((_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
+                                            rego.historicDateTime = (_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j.HistoricDateTime;
+                                            rego.historicAttrKey = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.HistoricAttrKey;
                                             rego.cdn = this.item.cdnEnabled;
-                                            rego.schemaId = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.SchemaID;
+                                            rego.schemaId = (_l = entity.Bruce) === null || _l === void 0 ? void 0 : _l.SchemaID;
                                             // 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) {
@@ -12717,7 +12745,7 @@
                                             menuItemId: this.item.id,
                                             requestRender: false
                                         });
-                                        (_l = this.clustering) === null || _l === void 0 ? void 0 : _l.RemoveEntity(id, false);
+                                        (_m = this.clustering) === null || _m === void 0 ? void 0 : _m.RemoveEntity(id, false);
                                     }
                                 }
                                 this.viewer.scene.requestRender();
@@ -15944,10 +15972,10 @@
                     return range;
                 }
                 // Add minor decimal as API crashes when giving it whole numbers.
-                var maxLon = prepareRangeForBounds(this.Boundaries.maxLongitude) + 0.00001;
-                var minLon = prepareRangeForBounds(this.Boundaries.minLongitude) - 0.00001;
-                var maxLat = prepareRangeForBounds(this.Boundaries.maxLatitude) + 0.00001;
-                var minLat = prepareRangeForBounds(this.Boundaries.minLatitude) - 0.00001;
+                var maxLon = prepareRangeForBounds(this.Boundaries.maxLongitude);
+                var minLon = prepareRangeForBounds(this.Boundaries.minLongitude);
+                var maxLat = prepareRangeForBounds(this.Boundaries.maxLatitude);
+                var minLat = prepareRangeForBounds(this.Boundaries.minLatitude);
                 return {
                     east: maxLon,
                     north: maxLat,
@@ -15970,6 +15998,7 @@
                 var maxLon = viewRect.east;
                 var MAX_CELLS = 150;
                 var cellDegreeSize = getCellSizeFromHeight(viewRect.alt);
+                // console.log("cell size", cellDegreeSize, "height", viewRect.alt);
                 var curMinLon = floorValueToCellSize(cellDegreeSize, minLon);
                 var curMinLat = floorValueToCellSize(cellDegreeSize, minLat);
                 // For larger views we add additional padding because our view-area culling is too strong.
@@ -16026,39 +16055,45 @@
             return 0.01;
         }
         if (height < 5000) {
-            return 0.025;
+            return 0.05;
         }
         else if (height < 10000) {
             return 0.05;
         }
         else if (height < 30000) {
-            return 0.1;
+            return 0.2;
         }
         else if (height < 70000) {
             return 0.2;
         }
         else if (height < 100000) {
-            return 0.3;
+            return 0.5;
         }
         else if (height < 150000) {
-            return 0.4;
+            return 0.5;
         }
         else if (height < 200000) {
-            return 0.5;
+            return 1.5;
         }
         else if (height < 300000) {
-            return 0.6;
+            return 1.5;
         }
         else if (height < 500000) {
-            return 1;
+            return 3;
         }
         else if (height < 1000000) {
-            return 1.3;
+            return 3;
         }
         else if (height < 1200000) {
-            return 1.8;
+            return 4;
+        }
+        else if (height < 2000000) {
+            return 6;
+        }
+        else if (height < 3000000) {
+            return 20;
         }
-        return 4;
+        return 35;
     }
     function isCellFetched(cell) {
         if (cell.Fetched) {
@@ -16124,20 +16159,28 @@
                 this.onStateUpdate = null;
                 this.onScanUpdate = null;
                 this.viewPortChangeRemoval = null;
+                this.viewPortDelayQueue = null;
                 this.viewerDateTimeChangeRemoval = null;
                 this.cells = null;
                 this.registeredItems = {};
                 this.getterLoopId = 0;
+                this.getterLoopAbortControllers = {};
                 this.tagIds = null;
                 this.minHeight = 0;
                 this.maxHeight = 100000;
                 this.viewRect = null;
                 this.viewCenter = null;
-                var api = params.api, viewer = params.viewer, viewPort = params.viewPort, typeId = params.typeId, schemaId = params.schemaId, batchSize = params.batchSize, attrFilter = params.attrFilter, historicAttrKey = params.historicAttrKey, viaCdn = params.viaCdn;
+                this.historicRefreshAbortController = null;
+                // Entity IDs found for the latest integrity.
+                // We use this for refreshing historic data without having to repeat geographic queries.
+                this.gatheredIntegrity = null;
+                this.gatheredEntityIds = [];
+                var api = params.api, viewer = params.viewer, viewPort = params.viewPort, typeId = params.typeId, schemaId = params.schemaId, batchSize = params.batchSize, attrFilter = params.attrFilter, historicAttrKey = params.historicAttrKey, historicInterpolation = params.historicInterpolation, viaCdn = params.viaCdn;
                 this.api = api;
                 this.typeId = typeId;
                 this.schemaId = schemaId;
                 this.historicAttrKey = historicAttrKey;
+                this.historicInterpolation = Boolean(historicInterpolation);
                 this.viaCdn = Boolean(viaCdn);
                 this.batchSize = isNaN(batchSize) ? 300 : batchSize;
                 this.viewPort = viewPort;
@@ -16190,15 +16233,22 @@
             Getter.prototype.viewAreaSub = function () {
                 var _this = this;
                 this.viewAreaDispose();
-                this.viewPortChangeRemoval = this.viewPort.Updated().Subscribe(function () {
+                // We'll avoid restarting the scanner too often.
+                this.viewPortDelayQueue = new BModels.DelayQueue(function () {
                     _this.updateBounds();
                     _this.startGetterLoop();
+                }, 2000);
+                this.viewPortChangeRemoval = this.viewPort.Updated().Subscribe(function () {
+                    var _a;
+                    (_a = _this.viewPortDelayQueue) === null || _a === void 0 ? void 0 : _a.Call();
                 });
             };
             Getter.prototype.viewAreaDispose = function () {
-                var _a;
+                var _a, _b;
                 (_a = this.viewPortChangeRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
                 this.viewPortChangeRemoval = null;
+                (_b = this.viewPortDelayQueue) === null || _b === void 0 ? void 0 : _b.Dispose();
+                this.viewPortDelayQueue = null;
             };
             /**
              * Monitors the Cesium viewer and updates the historic data filter values.
@@ -16212,6 +16262,11 @@
                 // This is multiplied by the speed of animation to figure
                 // out how many animation "ticks" before we allow an update.
                 var INTERVAL_WHILE_ANIMATING = 2.5 * 1000;
+                var INTERVAL_WHILE_NOT_ANIMATING = 1000;
+                if (this.historicInterpolation) {
+                    INTERVAL_WHILE_ANIMATING = 6 * 1000;
+                    INTERVAL_WHILE_NOT_ANIMATING = 3.5 * 1000;
+                }
                 var lastUpdateTime = null;
                 var delayQueue = new BModels.DelayQueue(function () {
                     try {
@@ -16221,17 +16276,16 @@
                                 return;
                             }
                         }
-                        lastUpdateTime = new Date().getTime();
                         var current = _this.historicAttrDateTime;
                         _this.updateHistoricDateTime();
                         if (current != _this.historicAttrDateTime) {
-                            _this.updateState();
+                            _this.emitHistoricData();
                         }
                     }
                     catch (e) {
                         console.error(e);
                     }
-                }, 250);
+                }, INTERVAL_WHILE_NOT_ANIMATING);
                 var postUpdateRemoval = this.viewer.scene.postUpdate.addEventListener(function () {
                     if (delayQueue) {
                         delayQueue.Call();
@@ -16350,20 +16404,32 @@
                 this.getterLoopId += 1;
                 var loopId = this.getterLoopId;
                 var loopIntegrity = this.getIntegrityId();
-                new Promise(function () { return __awaiter(_this, void 0, void 0, function () {
-                    var MIN_HEIGHT, MAX_HEIGHT, PAGE_SIZE, retryAttempts, retryDelay, prevFirstId, prevLastId, prevTicks, alt, cells, curCellIndex, postedScanning, postedLoading, total, curCell, entities, integrity, first, last, e_1;
+                // Abort any existing loops that don't match the current loop.
+                // We tried using integrity, however we want to interrupt when user moves camera quickly.
+                // So it's better to use the loop ID.
+                var abortId = String(loopId);
+                {
+                    var newAbortControllers = {};
+                    for (var key in this.getterLoopAbortControllers) {
+                        this.getterLoopAbortControllers[key].abort();
+                    }
+                    this.getterLoopAbortControllers = newAbortControllers;
+                }
+                var abortController = this.getterLoopAbortControllers[abortId] = new AbortController();
+                (function () { return __awaiter(_this, void 0, void 0, function () {
+                    var MIN_HEIGHT, MAX_HEIGHT, PAGE_SIZE, retryAttempts, retryDelay, prevFirstId, prevLastId, prevTicks, alt, cells, curCellIndex, postedScanning, postedLoading, total, curCell, entities, integrity, i, entity, first, last, e_1;
                     var _a, _b, _c, _d, _e, _f, _g, _h;
                     return __generator(this, function (_j) {
                         switch (_j.label) {
                             case 0: 
-                            // Minor delay to stop 50 menu items enabling doing their first request all together.
-                            // This gives it time to recognize only 1 request is needed.
-                            // Would be better to not use this delay but we're on a clock.
-                            return [4 /*yield*/, delay(100)];
+                            // Larger initial delay for the first loops because terrain is likely loading in.
+                            // We also delay because if we enable 50 Menu Items at the same time, common requests we be made if we wait a bit.
+                            // Eg: same entity type will be grouped into the same filter getter instance.
+                            return [4 /*yield*/, delay(loopId <= 3 ? 800 : 300)];
                             case 1:
-                                // Minor delay to stop 50 menu items enabling doing their first request all together.
-                                // This gives it time to recognize only 1 request is needed.
-                                // Would be better to not use this delay but we're on a clock.
+                                // Larger initial delay for the first loops because terrain is likely loading in.
+                                // We also delay because if we enable 50 Menu Items at the same time, common requests we be made if we wait a bit.
+                                // Eg: same entity type will be grouped into the same filter getter instance.
                                 _j.sent();
                                 MIN_HEIGHT = this.minHeight;
                                 MAX_HEIGHT = this.maxHeight;
@@ -16445,7 +16511,10 @@
                                         viaCdn: this.viaCdn,
                                         migrated: true,
                                         req: {
-                                            noCache: true
+                                            // If we are passing in an abort, we MUST pass in noCache.
+                                            // Otherwise we will cache an aborted request.
+                                            noCache: true,
+                                            abortSignal: abortController.signal
                                         }
                                     })];
                             case 9:
@@ -16454,6 +16523,20 @@
                                 if (loopIntegrity == integrity && entities) {
                                     (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger(entities);
                                 }
+                                if (this.gatheredIntegrity != integrity) {
+                                    this.gatheredIntegrity = integrity;
+                                    this.gatheredEntityIds = [];
+                                }
+                                // Add to the integrity list for any new IDs found.
+                                // This lets us keep track of all IDs we've found within the same integrity for historic data.
+                                if (this.historicAttrKey) {
+                                    for (i = 0; i < entities.length; i++) {
+                                        entity = entities[i];
+                                        if (!this.gatheredEntityIds.includes(entity.Bruce.ID)) {
+                                            this.gatheredEntityIds.push(entity.Bruce.ID);
+                                        }
+                                    }
+                                }
                                 if (this.getterLoopId != loopId) {
                                     return [3 /*break*/, 13];
                                 }
@@ -16496,7 +16579,14 @@
                                 return [3 /*break*/, 11];
                             case 10:
                                 e_1 = _j.sent();
+                                // Ignore abort errors.
+                                if (e_1 && typeof e_1 === "object" && e_1.name == "AbortError") {
+                                    return [3 /*break*/, 13];
+                                }
                                 console.error(e_1);
+                                if (this.getterLoopId != loopId) {
+                                    return [3 /*break*/, 13];
+                                }
                                 // Request failed so let's add a delay and try again soon.
                                 retryDelay += RETRY_DELAY_INCREMENT;
                                 retryAttempts -= 1;
@@ -16515,7 +16605,104 @@
                                 return [2 /*return*/];
                         }
                     });
-                }); });
+                }); })();
+            };
+            /**
+             * Gets the historic state of found Entities for the current date times and emits them.
+             * Since geometry searches are tied to the base Entity, we don't have to re-scan the viewport.
+             */
+            Getter.prototype.emitHistoricData = function () {
+                var _this = this;
+                var integrity = this.getIntegrityId();
+                // Gathered ID does't match current one.
+                if (this.gatheredIntegrity != integrity) {
+                    return;
+                }
+                var historicAttrDateTime = this.historicAttrDateTime;
+                var SCAN_BATCH_SIZE = 1000;
+                if (this.historicRefreshAbortController) {
+                    this.historicRefreshAbortController.abort();
+                    this.historicRefreshAbortController = null;
+                }
+                (function () { return __awaiter(_this, void 0, void 0, function () {
+                    var pageIndex, i, batch, controller, entities, e_2;
+                    var _a;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                pageIndex = 0;
+                                _b.label = 1;
+                            case 1:
+                                _b.trys.push([1, 6, , 7]);
+                                i = 0;
+                                _b.label = 2;
+                            case 2:
+                                if (!(i < this.gatheredEntityIds.length)) return [3 /*break*/, 5];
+                                batch = this.gatheredEntityIds.slice(i, i + SCAN_BATCH_SIZE);
+                                if (!batch.length) {
+                                    return [3 /*break*/, 5];
+                                }
+                                controller = this.historicRefreshAbortController = new AbortController();
+                                return [4 /*yield*/, BModels.Entity.GetList({
+                                        api: this.api,
+                                        historicKey: this.historicAttrKey,
+                                        historicPoint: historicAttrDateTime,
+                                        schemaId: this.schemaId,
+                                        filter: {
+                                            pageSize: SCAN_BATCH_SIZE,
+                                            pageIndex: pageIndex,
+                                            entityTypeId: this.typeId,
+                                            layerIds: this.tagIds,
+                                            layerIdsOperator: "in",
+                                            sortOrder: BModels.Api.ESortOrder.Asc,
+                                            entityTypeConditions: {
+                                                "ID": {
+                                                    "IN": batch
+                                                }
+                                            },
+                                        },
+                                        viaCdn: this.viaCdn,
+                                        migrated: true,
+                                        req: {
+                                            // If we are passing in an abort, we MUST pass in noCache.
+                                            // Otherwise we will cache an aborted request.
+                                            noCache: true,
+                                            abortSignal: controller.signal
+                                        }
+                                    })];
+                            case 3:
+                                entities = (_b.sent()).entities;
+                                // Date changed.
+                                if (this.historicAttrDateTime != historicAttrDateTime) {
+                                    return [3 /*break*/, 5];
+                                }
+                                // Integrity changed.
+                                if (this.gatheredIntegrity != integrity) {
+                                    return [3 /*break*/, 5];
+                                }
+                                // No Menu Items.
+                                if (!this.GetMenuItems().length) {
+                                    return [3 /*break*/, 5];
+                                }
+                                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(entities);
+                                pageIndex += 1;
+                                _b.label = 4;
+                            case 4:
+                                i += SCAN_BATCH_SIZE;
+                                return [3 /*break*/, 2];
+                            case 5: return [3 /*break*/, 7];
+                            case 6:
+                                e_2 = _b.sent();
+                                // Ignore abort errors.
+                                if (e_2 && typeof e_2 === "object" && e_2.name == "AbortError") {
+                                    return [2 /*return*/];
+                                }
+                                console.error(e_2);
+                                return [3 /*break*/, 7];
+                            case 7: return [2 /*return*/];
+                        }
+                    });
+                }); })();
             };
             return Getter;
         }());
@@ -16531,6 +16718,9 @@
         cacheKey += params.schemaId ? params.schemaId : "";
         cacheKey += JSON.stringify(params.tagIds ? params.tagIds : []);
         cacheKey += params.historicAttrKey ? params.historicAttrKey : "";
+        if (params.historicAttrKey) {
+            cacheKey += params.historicInterpolation ? "true" : "false";
+        }
         // This could potentially crash, but if it crashes here then it would crash during API request anyways.
         cacheKey += JSON.stringify(params.attrFilter ? params.attrFilter : {});
         return cacheKey;
@@ -16554,6 +16744,7 @@
                         batchSize: params.batchSize,
                         attrFilter: params.attrFilter,
                         historicAttrKey: params.historicAttrKey,
+                        historicInterpolation: params.historicInterpolation,
                         viaCdn: params.cdn
                     });
                     this.data[cacheKey] = getter;
@@ -16564,6 +16755,7 @@
                     if (params.viewer && params.debugShowBounds) {
                         // Cell id -> entity.
                         var cellCache_1 = {};
+                        var cellPrefix_1 = BModels.ObjectUtils.UId(10) + "_";
                         getter.OnScanUpdate.Subscribe(function (cells) {
                             if (window.ON_SCAN_UPDATE_PAUSED == true) {
                                 return;
@@ -16574,7 +16766,7 @@
                             cells.forEach(function (cell) {
                                 var _a;
                                 var bounds = cell.GetBounds();
-                                var id = bounds.east + "_" + bounds.north + "_" + bounds.south + "_" + bounds.west;
+                                var id = cellPrefix_1 + bounds.east + "_" + bounds.north + "_" + bounds.south + "_" + bounds.west;
                                 curCellIds.push(id);
                                 fetchedCells[id] = cell.IsFetched();
                                 fetchingCellId = cell.Fetching ? id : fetchingCellId;
@@ -24033,11 +24225,11 @@
     }
     (function (ViewRenderEngine) {
         function Render(params) {
-            var _a;
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var iteration, api, view, _b, bookmark, bookmarkId, _c, version, bWidget;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var iteration, api, view, _c, bookmark, bookmarkId, _d, version, bWidget, lpWidget;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (!params.manager && params.viewer) {
                                 params.manager = exports.ViewerUtils.GetManager({
@@ -24060,17 +24252,17 @@
                             }
                             api = params.getters.GetBruceApi();
                             if (!params.view) return [3 /*break*/, 1];
-                            _b = params.view;
+                            _c = params.view;
                             return [3 /*break*/, 3];
                         case 1: return [4 /*yield*/, BModels.ProjectView.Get({
                                 api: api,
                                 viewId: params.viewId
                             })];
                         case 2:
-                            _b = (_d.sent()).view;
-                            _d.label = 3;
+                            _c = (_e.sent()).view;
+                            _e.label = 3;
                         case 3:
-                            view = _b;
+                            view = _c;
                             bookmark = params.bookmark;
                             if (!!bookmark) return [3 /*break*/, 7];
                             bookmarkId = params.bookmarkId;
@@ -24084,14 +24276,14 @@
                                     bookmarkId: bookmarkId
                                 })];
                         case 4:
-                            _c = (_d.sent()).bookmark;
+                            _d = (_e.sent()).bookmark;
                             return [3 /*break*/, 6];
                         case 5:
-                            _c = null;
-                            _d.label = 6;
+                            _d = null;
+                            _e.label = 6;
                         case 6:
-                            bookmark = _c;
-                            _d.label = 7;
+                            bookmark = _d;
+                            _e.label = 7;
                         case 7:
                             if (!assertIteration$1(params.viewer, iteration)) {
                                 return [2 /*return*/];
@@ -24100,12 +24292,12 @@
                             if (!(version == 1)) return [3 /*break*/, 9];
                             return [4 /*yield*/, renderLegacyNavigator(iteration, params, bookmark, view)];
                         case 8:
-                            _d.sent();
+                            _e.sent();
                             return [3 /*break*/, 11];
                         case 9: return [4 /*yield*/, renderNavigator(iteration, params, bookmark, view, params.getters)];
                         case 10:
-                            _d.sent();
-                            _d.label = 11;
+                            _e.sent();
+                            _e.label = 11;
                         case 11:
                             if (!assertIteration$1(params.viewer, iteration)) {
                                 return [2 /*return*/];
@@ -24115,6 +24307,11 @@
                                 bWidget.ViewId = params.viewId ? params.viewId : view === null || view === void 0 ? void 0 : view.ID;
                                 bWidget.LastEnabledBookmarkId = params.bookmarkId ? params.bookmarkId : bookmark === null || bookmark === void 0 ? void 0 : bookmark.ID;
                             }
+                            lpWidget = (_b = params.viewer) === null || _b === void 0 ? void 0 : _b[VIEWER_LEFT_PANEL_WIDGET_KEY];
+                            if (lpWidget) {
+                                lpWidget.ViewId = params.viewId ? params.viewId : view === null || view === void 0 ? void 0 : view.ID;
+                                lpWidget.LastEnabledBookmarkId = params.bookmarkId ? params.bookmarkId : bookmark === null || bookmark === void 0 ? void 0 : bookmark.ID;
+                            }
                             return [2 /*return*/];
                     }
                 });
@@ -24157,6 +24354,8 @@
                 var isChanged = this._viewId != value;
                 if (isChanged) {
                     this._viewId = value;
+                    this._updatePanelStyles();
+                    this._loading = this.loadBookmarks();
                 }
             },
             enumerable: false,
@@ -24208,13 +24407,15 @@
         };
         WidgetLeftPanel.prototype.loadBookmarks = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var api, viewId, data, e_1;
+                var viewId, api, data, e_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            _a.trys.push([0, 2, , 3]);
-                            api = this._apiGetters.GetBruceApi();
                             viewId = this._viewId;
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            api = this._apiGetters.GetBruceApi();
                             if (!viewId) {
                                 this.bookmarks = [];
                                 return [2 /*return*/];
@@ -24223,16 +24424,22 @@
                                     viewId: viewId,
                                     api: api
                                 })];
-                        case 1:
+                        case 2:
                             data = _a.sent();
+                            if (this._viewId !== viewId) {
+                                return [2 /*return*/];
+                            }
                             this.bookmarks = data.bookmarks;
-                            return [3 /*break*/, 3];
-                        case 2:
+                            return [3 /*break*/, 4];
+                        case 3:
                             e_1 = _a.sent();
                             console.error(e_1);
+                            if (this._viewId !== viewId) {
+                                return [2 /*return*/];
+                            }
                             this.bookmarks = [];
-                            return [3 /*break*/, 3];
-                        case 3: return [2 /*return*/];
+                            return [3 /*break*/, 4];
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
@@ -27775,7 +27982,7 @@
         return WidgetViewBar;
     }(exports.Widget.AWidget));
 
-    var VERSION = "4.6.2";
+    var VERSION = "4.6.4";
 
     exports.VERSION = VERSION;
     exports.CesiumParabola = CesiumParabola;