bruce-cesium 2.0.0 → 2.0.1

package/dist/bruce-cesium.umd.js

@@ -2600,10 +2600,18 @@
                 clearInterval(this.renderQueueInterval);
                 this.renderQueueInterval = null;
                 this.renderQueue = [];
-                this.visualsManager.RemoveRegos({
-                    menuItemId: this.item.id
-                });
-                if (!shouldRender) {
+                // Remove just the ones that shouldn't be rendered.
+                // Eg: for a tag menu item we can see what tags are selected and only render those.
+                if (shouldRender) {
+                    this.visualsManager.RemoveRegos({
+                        menuItemId: this.item.id,
+                        retainTagIds: tagsToRender
+                    });
+                }
+                else {
+                    this.visualsManager.RemoveRegos({
+                        menuItemId: this.item.id
+                    });
                     return;
                 }
                 var api = this.apiGetter.getApi();
@@ -4145,10 +4153,13 @@
              */
             Register.prototype.RemoveRegos = function (params) {
                 var _a, _b, _c;
-                var entityId = params.entityId, menuItemId = params.menuItemId, doUpdate = params.doUpdate, relation = params.relation;
+                var entityId = params.entityId, menuItemId = params.menuItemId, doUpdate = params.doUpdate, relation = params.relation, retainTagIds = params.retainTagIds;
                 if (doUpdate == null) {
                     doUpdate = true;
                 }
+                if (retainTagIds == null) {
+                    retainTagIds = [];
+                }
                 // TODO: refactor.
                 // Currently this was made by merging two functions.
                 if (menuItemId && !entityId) {
@@ -4159,6 +4170,11 @@
                             if (!rego) {
                                 continue;
                             }
+                            var regoTagIds = rego.tagIds ? rego.tagIds : [];
+                            var shouldRetain = regoTagIds.some(function (tagId) { return retainTagIds.includes(tagId); });
+                            if (shouldRetain) {
+                                continue;
+                            }
                             removeEntity(this.viewer, rego.visual);
                             var doesInclude = this.rego[entityId_3].find(function (r) { return r.menuItemId === menuItemId; });
                             if (doesInclude) {
@@ -7245,14 +7261,28 @@
              * @returns
              */
             Manager.prototype.RenderItem = function (params) {
-                var _a, _b, _c;
+                var _a, _b, _c, _d;
                 if (this.viewer.isDestroyed()) {
                     return null;
                 }
                 var rItem = this.items.find(function (x) { return x.id == params.item.id; });
-                if (!rItem) {
+                if (rItem) {
+                    // This means we're updating a tag menu item.
+                    // Tag menu items have alternative states based on bookmark settings.
+                    // Eg: different tags that were enabled.
+                    if (rItem.type == bruceModels.MenuItem.EType.Entities && params.item.Type == bruceModels.MenuItem.EType.Entities) {
+                        var eItem = rItem.item;
+                        if ((_a = eItem === null || eItem === void 0 ? void 0 : eItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandLayers) {
+                            rItem.renderManager.Init({
+                                item: params.item,
+                            });
+                            rItem.item = params.item;
+                        }
+                    }
+                }
+                else {
                     rItem = {
-                        id: (_a = params.item.id) !== null && _a !== void 0 ? _a : bruceModels.ObjectUtils.UId(),
+                        id: (_b = params.item.id) !== null && _b !== void 0 ? _b : bruceModels.ObjectUtils.UId(),
                         childIds: [],
                         item: params.item,
                         renderManager: null,
@@ -7387,8 +7417,8 @@
                         rItem.childIds.push(childId);
                     }
                 }
-                if (!rItem.renderManager || !((_b = rItem.renderManager) === null || _b === void 0 ? void 0 : _b.Disposed)) {
-                    (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger({ isEnabling: true, itemId: rItem.id });
+                if (rItem.renderManager && !((_c = rItem.renderManager) === null || _c === void 0 ? void 0 : _c.Disposed)) {
+                    (_d = this.onUpdate) === null || _d === void 0 ? void 0 : _d.Trigger({ isEnabling: true, itemId: rItem.id });
                 }
                 rItem.id;
             };
@@ -7731,28 +7761,29 @@
         }
         MenuItemCreator.RenderTileset = RenderTileset;
         function RenderBookmarkItems(params) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var viewId, bookmarkId, api, view, _a, bookmark, _b, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, renderedItemIds, traverseItems_1, i;
+                var viewId, bookmarkId, api, view, _b, bookmark, _c, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, alternations, renderedItemIds, traverseItems_1, i;
                 var _this = this;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             viewId = params.viewId, bookmarkId = params.bookmarkId;
                             api = params.apiGetter.getApi();
                             if (!params.view) return [3 /*break*/, 1];
-                            _a = params.view;
+                            _b = params.view;
                             return [3 /*break*/, 3];
                         case 1: return [4 /*yield*/, bruceModels.ProjectView.Get({
                                 api: api,
                                 viewId: viewId
                             })];
                         case 2:
-                            _a = (_c.sent()).view;
-                            _c.label = 3;
+                            _b = (_d.sent()).view;
+                            _d.label = 3;
                         case 3:
-                            view = _a;
+                            view = _b;
                             if (!params.bookmark) return [3 /*break*/, 4];
-                            _b = params.bookmark;
+                            _c = params.bookmark;
                             return [3 /*break*/, 6];
                         case 4: return [4 /*yield*/, bruceModels.ProjectViewBookmark.Get({
                                 api: api,
@@ -7760,10 +7791,10 @@
                                 bookmarkId: bookmarkId
                             })];
                         case 5:
-                            _b = (_c.sent()).bookmark;
-                            _c.label = 6;
+                            _c = (_d.sent()).bookmark;
+                            _d.label = 6;
                         case 6:
-                            bookmark = _b;
+                            bookmark = _c;
                             if (view.DataVersion != bookmark.DataVersion) {
                                 throw new Error("View and bookmark settings version mismatch.");
                             }
@@ -7784,32 +7815,48 @@
                                     enabledIds = bSettings.selectedItemIds;
                                 }
                             }
+                            alternations = (_a = bookmark.Settings) === null || _a === void 0 ? void 0 : _a.menuItemAlternations;
+                            if (!alternations) {
+                                alternations = {};
+                            }
                             renderedItemIds = [];
                             if (!((menuItems === null || menuItems === void 0 ? void 0 : menuItems.length) && (enabledIds === null || enabledIds === void 0 ? void 0 : enabledIds.length))) return [3 /*break*/, 10];
                             traverseItems_1 = function (item) { return __awaiter(_this, void 0, void 0, function () {
-                                var itemId, i;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
+                                var eItem, eItemAlt, itemId, i;
+                                var _a;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
                                         case 0:
+                                            if (alternations[item.id]) {
+                                                // The only alternation we support right now is tag menu item ones.
+                                                // The project view menu item contains the instruction to enable tags, the bookmark specifies which ones.
+                                                if (item.Type == bruceModels.MenuItem.EType.Entities) {
+                                                    eItem = item;
+                                                    if (eItem.BruceEntity.ExpandLayers) {
+                                                        eItemAlt = alternations[item.id];
+                                                        eItem.BruceEntity = __assign(__assign({}, eItem.BruceEntity), { SelectedExpandLayers: (_a = eItemAlt.BruceEntity) === null || _a === void 0 ? void 0 : _a.SelectedExpandLayers });
+                                                    }
+                                                }
+                                            }
                                             if (!enabledIds.includes(item.id)) return [3 /*break*/, 2];
                                             return [4 /*yield*/, params.manager.RenderItem({
                                                     item: item,
                                                     apiGetter: params.apiGetter
                                                 })];
                                         case 1:
-                                            itemId = _a.sent();
+                                            itemId = _b.sent();
                                             renderedItemIds.push(itemId);
-                                            _a.label = 2;
+                                            _b.label = 2;
                                         case 2:
                                             if (!item.Children) return [3 /*break*/, 6];
                                             i = 0;
-                                            _a.label = 3;
+                                            _b.label = 3;
                                         case 3:
                                             if (!(i < item.Children.length)) return [3 /*break*/, 6];
                                             return [4 /*yield*/, traverseItems_1(item.Children[i])];
                                         case 4:
-                                            _a.sent();
-                                            _a.label = 5;
+                                            _b.sent();
+                                            _b.label = 5;
                                         case 5:
                                             i++;
                                             return [3 /*break*/, 3];
@@ -7818,13 +7865,13 @@
                                 });
                             }); };
                             i = 0;
-                            _c.label = 7;
+                            _d.label = 7;
                         case 7:
                             if (!(i < menuItems.length)) return [3 /*break*/, 10];
                             return [4 /*yield*/, traverseItems_1(menuItems[i])];
                         case 8:
-                            _c.sent();
-                            _c.label = 9;
+                            _d.sent();
+                            _d.label = 9;
                         case 9:
                             i++;
                             return [3 /*break*/, 7];