bruce-cesium 2.3.4 → 2.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. package/dist/bruce-cesium.es5.js +143 -77
  2. package/dist/bruce-cesium.es5.js.map +1 -1
  3. package/dist/bruce-cesium.umd.js +142 -76
  4. package/dist/bruce-cesium.umd.js.map +1 -1
  5. package/dist/lib/bruce-cesium.js +1 -1
  6. package/dist/lib/rendering/menu-item-manager.js +13 -7
  7. package/dist/lib/rendering/menu-item-manager.js.map +1 -1
  8. package/dist/lib/rendering/render-managers/tilesets/tileset-arb-render-manager.js +67 -39
  9. package/dist/lib/rendering/render-managers/tilesets/tileset-arb-render-manager.js.map +1 -1
  10. package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js +6 -6
  11. package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js.map +1 -1
  12. package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js +6 -6
  13. package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js.map +1 -1
  14. package/dist/lib/rendering/render-managers/tilesets/tileset-osm-render-manager.js +4 -4
  15. package/dist/lib/rendering/render-managers/tilesets/tileset-osm-render-manager.js.map +1 -1
  16. package/dist/lib/rendering/render-managers/tilesets/tileset-pointcloud-render-manager.js +45 -13
  17. package/dist/lib/rendering/render-managers/tilesets/tileset-pointcloud-render-manager.js.map +1 -1
  18. package/dist/types/bruce-cesium.d.ts +1 -1
  19. package/dist/types/rendering/menu-item-manager.d.ts +2 -1
  20. package/dist/types/rendering/render-managers/tilesets/tileset-arb-render-manager.d.ts +3 -3
  21. package/dist/types/rendering/render-managers/tilesets/tileset-cad-render-manager.d.ts +3 -3
  22. package/dist/types/rendering/render-managers/tilesets/tileset-entities-render-manager.d.ts +3 -3
  23. package/dist/types/rendering/render-managers/tilesets/tileset-osm-render-manager.d.ts +3 -3
  24. package/dist/types/rendering/render-managers/tilesets/tileset-pointcloud-render-manager.d.ts +3 -3
  25. package/package.json +2 -2
@@ -1,6 +1,6 @@
1
1
  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';
2
2
  import * as Cesium from 'cesium';
3
- 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';
3
+ import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, 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, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, CesiumInspector, ColorMaterialProperty, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
4
4
 
5
5
  var TIME_LAG = 300;
6
6
  var POSITION_CHECK_TIMER = 950;
@@ -6844,9 +6844,9 @@ var TilesetCadRenderManager;
6844
6844
  // This likely means poor data so we have to disable drilling otherwise lag would be too bad.
6845
6845
  // The result is no entity type IDs are known so most styles fail.
6846
6846
  this.hasHitDepthLimit = false;
6847
- var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, item = params.item;
6847
+ var viewer = params.viewer, visualsManager = params.register, getters = params.getters, item = params.item;
6848
6848
  this.viewer = viewer;
6849
- this.apiGetter = apiGetter;
6849
+ this.getters = getters;
6850
6850
  this.item = item;
6851
6851
  this.visualsManager = visualsManager;
6852
6852
  }
@@ -6878,7 +6878,7 @@ var TilesetCadRenderManager;
6878
6878
  return __generator(this, function (_d) {
6879
6879
  switch (_d.label) {
6880
6880
  case 0:
6881
- api = this.apiGetter.getApi();
6881
+ api = this.getters.GetBruceApi();
6882
6882
  return [4 /*yield*/, Tileset.Get({
6883
6883
  api: api,
6884
6884
  tilesetId: tilesetId
@@ -6902,11 +6902,11 @@ var TilesetCadRenderManager;
6902
6902
  }
6903
6903
  _a = this;
6904
6904
  return [4 /*yield*/, TilesetRenderEngine.Render({
6905
- apiGetter: this.apiGetter,
6905
+ apiGetter: this.getters.GetBruceGetter(),
6906
6906
  tileset: tileset,
6907
6907
  viewer: this.viewer,
6908
6908
  coords: coords,
6909
- accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId,
6909
+ accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
6910
6910
  viaCdn: this.item.cdnEnabled
6911
6911
  })];
6912
6912
  case 3:
@@ -6972,7 +6972,7 @@ var TilesetCadRenderManager;
6972
6972
  menuItemId: this.item.id,
6973
6973
  priority: 0,
6974
6974
  visual: feature,
6975
- accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.apiGetter.accountId,
6975
+ accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
6976
6976
  tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
6977
6977
  rootId: this.rootId
6978
6978
  };
@@ -7263,9 +7263,9 @@ var TilesetOsmRenderManager;
7263
7263
  this.entityTypeId = null;
7264
7264
  this.queueCheckInterval = null;
7265
7265
  this.processingQueue = 0;
7266
- var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item;
7266
+ var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, monitor = params.monitor, item = params.item;
7267
7267
  this.viewer = viewer;
7268
- this.apiGetter = apiGetter;
7268
+ this.getters = apiGetter;
7269
7269
  this.item = item;
7270
7270
  this.visualsManager = visualsManager;
7271
7271
  this.monitor = monitor;
@@ -7486,7 +7486,7 @@ var TilesetOsmRenderManager;
7486
7486
  for (i = 0; i < features.length; i++) {
7487
7487
  _loop_1(i);
7488
7488
  }
7489
- api = this.apiGetter.getApi();
7489
+ api = this.getters.GetBruceApi();
7490
7490
  return [4 /*yield*/, EntitySource.GetEntityIdsBySourceKeys({
7491
7491
  api: api,
7492
7492
  sourceId: this.sourceId,
@@ -7512,7 +7512,7 @@ var TilesetOsmRenderManager;
7512
7512
  entityTypeId: this.entityTypeId,
7513
7513
  sourceId: this.sourceId,
7514
7514
  sourceEntityId: osmId,
7515
- accountId: this.apiGetter.accountId
7515
+ accountId: this.getters.GetAccountId()
7516
7516
  };
7517
7517
  this.visualsManager.AddRego({
7518
7518
  rego: rego
@@ -7568,9 +7568,9 @@ var TilesetEntitiesRenderManager;
7568
7568
  function Manager(params) {
7569
7569
  this.disposed = false;
7570
7570
  this.cTileset = null;
7571
- var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, item = params.item;
7571
+ var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, item = params.item;
7572
7572
  this.viewer = viewer;
7573
- this.apiGetter = apiGetter;
7573
+ this.getters = apiGetter;
7574
7574
  this.item = item;
7575
7575
  this.visualsManager = visualsManager;
7576
7576
  }
@@ -7605,7 +7605,7 @@ var TilesetEntitiesRenderManager;
7605
7605
  return __generator(this, function (_d) {
7606
7606
  switch (_d.label) {
7607
7607
  case 0:
7608
- api = this.apiGetter.getApi();
7608
+ api = this.getters.GetBruceApi();
7609
7609
  return [4 /*yield*/, Tileset.Get({
7610
7610
  api: api,
7611
7611
  tilesetId: tilesetId
@@ -7618,10 +7618,10 @@ var TilesetEntitiesRenderManager;
7618
7618
  this.typeId = tileset.settings.entityTypeId;
7619
7619
  _a = this;
7620
7620
  return [4 /*yield*/, TilesetRenderEngine.Render({
7621
- apiGetter: this.apiGetter,
7621
+ apiGetter: this.getters.GetBruceGetter(),
7622
7622
  tileset: tileset,
7623
7623
  viewer: this.viewer,
7624
- accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId,
7624
+ accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
7625
7625
  viaCdn: this.item.cdnEnabled
7626
7626
  })];
7627
7627
  case 2:
@@ -7700,7 +7700,7 @@ var TilesetEntitiesRenderManager;
7700
7700
  priority: 0,
7701
7701
  visual: feature,
7702
7702
  tilesetId: (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID,
7703
- accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId
7703
+ accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId()
7704
7704
  };
7705
7705
  this.visualsManager.AddRego({
7706
7706
  rego: rego
@@ -7727,9 +7727,9 @@ var TilesetPointcloudRenderManager;
7727
7727
  function Manager(params) {
7728
7728
  this.disposed = false;
7729
7729
  this.cTileset = null;
7730
- var viewer = params.viewer, apiGetter = params.apiGetter, item = params.item;
7730
+ var viewer = params.viewer, apiGetter = params.getters, item = params.item;
7731
7731
  this.viewer = viewer;
7732
- this.apiGetter = apiGetter;
7732
+ this.getters = apiGetter;
7733
7733
  this.item = item;
7734
7734
  }
7735
7735
  Object.defineProperty(Manager.prototype, "Disposed", {
@@ -7754,33 +7754,65 @@ var TilesetPointcloudRenderManager;
7754
7754
  return;
7755
7755
  }
7756
7756
  (function () { return __awaiter(_this, void 0, void 0, function () {
7757
- var api, tileset, cTileset, _a;
7757
+ var canAccess, e_1, accountId, api, tileset, cTileset, _a;
7758
7758
  var _this = this;
7759
- var _b, _c;
7760
- return __generator(this, function (_d) {
7761
- switch (_d.label) {
7759
+ var _b, _c, _d, _e;
7760
+ return __generator(this, function (_f) {
7761
+ switch (_f.label) {
7762
7762
  case 0:
7763
- api = this.apiGetter.getApi();
7763
+ if (!tilesetId) return [3 /*break*/, 5];
7764
+ canAccess = false;
7765
+ _f.label = 1;
7766
+ case 1:
7767
+ _f.trys.push([1, 3, , 4]);
7768
+ return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
7769
+ sourceAccountId: this.getters.GetAccountId(),
7770
+ tilesetId: tilesetId,
7771
+ forAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
7772
+ // TODO: we need to pass api-getters instance instead of bruce-api-getters around.
7773
+ api: null
7774
+ })];
7775
+ case 2:
7776
+ canAccess = _f.sent();
7777
+ return [3 /*break*/, 4];
7778
+ case 3:
7779
+ e_1 = _f.sent();
7780
+ console.error(e_1);
7781
+ return [3 /*break*/, 4];
7782
+ case 4:
7783
+ if (!canAccess) {
7784
+ console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID, "."));
7785
+ return [2 /*return*/];
7786
+ }
7787
+ return [3 /*break*/, 6];
7788
+ case 5:
7789
+ console.warn("No tileset id found. Skipping access check.");
7790
+ _f.label = 6;
7791
+ case 6:
7792
+ accountId = (_e = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID) !== null && _e !== void 0 ? _e : this.getters.GetAccountId();
7793
+ api = this.getters.GetBruceApi({
7794
+ accountId: accountId
7795
+ });
7764
7796
  return [4 /*yield*/, Tileset.Get({
7765
7797
  api: api,
7766
7798
  tilesetId: tilesetId
7767
7799
  })];
7768
- case 1:
7769
- tileset = (_d.sent()).tileset;
7800
+ case 7:
7801
+ tileset = (_f.sent()).tileset;
7770
7802
  if (!tileset || this.disposed) {
7771
7803
  return [2 /*return*/];
7772
7804
  }
7773
7805
  _a = this;
7774
7806
  return [4 /*yield*/, TilesetRenderEngine.Render({
7775
- apiGetter: this.apiGetter,
7807
+ apiGetter: this.getters.GetBruceGetter(),
7776
7808
  tileset: tileset,
7777
7809
  viewer: this.viewer,
7778
7810
  coords: null,
7779
- accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId,
7811
+ accountId: accountId,
7780
7812
  viaCdn: this.item.cdnEnabled
7781
7813
  })];
7782
- case 2:
7783
- cTileset = _a.cTileset = _d.sent();
7814
+ case 8:
7815
+ cTileset = _a.cTileset = _f.sent();
7784
7816
  if (this.disposed) {
7785
7817
  this.doDispose();
7786
7818
  return [2 /*return*/];
@@ -7989,7 +8021,7 @@ var TilesetArbRenderManager;
7989
8021
  this.cTileset = null;
7990
8022
  this.styler = null;
7991
8023
  this.viewer = params.viewer;
7992
- this.apiGetter = params.apiGetter;
8024
+ this.getters = params.getters;
7993
8025
  this.visualsManager = params.register;
7994
8026
  // We modify the object due to a lot of backwards compatibility.
7995
8027
  try {
@@ -8042,24 +8074,52 @@ var TilesetArbRenderManager;
8042
8074
  }
8043
8075
  var tilesetId = (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID;
8044
8076
  (function () { return __awaiter(_this, void 0, void 0, function () {
8045
- var _a, tileset, type, _b, LEGACY_TYPES, legacyTileset, _c, accountId, _d, _e;
8077
+ var canAccess, e_3, _a, tileset, type, _b, LEGACY_TYPES, legacyTileset, _c, accountId, _d, _e;
8046
8078
  var _this = this;
8047
- var _f, _g, _h, _j, _k;
8048
- return __generator(this, function (_l) {
8049
- switch (_l.label) {
8079
+ var _f, _g, _h, _j, _k, _l, _m;
8080
+ return __generator(this, function (_o) {
8081
+ switch (_o.label) {
8050
8082
  case 0:
8051
- if (!tilesetId) return [3 /*break*/, 2];
8083
+ if (!tilesetId) return [3 /*break*/, 5];
8084
+ canAccess = false;
8085
+ _o.label = 1;
8086
+ case 1:
8087
+ _o.trys.push([1, 3, , 4]);
8088
+ return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
8089
+ sourceAccountId: this.getters.GetAccountId(),
8090
+ tilesetId: tilesetId,
8091
+ forAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
8092
+ api: this.getters.GetGlobalApi()
8093
+ })];
8094
+ case 2:
8095
+ canAccess = _o.sent();
8096
+ return [3 /*break*/, 4];
8097
+ case 3:
8098
+ e_3 = _o.sent();
8099
+ console.error(e_3);
8100
+ return [3 /*break*/, 4];
8101
+ case 4:
8102
+ if (!canAccess) {
8103
+ console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_g = this.item.tileset) === null || _g === void 0 ? void 0 : _g.ClientAccountID, "."));
8104
+ return [2 /*return*/];
8105
+ }
8106
+ return [3 /*break*/, 6];
8107
+ case 5:
8108
+ console.warn("No tileset id found. Skipping access check.");
8109
+ _o.label = 6;
8110
+ case 6:
8111
+ if (!tilesetId) return [3 /*break*/, 8];
8052
8112
  return [4 /*yield*/, getTileset({
8053
- apiGetter: this.apiGetter,
8113
+ apiGetter: this.getters.GetBruceGetter(),
8054
8114
  menuItem: this.item
8055
8115
  })];
8056
- case 1:
8057
- _b = _l.sent();
8058
- return [3 /*break*/, 3];
8059
- case 2:
8116
+ case 7:
8117
+ _b = _o.sent();
8118
+ return [3 /*break*/, 9];
8119
+ case 8:
8060
8120
  _b = { tileset: null, type: null };
8061
- _l.label = 3;
8062
- case 3:
8121
+ _o.label = 9;
8122
+ case 9:
8063
8123
  _a = _b, tileset = _a.tileset, type = _a.type;
8064
8124
  if (this.disposed) {
8065
8125
  return [2 /*return*/];
@@ -8072,57 +8132,57 @@ var TilesetArbRenderManager;
8072
8132
  Tileset.EType.LegacyExternal,
8073
8133
  Tileset.EType.LegacyStatic
8074
8134
  ];
8075
- if (!(!type || LEGACY_TYPES.includes(type))) return [3 /*break*/, 8];
8076
- if (!tileset) return [3 /*break*/, 5];
8135
+ if (!(!type || LEGACY_TYPES.includes(type))) return [3 /*break*/, 14];
8136
+ if (!tileset) return [3 /*break*/, 11];
8077
8137
  return [4 /*yield*/, getLegacyTileset({
8078
- apiGetter: this.apiGetter,
8138
+ apiGetter: this.getters.GetBruceGetter(),
8079
8139
  menuItem: this.item,
8080
8140
  tileset: tileset
8081
8141
  })];
8082
- case 4:
8083
- _c = _l.sent();
8084
- return [3 /*break*/, 6];
8085
- case 5:
8142
+ case 10:
8143
+ _c = _o.sent();
8144
+ return [3 /*break*/, 12];
8145
+ case 11:
8086
8146
  _c = null;
8087
- _l.label = 6;
8088
- case 6:
8147
+ _o.label = 12;
8148
+ case 12:
8089
8149
  legacyTileset = _c;
8090
8150
  if (this.disposed) {
8091
8151
  return [2 /*return*/];
8092
8152
  }
8093
- accountId = (_g = (_f = this.item) === null || _f === void 0 ? void 0 : _f.tileset) === null || _g === void 0 ? void 0 : _g.ClientAccountID;
8153
+ accountId = (_j = (_h = this.item) === null || _h === void 0 ? void 0 : _h.tileset) === null || _j === void 0 ? void 0 : _j.ClientAccountID;
8094
8154
  if (!accountId) {
8095
- accountId = this.apiGetter.accountId;
8155
+ accountId = this.getters.GetAccountId();
8096
8156
  }
8097
8157
  _d = this;
8098
8158
  return [4 /*yield*/, TilesetRenderEngine.RenderLegacy({
8099
- apiGetter: this.apiGetter,
8159
+ apiGetter: this.getters.GetBruceGetter(),
8100
8160
  tileset: legacyTileset,
8101
8161
  viewer: this.viewer,
8102
- ionId: (_h = this.item.IonResource) === null || _h === void 0 ? void 0 : _h.AssetID,
8162
+ ionId: (_k = this.item.IonResource) === null || _k === void 0 ? void 0 : _k.AssetID,
8103
8163
  loadUrl: loadUrlOverride,
8104
8164
  accountId: accountId,
8105
8165
  viaCdn: true
8106
8166
  })];
8107
- case 7:
8108
- _d.cTileset = _l.sent();
8109
- return [3 /*break*/, 10];
8110
- case 8:
8111
- if (!tileset) return [3 /*break*/, 10];
8167
+ case 13:
8168
+ _d.cTileset = _o.sent();
8169
+ return [3 /*break*/, 16];
8170
+ case 14:
8171
+ if (!tileset) return [3 /*break*/, 16];
8112
8172
  _e = this;
8113
8173
  return [4 /*yield*/, TilesetRenderEngine.Render({
8114
- apiGetter: this.apiGetter,
8174
+ apiGetter: this.getters.GetBruceGetter(),
8115
8175
  tileset: tileset,
8116
8176
  viewer: this.viewer,
8117
8177
  coords: null,
8118
- accountId: (_k = (_j = this.item.tileset) === null || _j === void 0 ? void 0 : _j.ClientAccountID) !== null && _k !== void 0 ? _k : this.apiGetter.accountId,
8178
+ accountId: (_m = (_l = this.item.tileset) === null || _l === void 0 ? void 0 : _l.ClientAccountID) !== null && _m !== void 0 ? _m : this.getters.GetAccountId(),
8119
8179
  // Not doing viaCDN here because I fear it'll break something since this is a legacy menu item type.
8120
8180
  viaCdn: false
8121
8181
  })];
8122
- case 9:
8123
- _e.cTileset = _l.sent();
8124
- _l.label = 10;
8125
- case 10:
8182
+ case 15:
8183
+ _e.cTileset = _o.sent();
8184
+ _o.label = 16;
8185
+ case 16:
8126
8186
  if (this.disposed) {
8127
8187
  this.doDispose();
8128
8188
  return [2 /*return*/];
@@ -8131,7 +8191,7 @@ var TilesetArbRenderManager;
8131
8191
  try {
8132
8192
  if (_this.item.ApplyStyles ||
8133
8193
  _this.item.Type == MenuItem.EType.IonTileset) {
8134
- var api = _this.apiGetter.getApi();
8194
+ var api = _this.getters.GetBruceApi();
8135
8195
  _this.styler = new TilesetRenderEngine.Styler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
8136
8196
  }
8137
8197
  _this.onCTilesetLoad();
@@ -8221,7 +8281,7 @@ var TilesetArbRenderManager;
8221
8281
  menuItemId: this.item.id,
8222
8282
  priority: 0,
8223
8283
  visual: feature,
8224
- accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.apiGetter.accountId,
8284
+ accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
8225
8285
  tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID
8226
8286
  };
8227
8287
  // Two different methods for two different Cesium versions...
@@ -8560,8 +8620,14 @@ var MenuItemManager;
8560
8620
  if (this.viewer.isDestroyed()) {
8561
8621
  return null;
8562
8622
  }
8563
- if (!params.apiGetter) {
8564
- params.apiGetter = ENVIRONMENT.Api().GetBruceGetter();
8623
+ if (!params.getters) {
8624
+ params.getters = ENVIRONMENT.Api();
8625
+ }
8626
+ if (params.apiGetter && !params.getters) {
8627
+ console.warn("RenderItem(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
8628
+ }
8629
+ else if (!params.apiGetter) {
8630
+ params.apiGetter = params.getters.GetBruceGetter();
8565
8631
  }
8566
8632
  var rItem = this.items.find(function (x) { return x.id == params.item.id; });
8567
8633
  if (rItem) {
@@ -8633,7 +8699,7 @@ var MenuItemManager;
8633
8699
  rItem.renderManager = new TilesetCadRenderManager.Manager({
8634
8700
  viewer: this.viewer,
8635
8701
  register: this.visualsRegister,
8636
- apiGetter: params.apiGetter,
8702
+ getters: params.getters,
8637
8703
  item: params.item
8638
8704
  });
8639
8705
  break;
@@ -8641,7 +8707,7 @@ var MenuItemManager;
8641
8707
  rItem.renderManager = new TilesetOsmRenderManager.Manager({
8642
8708
  viewer: this.viewer,
8643
8709
  register: this.visualsRegister,
8644
- apiGetter: params.apiGetter,
8710
+ getters: params.getters,
8645
8711
  monitor: this.sharedMonitor,
8646
8712
  item: params.item
8647
8713
  });
@@ -8649,7 +8715,7 @@ var MenuItemManager;
8649
8715
  case MenuItem.EType.PointCloud:
8650
8716
  rItem.renderManager = new TilesetPointcloudRenderManager.Manager({
8651
8717
  viewer: this.viewer,
8652
- apiGetter: params.apiGetter,
8718
+ getters: params.getters,
8653
8719
  item: params.item
8654
8720
  });
8655
8721
  break;
@@ -8657,7 +8723,7 @@ var MenuItemManager;
8657
8723
  rItem.renderManager = new TilesetEntitiesRenderManager.Manager({
8658
8724
  viewer: this.viewer,
8659
8725
  register: this.visualsRegister,
8660
- apiGetter: params.apiGetter,
8726
+ getters: params.getters,
8661
8727
  item: params.item
8662
8728
  });
8663
8729
  break;
@@ -8671,7 +8737,7 @@ var MenuItemManager;
8671
8737
  case MenuItem.EType.IonTileset:
8672
8738
  case MenuItem.EType.ArbTileset:
8673
8739
  rItem.renderManager = new TilesetArbRenderManager.Manager({
8674
- apiGetter: params.apiGetter,
8740
+ getters: params.getters,
8675
8741
  item: params.item,
8676
8742
  viewer: this.viewer,
8677
8743
  register: this.visualsRegister
@@ -14256,7 +14322,7 @@ var ViewerUtils;
14256
14322
  ViewerUtils.CreateWidgets = CreateWidgets;
14257
14323
  })(ViewerUtils || (ViewerUtils = {}));
14258
14324
 
14259
- var VERSION$1 = "2.3.4";
14325
+ var VERSION$1 = "2.3.5";
14260
14326
 
14261
14327
  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 };
14262
14328
  //# sourceMappingURL=bruce-cesium.es5.js.map