bruce-cesium 2.2.1 → 2.2.2

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, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Primitive, Cesium3DTileFeature, Cesium3DTileStyle, KmlDataSource, createOsmBuildings, OrthographicFrustum, JulianDate, CesiumInspector, PolygonPipeline, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed } from 'cesium';
+import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -9757,10 +9757,9 @@ var TileRenderEngine;
         (function (Navigator) {
             function GetOrCreateLayer(params) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var viewer, apiGetter, meta, enabled, i, layer, layerMeta, defaultImg, provider, api, tileset, boundaries, settings, minLat, maxLat, minLon, maxLon, minLevel, maxLevel, hasLevels, settings_1, _a, _b, _c, mapboxKey, _d, layer;
-                    var _e;
-                    return __generator(this, function (_f) {
-                        switch (_f.label) {
+                    var viewer, apiGetter, meta, enabled, i, layer, layerMeta, defaultImg, provider, api, tileset, boundaries, settings, minLat, maxLat, minLon, maxLon, minLevel, maxLevel, hasLevels, settings_1, _a, cesiumIonKey, _b, mapboxKey, _c, layer;
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
                             case 0:
                                 viewer = params.viewer, apiGetter = params.apiGetter, meta = params.meta;
                                 if (!apiGetter) {
@@ -9779,8 +9778,8 @@ var TileRenderEngine;
                                 if (!defaultImg) return [3 /*break*/, 2];
                                 return [4 /*yield*/, renderDefaultMapTile(apiGetter, defaultImg.id)];
                             case 1:
-                                provider = _f.sent();
-                                return [3 /*break*/, 16];
+                                provider = _d.sent();
+                                return [3 /*break*/, 18];
                             case 2:
                                 api = apiGetter.getApi(meta.accountId);
                                 // Ensure regional url is loaded.
@@ -9791,13 +9790,13 @@ var TileRenderEngine;
                                 // Ensure regional url is loaded.
                                 // When loading stuff in the same account as the default it's likely already loaded,
                                 // but if we just made an API instance for some external account then it won't be loaded yet.
-                                _f.sent();
+                                _d.sent();
                                 return [4 /*yield*/, Tileset.Get({
                                         api: api,
                                         tilesetId: meta.tilesetId
                                     })];
                             case 4:
-                                tileset = (_f.sent()).tileset;
+                                tileset = (_d.sent()).tileset;
                                 boundaries = undefined;
                                 settings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
                                 if (settings && settings.boundaries) {
@@ -9825,67 +9824,72 @@ var TileRenderEngine;
                                     maximumLevel: hasLevels ? maxLevel : undefined,
                                     minimumLevel: hasLevels ? minLevel : undefined,
                                 });
-                                return [3 /*break*/, 16];
+                                return [3 /*break*/, 18];
                             case 5:
-                                if (!(tileset.type === Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 15];
+                                if (!(tileset.type === Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 17];
                                 settings_1 = tileset.settings;
                                 _a = settings_1.mapType;
                                 switch (_a) {
                                     case Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 6];
-                                    case Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 8];
-                                    case Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 12];
-                                    case Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 13];
+                                    case Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 10];
+                                    case Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 14];
+                                    case Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 15];
                                 }
-                                return [3 /*break*/, 14];
+                                return [3 /*break*/, 16];
                             case 6:
-                                _c = (_b = IonImageryProvider).bind;
-                                _e = {
-                                    assetId: settings_1.ionId
-                                };
-                                return [4 /*yield*/, findKey(apiGetter, ProgramKey.EProgramId.CesiumIon, null)];
-                            case 7:
-                                provider = new (_c.apply(_b, [void 0, (_e.accessToken = _f.sent(),
-                                        _e)]))();
-                                return [3 /*break*/, 14];
+                                if (!settings_1.key) return [3 /*break*/, 7];
+                                _b = settings_1.key;
+                                return [3 /*break*/, 9];
+                            case 7: return [4 /*yield*/, findKey(apiGetter, ProgramKey.EProgramId.CesiumIon, null)];
                             case 8:
-                                if (!settings_1.mapBoxKey) return [3 /*break*/, 9];
-                                _d = settings_1.mapBoxKey;
-                                return [3 /*break*/, 11];
-                            case 9: return [4 /*yield*/, findKey(apiGetter, ProgramKey.EProgramId.Mapbox, null)];
+                                _b = _d.sent();
+                                _d.label = 9;
+                            case 9:
+                                cesiumIonKey = _b;
+                                provider = new IonImageryProvider({
+                                    assetId: Number(settings_1.externalId),
+                                    accessToken: cesiumIonKey
+                                });
+                                return [3 /*break*/, 16];
                             case 10:
-                                _d = _f.sent();
-                                _f.label = 11;
-                            case 11:
-                                mapboxKey = _d;
+                                if (!settings_1.key) return [3 /*break*/, 11];
+                                _c = settings_1.key;
+                                return [3 /*break*/, 13];
+                            case 11: return [4 /*yield*/, findKey(apiGetter, ProgramKey.EProgramId.Mapbox, null)];
+                            case 12:
+                                _c = _d.sent();
+                                _d.label = 13;
+                            case 13:
+                                mapboxKey = _c;
                                 provider = new UrlTemplateImageryProvider({
                                     url: "https://api.mapbox.com/styles/v1/"
-                                        + settings_1.mapBoxAccount + "/" + settings_1.mapBoxStyleId +
+                                        + settings_1.account + "/" + settings_1.styleId +
                                         "/tiles/256/{z}/{x}/{y}?access_token="
                                         + mapboxKey
                                 });
-                                return [3 /*break*/, 14];
-                            case 12:
+                                return [3 /*break*/, 16];
+                            case 14:
                                 provider = new OpenStreetMapImageryProvider({
                                     url: settings_1.url,
-                                    fileExtension: prepareFileExt(settings_1.sourceExt),
+                                    fileExtension: prepareFileExt(settings_1.fileExtension),
                                     // Unused until tested properly. In the past these settings caused large lag.
                                     // rectangle: boundaries,
                                     // maximumLevel: hasLevels ? maxLevel : undefined,
                                     // minimumLevel: hasLevels ? minLevel : undefined,
                                 });
-                                return [3 /*break*/, 14];
-                            case 13:
+                                return [3 /*break*/, 16];
+                            case 15:
                                 provider = new TileMapServiceImageryProvider({
                                     url: settings_1.url,
-                                    fileExtension: prepareFileExt(settings_1.sourceExt),
+                                    fileExtension: prepareFileExt(settings_1.fileExtension),
                                     // Unused until tested properly. In the past these settings caused large lag.
                                     // rectangle: boundaries,
                                     // maximumLevel: hasLevels ? maxLevel : undefined,
                                     // minimumLevel: hasLevels ? minLevel : undefined,
                                 });
-                                return [3 /*break*/, 14];
-                            case 14: return [3 /*break*/, 16];
-                            case 15:
+                                return [3 /*break*/, 16];
+                            case 16: return [3 /*break*/, 18];
+                            case 17:
                                 if (tileset.type === Tileset.EType.EntitiesMap) {
                                     provider = new UrlTemplateImageryProvider({
                                         url: Tileset.GetPublicFileUrl({
@@ -9903,8 +9907,8 @@ var TileRenderEngine;
                                         // maximumLevel: hasLevels ? maxLevel : undefined,
                                     });
                                 }
-                                _f.label = 16;
-                            case 16:
+                                _d.label = 18;
+                            case 18:
                                 if (provider) {
                                     layer = viewer.imageryLayers.addImageryProvider(provider);
                                     layer._bMeta = meta;
@@ -10866,7 +10870,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "2.2.1";
+var VERSION = "2.2.2";
 
 export { 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 };
 //# sourceMappingURL=bruce-cesium.es5.js.map