bruce-cesium 4.2.2 → 4.2.4

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.
@@ -9742,7 +9742,7 @@
9742
9742
  */
9743
9743
  Register.prototype.RemoveRegos = function (params) {
9744
9744
  var _a, _b, _c;
9745
- var entityId = params.entityId, menuItemId = params.menuItemId, doUpdate = params.doUpdate, relation = params.relation, retainTagIds = params.retainTagIds, requestRender = params.requestRender;
9745
+ var entityId = params.entityId, menuItemId = params.menuItemId, doUpdate = params.doUpdate, relation = params.relation, retainTagIds = params.retainTagIds, requestRender = params.requestRender, doRemove = params.doRemove;
9746
9746
  if (doUpdate == null) {
9747
9747
  doUpdate = true;
9748
9748
  }
@@ -9767,7 +9767,9 @@
9767
9767
  exports.EntityLabel.Detatch({
9768
9768
  rego: rego
9769
9769
  });
9770
- removeEntity(this.viewer, rego.visual);
9770
+ if (doRemove != false) {
9771
+ removeEntity(this.viewer, rego.visual);
9772
+ }
9771
9773
  rego.visual = null;
9772
9774
  var doesInclude = this.rego[entityId_4].find(function (r) { return r.menuItemId === menuItemId; });
9773
9775
  if (doesInclude) {
@@ -9799,7 +9801,9 @@
9799
9801
  exports.EntityLabel.Detatch({
9800
9802
  rego: rego
9801
9803
  });
9802
- removeEntity(this_2.viewer, rego.visual);
9804
+ if (doRemove != false) {
9805
+ removeEntity(this_2.viewer, rego.visual);
9806
+ }
9803
9807
  rego.visual = null;
9804
9808
  (_b = this_2.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({
9805
9809
  type: EVisualUpdateType.Remove,
@@ -13532,18 +13536,21 @@
13532
13536
  * New versions use fromUrl whereas old versions pass the url as a property.
13533
13537
  * @param url
13534
13538
  * @param props
13539
+ * @param noMemoryLimit
13535
13540
  * @returns
13536
13541
  */
13537
- function createTileset(url, props) {
13542
+ function createTileset(url, props, noMemoryLimit) {
13538
13543
  return __awaiter(this, void 0, void 0, function () {
13539
13544
  var defaultProps, C3DT;
13540
13545
  return __generator(this, function (_a) {
13541
13546
  defaultProps = {
13542
13547
  // "Optimization option. Reduce the screen space error for tiles that are further away from the camera.".
13543
13548
  dynamicScreenSpaceError: true,
13544
- // "The maximum amount of memory in MB that can be used by the tileset.".
13545
- maximumMemoryUsage: 512
13546
13549
  };
13550
+ if (noMemoryLimit != true) {
13551
+ // "The maximum amount of memory in MB that can be used by the tileset.".
13552
+ defaultProps.maximumMemoryUsage = 512;
13553
+ }
13547
13554
  C3DT = Cesium.Cesium3DTileset;
13548
13555
  if (C3DT.fromUrl) {
13549
13556
  // New cesium is running.
@@ -13735,6 +13742,7 @@
13735
13742
  return __generator(this, function (_a) {
13736
13743
  switch (_a.label) {
13737
13744
  case 0:
13745
+ console.log(params.noMemoryLimit);
13738
13746
  api = params.apiGetter.getApi(params.accountId);
13739
13747
  // Ensure regional url is loaded.
13740
13748
  return [4 /*yield*/, api.Loading];
@@ -13766,7 +13774,7 @@
13766
13774
  cacheToken: params.tileset.generateVersion,
13767
13775
  legacy: false,
13768
13776
  viaCdn: false
13769
- }) + "?generation=" + params.tileset.generateVersion, null)];
13777
+ }) + "?generation=" + params.tileset.generateVersion, null, params.noMemoryLimit)];
13770
13778
  case 2:
13771
13779
  cTileset_1 = _a.sent();
13772
13780
  params.viewer.scene.primitives.add(cTileset_1);
@@ -13776,7 +13784,9 @@
13776
13784
  if (!isAlive$2(params.viewer, cTileset_1)) {
13777
13785
  return;
13778
13786
  }
13779
- (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset_1);
13787
+ if (params.noMemoryLimit != true) {
13788
+ (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset_1);
13789
+ }
13780
13790
  var settings = params.tileset.settings;
13781
13791
  ApplySettings({
13782
13792
  cTileset: cTileset_1,
@@ -13808,7 +13818,7 @@
13808
13818
  cacheToken: params.tileset.generateVersion,
13809
13819
  legacy: false,
13810
13820
  viaCdn: false
13811
- }) + "?generation=" + params.tileset.generateVersion, null)];
13821
+ }) + "?generation=" + params.tileset.generateVersion, null, params.noMemoryLimit)];
13812
13822
  case 4:
13813
13823
  cTileset = _a.sent();
13814
13824
  params.viewer.scene.primitives.add(cTileset);
@@ -13822,7 +13832,7 @@
13822
13832
  cacheToken: params.tileset.generateVersion,
13823
13833
  legacy: false,
13824
13834
  viaCdn: false
13825
- }) + "?generation=" + params.tileset.generateVersion, null)];
13835
+ }) + "?generation=" + params.tileset.generateVersion, null, params.noMemoryLimit)];
13826
13836
  case 6:
13827
13837
  cTileset_2 = _a.sent();
13828
13838
  params.viewer.scene.primitives.add(cTileset_2);
@@ -13864,11 +13874,11 @@
13864
13874
  TilesetRenderEngine.Render = Render;
13865
13875
  function RenderLegacy(params) {
13866
13876
  return __awaiter(this, void 0, void 0, function () {
13867
- var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, settings, visual, etc, api, api, cTileset;
13877
+ var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, noMemoryLimit, settings, visual, etc, api, api, cTileset;
13868
13878
  return __generator(this, function (_a) {
13869
13879
  switch (_a.label) {
13870
13880
  case 0:
13871
- apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn, accountId = params.accountId;
13881
+ apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn, accountId = params.accountId, noMemoryLimit = params.noMemoryLimit;
13872
13882
  settings = tileset === null || tileset === void 0 ? void 0 : tileset.Settings;
13873
13883
  settings = __assign({}, settings);
13874
13884
  visual = settings.visual;
@@ -13926,7 +13936,7 @@
13926
13936
  });
13927
13937
  }
13928
13938
  _a.label = 7;
13929
- case 7: return [4 /*yield*/, createTileset(loadUrl, null)];
13939
+ case 7: return [4 /*yield*/, createTileset(loadUrl, null, noMemoryLimit)];
13930
13940
  case 8:
13931
13941
  cTileset = _a.sent();
13932
13942
  viewer.scene.primitives.add(cTileset);
@@ -13936,7 +13946,9 @@
13936
13946
  if (!isAlive$2(viewer, cTileset)) {
13937
13947
  return;
13938
13948
  }
13939
- (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset);
13949
+ if (noMemoryLimit != true) {
13950
+ (_a = GetMemoryWatcher(params.viewer)) === null || _a === void 0 ? void 0 : _a.Watch(cTileset);
13951
+ }
13940
13952
  if (tileset) {
13941
13953
  var settings_1 = tileset.Settings;
13942
13954
  settings_1 = __assign({}, settings_1);
@@ -14699,7 +14711,8 @@
14699
14711
  viewer: this.viewer,
14700
14712
  coords: coords,
14701
14713
  accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
14702
- viaCdn: this.item.cdnEnabled
14714
+ viaCdn: this.item.cdnEnabled,
14715
+ noMemoryLimit: this.item["noMaximumMemory"]
14703
14716
  })];
14704
14717
  case 3:
14705
14718
  cTileset = _a.cTileset = _d.sent();
@@ -14723,7 +14736,15 @@
14723
14736
  });
14724
14737
  cTileset.tileLoad.addEventListener(function (tile) {
14725
14738
  try {
14726
- _this.mapCTile(tile);
14739
+ _this.mapCTile(tile, true);
14740
+ }
14741
+ catch (e) {
14742
+ console.error(e);
14743
+ }
14744
+ });
14745
+ cTileset.tileUnload.addEventListener(function (tile) {
14746
+ try {
14747
+ _this.mapCTile(tile, false);
14727
14748
  }
14728
14749
  catch (e) {
14729
14750
  console.error(e);
@@ -14744,21 +14765,31 @@
14744
14765
  this.viewer.zoomTo(this.cTileset, new Cesium.HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
14745
14766
  }
14746
14767
  };
14747
- Manager.prototype.mapCTile = function (tile) {
14768
+ /**
14769
+ * @param tile
14770
+ * @param load indicates if we are loading or unloading the tile.
14771
+ * @returns
14772
+ */
14773
+ Manager.prototype.mapCTile = function (tile, load) {
14748
14774
  var content = tile === null || tile === void 0 ? void 0 : tile.content;
14749
14775
  if (!content) {
14750
14776
  return;
14751
14777
  }
14752
14778
  for (var i = 0; i < content.featuresLength; i++) {
14753
14779
  var feature = content.getFeature(i);
14754
- var rego = this.mapTilesetFeature(feature);
14780
+ var rego = this.mapTilesetFeature(feature, load);
14755
14781
  if ((rego === null || rego === void 0 ? void 0 : rego.entityId) && this.styler) {
14756
14782
  this.styler.QueueEntities([rego]);
14757
14783
  }
14758
14784
  }
14759
14785
  this.viewer.scene.requestRender();
14760
14786
  };
14761
- Manager.prototype.mapTilesetFeature = function (feature) {
14787
+ /**
14788
+ * @param feature
14789
+ * @param add indicates if we are adding or removing the feature.
14790
+ * @returns
14791
+ */
14792
+ Manager.prototype.mapTilesetFeature = function (feature, add) {
14762
14793
  var _this = this;
14763
14794
  var _a, _b, _c, _d, _e;
14764
14795
  var rego = {
@@ -14832,11 +14863,21 @@
14832
14863
  }
14833
14864
  return null;
14834
14865
  }
14835
- this.visualsManager.AddRego({
14836
- rego: rego,
14837
- requestRender: false
14838
- });
14839
- return rego;
14866
+ if (add) {
14867
+ this.visualsManager.AddRego({
14868
+ rego: rego,
14869
+ requestRender: false
14870
+ });
14871
+ return rego;
14872
+ }
14873
+ else {
14874
+ this.visualsManager.RemoveRegos({
14875
+ entityId: rego.entityId,
14876
+ requestRender: false,
14877
+ menuItemId: this.item.id,
14878
+ doRemove: false
14879
+ });
14880
+ }
14840
14881
  };
14841
14882
  Manager.prototype.getMetaByGeomId = function (geomId, tileset) {
14842
14883
  var _a;
@@ -14921,7 +14962,8 @@
14921
14962
  }
14922
14963
  (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
14923
14964
  this.visualsManager.RemoveRegos({
14924
- menuItemId: this.item.id
14965
+ menuItemId: this.item.id,
14966
+ doRemove: false
14925
14967
  });
14926
14968
  };
14927
14969
  Manager.prototype.ReRender = function (params) {
@@ -16151,7 +16193,8 @@
16151
16193
  tileset: tileset,
16152
16194
  viewer: this.viewer,
16153
16195
  accountId: accountId,
16154
- viaCdn: this.item.cdnEnabled
16196
+ viaCdn: this.item.cdnEnabled,
16197
+ noMemoryLimit: this.item["noMaximumMemory"]
16155
16198
  })];
16156
16199
  case 8:
16157
16200
  cTileset = _a.cTileset = _g.sent();
@@ -16336,7 +16379,7 @@
16336
16379
  return;
16337
16380
  }
16338
16381
  (function () { return __awaiter(_this, void 0, void 0, function () {
16339
- var canAccess, e_1, accountId, api, tileset, cTileset, _a;
16382
+ var canAccess, e_1, accountId, api, tileset, _a;
16340
16383
  var _this = this;
16341
16384
  var _b, _c, _d, _e;
16342
16385
  return __generator(this, function (_f) {
@@ -16390,10 +16433,11 @@
16390
16433
  viewer: this.viewer,
16391
16434
  coords: null,
16392
16435
  accountId: accountId,
16393
- viaCdn: this.item.cdnEnabled
16436
+ viaCdn: this.item.cdnEnabled,
16437
+ noMemoryLimit: this.item["noMaximumMemory"]
16394
16438
  })];
16395
16439
  case 8:
16396
- cTileset = _a.cTileset = _f.sent();
16440
+ _a.cTileset = _f.sent();
16397
16441
  if (this.disposed) {
16398
16442
  this.doDispose();
16399
16443
  return [2 /*return*/];
@@ -16782,7 +16826,8 @@
16782
16826
  ionAccessToken: (_l = this.item.IonResource) === null || _l === void 0 ? void 0 : _l.AccessToken,
16783
16827
  loadUrl: loadUrlOverride,
16784
16828
  accountId: accountId,
16785
- viaCdn: true
16829
+ viaCdn: true,
16830
+ noMemoryLimit: this.item["noMaximumMemory"]
16786
16831
  })];
16787
16832
  case 13:
16788
16833
  _d.cTileset = _p.sent();
@@ -25694,7 +25739,7 @@
25694
25739
  ViewRenderEngine.Render = Render;
25695
25740
  })(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
25696
25741
 
25697
- var VERSION = "4.2.2";
25742
+ var VERSION = "4.2.4";
25698
25743
 
25699
25744
  exports.VERSION = VERSION;
25700
25745
  exports.CesiumParabola = CesiumParabola;