bruce-cesium 2.5.1 → 2.5.3

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, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, Model, ScreenSpaceEventHandler, ScreenSpaceEventType, CesiumInspector, IonResource, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, Cesium3DTileset, Model, PolygonPipeline, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, IonResource, CesiumInspector, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1978,7 +1978,6 @@ var EntityRenderEngine;
                                         rendered = rendered.filter(function (x) { return x != null; });
                                         if (rendered.length) {
                                             rootEntity_1 = new Entity({});
-                                            params.viewer.entities.add(rootEntity_1);
                                             rootEntity_1._siblingGraphics = [];
                                             rootEntity_1._renderGroup = getRenderGroupId(zoomItem, (_h = params.viewer) === null || _h === void 0 ? void 0 : _h.terrainProvider);
                                             rootEntity_1._siblingGraphics = rootEntity_1._siblingGraphics.concat(rendered);
@@ -2182,7 +2181,7 @@ var EntityRenderEngine;
                                             recordHeightRef: heightRef,
                                             returnHeightRef: heightRef
                                         }),
-                                        show: false
+                                        show: true
                                     });
                                 }
                             }
@@ -2229,7 +2228,7 @@ var EntityRenderEngine;
                                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
                                     },
                                     position: pos === null || pos === void 0 ? void 0 : pos.clone(),
-                                    show: false
+                                    show: true
                                 });
                                 if (outline && outlineWidth > 0) {
                                     if (!exHeightRef && outlineHeight > 0) {
@@ -2278,16 +2277,10 @@ var EntityRenderEngine;
                                         recordHeightRef: heightRef,
                                         returnHeightRef: heightRef
                                     }),
-                                    show: false
+                                    show: true
                                 });
                             }
                             if (cEntity) {
-                                params.viewer.entities.add(cEntity);
-                                if (siblings) {
-                                    siblings.forEach(function (sibling) {
-                                        params.viewer.entities.add(sibling);
-                                    });
-                                }
                                 cEntity._siblingGraphics = siblings;
                             }
                             return [2 /*return*/, cEntity];
@@ -2455,9 +2448,8 @@ var EntityRenderEngine;
                     recordHeightRef: heightRef,
                     returnHeightRef: heightRef
                 }),
-                show: false
+                show: true
             });
-            params.viewer.entities.add(cEntity);
             return cEntity;
         }
         Polyline.Render = Render;
@@ -2582,7 +2574,7 @@ var EntityRenderEngine;
                     recordHeightRef: heightRef,
                     returnHeightRef: heightRef
                 }),
-                show: false
+                show: true
             });
             cEntity._siblingGraphics = [];
             if (width > 0 && cLineColor) {
@@ -2633,9 +2625,8 @@ var EntityRenderEngine;
                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                         shadows: ShadowMode.ENABLED
                     },
-                    show: false
+                    show: true
                 });
-                params.viewer.entities.add(cEntityBorder);
                 cEntityBorder._parentEntity = cEntity;
                 cEntity._siblingGraphics.push(cEntityBorder);
                 for (var i = 0; i < holePosses.length; i++) {
@@ -2665,14 +2656,12 @@ var EntityRenderEngine;
                             distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                             shadows: ShadowMode.ENABLED,
                         },
-                        show: false
+                        show: true
                     });
                     cEntity._siblingGraphics.push(cEntityHole);
                     cEntityHole._parentEntity = cEntity;
-                    params.viewer.entities.add(cEntityHole);
                 }
             }
-            params.viewer.entities.add(cEntity);
             return cEntity;
         }
         Polygon.Render = Render;
@@ -2797,7 +2786,7 @@ var EntityRenderEngine;
                 },
                 orientation: orientation,
                 position: pos,
-                show: false
+                show: true
             });
             var model = cEntity.model;
             model._clientFileId = params.lodClientFileId;
@@ -2805,7 +2794,6 @@ var EntityRenderEngine;
                 record: scale,
                 style: styleScale
             };
-            params.viewer.entities.add(cEntity);
             return cEntity;
         }
         Model3d.Render = Render;
@@ -3543,18 +3531,29 @@ function updateCEntityShow(viewer, visual, show, ignoreParent) {
             updateCEntityShow(viewer, sibling, show, true);
         }
     }
-    if (viewer.entities.contains(visual)) {
-        visual.show = show;
+    /**
+     * Do NOT use ".show" as it causes crashes in Cesium polylines that are clamped to ground.
+     * We could target them specifically here but we may be getting overall performance gain by just removing stuff from the scene.
+     */
+    if (!show && viewer.entities.contains(visual)) {
+        viewer.entities.remove(visual);
+    }
+    else if (show && !viewer.entities.contains(visual)) {
+        viewer.entities.add(visual);
     }
 }
 function updateEntityShow(viewer, visual, show) {
-    if (!isAlive$1(viewer, visual)) {
-        return;
-    }
     if (visual instanceof Entity) {
+        if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene) || viewer.isDestroyed()) {
+            return;
+        }
         updateCEntityShow(viewer, visual, show, false);
+        return;
     }
-    else if (visual instanceof Primitive) {
+    if (!isAlive$1(viewer, visual)) {
+        return;
+    }
+    if (visual instanceof Primitive) {
         if (viewer.scene.primitives.contains(visual)) {
             visual.show = show;
         }
@@ -4734,6 +4733,9 @@ var PointClustering = /** @class */ (function () {
             }
         }
     }
+    PointClustering.prototype.Update = function () {
+        this.updateQueue.Call();
+    };
     PointClustering.prototype.queueForceUpdate = function (entityIds) {
         for (var i = 0; i < entityIds.length; i++) {
             if (this.updateEntityQueue.includes(entityIds[i])) {
@@ -5131,9 +5133,11 @@ var PointClustering = /** @class */ (function () {
      * Will return false if entity could not be clustered and therefor should not be hidden.
      * @param id
      * @param entity
+     * @param queueUpdate
      * @returns
      */
-    PointClustering.prototype.AddEntity = function (id, entity) {
+    PointClustering.prototype.AddEntity = function (id, entity, queueUpdate) {
+        if (queueUpdate === void 0) { queueUpdate = true; }
         if (this.disposed) {
             return false;
         }
@@ -5177,15 +5181,17 @@ var PointClustering = /** @class */ (function () {
                 this.iconUrl = iconUrl;
             }
         }
+        if (this.registeredEntityIds.has(id)) {
+            this.RemoveEntity(id, false);
+        }
         var added = this.addPoint(id, pos3d);
         if (!added) {
             return false;
         }
-        if (this.registeredEntityIds.has(id)) {
-            this.RemoveEntity(id, false);
-        }
         this.registeredEntityIds.add(id);
-        this.updateQueue.Call();
+        if (queueUpdate) {
+            this.updateQueue.Call();
+        }
         return true;
     };
     /**
@@ -5550,7 +5556,7 @@ var EntitiesRenderManager;
                                         menuItemId: this.item.id
                                     })) === null || _b === void 0 ? void 0 : _b.visual;
                                     if (!visual || visual != cEntity) {
-                                        wasClustered = this.clustering ? this.clustering.AddEntity(id, cEntity) : false;
+                                        wasClustered = this.clustering ? this.clustering.AddEntity(id, cEntity, false) : false;
                                         tagIds = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c["Layer.ID"];
                                         rego = {
                                             entityId: id,
@@ -5576,10 +5582,13 @@ var EntitiesRenderManager;
                                         menuItemId: this.item.id,
                                         requestRender: false
                                     });
-                                    (_d = this.clustering) === null || _d === void 0 ? void 0 : _d.RemoveEntity(id);
+                                    (_d = this.clustering) === null || _d === void 0 ? void 0 : _d.RemoveEntity(id, false);
                                 }
                             }
                             this.viewer.scene.requestRender();
+                            if (this.clustering && entities.length) {
+                                this.clustering.Update();
+                            }
                             return [3 /*break*/, 3];
                         case 2:
                             e_3 = _e.sent();
@@ -6008,7 +6017,7 @@ var EntitiesIdsRenderManager;
                                         menuItemId: this.item.id
                                     })) === null || _a === void 0 ? void 0 : _a.visual;
                                     if (!visual || visual != cEntity) {
-                                        clustered = this.clustering ? this.clustering.AddEntity(id, cEntity) : false;
+                                        clustered = this.clustering ? this.clustering.AddEntity(id, cEntity, false) : false;
                                         this.visualsManager.AddRego({
                                             rego: {
                                                 entityId: id,
@@ -6030,10 +6039,13 @@ var EntitiesIdsRenderManager;
                                         menuItemId: this.item.id,
                                         requestRender: false
                                     });
-                                    (_b = this.clustering) === null || _b === void 0 ? void 0 : _b.RemoveEntity(id);
+                                    (_b = this.clustering) === null || _b === void 0 ? void 0 : _b.RemoveEntity(id, false);
                                 }
                             }
                             this.viewer.scene.requestRender();
+                            if (this.clustering && entities.length) {
+                                this.clustering.Update();
+                            }
                             return [3 /*break*/, 4];
                         case 3:
                             e_2 = _c.sent();
@@ -14847,7 +14859,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.5.1";
+var VERSION$1 = "2.5.3";
 
 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