bruce-cesium 2.1.5 → 2.1.7

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, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, Entity, Primitive, Cesium3DTileFeature, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, NearFarScalar, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, CesiumInspector, PolygonPipeline, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, SceneMode, Cesium3DTileColorBlendMode, Cesium3DTileStyle, createOsmBuildings, KmlDataSource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, NearFarScalar, PolygonPipeline, CesiumInspector, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -549,6 +549,34 @@ var DrawingUtils;
     DrawingUtils.EnsurePosHeight = EnsurePosHeight;
 })(DrawingUtils || (DrawingUtils = {}));
 
+/**
+ * Returns if a given visual is alive and in the scene.
+ * @param viewer
+ * @param visual
+ * @returns
+ */
+function isAlive(viewer, visual) {
+    if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene) || viewer.isDestroyed()) {
+        return false;
+    }
+    if (visual instanceof Entity) {
+        return viewer.entities.contains(visual);
+    }
+    else if (visual instanceof Primitive) {
+        return viewer.scene.primitives.contains(visual);
+    }
+    else if (visual instanceof Cesium3DTileFeature) {
+        var cTileset = visual === null || visual === void 0 ? void 0 : visual.tileset;
+        if (!cTileset) {
+            return false;
+        }
+        if (cTileset.isDestroyed() || !viewer.scene.primitives.contains(cTileset)) {
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
 function traverseEntity(cEntity, arr, ignoreParent) {
     if (cEntity._parentEntity && !ignoreParent) {
         traverseEntity(cEntity._parentEntity, arr, false);
@@ -597,6 +625,9 @@ function applyOpacityToGraphic(viewer, entity, graphicKey, materialKey, opacity)
     }
 }
 function revertAppliedEntityOpacity(viewer, entity) {
+    if (!isAlive(viewer, entity)) {
+        return;
+    }
     entity[NEW_OPACITY_KEY] = null;
     if (entity instanceof Entity) {
         var processKey = function (graphicKey, materialKey) {
@@ -626,6 +657,9 @@ function revertAppliedEntityOpacity(viewer, entity) {
     }
 }
 function applyOpacityToEntity(viewer, opacity, entity) {
+    if (!isAlive(viewer, entity)) {
+        return;
+    }
     entity[NEW_OPACITY_KEY] = opacity;
     if (entity instanceof Entity) {
         var processKey = function (graphicKey, materialKey) {
@@ -665,7 +699,7 @@ function applyOpacityToEntity(viewer, opacity, entity) {
     }
 }
 function findOpacity(entity) {
-    return entity[NEW_OPACITY_KEY];
+    return entity ? entity[NEW_OPACITY_KEY] : null;
 }
 function GetValue(viewer, obj) {
     if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
@@ -1972,7 +2006,9 @@ var EntityRenderEngine;
                                 })];
                         case 5:
                             cEntity = _d.sent();
-                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
+                            if (cEntity) {
+                                cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
+                            }
                             cEntities[entity.Bruce.ID] = cEntity;
                             _d.label = 6;
                         case 6:
@@ -2035,11 +2071,17 @@ var EntityRenderEngine;
             }
             var bColor = style.lineColor ? Calculator.GetColor(style.lineColor, entity, params.tags) : null;
             var cColor = bColor ? colorToCColor(bColor) : Color.RED;
+            if (cColor.alpha <= 0) {
+                return null;
+            }
             var width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
             if (width == null) {
                 width = 4;
             }
             width = EnsureNumber(width);
+            if (width < 0.01) {
+                width = 0;
+            }
             if (width <= 0) {
                 return null;
             }
@@ -2135,7 +2177,12 @@ var EntityRenderEngine;
                 width = 4;
             }
             width = EnsureNumber(width);
-            if (width <= 0) {
+            if (width < 0.01) {
+                width = 0;
+            }
+            // If both outline and fill is not available then don't render anything.
+            if ((width <= 0 || cLineColor.alpha <= 0) &&
+                cFillColor.alpha <= 0) {
                 return null;
             }
             var heightRef = getHeightRef(style);
@@ -3586,6 +3633,34 @@ var RelationRenderEngine;
     })(Parabola = RelationRenderEngine.Parabola || (RelationRenderEngine.Parabola = {}));
 })(RelationRenderEngine || (RelationRenderEngine = {}));
 
+/**
+ * Returns if a given visual is alive and in the scene.
+ * @param viewer
+ * @param visual
+ * @returns
+ */
+function isAlive$1(viewer, visual) {
+    if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene) || viewer.isDestroyed()) {
+        return false;
+    }
+    if (visual instanceof Entity) {
+        return viewer.entities.contains(visual);
+    }
+    else if (visual instanceof Primitive) {
+        return viewer.scene.primitives.contains(visual);
+    }
+    else if (visual instanceof Cesium3DTileFeature) {
+        var cTileset = visual === null || visual === void 0 ? void 0 : visual.tileset;
+        if (!cTileset) {
+            return false;
+        }
+        if (cTileset.isDestroyed() || !viewer.scene.primitives.contains(cTileset)) {
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
 function removeEntity(viewer, visual) {
     unmarkEntity(visual, false);
     if (visual instanceof Entity) {
@@ -3626,6 +3701,9 @@ function updateCEntityShow(viewer, visual, show, ignoreParent) {
     }
 }
 function updateEntityShow(viewer, visual, show) {
+    if (!isAlive$1(viewer, visual)) {
+        return;
+    }
     if (visual instanceof Entity) {
         updateCEntityShow(viewer, visual, show, false);
     }
@@ -3709,6 +3787,9 @@ function unmarkEntity(visual, ignoreParent) {
 var ORG_COLOR_KEY = "_org_color_";
 function select(viewer, visual, color) {
     var _a;
+    if (!isAlive$1(viewer, visual)) {
+        return;
+    }
     if (!color) {
         color = Color.fromAlpha(Color.YELLOW, 0.5);
     }
@@ -3768,6 +3849,9 @@ function select(viewer, visual, color) {
     }
 }
 function deselect(viewer, visual) {
+    if (!isAlive$1(viewer, visual)) {
+        return;
+    }
     if (visual instanceof Entity) {
         var entities = EntityUtils.GatherEntity({
             entity: visual
@@ -4735,7 +4819,7 @@ function colorToCColor$2(color) {
  * @param cTileset
  * @returns
  */
-function isAlive(viewer, cTileset) {
+function isAlive$2(viewer, cTileset) {
     if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene)) {
         return false;
     }
@@ -4959,7 +5043,7 @@ var TilesetRenderEngine;
                         cTileset_1.readyPromise.then(function () {
                             var _a, _b, _c, _d;
                             try {
-                                if (!isAlive(params.viewer, cTileset_1)) {
+                                if (!isAlive$2(params.viewer, cTileset_1)) {
                                     return;
                                 }
                                 (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset_1);
@@ -5008,7 +5092,7 @@ var TilesetRenderEngine;
                         cTileset_2.readyPromise.then(function () {
                             var _a;
                             try {
-                                if (!isAlive(params.viewer, cTileset_2)) {
+                                if (!isAlive$2(params.viewer, cTileset_2)) {
                                     return;
                                 }
                                 (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset_2);
@@ -5086,7 +5170,7 @@ var TilesetRenderEngine;
                         cTileset.readyPromise.then(function () {
                             var _a;
                             try {
-                                if (!isAlive(viewer, cTileset)) {
+                                if (!isAlive$2(viewer, cTileset)) {
                                     return;
                                 }
                                 (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset);
@@ -5572,7 +5656,7 @@ var TilesetRenderEngine;
         MemoryWatcher.prototype.clean = function () {
             var _this = this;
             // Remove all dead tilesets.
-            this.watched = this.watched.filter(function (x) { return isAlive(_this.viewer, x); });
+            this.watched = this.watched.filter(function (x) { return isAlive$2(_this.viewer, x); });
             // Check if viewer is destroyed.
             if (!this.viewer || this.viewer.isDestroyed()) {
                 this.destroy();