bruce-cesium 2.8.7 → 2.8.8

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, JulianDate, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, SceneTransforms, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, KmlDataSource, PolygonPipeline, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, CesiumInspector, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, GeometryInstance, BoundingSphere } from 'cesium';
+import { Cartographic, JulianDate, Color, HeightReference, Cartesian3, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Math as Math$1, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cartesian2, CallbackProperty, Rectangle, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -3810,12 +3810,12 @@ var EntityLabel;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
                         case 0:
+                            this.removeLabel();
                             pos3d = starterPos3d ? starterPos3d.clone() : null;
                             counter = ++this.counter;
                             if (this.disposed) {
                                 return [2 /*return*/];
                             }
-                            this.removeLabel();
                             sizeInM = 0;
                             heightRef = null;
                             pixelOffset = new Cartesian2(0, -5);
@@ -3950,7 +3950,7 @@ var EntityLabel;
                         case 1:
                             pos3d = _h.sent();
                             heightRef = HeightReference.NONE;
-                            if (this.counter != counter) {
+                            if (this.counter != counter || this.disposed) {
                                 return [2 /*return*/];
                             }
                             _h.label = 2;
@@ -4007,11 +4007,17 @@ var EntityLabel;
                             if (this.disposed || this.counter != counter) {
                                 return [2 /*return*/];
                             }
-                            ele = document.createElement("div");
-                            ele.innerHTML = text;
-                            ele.setAttribute("style", "\n                position: absolute;\n                z-index: 0;\n                display: none;\n                pointer-events: none;\n                padding: 6px 8px;\n                border-radius: 6px;\n                font-family: Arial;\n                font-size: 12px;\n                -webkit-backdrop-filter: blur(20px);\n                backdrop-filter: blur(20px);\n                background: rgba(33,39,42,.8);\n                border-radius: 9px;\n                box-shadow: 0 0 1px rgba(18,22,25,.36),0 18px 36px -4px rgba(18,22,25,.36);\n                color: #ffffff;\n            }");
-                            this.label = ele;
-                            this.viewer.container.appendChild(ele);
+                            ele = null;
+                            if (this.label) {
+                                ele = this.label;
+                            }
+                            else {
+                                ele = document.createElement("div");
+                                ele.innerHTML = text;
+                                ele.setAttribute("style", "\n                    position: absolute;\n                    z-index: 0;\n                    display: none;\n                    pointer-events: none;\n                    padding: 6px 8px;\n                    border-radius: 6px;\n                    font-family: Arial;\n                    font-size: 12px;\n                    -webkit-backdrop-filter: blur(20px);\n                    backdrop-filter: blur(20px);\n                    background: rgba(33,39,42,.8);\n                    border-radius: 9px;\n                    box-shadow: 0 0 1px rgba(18,22,25,.36),0 18px 36px -4px rgba(18,22,25,.36);\n                    color: #ffffff;\n                }");
+                                this.label = ele;
+                                this.viewer.container.appendChild(ele);
+                            }
                             _lastDistance = null;
                             _lastCameraPos = null;
                             getDistance = function () {
@@ -4114,12 +4120,12 @@ var EntityLabel;
                             updateLabel();
                             terrTimeout = null;
                             this.terrChangedRemoval = this.viewer.scene.terrainProviderChanged.addEventListener(function () {
-                                if (_this.disposed) {
+                                clearTimeout(terrTimeout);
+                                if (_this.disposed || _this.counter != counter) {
                                     return;
                                 }
-                                clearTimeout(terrTimeout);
                                 terrTimeout = setTimeout(function () {
-                                    if (counter != _this.counter) {
+                                    if (_this.disposed || counter != _this.counter) {
                                         return;
                                     }
                                     _this.createLabel(starterPos3d);
@@ -4353,6 +4359,11 @@ function updateEntity(viewer, entityId, register) {
                 });
             }
         }
+        else {
+            EntityLabel.Detatch({
+                rego: rego
+            });
+        }
     }
 }
 function markEntity(register, rego, visual, ignoreParent) {
@@ -4952,6 +4963,9 @@ var VisualsRegister;
                         if (shouldRetain) {
                             continue;
                         }
+                        EntityLabel.Detatch({
+                            rego: rego
+                        });
                         removeEntity(this.viewer, rego.visual);
                         var doesInclude = this.rego[entityId_4].find(function (r) { return r.menuItemId === menuItemId; });
                         if (doesInclude) {
@@ -4980,6 +4994,9 @@ var VisualsRegister;
                     if (!rego) {
                         return { value: void 0 };
                     }
+                    EntityLabel.Detatch({
+                        rego: rego
+                    });
                     removeEntity(this_2.viewer, rego.visual);
                     (_b = this_2.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({
                         type: EVisualUpdateType.Remove,
@@ -5007,6 +5024,9 @@ var VisualsRegister;
                         if (!rego) {
                             continue;
                         }
+                        EntityLabel.Detatch({
+                            rego: rego
+                        });
                         removeEntity(this.viewer, rego.visual);
                         this.rego[entityId_5] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId; });
                         (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger({
@@ -5027,7 +5047,7 @@ var VisualsRegister;
         /**
          * Returns an array of drilled visuals associated with this register.
          * The top array item is the first found.
-         * @param cursor
+         * @param params
          * @returns
          */
         Register.prototype.GetRegosFromCursor = function (params) {
@@ -10412,8 +10432,7 @@ var MenuItemManager;
         /**
          * Disables a menu item by its id.
          * This will disable all children as well.
-         * @param id
-         * @param recursive
+         * @param params
          */
         Manager.prototype.RemoveItemById = function (params) {
             var _a, _b;
@@ -12898,7 +12917,7 @@ function renderLegacyNavigator(iteration, params, bookmark, view) {
 function renderNavigator(iteration, params, bookmark, view) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, curLabelledIds, toUnLabel, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
         return __generator(this, function (_7) {
             switch (_7.label) {
                 case 0:
@@ -13126,15 +13145,24 @@ function renderNavigator(iteration, params, bookmark, view) {
                             entityIds: isolatedIds
                         });
                     }
-                    params.manager.VisualsRegister.ClearLabelled();
                     labelledIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.labelledEntityIds;
                     if (labelledIds == null) {
                         labelledIds = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.labelledEntityIds;
                     }
-                    if (labelledIds != null) {
+                    if (!(labelledIds === null || labelledIds === void 0 ? void 0 : labelledIds.length)) {
+                        params.manager.VisualsRegister.ClearLabelled();
+                    }
+                    else {
+                        curLabelledIds = params.manager.VisualsRegister.GetLabelled();
                         params.manager.VisualsRegister.SetLabelled({
                             labelled: true,
-                            entityIds: labelledIds
+                            entityIds: labelledIds,
+                            requestRender: false
+                        });
+                        toUnLabel = curLabelledIds.filter(function (id) { return labelledIds.indexOf(id) === -1; });
+                        params.manager.VisualsRegister.SetLabelled({
+                            labelled: false,
+                            entityIds: toUnLabel
                         });
                     }
                     params.manager.VisualsRegister.ClearOpacity();
@@ -16133,7 +16161,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.8.7";
+var VERSION$1 = "2.8.8";
 
 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, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map