bruce-cesium 2.3.5 → 2.3.7

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 (13) hide show
  1. package/dist/bruce-cesium.es5.js +52 -27
  2. package/dist/bruce-cesium.es5.js.map +1 -1
  3. package/dist/bruce-cesium.umd.js +51 -26
  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-creator.js +37 -20
  7. package/dist/lib/rendering/menu-item-creator.js.map +1 -1
  8. package/dist/lib/rendering/view-render-engine.js +13 -5
  9. package/dist/lib/rendering/view-render-engine.js.map +1 -1
  10. package/dist/types/bruce-cesium.d.ts +1 -1
  11. package/dist/types/rendering/menu-item-creator.d.ts +2 -1
  12. package/dist/types/rendering/view-render-engine.d.ts +2 -1
  13. package/package.json +1 -1
package/dist/bruce-cesium.umd.js CHANGED
@@ -8884,11 +8884,11 @@
8884
8884
  (function (MenuItemCreator) {
8885
8885
  function RenderEntities(params) {
8886
8886
  return __awaiter(this, void 0, void 0, function () {
8887
- var entityIds, apiGetter, manager, viewer, item, renderedId;
8887
+ var entityIds, apiGetter, getters, manager, viewer, item, renderedId;
8888
8888
  return __generator(this, function (_a) {
8889
8889
  switch (_a.label) {
8890
8890
  case 0:
8891
- entityIds = params.entityIds, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
8891
+ entityIds = params.entityIds, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
8892
8892
  if (!manager && viewer) {
8893
8893
  manager = exports.ViewerUtils.GetManager({
8894
8894
  viewer: viewer,
@@ -8919,6 +8919,7 @@
8919
8919
  };
8920
8920
  return [4 /*yield*/, manager.RenderItem({
8921
8921
  apiGetter: apiGetter,
8922
+ getters: getters,
8922
8923
  item: item
8923
8924
  })];
8924
8925
  case 1:
@@ -8934,11 +8935,11 @@
8934
8935
  MenuItemCreator.RenderEntities = RenderEntities;
8935
8936
  function RenderEntityTypes(params) {
8936
8937
  return __awaiter(this, void 0, void 0, function () {
8937
- var typeIds, apiGetter, manager, viewer, renderedItemIds, menuItems, i, typeId, menuItem, itemId;
8938
+ var typeIds, apiGetter, getters, manager, viewer, renderedItemIds, menuItems, i, typeId, menuItem, itemId;
8938
8939
  return __generator(this, function (_a) {
8939
8940
  switch (_a.label) {
8940
8941
  case 0:
8941
- typeIds = params.entityTypeIds, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
8942
+ typeIds = params.entityTypeIds, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
8942
8943
  if (!manager && viewer) {
8943
8944
  manager = exports.ViewerUtils.GetManager({
8944
8945
  viewer: viewer,
@@ -8959,6 +8960,7 @@
8959
8960
  menuItems.push(menuItem);
8960
8961
  return [4 /*yield*/, manager.RenderItem({
8961
8962
  apiGetter: apiGetter,
8963
+ getters: getters,
8962
8964
  item: menuItem
8963
8965
  })];
8964
8966
  case 2:
@@ -8979,11 +8981,11 @@
8979
8981
  MenuItemCreator.RenderEntityTypes = RenderEntityTypes;
8980
8982
  function RenderEntityFilter(params) {
8981
8983
  return __awaiter(this, void 0, void 0, function () {
8982
- var filter, apiGetter, manager, viewer, item, renderedIds;
8984
+ var filter, apiGetter, getters, manager, viewer, item, renderedIds;
8983
8985
  return __generator(this, function (_a) {
8984
8986
  switch (_a.label) {
8985
8987
  case 0:
8986
- filter = params.attrFilter, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
8988
+ filter = params.attrFilter, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
8987
8989
  if (!manager && viewer) {
8988
8990
  manager = exports.ViewerUtils.GetManager({
8989
8991
  viewer: viewer,
@@ -9015,6 +9017,7 @@
9015
9017
  };
9016
9018
  return [4 /*yield*/, manager.RenderItem({
9017
9019
  apiGetter: apiGetter,
9020
+ getters: getters,
9018
9021
  item: item
9019
9022
  })];
9020
9023
  case 1:
@@ -9030,11 +9033,11 @@
9030
9033
  MenuItemCreator.RenderEntityFilter = RenderEntityFilter;
9031
9034
  function RenderMenuItems(params) {
9032
9035
  return __awaiter(this, void 0, void 0, function () {
9033
- var menuItems, apiGetter, manager, viewer, renderedItemIds, i, menuItem, itemId;
9036
+ var menuItems, apiGetter, getters, manager, viewer, renderedItemIds, i, menuItem, itemId;
9034
9037
  return __generator(this, function (_a) {
9035
9038
  switch (_a.label) {
9036
9039
  case 0:
9037
- menuItems = params.menuItems, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
9040
+ menuItems = params.menuItems, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
9038
9041
  if (!manager && viewer) {
9039
9042
  manager = exports.ViewerUtils.GetManager({
9040
9043
  viewer: viewer,
@@ -9052,6 +9055,7 @@
9052
9055
  menuItem = menuItems[i];
9053
9056
  return [4 /*yield*/, manager.RenderItem({
9054
9057
  apiGetter: apiGetter,
9058
+ getters: getters,
9055
9059
  item: menuItem
9056
9060
  })];
9057
9061
  case 2:
@@ -9071,13 +9075,19 @@
9071
9075
  MenuItemCreator.RenderMenuItems = RenderMenuItems;
9072
9076
  function RenderTileset(params) {
9073
9077
  return __awaiter(this, void 0, void 0, function () {
9074
- var tilesetId, apiGetter, viewer, manager, api, tileset, _a, menuItem, renderedIds;
9078
+ var tilesetId, apiGetter, getters, viewer, manager, api, tileset, _a, menuItem, renderedIds;
9075
9079
  return __generator(this, function (_b) {
9076
9080
  switch (_b.label) {
9077
9081
  case 0:
9078
- tilesetId = params.tilesetId, apiGetter = params.apiGetter, viewer = params.viewer, manager = params.manager;
9079
- if (!apiGetter) {
9080
- apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
9082
+ tilesetId = params.tilesetId, apiGetter = params.apiGetter, getters = params.getters, viewer = params.viewer, manager = params.manager;
9083
+ if (!getters) {
9084
+ getters = bruceModels.ENVIRONMENT.Api();
9085
+ }
9086
+ if (apiGetter && !getters) {
9087
+ console.warn("RenderTileset(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
9088
+ }
9089
+ else if (!apiGetter) {
9090
+ apiGetter = getters.GetBruceGetter();
9081
9091
  }
9082
9092
  if (!manager && viewer) {
9083
9093
  manager = exports.ViewerUtils.GetManager({
@@ -9088,7 +9098,7 @@
9088
9098
  else if (manager && !viewer) {
9089
9099
  viewer = manager.Viewer;
9090
9100
  }
9091
- api = apiGetter.getApi();
9101
+ api = getters.GetBruceApi();
9092
9102
  if (!params.tileset) return [3 /*break*/, 1];
9093
9103
  _a = params.tileset;
9094
9104
  return [3 /*break*/, 3];
@@ -9156,7 +9166,8 @@
9156
9166
  if (!menuItem) return [3 /*break*/, 5];
9157
9167
  return [4 /*yield*/, manager.RenderItem({
9158
9168
  item: menuItem,
9159
- apiGetter: apiGetter
9169
+ apiGetter: apiGetter,
9170
+ getters: getters
9160
9171
  })];
9161
9172
  case 4:
9162
9173
  renderedIds = _b.sent();
@@ -9176,14 +9187,20 @@
9176
9187
  function RenderBookmarkItems(params) {
9177
9188
  var _a;
9178
9189
  return __awaiter(this, void 0, void 0, function () {
9179
- var viewId, bookmarkId, apiGetter, manager, viewer, api, view, _b, bookmark, _c, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, alternations, renderedItemIds, traverseItems_1, i;
9190
+ var viewId, bookmarkId, apiGetter, getters, manager, viewer, api, view, _b, bookmark, _c, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, alternations, renderedItemIds, traverseItems_1, i;
9180
9191
  var _this = this;
9181
9192
  return __generator(this, function (_d) {
9182
9193
  switch (_d.label) {
9183
9194
  case 0:
9184
- viewId = params.viewId, bookmarkId = params.bookmarkId, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
9185
- if (!apiGetter) {
9186
- apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
9195
+ viewId = params.viewId, bookmarkId = params.bookmarkId, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
9196
+ if (!getters) {
9197
+ getters = bruceModels.ENVIRONMENT.Api();
9198
+ }
9199
+ if (apiGetter && !getters) {
9200
+ console.warn("RenderBookmarkItems(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
9201
+ }
9202
+ else if (!apiGetter) {
9203
+ apiGetter = getters.GetBruceGetter();
9187
9204
  }
9188
9205
  if (!manager && viewer) {
9189
9206
  manager = exports.ViewerUtils.GetManager({
@@ -9194,7 +9211,7 @@
9194
9211
  else if (manager && !viewer) {
9195
9212
  viewer = manager.Viewer;
9196
9213
  }
9197
- api = apiGetter.getApi();
9214
+ api = getters.GetBruceApi();
9198
9215
  if (!params.view) return [3 /*break*/, 1];
9199
9216
  _b = params.view;
9200
9217
  return [3 /*break*/, 3];
@@ -9266,7 +9283,7 @@
9266
9283
  if (!enabledIds.includes(item.id)) return [3 /*break*/, 2];
9267
9284
  return [4 /*yield*/, manager.RenderItem({
9268
9285
  item: item,
9269
- apiGetter: apiGetter
9286
+ getters: getters
9270
9287
  })];
9271
9288
  case 1:
9272
9289
  itemId = _b.sent();
@@ -11035,6 +11052,7 @@
11035
11052
  if (!bookmark) return [3 /*break*/, 4];
11036
11053
  return [4 /*yield*/, exports.MenuItemCreator.RenderBookmarkItems({
11037
11054
  apiGetter: params.apiGetter,
11055
+ getters: params.getters,
11038
11056
  manager: manager,
11039
11057
  view: view,
11040
11058
  bookmark: bookmark
@@ -11054,6 +11072,7 @@
11054
11072
  };
11055
11073
  return [4 /*yield*/, params.manager.RenderItem({
11056
11074
  apiGetter: params.apiGetter,
11075
+ getters: params.getters,
11057
11076
  item: menuItem
11058
11077
  })];
11059
11078
  case 5:
@@ -11358,7 +11377,7 @@
11358
11377
  }
11359
11378
  if (!bookmark) return [3 /*break*/, 5];
11360
11379
  return [4 /*yield*/, exports.MenuItemCreator.RenderBookmarkItems({
11361
- apiGetter: params.apiGetter,
11380
+ getters: params.getters,
11362
11381
  manager: params.manager,
11363
11382
  view: view,
11364
11383
  bookmark: bookmark
@@ -11377,7 +11396,7 @@
11377
11396
  Type: bruceModels.MenuItem.EType.Relations
11378
11397
  };
11379
11398
  return [4 /*yield*/, params.manager.RenderItem({
11380
- apiGetter: params.apiGetter,
11399
+ getters: params.getters,
11381
11400
  item: menuItem
11382
11401
  })];
11383
11402
  case 6:
@@ -11415,10 +11434,16 @@
11415
11434
  else if (!params.viewer && params.manager) {
11416
11435
  params.viewer = params.manager.Viewer;
11417
11436
  }
11418
- if (!params.apiGetter) {
11419
- params.apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
11437
+ if (!params.getters) {
11438
+ params.getters = bruceModels.ENVIRONMENT.Api();
11439
+ }
11440
+ if (params.apiGetter && !params.getters) {
11441
+ console.warn("ViewRenderEngine.Render(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
11442
+ }
11443
+ else if (!params.apiGetter) {
11444
+ params.apiGetter = params.getters.GetBruceGetter();
11420
11445
  }
11421
- api = params.apiGetter.getApi();
11446
+ api = params.getters.GetBruceApi();
11422
11447
  if (!params.view) return [3 /*break*/, 1];
11423
11448
  _b = params.view;
11424
11449
  return [3 /*break*/, 3];
@@ -14268,7 +14293,7 @@
14268
14293
  ViewerUtils.CreateWidgets = CreateWidgets;
14269
14294
  })(exports.ViewerUtils || (exports.ViewerUtils = {}));
14270
14295
 
14271
- var VERSION$1 = "2.3.5";
14296
+ var VERSION$1 = "2.3.7";
14272
14297
 
14273
14298
  exports.VERSION = VERSION$1;
14274
14299
  exports.CesiumViewMonitor = CesiumViewMonitor;