bruce-cesium 2.7.9 → 2.8.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, JulianDate, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidTerrainProvider, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, ColorMaterialProperty, GeometryInstance, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, JulianDate, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, KmlDataSource, createOsmBuildings, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, CesiumInspector, defined, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -4249,20 +4249,33 @@ var VisualsRegister;
         /**
          * 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.
@@ -4275,8 +4288,8 @@ var VisualsRegister;
             // 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 [];
                 }
@@ -4285,8 +4298,8 @@ var VisualsRegister;
             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) {
@@ -4315,8 +4328,8 @@ var VisualsRegister;
             // 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) {
@@ -4328,9 +4341,9 @@ var VisualsRegister;
                             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,
@@ -4338,7 +4351,7 @@ var VisualsRegister;
                             rego: rego
                         });
                         if (doesInclude) {
-                            updateEntity(this.viewer, entityId_3, this);
+                            updateEntity(this.viewer, entityId_4, this);
                         }
                     }
                 }
@@ -4374,23 +4387,23 @@ var VisualsRegister;
                 }
             }
             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);
                         }
                     }
                 }
@@ -9133,6 +9146,9 @@ var RelationsRenderManager;
             // 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;
@@ -9153,6 +9169,7 @@ var RelationsRenderManager;
          * @returns
          */
         Manager.prototype.Init = function (params) {
+            var _this = this;
             var _a;
             if (this.disposed) {
                 return;
@@ -9165,8 +9182,6 @@ var RelationsRenderManager;
             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 = [];
@@ -9181,27 +9196,12 @@ var RelationsRenderManager;
                         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) {
@@ -9214,18 +9214,25 @@ var RelationsRenderManager;
         };
         /**
          * 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*/];
@@ -9302,7 +9309,7 @@ var RelationsRenderManager;
                             }
                         }).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; })) {
@@ -9315,7 +9322,7 @@ var RelationsRenderManager;
                                 }
                             };
                             for (var j = 0; j < relations.length; j++) {
-                                _loop_2(j);
+                                _loop_1(j);
                             }
                             onResolve();
                         }).catch(function (e) {
@@ -9397,7 +9404,7 @@ var RelationsRenderManager;
                                 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) {
@@ -15482,7 +15489,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.7.9";
+var VERSION$1 = "2.8.1";
 
 export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map