bruce-cesium 4.5.8 → 4.6.0

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, Cesium3DTileColorBlendMode, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, NearFarScalar, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, Quaternion, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, CesiumInspector, ClockRange, Matrix4, Matrix3, IonResource, BoundingSphere, GeometryInstance, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -611,13 +611,13 @@ var DrawingUtils;
     /**
      * Returns the point across a polyline at a given distance.
      * If the distance exceeds the length of the line, the point will be placed at the end of the line.
-     * @param viewer
+     * @param viewer deprecated, unused.
      * @param positions
      * @param distance
      * @returns
      */
     function PointAcrossPolyline(params) {
-        var viewer = params.viewer, positions = params.posses, distance = params.distance;
+        var positions = params.posses, distance = params.distance;
         if (distance <= 0 && positions.length > 0) {
             return {
                 point: positions[0]
@@ -638,7 +638,7 @@ var DrawingUtils;
                 if (length_1 + currentDistance >= distance) {
                     var carto1 = Cartographic.fromCartesian(positions[i]);
                     var carto2 = Cartographic.fromCartesian(positions[i + 1]);
-                    var geodesic = new EllipsoidGeodesic(carto1, carto2, viewer.scene.globe.ellipsoid);
+                    var geodesic = new EllipsoidGeodesic(carto1, carto2);
                     //const position = geodesic.interpolateUsingSurfaceDistance(distance - currentDistance);
                     var position = geodesic.interpolateUsingFraction((distance - currentDistance) / length_1);
                     var height = (carto1.height + carto2.height) / 2;
@@ -3343,7 +3343,7 @@ var EntityUtils;
         if (selectable == null) {
             selectable = false;
         }
-        if (entity instanceof Entity) {
+        if (entity instanceof Entity || entity instanceof Cesium3DTileFeature) {
             var cEntity = entity;
             var items = [];
             traverseEntity(cEntity, items, false, editable, selectable);
@@ -9996,12 +9996,25 @@ function updateEntityShow(viewer, rego, show) {
     }
     else if (visual instanceof Cesium3DTileFeature) {
         // No way to tell if changing show will crash it!
+        // ^ We need to improve removing visuals from the register when tiles unload to avoid this :)
         try {
             visual.show = show;
         }
         catch (e) {
             console.error(e);
         }
+        var ent = visual;
+        if (ent._siblingGraphics) {
+            for (var i = 0; i < ent._siblingGraphics.length; i++) {
+                try {
+                    var sibling = ent._siblingGraphics[i];
+                    sibling.show = show;
+                }
+                catch (e) {
+                    console.error(e);
+                }
+            }
+        }
     }
 }
 function updateEntity(viewer, entityId, register) {
@@ -10077,6 +10090,14 @@ function markEntity(register, rego, visual, ignoreParent) {
             }
         }
     }
+    else if (visual instanceof Cesium3DTileFeature) {
+        var visEnt = visual;
+        if (visEnt._siblingGraphics) {
+            for (var i = 0; i < visEnt._siblingGraphics.length; i++) {
+                markEntity(register, rego, visEnt._siblingGraphics[i], true);
+            }
+        }
+    }
 }
 function unmarkEntity(visual, ignoreParent) {
     var vis = visual;
@@ -10092,6 +10113,14 @@ function unmarkEntity(visual, ignoreParent) {
             }
         }
     }
+    else if (visual instanceof Cesium3DTileFeature) {
+        var visEnt = visual;
+        if (visEnt._siblingGraphics) {
+            for (var i = 0; i < visEnt._siblingGraphics.length; i++) {
+                unmarkEntity(visEnt._siblingGraphics[i], true);
+            }
+        }
+    }
 }
 /**
  * Manages a registry of all Bruce visuals being rendered by menu items.
@@ -10542,7 +10571,7 @@ var VisualsRegister;
             // ND-2078
             // Tilesets will often add -> remove -> add because of how tiles load in and out of the scene.
             // To avoid flickering, we'll just replace rather than remove -> add.
-            if (!rego.tilesetId) {
+            if (!rego.tilesetId && params.removePrior != false) {
                 this.RemoveRegos({
                     entityId: rego.entityId,
                     menuItemId: rego.menuItemId,
@@ -16935,7 +16964,7 @@ var TilesetOsmRenderManager;
         };
         Manager.prototype.mapTileBatch = function (features) {
             return __awaiter(this, void 0, void 0, function () {
-                var featureIds, featureMap, _loop_1, this_1, i, api, bIds, i, osmId, bruceId, feature, rego;
+                var featureIds, featureMap, _loop_1, this_1, i, api, bIds, i, osmId, bruceId, feature, rego, visual;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -16975,22 +17004,52 @@ var TilesetOsmRenderManager;
                                 if (this.item.ghostLoading == true) {
                                     feature.color = feature._orgColor;
                                 }
-                                rego = {
-                                    entityId: bruceId,
-                                    menuItemId: this.item.id,
-                                    menuItemType: this.item.Type,
-                                    priority: 0,
-                                    visual: feature,
-                                    entityTypeId: this.entityTypeId,
-                                    sourceEntityId: osmId,
-                                    accountId: this.getters.GetAccountId()
-                                };
-                                if (this.sourceId) {
-                                    rego.sourceId = this.sourceId;
+                                rego = this._loadedCesiumEntities[bruceId];
+                                // Rego already exists, we'll add this graphic as a sibling.
+                                if (rego) {
+                                    if (!rego.visual) {
+                                        // No parent graphic.
+                                        rego.visual = feature;
+                                    }
+                                    else if (rego.visual == feature) {
+                                        // Same graphic.
+                                        continue;
+                                    }
+                                    else {
+                                        visual = rego.visual;
+                                        // Sibling graphic.
+                                        if (!visual._siblingGraphics) {
+                                            visual._siblingGraphics = [];
+                                        }
+                                        if (visual._siblingGraphics.indexOf(feature) < 0) {
+                                            visual._siblingGraphics.push(feature);
+                                        }
+                                        // Already exists.
+                                        else {
+                                            continue;
+                                        }
+                                    }
+                                }
+                                // Doesn't exist. Create a rego.
+                                else {
+                                    rego = {
+                                        entityId: bruceId,
+                                        menuItemId: this.item.id,
+                                        menuItemType: this.item.Type,
+                                        priority: 0,
+                                        visual: feature,
+                                        entityTypeId: this.entityTypeId,
+                                        sourceEntityId: osmId,
+                                        accountId: this.getters.GetAccountId()
+                                    };
+                                    if (this.sourceId) {
+                                        rego.sourceId = this.sourceId;
+                                    }
                                 }
                                 this.visualsManager.AddRego({
                                     rego: rego,
-                                    requestRender: false
+                                    requestRender: false,
+                                    removePrior: false
                                 });
                                 this._loadedCesiumEntities[bruceId] = rego;
                             }
@@ -27780,7 +27839,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.5.8";
+var VERSION = "4.6.0";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map