bruce-cesium 2.7.5 → 2.7.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, 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, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, JulianDate, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, KmlDataSource, Cesium3DTileStyle, EllipsoidTerrainProvider, CesiumInspector, OrthographicFrustum, defined, createOsmBuildings, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, EasingFunction, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ColorMaterialProperty, GeometryInstance, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -2647,6 +2647,10 @@ var EntityRenderEngine;
             if (width < 0.01) {
                 width = 0;
             }
+            var units = style.lineWidthUnits;
+            if (units != "px" && units != "m") {
+                units = "m";
+            }
             // If both outline and fill is not available then don't render anything.
             if ((width <= 0 || cLineColor.alpha <= 0) &&
                 cFillColor.alpha <= 0) {
@@ -2686,7 +2690,7 @@ var EntityRenderEngine;
                     classificationType: classification,
                     perPositionHeight: heightRef == HeightReference.CLAMP_TO_GROUND ? false : true,
                     zIndex: zIndex,
-                    distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, size, true)
+                    distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true)
                 },
                 position: EntityUtils.GetPos({
                     viewer: params.viewer,
@@ -2722,17 +2726,17 @@ var EntityRenderEngine;
                     borderPosses = posses.map(function (x) { return x.clone ? x.clone() : __assign({}, x); });
                 }
                 var cEntityBorder = new Entity({
-                    // polyline: new Cesium.PolylineGraphics({
-                    //     positions: borderPosses,
-                    //     material: <Cesium.MaterialProperty><any>cLineColor,
-                    //     width: width,
-                    //     clampToGround: heightRef == Cesium.HeightReference.CLAMP_TO_GROUND,
-                    //     classificationType: Cesium.ClassificationType.TERRAIN,
-                    //     arcType: Cesium.ArcType.GEODESIC,
-                    //     zIndex: zIndex,
-                    //     distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
-                    // }),
-                    corridor: {
+                    polyline: units == "px" ? new PolylineGraphics({
+                        positions: borderPosses,
+                        material: cLineColor,
+                        width: width,
+                        clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
+                        classificationType: ClassificationType.TERRAIN,
+                        arcType: ArcType.GEODESIC,
+                        zIndex: zIndex,
+                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                    }) : null,
+                    corridor: units == "m" ? {
                         positions: borderPosses,
                         material: cLineColor,
                         heightReference: heightRef,
@@ -2744,7 +2748,7 @@ var EntityRenderEngine;
                         classificationType: classification,
                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                         shadows: ShadowMode.ENABLED
-                    },
+                    } : null,
                     show: true
                 });
                 cEntityBorder._parentEntity = cEntity;
@@ -2753,17 +2757,17 @@ var EntityRenderEngine;
                     var posses_1 = holePosses[i];
                     Cartes.CloseRing3(posses_1);
                     var cEntityHole = new Entity({
-                        // polyline: new Cesium.PolylineGraphics({
-                        //     positions: posses,
-                        //     material: <Cesium.MaterialProperty><any>cLineColor,
-                        //     width: width,
-                        //     clampToGround: heightRef == Cesium.HeightReference.CLAMP_TO_GROUND,
-                        //     classificationType: Cesium.ClassificationType.TERRAIN,
-                        //     arcType: Cesium.ArcType.GEODESIC,
-                        //     zIndex: zIndex,
-                        //     distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
-                        // }),
-                        corridor: {
+                        polyline: units == "px" ? new PolylineGraphics({
+                            positions: posses_1,
+                            material: cLineColor,
+                            width: width,
+                            clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
+                            classificationType: ClassificationType.TERRAIN,
+                            arcType: ArcType.GEODESIC,
+                            zIndex: zIndex,
+                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                        }) : null,
+                        corridor: units == "m" ? {
                             positions: borderPosses,
                             material: cLineColor,
                             heightReference: heightRef,
@@ -2775,7 +2779,7 @@ var EntityRenderEngine;
                             classificationType: classification,
                             distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                             shadows: ShadowMode.ENABLED,
-                        },
+                        } : null,
                         show: true
                     });
                     cEntity._siblingGraphics.push(cEntityHole);
@@ -8256,6 +8260,7 @@ var TilesetEntitiesRenderManager;
 (function (TilesetEntitiesRenderManager) {
     var Manager = /** @class */ (function () {
         function Manager(params) {
+            this.initCounter = 0;
             this.disposed = false;
             this.cTileset = null;
             var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, item = params.item;
@@ -8278,23 +8283,32 @@ var TilesetEntitiesRenderManager;
             enumerable: false,
             configurable: true
         });
-        Manager.prototype.Init = function () {
+        Manager.prototype.Init = function (params) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var tilesetId;
+                var counter, tilesetId;
                 var _this = this;
                 return __generator(this, function (_b) {
+                    this.initCounter += 1;
+                    counter = this.initCounter;
+                    if (this.disposed) {
+                        return [2 /*return*/];
+                    }
+                    if (params === null || params === void 0 ? void 0 : params.item) {
+                        this.item = params.item;
+                    }
                     tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
                     if (!tilesetId) {
                         return [2 /*return*/];
                     }
                     (function () { return __awaiter(_this, void 0, void 0, function () {
-                        var canAccess, e_1, accountId, api, tileset, cTileset, _a;
+                        var canAccess, e_1, accountId, api, tileset, cTileset, _a, attenuation, attenuationMax;
                         var _this = this;
                         var _b, _c, _d;
                         return __generator(this, function (_e) {
                             switch (_e.label) {
                                 case 0:
+                                    if (!!this.cTileset) return [3 /*break*/, 9];
                                     if (!tilesetId) return [3 /*break*/, 5];
                                     canAccess = false;
                                     _e.label = 1;
@@ -8323,6 +8337,9 @@ var TilesetEntitiesRenderManager;
                                     console.warn("No tileset id found. Skipping access check.");
                                     _e.label = 6;
                                 case 6:
+                                    if (this.disposed || counter !== this.initCounter) {
+                                        return [2 /*return*/];
+                                    }
                                     accountId = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID;
                                     if (!accountId) {
                                         accountId = this.getters.GetAccountId();
@@ -8336,7 +8353,7 @@ var TilesetEntitiesRenderManager;
                                         })];
                                 case 7:
                                     tileset = (_e.sent()).tileset;
-                                    if (!tileset || this.disposed) {
+                                    if (!tileset || this.disposed || counter !== this.initCounter) {
                                         return [2 /*return*/];
                                     }
                                     this.typeId = tileset.settings.entityTypeId;
@@ -8370,6 +8387,25 @@ var TilesetEntitiesRenderManager;
                                     cTileset.tileLoad.addEventListener(function (tile) {
                                         _this.mapCTile(tile);
                                     });
+                                    _e.label = 9;
+                                case 9:
+                                    attenuation = this.item.attenuation;
+                                    if (!attenuation && attenuation != false) {
+                                        attenuation = true;
+                                    }
+                                    attenuationMax = this.item.attenuationMax;
+                                    if (isNaN(attenuationMax)) {
+                                        attenuationMax = 20;
+                                    }
+                                    this.cTileset.readyPromise.then(function () {
+                                        TilesetRenderEngine.ApplySettings({
+                                            cTileset: _this.cTileset,
+                                            settings: {
+                                                attenuation: attenuation,
+                                                maximumAttenuation: attenuationMax
+                                            }
+                                        });
+                                    });
                                     return [2 /*return*/];
                             }
                         });
@@ -9396,6 +9432,14 @@ var MenuItemManager;
                         rItem.item = params.item;
                     }
                 }
+                // This means we're updating a entities tileset menu item.
+                // These have different point scaling settings based on bookmark settings.
+                else if (rItem.type == MenuItem.EType.EntityTileset && params.item.Type == MenuItem.EType.EntityTileset) {
+                    rItem.renderManager.Init({
+                        item: params.item,
+                    });
+                    rItem.item = params.item;
+                }
             }
             else {
                 rItem = {
@@ -10067,7 +10111,7 @@ var MenuItemCreator;
                         renderedItemIds = [];
                         if (!((menuItems === null || menuItems === void 0 ? void 0 : menuItems.length) && (enabledIds === null || enabledIds === void 0 ? void 0 : enabledIds.length))) return [3 /*break*/, 10];
                         traverseItems_1 = function (item) { return __awaiter(_this, void 0, void 0, function () {
-                            var eItem, eItemAlt, itemId, i;
+                            var eItem, eItemAlt, tItem, tItemAlt, itemId, i;
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
@@ -10082,6 +10126,12 @@ var MenuItemCreator;
                                                     eItem.BruceEntity = __assign(__assign({}, eItem.BruceEntity), { SelectedExpandLayers: (_a = eItemAlt.BruceEntity) === null || _a === void 0 ? void 0 : _a.SelectedExpandLayers });
                                                 }
                                             }
+                                            else if (item.Type == MenuItem.EType.EntityTileset) {
+                                                tItem = item;
+                                                tItemAlt = alternations[item.id];
+                                                tItem.attenuation = tItemAlt.attenuation;
+                                                tItem.attenuationMax = tItemAlt.attenuationMax;
+                                            }
                                         }
                                         if (!enabledIds.includes(item.id)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, manager.RenderItem({
@@ -15243,7 +15293,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.7.5";
+var VERSION$1 = "2.7.7";
 
 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, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map