bruce-cesium 2.3.4 → 2.3.6

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, Entity, Primitive, Cesium3DTileFeature, Color, Cartesian2, HeightReference, Cartesian3, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Math as Math$1, Transforms, ColorBlendMode, CallbackProperty, Rectangle, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, OrthographicFrustum, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, JulianDate, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, 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, HeadingPitchRange, Cesium3DTileColorBlendMode, Cesium3DTileStyle, createOsmBuildings, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, CesiumInspector, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -6844,9 +6844,9 @@ var TilesetCadRenderManager;
             // This likely means poor data so we have to disable drilling otherwise lag would be too bad.
             // The result is no entity type IDs are known so most styles fail.
             this.hasHitDepthLimit = false;
-            var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, item = params.item;
+            var viewer = params.viewer, visualsManager = params.register, getters = params.getters, item = params.item;
             this.viewer = viewer;
-            this.apiGetter = apiGetter;
+            this.getters = getters;
             this.item = item;
             this.visualsManager = visualsManager;
         }
@@ -6878,7 +6878,7 @@ var TilesetCadRenderManager;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
-                            api = this.apiGetter.getApi();
+                            api = this.getters.GetBruceApi();
                             return [4 /*yield*/, Tileset.Get({
                                     api: api,
                                     tilesetId: tilesetId
@@ -6902,11 +6902,11 @@ var TilesetCadRenderManager;
                             }
                             _a = this;
                             return [4 /*yield*/, TilesetRenderEngine.Render({
-                                    apiGetter: this.apiGetter,
+                                    apiGetter: this.getters.GetBruceGetter(),
                                     tileset: tileset,
                                     viewer: this.viewer,
                                     coords: coords,
-                                    accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId,
+                                    accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
                                     viaCdn: this.item.cdnEnabled
                                 })];
                         case 3:
@@ -6972,7 +6972,7 @@ var TilesetCadRenderManager;
                 menuItemId: this.item.id,
                 priority: 0,
                 visual: feature,
-                accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.apiGetter.accountId,
+                accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
                 rootId: this.rootId
             };
@@ -7263,9 +7263,9 @@ var TilesetOsmRenderManager;
             this.entityTypeId = null;
             this.queueCheckInterval = null;
             this.processingQueue = 0;
-            var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item;
+            var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, monitor = params.monitor, item = params.item;
             this.viewer = viewer;
-            this.apiGetter = apiGetter;
+            this.getters = apiGetter;
             this.item = item;
             this.visualsManager = visualsManager;
             this.monitor = monitor;
@@ -7486,7 +7486,7 @@ var TilesetOsmRenderManager;
                             for (i = 0; i < features.length; i++) {
                                 _loop_1(i);
                             }
-                            api = this.apiGetter.getApi();
+                            api = this.getters.GetBruceApi();
                             return [4 /*yield*/, EntitySource.GetEntityIdsBySourceKeys({
                                     api: api,
                                     sourceId: this.sourceId,
@@ -7512,7 +7512,7 @@ var TilesetOsmRenderManager;
                                     entityTypeId: this.entityTypeId,
                                     sourceId: this.sourceId,
                                     sourceEntityId: osmId,
-                                    accountId: this.apiGetter.accountId
+                                    accountId: this.getters.GetAccountId()
                                 };
                                 this.visualsManager.AddRego({
                                     rego: rego
@@ -7568,9 +7568,9 @@ var TilesetEntitiesRenderManager;
         function Manager(params) {
             this.disposed = false;
             this.cTileset = null;
-            var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, item = params.item;
+            var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, item = params.item;
             this.viewer = viewer;
-            this.apiGetter = apiGetter;
+            this.getters = apiGetter;
             this.item = item;
             this.visualsManager = visualsManager;
         }
@@ -7605,7 +7605,7 @@ var TilesetEntitiesRenderManager;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
-                                    api = this.apiGetter.getApi();
+                                    api = this.getters.GetBruceApi();
                                     return [4 /*yield*/, Tileset.Get({
                                             api: api,
                                             tilesetId: tilesetId
@@ -7618,10 +7618,10 @@ var TilesetEntitiesRenderManager;
                                     this.typeId = tileset.settings.entityTypeId;
                                     _a = this;
                                     return [4 /*yield*/, TilesetRenderEngine.Render({
-                                            apiGetter: this.apiGetter,
+                                            apiGetter: this.getters.GetBruceGetter(),
                                             tileset: tileset,
                                             viewer: this.viewer,
-                                            accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId,
+                                            accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
                                             viaCdn: this.item.cdnEnabled
                                         })];
                                 case 2:
@@ -7700,7 +7700,7 @@ var TilesetEntitiesRenderManager;
                     priority: 0,
                     visual: feature,
                     tilesetId: (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID,
-                    accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId
+                    accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId()
                 };
                 this.visualsManager.AddRego({
                     rego: rego
@@ -7727,9 +7727,9 @@ var TilesetPointcloudRenderManager;
         function Manager(params) {
             this.disposed = false;
             this.cTileset = null;
-            var viewer = params.viewer, apiGetter = params.apiGetter, item = params.item;
+            var viewer = params.viewer, apiGetter = params.getters, item = params.item;
             this.viewer = viewer;
-            this.apiGetter = apiGetter;
+            this.getters = apiGetter;
             this.item = item;
         }
         Object.defineProperty(Manager.prototype, "Disposed", {
@@ -7754,33 +7754,65 @@ var TilesetPointcloudRenderManager;
                 return;
             }
             (function () { return __awaiter(_this, void 0, void 0, function () {
-                var api, tileset, cTileset, _a;
+                var canAccess, e_1, accountId, api, tileset, cTileset, _a;
                 var _this = this;
-                var _b, _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var _b, _c, _d, _e;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
-                            api = this.apiGetter.getApi();
+                            if (!tilesetId) return [3 /*break*/, 5];
+                            canAccess = false;
+                            _f.label = 1;
+                        case 1:
+                            _f.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
+                                    sourceAccountId: this.getters.GetAccountId(),
+                                    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
+                                })];
+                        case 2:
+                            canAccess = _f.sent();
+                            return [3 /*break*/, 4];
+                        case 3:
+                            e_1 = _f.sent();
+                            console.error(e_1);
+                            return [3 /*break*/, 4];
+                        case 4:
+                            if (!canAccess) {
+                                console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID, "."));
+                                return [2 /*return*/];
+                            }
+                            return [3 /*break*/, 6];
+                        case 5:
+                            console.warn("No tileset id found. Skipping access check.");
+                            _f.label = 6;
+                        case 6:
+                            accountId = (_e = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID) !== null && _e !== void 0 ? _e : this.getters.GetAccountId();
+                            api = this.getters.GetBruceApi({
+                                accountId: accountId
+                            });
                             return [4 /*yield*/, Tileset.Get({
                                     api: api,
                                     tilesetId: tilesetId
                                 })];
-                        case 1:
-                            tileset = (_d.sent()).tileset;
+                        case 7:
+                            tileset = (_f.sent()).tileset;
                             if (!tileset || this.disposed) {
                                 return [2 /*return*/];
                             }
                             _a = this;
                             return [4 /*yield*/, TilesetRenderEngine.Render({
-                                    apiGetter: this.apiGetter,
+                                    apiGetter: this.getters.GetBruceGetter(),
                                     tileset: tileset,
                                     viewer: this.viewer,
                                     coords: null,
-                                    accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId,
+                                    accountId: accountId,
                                     viaCdn: this.item.cdnEnabled
                                 })];
-                        case 2:
-                            cTileset = _a.cTileset = _d.sent();
+                        case 8:
+                            cTileset = _a.cTileset = _f.sent();
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
@@ -7989,7 +8021,7 @@ var TilesetArbRenderManager;
             this.cTileset = null;
             this.styler = null;
             this.viewer = params.viewer;
-            this.apiGetter = params.apiGetter;
+            this.getters = params.getters;
             this.visualsManager = params.register;
             // We modify the object due to a lot of backwards compatibility.
             try {
@@ -8042,24 +8074,52 @@ var TilesetArbRenderManager;
             }
             var tilesetId = (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID;
             (function () { return __awaiter(_this, void 0, void 0, function () {
-                var _a, tileset, type, _b, LEGACY_TYPES, legacyTileset, _c, accountId, _d, _e;
+                var canAccess, e_3, _a, tileset, type, _b, LEGACY_TYPES, legacyTileset, _c, accountId, _d, _e;
                 var _this = this;
-                var _f, _g, _h, _j, _k;
-                return __generator(this, function (_l) {
-                    switch (_l.label) {
+                var _f, _g, _h, _j, _k, _l, _m;
+                return __generator(this, function (_o) {
+                    switch (_o.label) {
                         case 0:
-                            if (!tilesetId) return [3 /*break*/, 2];
+                            if (!tilesetId) return [3 /*break*/, 5];
+                            canAccess = false;
+                            _o.label = 1;
+                        case 1:
+                            _o.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
+                                    sourceAccountId: this.getters.GetAccountId(),
+                                    tilesetId: tilesetId,
+                                    forAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
+                                    api: this.getters.GetGlobalApi()
+                                })];
+                        case 2:
+                            canAccess = _o.sent();
+                            return [3 /*break*/, 4];
+                        case 3:
+                            e_3 = _o.sent();
+                            console.error(e_3);
+                            return [3 /*break*/, 4];
+                        case 4:
+                            if (!canAccess) {
+                                console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_g = this.item.tileset) === null || _g === void 0 ? void 0 : _g.ClientAccountID, "."));
+                                return [2 /*return*/];
+                            }
+                            return [3 /*break*/, 6];
+                        case 5:
+                            console.warn("No tileset id found. Skipping access check.");
+                            _o.label = 6;
+                        case 6:
+                            if (!tilesetId) return [3 /*break*/, 8];
                             return [4 /*yield*/, getTileset({
-                                    apiGetter: this.apiGetter,
+                                    apiGetter: this.getters.GetBruceGetter(),
                                     menuItem: this.item
                                 })];
-                        case 1:
-                            _b = _l.sent();
-                            return [3 /*break*/, 3];
-                        case 2:
+                        case 7:
+                            _b = _o.sent();
+                            return [3 /*break*/, 9];
+                        case 8:
                             _b = { tileset: null, type: null };
-                            _l.label = 3;
-                        case 3:
+                            _o.label = 9;
+                        case 9:
                             _a = _b, tileset = _a.tileset, type = _a.type;
                             if (this.disposed) {
                                 return [2 /*return*/];
@@ -8072,57 +8132,57 @@ var TilesetArbRenderManager;
                                 Tileset.EType.LegacyExternal,
                                 Tileset.EType.LegacyStatic
                             ];
-                            if (!(!type || LEGACY_TYPES.includes(type))) return [3 /*break*/, 8];
-                            if (!tileset) return [3 /*break*/, 5];
+                            if (!(!type || LEGACY_TYPES.includes(type))) return [3 /*break*/, 14];
+                            if (!tileset) return [3 /*break*/, 11];
                             return [4 /*yield*/, getLegacyTileset({
-                                    apiGetter: this.apiGetter,
+                                    apiGetter: this.getters.GetBruceGetter(),
                                     menuItem: this.item,
                                     tileset: tileset
                                 })];
-                        case 4:
-                            _c = _l.sent();
-                            return [3 /*break*/, 6];
-                        case 5:
+                        case 10:
+                            _c = _o.sent();
+                            return [3 /*break*/, 12];
+                        case 11:
                             _c = null;
-                            _l.label = 6;
-                        case 6:
+                            _o.label = 12;
+                        case 12:
                             legacyTileset = _c;
                             if (this.disposed) {
                                 return [2 /*return*/];
                             }
-                            accountId = (_g = (_f = this.item) === null || _f === void 0 ? void 0 : _f.tileset) === null || _g === void 0 ? void 0 : _g.ClientAccountID;
+                            accountId = (_j = (_h = this.item) === null || _h === void 0 ? void 0 : _h.tileset) === null || _j === void 0 ? void 0 : _j.ClientAccountID;
                             if (!accountId) {
-                                accountId = this.apiGetter.accountId;
+                                accountId = this.getters.GetAccountId();
                             }
                             _d = this;
                             return [4 /*yield*/, TilesetRenderEngine.RenderLegacy({
-                                    apiGetter: this.apiGetter,
+                                    apiGetter: this.getters.GetBruceGetter(),
                                     tileset: legacyTileset,
                                     viewer: this.viewer,
-                                    ionId: (_h = this.item.IonResource) === null || _h === void 0 ? void 0 : _h.AssetID,
+                                    ionId: (_k = this.item.IonResource) === null || _k === void 0 ? void 0 : _k.AssetID,
                                     loadUrl: loadUrlOverride,
                                     accountId: accountId,
                                     viaCdn: true
                                 })];
-                        case 7:
-                            _d.cTileset = _l.sent();
-                            return [3 /*break*/, 10];
-                        case 8:
-                            if (!tileset) return [3 /*break*/, 10];
+                        case 13:
+                            _d.cTileset = _o.sent();
+                            return [3 /*break*/, 16];
+                        case 14:
+                            if (!tileset) return [3 /*break*/, 16];
                             _e = this;
                             return [4 /*yield*/, TilesetRenderEngine.Render({
-                                    apiGetter: this.apiGetter,
+                                    apiGetter: this.getters.GetBruceGetter(),
                                     tileset: tileset,
                                     viewer: this.viewer,
                                     coords: null,
-                                    accountId: (_k = (_j = this.item.tileset) === null || _j === void 0 ? void 0 : _j.ClientAccountID) !== null && _k !== void 0 ? _k : this.apiGetter.accountId,
+                                    accountId: (_m = (_l = this.item.tileset) === null || _l === void 0 ? void 0 : _l.ClientAccountID) !== null && _m !== void 0 ? _m : 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 9:
-                            _e.cTileset = _l.sent();
-                            _l.label = 10;
-                        case 10:
+                        case 15:
+                            _e.cTileset = _o.sent();
+                            _o.label = 16;
+                        case 16:
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
@@ -8131,7 +8191,7 @@ var TilesetArbRenderManager;
                                 try {
                                     if (_this.item.ApplyStyles ||
                                         _this.item.Type == MenuItem.EType.IonTileset) {
-                                        var api = _this.apiGetter.getApi();
+                                        var api = _this.getters.GetBruceApi();
                                         _this.styler = new TilesetRenderEngine.Styler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
                                     }
                                     _this.onCTilesetLoad();
@@ -8221,7 +8281,7 @@ var TilesetArbRenderManager;
                 menuItemId: this.item.id,
                 priority: 0,
                 visual: feature,
-                accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.apiGetter.accountId,
+                accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID
             };
             // Two different methods for two different Cesium versions...
@@ -8560,8 +8620,14 @@ var MenuItemManager;
             if (this.viewer.isDestroyed()) {
                 return null;
             }
-            if (!params.apiGetter) {
-                params.apiGetter = ENVIRONMENT.Api().GetBruceGetter();
+            if (!params.getters) {
+                params.getters = ENVIRONMENT.Api();
+            }
+            if (params.apiGetter && !params.getters) {
+                console.warn("RenderItem(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
+            }
+            else if (!params.apiGetter) {
+                params.apiGetter = params.getters.GetBruceGetter();
             }
             var rItem = this.items.find(function (x) { return x.id == params.item.id; });
             if (rItem) {
@@ -8633,7 +8699,7 @@ var MenuItemManager;
                         rItem.renderManager = new TilesetCadRenderManager.Manager({
                             viewer: this.viewer,
                             register: this.visualsRegister,
-                            apiGetter: params.apiGetter,
+                            getters: params.getters,
                             item: params.item
                         });
                         break;
@@ -8641,7 +8707,7 @@ var MenuItemManager;
                         rItem.renderManager = new TilesetOsmRenderManager.Manager({
                             viewer: this.viewer,
                             register: this.visualsRegister,
-                            apiGetter: params.apiGetter,
+                            getters: params.getters,
                             monitor: this.sharedMonitor,
                             item: params.item
                         });
@@ -8649,7 +8715,7 @@ var MenuItemManager;
                     case MenuItem.EType.PointCloud:
                         rItem.renderManager = new TilesetPointcloudRenderManager.Manager({
                             viewer: this.viewer,
-                            apiGetter: params.apiGetter,
+                            getters: params.getters,
                             item: params.item
                         });
                         break;
@@ -8657,7 +8723,7 @@ var MenuItemManager;
                         rItem.renderManager = new TilesetEntitiesRenderManager.Manager({
                             viewer: this.viewer,
                             register: this.visualsRegister,
-                            apiGetter: params.apiGetter,
+                            getters: params.getters,
                             item: params.item
                         });
                         break;
@@ -8671,7 +8737,7 @@ var MenuItemManager;
                     case MenuItem.EType.IonTileset:
                     case MenuItem.EType.ArbTileset:
                         rItem.renderManager = new TilesetArbRenderManager.Manager({
-                            apiGetter: params.apiGetter,
+                            getters: params.getters,
                             item: params.item,
                             viewer: this.viewer,
                             register: this.visualsRegister
@@ -8868,11 +8934,11 @@ var MenuItemCreator;
 (function (MenuItemCreator) {
     function RenderEntities(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var entityIds, apiGetter, manager, viewer, item, renderedId;
+            var entityIds, apiGetter, getters, manager, viewer, item, renderedId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        entityIds = params.entityIds, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
+                        entityIds = params.entityIds, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
                         if (!manager && viewer) {
                             manager = ViewerUtils.GetManager({
                                 viewer: viewer,
@@ -8903,6 +8969,7 @@ var MenuItemCreator;
                         };
                         return [4 /*yield*/, manager.RenderItem({
                                 apiGetter: apiGetter,
+                                getters: getters,
                                 item: item
                             })];
                     case 1:
@@ -8918,11 +8985,11 @@ var MenuItemCreator;
     MenuItemCreator.RenderEntities = RenderEntities;
     function RenderEntityTypes(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var typeIds, apiGetter, manager, viewer, renderedItemIds, menuItems, i, typeId, menuItem, itemId;
+            var typeIds, apiGetter, getters, manager, viewer, renderedItemIds, menuItems, i, typeId, menuItem, itemId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        typeIds = params.entityTypeIds, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
+                        typeIds = params.entityTypeIds, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
                         if (!manager && viewer) {
                             manager = ViewerUtils.GetManager({
                                 viewer: viewer,
@@ -8943,6 +9010,7 @@ var MenuItemCreator;
                         menuItems.push(menuItem);
                         return [4 /*yield*/, manager.RenderItem({
                                 apiGetter: apiGetter,
+                                getters: getters,
                                 item: menuItem
                             })];
                     case 2:
@@ -8963,11 +9031,11 @@ var MenuItemCreator;
     MenuItemCreator.RenderEntityTypes = RenderEntityTypes;
     function RenderEntityFilter(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var filter, apiGetter, manager, viewer, item, renderedIds;
+            var filter, apiGetter, getters, manager, viewer, item, renderedIds;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        filter = params.attrFilter, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
+                        filter = params.attrFilter, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
                         if (!manager && viewer) {
                             manager = ViewerUtils.GetManager({
                                 viewer: viewer,
@@ -8999,6 +9067,7 @@ var MenuItemCreator;
                         };
                         return [4 /*yield*/, manager.RenderItem({
                                 apiGetter: apiGetter,
+                                getters: getters,
                                 item: item
                             })];
                     case 1:
@@ -9014,11 +9083,11 @@ var MenuItemCreator;
     MenuItemCreator.RenderEntityFilter = RenderEntityFilter;
     function RenderMenuItems(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var menuItems, apiGetter, manager, viewer, renderedItemIds, i, menuItem, itemId;
+            var menuItems, apiGetter, getters, manager, viewer, renderedItemIds, i, menuItem, itemId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        menuItems = params.menuItems, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
+                        menuItems = params.menuItems, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
                         if (!manager && viewer) {
                             manager = ViewerUtils.GetManager({
                                 viewer: viewer,
@@ -9036,6 +9105,7 @@ var MenuItemCreator;
                         menuItem = menuItems[i];
                         return [4 /*yield*/, manager.RenderItem({
                                 apiGetter: apiGetter,
+                                getters: getters,
                                 item: menuItem
                             })];
                     case 2:
@@ -9055,12 +9125,18 @@ var MenuItemCreator;
     MenuItemCreator.RenderMenuItems = RenderMenuItems;
     function RenderTileset(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var tilesetId, apiGetter, viewer, manager, api, tileset, _a, menuItem, renderedIds;
+            var tilesetId, apiGetter, getters, viewer, manager, api, tileset, _a, menuItem, renderedIds;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        tilesetId = params.tilesetId, apiGetter = params.apiGetter, viewer = params.viewer, manager = params.manager;
-                        if (!apiGetter) {
+                        tilesetId = params.tilesetId, apiGetter = params.apiGetter, getters = params.getters, viewer = params.viewer, manager = params.manager;
+                        if (!getters) {
+                            getters = ENVIRONMENT.Api();
+                        }
+                        if (apiGetter && !getters) {
+                            console.warn("RenderTileset(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
+                        }
+                        else if (!apiGetter) {
                             apiGetter = ENVIRONMENT.Api().GetBruceGetter();
                         }
                         if (!manager && viewer) {
@@ -9072,7 +9148,7 @@ var MenuItemCreator;
                         else if (manager && !viewer) {
                             viewer = manager.Viewer;
                         }
-                        api = apiGetter.getApi();
+                        api = getters.GetBruceApi();
                         if (!params.tileset) return [3 /*break*/, 1];
                         _a = params.tileset;
                         return [3 /*break*/, 3];
@@ -9140,7 +9216,8 @@ var MenuItemCreator;
                         if (!menuItem) return [3 /*break*/, 5];
                         return [4 /*yield*/, manager.RenderItem({
                                 item: menuItem,
-                                apiGetter: apiGetter
+                                apiGetter: apiGetter,
+                                getters: getters
                             })];
                     case 4:
                         renderedIds = _b.sent();
@@ -9160,13 +9237,19 @@ var MenuItemCreator;
     function RenderBookmarkItems(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var viewId, bookmarkId, apiGetter, manager, viewer, api, view, _b, bookmark, _c, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, alternations, renderedItemIds, traverseItems_1, i;
+            var viewId, bookmarkId, apiGetter, getters, manager, viewer, api, view, _b, bookmark, _c, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, alternations, renderedItemIds, traverseItems_1, i;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        viewId = params.viewId, bookmarkId = params.bookmarkId, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
-                        if (!apiGetter) {
+                        viewId = params.viewId, bookmarkId = params.bookmarkId, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
+                        if (!getters) {
+                            getters = ENVIRONMENT.Api();
+                        }
+                        if (apiGetter && !getters) {
+                            console.warn("RenderBookmarkItems(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
+                        }
+                        else if (!apiGetter) {
                             apiGetter = ENVIRONMENT.Api().GetBruceGetter();
                         }
                         if (!manager && viewer) {
@@ -9178,7 +9261,7 @@ var MenuItemCreator;
                         else if (manager && !viewer) {
                             viewer = manager.Viewer;
                         }
-                        api = apiGetter.getApi();
+                        api = getters.GetBruceApi();
                         if (!params.view) return [3 /*break*/, 1];
                         _b = params.view;
                         return [3 /*break*/, 3];
@@ -9250,7 +9333,8 @@ var MenuItemCreator;
                                         if (!enabledIds.includes(item.id)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, manager.RenderItem({
                                                 item: item,
-                                                apiGetter: apiGetter
+                                                apiGetter: apiGetter,
+                                                getters: getters
                                             })];
                                     case 1:
                                         itemId = _b.sent();
@@ -11021,6 +11105,7 @@ function renderLegacyNavigator(params, bookmark, view) {
                     if (!bookmark) return [3 /*break*/, 4];
                     return [4 /*yield*/, MenuItemCreator.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
+                            getters: params.getters,
                             manager: manager,
                             view: view,
                             bookmark: bookmark
@@ -11040,6 +11125,7 @@ function renderLegacyNavigator(params, bookmark, view) {
                     };
                     return [4 /*yield*/, params.manager.RenderItem({
                             apiGetter: params.apiGetter,
+                            getters: params.getters,
                             item: menuItem
                         })];
                 case 5:
@@ -11345,6 +11431,7 @@ function renderNavigator(params, bookmark, view) {
                     if (!bookmark) return [3 /*break*/, 5];
                     return [4 /*yield*/, MenuItemCreator.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
+                            getters: params.getters,
                             manager: params.manager,
                             view: view,
                             bookmark: bookmark
@@ -11364,6 +11451,7 @@ function renderNavigator(params, bookmark, view) {
                     };
                     return [4 /*yield*/, params.manager.RenderItem({
                             apiGetter: params.apiGetter,
+                            getters: params.getters,
                             item: menuItem
                         })];
                 case 6:
@@ -11402,10 +11490,16 @@ var ViewRenderEngine;
                         else if (!params.viewer && params.manager) {
                             params.viewer = params.manager.Viewer;
                         }
-                        if (!params.apiGetter) {
+                        if (!params.getters) {
+                            params.getters = ENVIRONMENT.Api();
+                        }
+                        if (params.apiGetter && !params.getters) {
+                            console.warn("ViewRenderEngine.Render(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
+                        }
+                        else if (!params.apiGetter) {
                             params.apiGetter = ENVIRONMENT.Api().GetBruceGetter();
                         }
-                        api = params.apiGetter.getApi();
+                        api = params.getters.GetBruceApi();
                         if (!params.view) return [3 /*break*/, 1];
                         _b = params.view;
                         return [3 /*break*/, 3];
@@ -14256,7 +14350,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.3.4";
+var VERSION$1 = "2.3.6";
 
 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