bruce-cesium 4.8.8 → 4.9.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, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, 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, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10135,6 +10135,7 @@ function updateEntityShow(viewer, rego, show) {
     }
 }
 function updateEntity(viewer, entityId, register, refresh, cache) {
+    var _a;
     if (cache === void 0) { cache = {}; }
     // Unavailable for unoptimized single-Entity updates.
     if (!cache) {
@@ -10143,7 +10144,14 @@ function updateEntity(viewer, entityId, register, refresh, cache) {
     var regos = register.GetRegos({
         entityId: entityId
     });
-    function getShowState(state) {
+    regos.sort(function (a, b) {
+        return b.priority - a.priority;
+    });
+    var highestPriority = (_a = regos[0]) === null || _a === void 0 ? void 0 : _a.priority;
+    if (!highestPriority) {
+        highestPriority = 0;
+    }
+    function getShowState(rego, state) {
         if (state.hidden) {
             return false;
         }
@@ -10155,10 +10163,11 @@ function updateEntity(viewer, entityId, register, refresh, cache) {
                 return false;
             }
         }
-        // TODO: Should show only unique graphics.
-        // Eg: two if the same looking points in the same place should not be shown!
-        // return rego === highestPriority;
-        return true;
+        // We show all regos in the same highest priority level.
+        // So if a new visual is added that's higher priority, all lower ones get hidden.
+        // By default, everything has 0 priority unless explicitly set.
+        var priority = rego.priority ? rego.priority : 0;
+        return priority == highestPriority;
     }
     for (var i = 0; i < regos.length; i++) {
         var rego = regos[i];
@@ -10168,7 +10177,7 @@ function updateEntity(viewer, entityId, register, refresh, cache) {
         });
         var visible = rego.overrideShow;
         if (visible == null || visible === undefined) {
-            visible = getShowState(state);
+            visible = getShowState(rego, state);
         }
         updateEntityShow(viewer, rego, visible);
         if (visible) {
@@ -10685,8 +10694,41 @@ var VisualsRegister;
          * Returns all visual state settings.
          * This is typically used for saving.
          */
-        Register.prototype.GetStates = function () {
-            return this.states;
+        Register.prototype.GetStates = function (params) {
+            if (!(params === null || params === void 0 ? void 0 : params.optimized)) {
+                return this.states;
+            }
+            var newStates = {};
+            var keys = Object.keys(this.states);
+            for (var i = 0; i < keys.length; i++) {
+                var key = keys[i];
+                var state = this.states[key];
+                // Dereference.
+                state = __assign({}, state);
+                if (state.opacity === 1) {
+                    delete state.opacity;
+                }
+                if (state.hidden === false) {
+                    delete state.hidden;
+                }
+                if (state.highlighted === false) {
+                    delete state.highlighted;
+                }
+                if (state.selected === false) {
+                    delete state.selected;
+                }
+                if (state.labelled === false) {
+                    delete state.labelled;
+                }
+                if (state.isolated === false) {
+                    delete state.isolated;
+                }
+                if (isBlankState(state)) {
+                    continue;
+                }
+                newStates[key] = state;
+            }
+            return newStates;
         };
         /**
          * Applies a set of new states to override the existing ones.
@@ -11582,8 +11624,7 @@ var VisualsRegister;
                 this.setStateValues({
                     entityId: entityId,
                     menuItemId: menuItemId,
-                    // Null means it will be deleted from the object.
-                    opacity: opacity == 1 ? null : opacity
+                    opacity: opacity
                 });
                 (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
                     type: EVisualUpdateType.Update,
@@ -12632,6 +12673,10 @@ var EntitiesRenderManager;
                     }
                 ];
             }
+            this.renderPriority = this.item.renderPriority;
+            if (this.renderPriority == null) {
+                this.renderPriority = 1;
+            }
             if (this.useGeojson && this.zoomControl.length > 1) {
                 console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
                 this.zoomControl = [this.zoomControl[0]];
@@ -13280,7 +13325,7 @@ var EntitiesRenderManager;
                                         menuItemId: _this.item.id,
                                         menuItemType: _this.item.Type,
                                         visual: thing,
-                                        priority: 0,
+                                        priority: _this.renderPriority,
                                         entityTypeId: group.entityTypeId,
                                         accountId: _this.apiGetter.accountId,
                                         tagIds: group.tagIds ? [].concat(group.tagIds) : [],
@@ -13435,7 +13480,7 @@ var EntitiesRenderManager;
                                             menuItemId: this.item.id,
                                             menuItemType: this.item.Type,
                                             visual: cEntity,
-                                            priority: 0,
+                                            priority: this.renderPriority,
                                             entityTypeId: entity.Bruce["EntityType.ID"],
                                             accountId: this.apiGetter.accountId,
                                             tagIds: tagIds ? [].concat(tagIds) : [],
@@ -13731,6 +13776,10 @@ var EntitiesLoadedRenderManager;
                     }
                 ];
             }
+            this.renderPriority = this.item.renderPriority;
+            if (this.renderPriority == null) {
+                this.renderPriority = 2;
+            }
             if (this.renderAsGeojson && this.item.CameraZoomSettings.length > 1) {
                 console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
                 this.item.CameraZoomSettings = [this.item.CameraZoomSettings[0]];
@@ -14208,7 +14257,7 @@ var EntitiesLoadedRenderManager;
                                         menuItemId: _this.item.id,
                                         menuItemType: _this.item.Type,
                                         visual: thing,
-                                        priority: 0,
+                                        priority: _this.renderPriority,
                                         entityTypeId: group.entityTypeId,
                                         accountId: _this.apiGetter.accountId,
                                         tagIds: group.tagIds ? [].concat(group.tagIds) : [],
@@ -14313,7 +14362,7 @@ var EntitiesLoadedRenderManager;
                                                 menuItemId: this.item.id,
                                                 menuItemType: this.item.Type,
                                                 visual: cEntity,
-                                                priority: 0,
+                                                priority: this.renderPriority,
                                                 entityTypeId: entity.Bruce["EntityType.ID"],
                                                 accountId: this.apiGetter.accountId,
                                                 name: cEntity.name
@@ -14419,6 +14468,10 @@ var EntitiesIdsRenderManager;
                     }
                 ];
             }
+            this.renderPriority = this.item.renderPriority;
+            if (this.renderPriority == null) {
+                this.renderPriority = 2;
+            }
             if (this.renderAsGeojson && this.item.CameraZoomSettings.length > 1) {
                 console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
                 this.item.CameraZoomSettings = [this.item.CameraZoomSettings[0]];
@@ -14848,7 +14901,7 @@ var EntitiesIdsRenderManager;
                                         menuItemId: _this.item.id,
                                         menuItemType: _this.item.Type,
                                         visual: thing,
-                                        priority: 0,
+                                        priority: _this.renderPriority,
                                         entityTypeId: group.entityTypeId,
                                         accountId: _this.apiGetter.accountId,
                                         tagIds: group.tagIds ? [].concat(group.tagIds) : [],
@@ -14944,7 +14997,7 @@ var EntitiesIdsRenderManager;
                                                 menuItemId: this.item.id,
                                                 menuItemType: this.item.Type,
                                                 visual: cEntity,
-                                                priority: 0,
+                                                priority: this.renderPriority,
                                                 entityTypeId: entity.Bruce["EntityType.ID"],
                                                 accountId: this.apiGetter.accountId,
                                                 overrideShow: clustered ? false : null,
@@ -15030,6 +15083,10 @@ var EntityRenderManager;
                     }
                 ];
             }
+            this.renderPriority = this.item.renderPriority;
+            if (this.renderPriority == null) {
+                this.renderPriority = 4;
+            }
             this.getter = new BatchedDataGetter.Getter([this.item.BruceEntity.EntityId], this.monitor, 1);
             this.getterSub = this.getter.OnUpdate.Subscribe(function (ids) {
                 _this.onGetterUpdate(ids[0]);
@@ -15164,7 +15221,7 @@ var EntityRenderManager;
                                             menuItemId: this.item.id,
                                             menuItemType: this.item.Type,
                                             visual: cEntity,
-                                            priority: 0,
+                                            priority: this.renderPriority,
                                             entityTypeId: entity.Bruce["EntityType.ID"],
                                             accountId: this.apiGetter.accountId,
                                             name: cEntity.name
@@ -16531,6 +16588,10 @@ var TilesetCadRenderManager;
             if (!tilesetId) {
                 return;
             }
+            this.renderPriority = this.item.renderPriority;
+            if (this.renderPriority == null) {
+                this.renderPriority = 0;
+            }
             (function () { return __awaiter(_this, void 0, void 0, function () {
                 var api, tileset, settings, rootId, coords, cTileset, _a;
                 var _this = this;
@@ -16664,7 +16725,7 @@ var TilesetCadRenderManager;
                 entityTypeId: null,
                 menuItemId: this.item.id,
                 menuItemType: this.item.Type,
-                priority: 0,
+                priority: this.renderPriority,
                 visual: feature,
                 accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
@@ -16896,6 +16957,10 @@ var DataLabRenderManager;
                     }
                 ];
             }
+            this.renderPriority = this.item.renderPriority;
+            if (this.renderPriority == null) {
+                this.renderPriority = 3;
+            }
             // Perform the initial query and subscribe to updates
             this.getter = new BatchedDataGetter.Getter([this.item.DataLabQueryID], this.monitor, 1);
             this.getter.OnUpdate.Subscribe(function (queryIds) {
@@ -16989,7 +17054,7 @@ var DataLabRenderManager;
                                                 menuItemId: this.item.id,
                                                 menuItemType: this.item.Type,
                                                 visual: cEntity,
-                                                priority: 0,
+                                                priority: this.renderPriority,
                                                 entityTypeId: entity.Bruce["EntityType.ID"],
                                                 accountId: this.apiGetter.accountId,
                                                 name: cEntity.name
@@ -18553,6 +18618,10 @@ var TilesetEntitiesRenderManager;
             if (params === null || params === void 0 ? void 0 : params.item) {
                 this.item = params.item;
             }
+            this.renderPriority = this.item.renderPriority;
+            if (this.renderPriority == null) {
+                this.renderPriority = 0;
+            }
             var tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
             if (!tilesetId) {
                 return;
@@ -18751,7 +18820,7 @@ var TilesetEntitiesRenderManager;
                     entityTypeId: this.typeId,
                     menuItemId: this.item.id,
                     menuItemType: this.item.Type,
-                    priority: 0,
+                    priority: this.renderPriority,
                     visual: feature,
                     tilesetId: (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID,
                     tilesetType: Tileset.EType.EntitiesSet,
@@ -19153,6 +19222,10 @@ var TilesetArbRenderManager;
         Manager.prototype.Init = function () {
             var _this = this;
             var _a, _b, _c;
+            this.renderPriority = this.item.renderPriority;
+            if (this.renderPriority == null) {
+                this.renderPriority = 0;
+            }
             // Horrid backwards compatibility.
             var loadUrlOverride = null;
             if (this.item.tileset) {
@@ -19428,7 +19501,7 @@ var TilesetArbRenderManager;
                 entityTypeId: null,
                 menuItemId: this.item.id,
                 menuItemType: this.item.Type,
-                priority: 0,
+                priority: this.renderPriority,
                 visual: feature,
                 accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
@@ -29309,7 +29382,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.8.8";
+var VERSION = "4.9.0";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, 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