bruce-cesium 2.7.6 → 2.7.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, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, PolygonPipeline, CesiumInspector, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, EasingFunction, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, Matrix4, Matrix3, IonResource, Ion, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, GeometryInstance, 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);
@@ -6927,7 +6931,9 @@ var TilesetRenderEngine;
                         etc = settings.etc;
                         etc = __assign({}, etc);
                         if (!ionId) return [3 /*break*/, 2];
-                        return [4 /*yield*/, IonResource.fromAssetId(EnsureNumber(ionId))];
+                        return [4 /*yield*/, IonResource.fromAssetId(EnsureNumber(ionId), {
+                                accessToken: params.ionAccessToken ? params.ionAccessToken : Ion.defaultAccessToken
+                            })];
                     case 1:
                         loadUrl = (_a.sent());
                         return [3 /*break*/, 3];
@@ -8843,15 +8849,15 @@ var TilesetArbRenderManager;
             (function () { return __awaiter(_this, void 0, void 0, function () {
                 var canAccess, e_3, _a, tileset, type, _b, LEGACY_TYPES, legacyTileset, _c, accountId, _d, _e;
                 var _this = this;
-                var _f, _g, _h, _j, _k, _l, _m;
-                return __generator(this, function (_o) {
-                    switch (_o.label) {
+                var _f, _g, _h, _j, _k, _l, _m, _o;
+                return __generator(this, function (_p) {
+                    switch (_p.label) {
                         case 0:
                             if (!tilesetId) return [3 /*break*/, 5];
                             canAccess = false;
-                            _o.label = 1;
+                            _p.label = 1;
                         case 1:
-                            _o.trys.push([1, 3, , 4]);
+                            _p.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
                                     sourceAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
                                     tilesetId: tilesetId,
@@ -8859,10 +8865,10 @@ var TilesetArbRenderManager;
                                     api: this.getters.GetGlobalApi()
                                 })];
                         case 2:
-                            canAccess = _o.sent();
+                            canAccess = _p.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            e_3 = _o.sent();
+                            e_3 = _p.sent();
                             console.error(e_3);
                             return [3 /*break*/, 4];
                         case 4:
@@ -8873,7 +8879,7 @@ var TilesetArbRenderManager;
                             return [3 /*break*/, 6];
                         case 5:
                             console.warn("No tileset id found. Skipping access check.");
-                            _o.label = 6;
+                            _p.label = 6;
                         case 6:
                             if (!tilesetId) return [3 /*break*/, 8];
                             return [4 /*yield*/, getTileset({
@@ -8881,11 +8887,11 @@ var TilesetArbRenderManager;
                                     menuItem: this.item
                                 })];
                         case 7:
-                            _b = _o.sent();
+                            _b = _p.sent();
                             return [3 /*break*/, 9];
                         case 8:
                             _b = { tileset: null, type: null };
-                            _o.label = 9;
+                            _p.label = 9;
                         case 9:
                             _a = _b, tileset = _a.tileset, type = _a.type;
                             if (this.disposed) {
@@ -8908,11 +8914,11 @@ var TilesetArbRenderManager;
                                     tileset: tileset
                                 })];
                         case 10:
-                            _c = _o.sent();
+                            _c = _p.sent();
                             return [3 /*break*/, 12];
                         case 11:
                             _c = null;
-                            _o.label = 12;
+                            _p.label = 12;
                         case 12:
                             legacyTileset = _c;
                             if (this.disposed) {
@@ -8928,12 +8934,13 @@ var TilesetArbRenderManager;
                                     tileset: legacyTileset,
                                     viewer: this.viewer,
                                     ionId: (_k = this.item.IonResource) === null || _k === void 0 ? void 0 : _k.AssetID,
+                                    ionAccessToken: (_l = this.item.IonResource) === null || _l === void 0 ? void 0 : _l.AccessToken,
                                     loadUrl: loadUrlOverride,
                                     accountId: accountId,
                                     viaCdn: true
                                 })];
                         case 13:
-                            _d.cTileset = _o.sent();
+                            _d.cTileset = _p.sent();
                             return [3 /*break*/, 16];
                         case 14:
                             if (!tileset) return [3 /*break*/, 16];
@@ -8943,13 +8950,13 @@ var TilesetArbRenderManager;
                                     tileset: tileset,
                                     viewer: this.viewer,
                                     coords: null,
-                                    accountId: (_m = (_l = this.item.tileset) === null || _l === void 0 ? void 0 : _l.ClientAccountID) !== null && _m !== void 0 ? _m : this.getters.GetAccountId(),
+                                    accountId: (_o = (_m = this.item.tileset) === null || _m === void 0 ? void 0 : _m.ClientAccountID) !== null && _o !== void 0 ? _o : this.getters.GetAccountId(),
                                     // Not doing viaCDN here because I fear it'll break something since this is a legacy menu item type.
                                     viaCdn: false
                                 })];
                         case 15:
-                            _e.cTileset = _o.sent();
-                            _o.label = 16;
+                            _e.cTileset = _p.sent();
+                            _p.label = 16;
                         case 16:
                             if (this.disposed) {
                                 this.doDispose();
@@ -15289,7 +15296,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.7.6";
+var VERSION$1 = "2.7.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, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map