bruce-cesium 2.3.7 → 2.3.9

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, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ColorMaterialProperty, EasingFunction, GeometryInstance, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -6139,21 +6139,18 @@ var TilesetRenderEngine;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        api = params.apiGetter.getApi(params.apiGetter.accountId);
+                        api = params.apiGetter.getApi(params.accountId);
                         // Ensure regional url is loaded.
                         return [4 /*yield*/, api.Loading];
                     case 1:
                         // Ensure regional url is loaded.
                         _a.sent();
                         loadUrl = params.tileset.loadUrl;
-                        // CDN url must match the api getter account id.
-                        if (!params.accountId || params.accountId == params.apiGetter.accountId) {
-                            // CDN enabled and tileset url template is available.
-                            if (params.viaCdn && api.TilesetCdnUrl) {
-                                loadUrl = api.TilesetCdnUrl.replace("<TILESETID>", params.tileset.id).replace("<FILEPATH>", "files/tileset.json");
-                                // First url param reserved for accountId. This is set within the API instance.
-                                loadUrl += "&generation=" + params.tileset.generateVersion;
-                            }
+                        // CDN enabled and tileset url template is available.
+                        if (params.viaCdn && api.TilesetCdnUrl) {
+                            loadUrl = api.TilesetCdnUrl.replace("<TILESETID>", params.tileset.id).replace("<FILEPATH>", "files/tileset.json");
+                            // First url param reserved for accountId. This is set within the API instance.
+                            loadUrl += "&generation=" + params.tileset.generateVersion;
                         }
                         if (!(params.tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 3];
                         return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
@@ -7766,11 +7763,10 @@ var TilesetPointcloudRenderManager;
                         case 1:
                             _f.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
-                                    sourceAccountId: this.getters.GetAccountId(),
+                                    sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
                                     tilesetId: tilesetId,
-                                    forAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
-                                    // TODO: we need to pass api-getters instance instead of bruce-api-getters around.
-                                    api: null
+                                    forAccountId: this.getters.GetAccountId(),
+                                    api: this.getters.GetGlobalApi()
                                 })];
                         case 2:
                             canAccess = _f.sent();
@@ -8086,9 +8082,9 @@ var TilesetArbRenderManager;
                         case 1:
                             _o.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
-                                    sourceAccountId: this.getters.GetAccountId(),
+                                    sourceAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
                                     tilesetId: tilesetId,
-                                    forAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
+                                    forAccountId: this.getters.GetAccountId(),
                                     api: this.getters.GetGlobalApi()
                                 })];
                         case 2:
@@ -14347,7 +14343,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.3.7";
+var VERSION$1 = "2.3.9";
 
 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