bruce-cesium 2.7.9 → 2.8.1

package/dist/bruce-cesium.umd.js

@@ -4241,20 +4241,33 @@
             /**
              * Locates a visual corresponding to a given entity id.
              * If no menu item id is provided, then it will pick the "best" one.
-             * @param entityId
-             * @param menuItemId
+             * @param params
              * @returns
              */
             Register.prototype.GetRego = function (params) {
-                var entityId = params.entityId, menuItemId = params.menuItemId;
-                var entityRegos = this.rego[entityId];
-                if (!entityRegos) {
-                    return [];
+                var entityId = params.entityId, menuItemId = params.menuItemId, relation = params.relation;
+                if (relation) {
+                    var relationKey_1 = RelationRenderEngine.GetRenderGroupId(relation);
+                    for (var entityId_1 in this.rego) {
+                        var entityRegos = this.rego[entityId_1];
+                        if (entityRegos) {
+                            var rego = entityRegos.find(function (r) { return r.relation && RelationRenderEngine.GetRenderGroupId(r.relation) == relationKey_1; });
+                            if (rego) {
+                                return rego;
+                            }
+                        }
+                    }
                 }
-                if (menuItemId) {
-                    return entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
+                else {
+                    var entityRegos = this.rego[entityId];
+                    if (!entityRegos) {
+                        return [];
+                    }
+                    if (menuItemId) {
+                        return entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
+                    }
+                    return entityRegos.find(function (x) { return x.best; });
                 }
-                return entityRegos.find(function (x) { return x.best; });
             };
             /**
              * Returns regos matching given criteria.
@@ -4267,8 +4280,8 @@
                 // Currently this was made by merging two functions.
                 var entityId = params.entityId, menuItemId = params.menuItemId;
                 if (entityId) {
-                    var entityId_1 = params.entityId;
-                    var entityRegos = this.rego[entityId_1];
+                    var entityId_2 = params.entityId;
+                    var entityRegos = this.rego[entityId_2];
                     if (!entityRegos) {
                         return [];
                     }
@@ -4277,8 +4290,8 @@
                 else if (menuItemId) {
                     var menuItemId_1 = params.menuItemId;
                     var visuals = [];
-                    for (var entityId_2 in this.rego) {
-                        var entityRegos = this.rego[entityId_2];
+                    for (var entityId_3 in this.rego) {
+                        var entityRegos = this.rego[entityId_3];
                         if (entityRegos) {
                             var rego = entityRegos.find(function (r) { return r.menuItemId === menuItemId_1; });
                             if (rego) {
@@ -4307,8 +4320,8 @@
                 // TODO: refactor.
                 // Currently this was made by merging two functions.
                 if (menuItemId && !entityId) {
-                    for (var entityId_3 in this.rego) {
-                        var entityRegos = this.rego[entityId_3];
+                    for (var entityId_4 in this.rego) {
+                        var entityRegos = this.rego[entityId_4];
                         if (entityRegos) {
                             var rego = entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
                             if (!rego) {
@@ -4320,9 +4333,9 @@
                                 continue;
                             }
                             removeEntity(this.viewer, rego.visual);
-                            var doesInclude = this.rego[entityId_3].find(function (r) { return r.menuItemId === menuItemId; });
+                            var doesInclude = this.rego[entityId_4].find(function (r) { return r.menuItemId === menuItemId; });
                             if (doesInclude) {
-                                this.rego[entityId_3] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId; });
+                                this.rego[entityId_4] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId; });
                             }
                             (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
                                 type: EVisualUpdateType.Remove,
@@ -4330,7 +4343,7 @@
                                 rego: rego
                             });
                             if (doesInclude) {
-                                updateEntity(this.viewer, entityId_3, this);
+                                updateEntity(this.viewer, entityId_4, this);
                             }
                         }
                     }
@@ -4366,23 +4379,23 @@
                     }
                 }
                 else if (relation) {
-                    var relationKey_1 = RelationRenderEngine.GetRenderGroupId(relation);
-                    for (var entityId_4 in this.rego) {
-                        var entityRegos = this.rego[entityId_4];
+                    var relationKey_2 = RelationRenderEngine.GetRenderGroupId(relation);
+                    for (var entityId_5 in this.rego) {
+                        var entityRegos = this.rego[entityId_5];
                         if (entityRegos) {
-                            var rego = entityRegos.find(function (r) { return r.relation && RelationRenderEngine.GetRenderGroupId(r.relation) == relationKey_1; });
+                            var rego = entityRegos.find(function (r) { return r.relation && RelationRenderEngine.GetRenderGroupId(r.relation) == relationKey_2; });
                             if (!rego) {
                                 continue;
                             }
                             removeEntity(this.viewer, rego.visual);
-                            this.rego[entityId_4] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId; });
+                            this.rego[entityId_5] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId; });
                             (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger({
                                 type: EVisualUpdateType.Remove,
                                 entityId: rego.entityId,
                                 rego: rego
                             });
                             if (doUpdate && menuItemId) {
-                                updateEntity(this.viewer, entityId_4, this);
+                                updateEntity(this.viewer, entityId_5, this);
                             }
                         }
                     }
@@ -9092,6 +9105,9 @@
                 // If true, this menu item is disposed and should not be used.
                 // Any rendering will be ignored.
                 this.disposed = false;
+                // Record of the currently drawn entity IDs.
+                // This is to avoid re-queueing already drawn entities when Init is called multiple times.
+                this.drawnIds = [];
                 var apiGetter = params.apiGetter, item = params.item, register = params.register, viewer = params.viewer;
                 this.apiGetter = apiGetter;
                 this.item = item;
@@ -9112,6 +9128,7 @@
              * @returns
              */
             Manager.prototype.Init = function (params) {
+                var _this = this;
                 var _a;
                 if (this.disposed) {
                     return;
@@ -9124,8 +9141,6 @@
                 var regos = this.register.GetRegos({
                     menuItemId: this.item.id
                 });
-                var drawnIds = [];
-                var toDrawIds = [];
                 var entityIds = (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.EntityIds;
                 if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
                     entityIds = [];
@@ -9140,27 +9155,12 @@
                             requestRender: false
                         });
                     }
-                    else {
-                        drawnIds.push(rego.entityId);
-                        if (rego.relation) {
-                            drawnIds.push(rego.relation["Principal.Entity.ID"]);
-                            drawnIds.push(rego.relation["Related.Entity.ID"]);
-                        }
-                    }
                 }
                 this.viewer.scene.requestRender();
-                var _loop_1 = function (i) {
-                    if (!drawnIds.find(function (x) { return x == entityIds[i]; })) {
-                        toDrawIds.push(entityIds[i]);
-                    }
-                };
-                // We'll call a re-render on entity ids that are not drawn.
-                for (var i = 0; i < entityIds.length; i++) {
-                    _loop_1(i);
-                }
                 this.renderEntityIds({
-                    entityIds: toDrawIds
+                    entityIds: entityIds.filter(function (x) { return !_this.drawnIds.includes(x); })
                 });
+                this.drawnIds = [].concat(entityIds);
             };
             Manager.prototype.Dispose = function () {
                 if (this.disposed) {
@@ -9173,18 +9173,25 @@
             };
             /**
              * Re-renders specific entity relationships.
-             * @TODO: This should re-render all relationships when entityIds=null.
              * @param params
              */
             Manager.prototype.ReRender = function (params) {
                 return __awaiter(this, void 0, void 0, function () {
                     var entityIds, force;
+                    var _this = this;
                     return __generator(this, function (_a) {
                         entityIds = params.entityIds, force = params.force;
-                        if (entityIds == null) ;
+                        if (entityIds == null) {
+                            this.renderEntityIds({
+                                entityIds: this.drawnIds
+                            });
+                        }
                         else {
                             this.renderEntityIds({
-                                dataEntityIds: entityIds
+                                // TODO: This is a guess and not a proper check.
+                                // We need to record rendered relationships and check against them rather than the ID stored as the ID can be a child or parent.
+                                dataEntityIds: entityIds.filter(function (x) { return !_this.drawnIds.includes(x); }),
+                                entityIds: entityIds.filter(function (x) { return _this.drawnIds.includes(x); })
                             });
                         }
                         return [2 /*return*/];
@@ -9261,7 +9268,7 @@
                                 }
                             }).then(function (data) {
                                 var relations = data.relations;
-                                var _loop_2 = function (j) {
+                                var _loop_1 = function (j) {
                                     var relation = relations[j];
                                     var key = RelationRenderEngine.GetRenderGroupId(relation);
                                     if (!drawn.find(function (x) { return x == key; })) {
@@ -9274,7 +9281,7 @@
                                     }
                                 };
                                 for (var j = 0; j < relations.length; j++) {
-                                    _loop_2(j);
+                                    _loop_1(j);
                                 }
                                 onResolve();
                             }).catch(function (e) {
@@ -9356,7 +9363,7 @@
                                     cEntity = cEntities[key];
                                     if (cEntity && this.shouldRenderRelation(relation)) {
                                         visual = (_a = this.register.GetRego({
-                                            entityId: key,
+                                            relation: relation,
                                             menuItemId: this.item.id
                                         })) === null || _a === void 0 ? void 0 : _a.visual;
                                         if (!visual || visual != cEntity) {
@@ -15428,7 +15435,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.7.9";
+    var VERSION$1 = "2.8.1";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;