bruce-cesium 2.6.5 → 2.6.7

package/dist/bruce-cesium.umd.js

@@ -1713,7 +1713,7 @@
     }
     function getName(api, entity) {
         return __awaiter(this, void 0, void 0, function () {
-            var typeId, type, name_1, e_1;
+            var typeId, type, name_1, e_1, hideError, error, code;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1740,7 +1740,18 @@
                         return [3 /*break*/, 4];
                     case 3:
                         e_1 = _a.sent();
-                        console.error(e_1);
+                        hideError = false;
+                        // TODO: we need a util for extracting code + message rather than writing all this every time.
+                        if (e_1 && typeof e_1 == "object" && e_1.ERROR) {
+                            error = e_1.ERROR;
+                            code = error && typeof error == "object" ? error.Code : "";
+                            // Avoiding logging a common error.
+                            // This happens when rendering entities that don't have records.
+                            hideError = String(code).toLowerCase() == "notfound";
+                        }
+                        if (!hideError) {
+                            console.error(e_1);
+                        }
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/, "Unknown entity"];
                 }
@@ -5431,6 +5442,12 @@
                 var _this = this;
                 var _a;
                 this.unsetGetter();
+                var isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
+                var tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
+                if (!tagsToRender) {
+                    tagsToRender = [];
+                }
+                tagsToRender = [].concat(tagsToRender);
                 this.getter = this.sharedGetters.GetOrCreateFilterGetter({
                     api: this.apiGetter.getApi(),
                     attrFilter: (_a = this.item.BruceEntity.Filter) !== null && _a !== void 0 ? _a : {},
@@ -5438,19 +5455,18 @@
                     typeId: this.item.BruceEntity["EntityType.ID"],
                     monitor: this.monitor,
                     viewer: this.viewer,
+                    // 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.length == 1 ? tagsToRender : [],
                     debugShowBounds: Boolean(window === null || window === void 0 ? void 0 : window.ENTITIES_RENDER_MANAGER_SHOW_BOUNDS),
                     cdn: this.item.cdnEnabled
                 });
                 var minMax = exports.RenderManager.GetZoomMinMax({
                     zoomControl: this.item.CameraZoomSettings
                 });
-                this.getter.IncludeMenuItem(this.item.id, [], minMax[0], minMax[1]);
-                var isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
-                var tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
-                if (!tagsToRender) {
-                    tagsToRender = [];
-                }
-                tagsToRender = [].concat(tagsToRender);
+                // 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...
+                this.getter.IncludeMenuItem(this.item.id, tagsToRender.length == 1 ? tagsToRender : [], minMax[0], minMax[1]);
                 this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                     if (isTagItem) {
                         _this.distributeForRender(entities.filter(function (entity) {
@@ -5738,17 +5754,20 @@
     (function (EntitiesLoadedRenderManager) {
         var Manager = /** @class */ (function () {
             function Manager(params) {
+                var _a;
                 this.getter = null;
                 this.getterSub = null;
                 this.disposed = false;
                 this.renderedEntities = {};
-                this.updatedEntities = {};
                 var viewer = params.viewer, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item, visualsManager = params.register;
                 this.viewer = viewer;
                 this.apiGetter = apiGetter;
                 this.monitor = monitor;
                 this.item = item;
                 this.visualsManager = visualsManager;
+                if (!((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.Entities)) {
+                    this.item.BruceEntity = __assign(__assign({}, this.item.BruceEntity), { Entities: [] });
+                }
             }
             Object.defineProperty(Manager.prototype, "Disposed", {
                 get: function () {
@@ -5764,13 +5783,9 @@
              */
             Manager.prototype.AddEntities = function (params) {
                 var _this = this;
-                var _a;
                 if (this.disposed) {
                     throw (new Error("This item is disposed."));
                 }
-                if (!((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.Entities)) {
-                    this.item.BruceEntity = __assign(__assign({}, this.item.BruceEntity), { Entities: [] });
-                }
                 var entities = params.entities;
                 entities.forEach(function (x) {
                     var _a;
@@ -5797,13 +5812,9 @@
              */
             Manager.prototype.RemoveEntities = function (params) {
                 var _this = this;
-                var _a;
                 if (this.disposed) {
                     throw (new Error("This item is disposed."));
                 }
-                if (!((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.Entities)) {
-                    this.item.BruceEntity = __assign(__assign({}, this.item.BruceEntity), { Entities: [] });
-                }
                 var entityIds = params.entityIds;
                 entityIds.forEach(function (x) {
                     var index = _this.item.BruceEntity.Entities.findIndex(function (y) { var _a; return ((_a = y === null || y === void 0 ? void 0 : y.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == x; });
@@ -5814,9 +5825,25 @@
                         entityId: x,
                         menuItemId: _this.item.id
                     });
+                    _this.renderedEntities[x] = false;
                 });
                 this.recreateGetter();
             };
+            /**
+             * Clears all entities from the menu item.
+             * Any visuals will be removed as well.
+             */
+            Manager.prototype.ClearEntities = function () {
+                if (this.disposed) {
+                    throw (new Error("This item is disposed."));
+                }
+                this.item.BruceEntity.Entities = [];
+                this.visualsManager.RemoveRegos({
+                    menuItemId: this.item.id
+                });
+                this.renderedEntities = {};
+                this.recreateGetter();
+            };
             Manager.prototype.Init = function () {
                 var _a;
                 if (this.disposed) {
@@ -5891,10 +5918,6 @@
                         }
                         if (entities === null || entities === void 0 ? void 0 : entities.length) {
                             entities = [].concat(entities).filter(function (x) { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); });
-                            entities.forEach(function (x) {
-                                var _a;
-                                _this.updatedEntities[(_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID] = x;
-                            });
                         }
                         this.visualsManager.MarkStale({
                             entityIds: entityIds,
@@ -5945,7 +5968,6 @@
                                 if (!(ids.length > 0)) return [3 /*break*/, 4];
                                 checkBatch = function () { return __awaiter(_this, void 0, void 0, function () {
                                     var entityIds, entities;
-                                    var _this = this;
                                     return __generator(this, function (_a) {
                                         switch (_a.label) {
                                             case 0:
@@ -5959,10 +5981,6 @@
                                                 if (this.disposed) {
                                                     return [2 /*return*/];
                                                 }
-                                                entities.forEach(function (x) {
-                                                    var _a;
-                                                    _this.updatedEntities[(_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID] = x;
-                                                });
                                                 this.onGetterUpdate(entities, force);
                                                 return [2 /*return*/];
                                         }
@@ -5989,7 +6007,8 @@
                 var _a;
                 if (force === void 0) { force = false; }
                 return __awaiter(this, void 0, void 0, function () {
-                    var cEntities, i, entity, id, cEntity, visual, e_2;
+                    var isEntityInItem_1, cEntities, i, entity, id, cEntity, visual, e_2;
+                    var _this = this;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
@@ -5997,6 +6016,16 @@
                                 if (this.disposed || this.viewer.isDestroyed()) {
                                     return [2 /*return*/];
                                 }
+                                isEntityInItem_1 = function (entityId) {
+                                    var _a, _b;
+                                    return (_b = (_a = _this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.Entities) === null || _b === void 0 ? void 0 : _b.find(function (y) { var _a; return ((_a = y === null || y === void 0 ? void 0 : y.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == entityId; });
+                                };
+                                // Filter out entities that aren't in the menu item.
+                                // This can happen if the menu item is updated while the getter is running.
+                                entities = entities.filter(function (x) {
+                                    var _a;
+                                    return isEntityInItem_1((_a = x === null || x === void 0 ? void 0 : x.Bruce) === null || _a === void 0 ? void 0 : _a.ID);
+                                });
                                 return [4 /*yield*/, exports.EntityRenderEngine.Render({
                                         viewer: this.viewer,
                                         apiGetter: this.apiGetter,
@@ -6013,7 +6042,7 @@
                                     id = entity.Bruce.ID;
                                     cEntity = cEntities[id];
                                     this.renderedEntities[id] = !!cEntity;
-                                    if (cEntity) {
+                                    if (cEntity && isEntityInItem_1(id)) {
                                         visual = (_a = this.visualsManager.GetRego({
                                             entityId: id,
                                             menuItemId: this.item.id
@@ -7710,6 +7739,7 @@
         cacheKey += params.typeId;
         cacheKey += params.batchSize;
         cacheKey += String(params.cdn);
+        cacheKey += JSON.stringify(params.tagIds ? params.tagIds : []);
         // 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;
@@ -15092,7 +15122,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.6.5";
+    var VERSION$1 = "2.6.7";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;