bruce-cesium 1.1.4 → 1.1.5

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Entity, Primitive, Cesium3DTileFeature, Color, Cartesian2, Cartographic, Math as Math$1, Cartesian3, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileColorBlendMode, HeadingPitchRange, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, PolygonPipeline, CallbackProperty, createOsmBuildings, KmlDataSource } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, CallbackProperty, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, createOsmBuildings, KmlDataSource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -545,14 +545,14 @@ function EnsureNumber(value, defaultNum) {
     return value;
 }
 
-function traverseEntity(cEntity, arr) {
-    if (cEntity._parentEntity) {
-        traverseEntity(cEntity._parentEntity, arr);
+function traverseEntity(cEntity, arr, ignoreParent) {
+    if (cEntity._parentEntity && !ignoreParent) {
+        traverseEntity(cEntity._parentEntity, arr, false);
     }
     if (cEntity._siblingGraphics) {
         for (var i = 0; i < cEntity._siblingGraphics.length; i++) {
             var sibling = cEntity._siblingGraphics[i];
-            traverseEntity(sibling, arr);
+            traverseEntity(sibling, arr, true);
         }
     }
     arr.push(cEntity);
@@ -833,7 +833,7 @@ var EntityUtils;
         if (entity instanceof Entity) {
             var cEntity = entity;
             var items = [];
-            traverseEntity(cEntity, items);
+            traverseEntity(cEntity, items, false);
             return items;
         }
         return [entity];
@@ -1297,28 +1297,37 @@ var EntityRenderEngine;
     }
     EntityRenderEngine.Render = Render;
     function Remove(params) {
-        var viewer = params.viewer, entity = params.entity;
-        if (viewer.isDestroyed()) {
-            return;
-        }
-        if (entity._parentEntity) {
-            Remove({
-                viewer: viewer,
-                entity: entity._parentEntity
-            });
-        }
-        if (entity._siblingGraphics) {
-            for (var i = 0; i < entity._siblingGraphics.length; i++) {
-                var sibling = entity._siblingGraphics[i];
-                Remove({
+        function doRemove(params) {
+            var viewer = params.viewer, entity = params.entity, ignoreParent = params.ignoreParent;
+            if (viewer.isDestroyed()) {
+                return;
+            }
+            if (entity._parentEntity && !ignoreParent) {
+                doRemove({
                     viewer: viewer,
-                    entity: sibling
+                    entity: entity._parentEntity,
+                    ignoreParent: false
                 });
             }
+            if (entity._siblingGraphics) {
+                for (var i = 0; i < entity._siblingGraphics.length; i++) {
+                    var sibling = entity._siblingGraphics[i];
+                    doRemove({
+                        viewer: viewer,
+                        entity: sibling,
+                        ignoreParent: true
+                    });
+                }
+            }
+            if (viewer.entities.contains(entity)) {
+                viewer.entities.remove(entity);
+            }
         }
-        if (viewer.entities.contains(entity)) {
-            viewer.entities.remove(entity);
-        }
+        doRemove({
+            viewer: params.viewer,
+            entity: params.entity,
+            ignoreParent: false
+        });
     }
     EntityRenderEngine.Remove = Remove;
     var Point;
@@ -2840,7 +2849,7 @@ var RelationRenderEngine;
 })(RelationRenderEngine || (RelationRenderEngine = {}));
 
 function removeEntity(viewer, visual) {
-    unmarkEntity(visual);
+    unmarkEntity(visual, false);
     if (visual instanceof Entity) {
         EntityRenderEngine.Remove({
             viewer: viewer,
@@ -2944,17 +2953,17 @@ function markEntity(register, rego, visual) {
         }
     }
 }
-function unmarkEntity(visual) {
+function unmarkEntity(visual, ignoreParent) {
     var vis = visual;
     vis._register = null;
     if (visual instanceof Entity) {
         var visEnt = visual;
-        if (visEnt._parentEntity) {
-            unmarkEntity(visEnt._parentEntity);
+        if (visEnt._parentEntity && !ignoreParent) {
+            unmarkEntity(visEnt._parentEntity, false);
         }
         if (visEnt._siblingGraphics) {
             for (var i = 0; i < visEnt._siblingGraphics.length; i++) {
-                unmarkEntity(visEnt._siblingGraphics[i]);
+                unmarkEntity(visEnt._siblingGraphics[i], true);
             }
         }
     }