bruce-cesium 4.2.3 → 4.2.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.
@@ -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);
@@ -13810,7 +13818,7 @@
13810
13818
  cacheToken: params.tileset.generateVersion,
13811
13819
  legacy: false,
13812
13820
  viaCdn: false
13813
- }) + "?generation=" + params.tileset.generateVersion, null)];
13821
+ }) + "?generation=" + params.tileset.generateVersion, null, params.noMemoryLimit)];
13814
13822
  case 4:
13815
13823
  cTileset = _a.sent();
13816
13824
  params.viewer.scene.primitives.add(cTileset);
@@ -13824,7 +13832,7 @@
13824
13832
  cacheToken: params.tileset.generateVersion,
13825
13833
  legacy: false,
13826
13834
  viaCdn: false
13827
- }) + "?generation=" + params.tileset.generateVersion, null)];
13835
+ }) + "?generation=" + params.tileset.generateVersion, null, params.noMemoryLimit)];
13828
13836
  case 6:
13829
13837
  cTileset_2 = _a.sent();
13830
13838
  params.viewer.scene.primitives.add(cTileset_2);
@@ -13928,7 +13936,7 @@
13928
13936
  });
13929
13937
  }
13930
13938
  _a.label = 7;
13931
- case 7: return [4 /*yield*/, createTileset(loadUrl, null)];
13939
+ case 7: return [4 /*yield*/, createTileset(loadUrl, null, noMemoryLimit)];
13932
13940
  case 8:
13933
13941
  cTileset = _a.sent();
13934
13942
  viewer.scene.primitives.add(cTileset);
@@ -14066,9 +14074,15 @@
14066
14074
  }
14067
14075
  }
14068
14076
  }
14069
- if (isNaN(params.fallbackStyleId) && params.fallbackStyleId != null) {
14077
+ if (!isNaN(params.fallbackStyleId) && params.fallbackStyleId != null) {
14070
14078
  this.fallbackStyleId = params.fallbackStyleId;
14071
14079
  }
14080
+ if (params.fallbackStyle) {
14081
+ this.fallbackStyle = params.fallbackStyle;
14082
+ }
14083
+ else {
14084
+ this.fallbackStyle = null;
14085
+ }
14072
14086
  // Empty queues.
14073
14087
  // Requeue all.
14074
14088
  this.recordLoadQueue = [];
@@ -14216,7 +14230,6 @@
14216
14230
  counter = ++this.loadingCounter;
14217
14231
  this.styleMappingLoaded = false;
14218
14232
  this.styleMappingsLoaded = {};
14219
- this.fallbackStyle = null;
14220
14233
  fallbackStyleId = this.fallbackStyleId;
14221
14234
  if (!(fallbackStyleId && fallbackStyleId > 0)) return [3 /*break*/, 4];
14222
14235
  _c.label = 1;
@@ -14728,7 +14741,15 @@
14728
14741
  });
14729
14742
  cTileset.tileLoad.addEventListener(function (tile) {
14730
14743
  try {
14731
- _this.mapCTile(tile);
14744
+ _this.mapCTile(tile, true);
14745
+ }
14746
+ catch (e) {
14747
+ console.error(e);
14748
+ }
14749
+ });
14750
+ cTileset.tileUnload.addEventListener(function (tile) {
14751
+ try {
14752
+ _this.mapCTile(tile, false);
14732
14753
  }
14733
14754
  catch (e) {
14734
14755
  console.error(e);
@@ -14749,21 +14770,31 @@
14749
14770
  this.viewer.zoomTo(this.cTileset, new Cesium.HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
14750
14771
  }
14751
14772
  };
14752
- Manager.prototype.mapCTile = function (tile) {
14773
+ /**
14774
+ * @param tile
14775
+ * @param load indicates if we are loading or unloading the tile.
14776
+ * @returns
14777
+ */
14778
+ Manager.prototype.mapCTile = function (tile, load) {
14753
14779
  var content = tile === null || tile === void 0 ? void 0 : tile.content;
14754
14780
  if (!content) {
14755
14781
  return;
14756
14782
  }
14757
14783
  for (var i = 0; i < content.featuresLength; i++) {
14758
14784
  var feature = content.getFeature(i);
14759
- var rego = this.mapTilesetFeature(feature);
14785
+ var rego = this.mapTilesetFeature(feature, load);
14760
14786
  if ((rego === null || rego === void 0 ? void 0 : rego.entityId) && this.styler) {
14761
14787
  this.styler.QueueEntities([rego]);
14762
14788
  }
14763
14789
  }
14764
14790
  this.viewer.scene.requestRender();
14765
14791
  };
14766
- Manager.prototype.mapTilesetFeature = function (feature) {
14792
+ /**
14793
+ * @param feature
14794
+ * @param add indicates if we are adding or removing the feature.
14795
+ * @returns
14796
+ */
14797
+ Manager.prototype.mapTilesetFeature = function (feature, add) {
14767
14798
  var _this = this;
14768
14799
  var _a, _b, _c, _d, _e;
14769
14800
  var rego = {
@@ -14837,11 +14868,21 @@
14837
14868
  }
14838
14869
  return null;
14839
14870
  }
14840
- this.visualsManager.AddRego({
14841
- rego: rego,
14842
- requestRender: false
14843
- });
14844
- return rego;
14871
+ if (add) {
14872
+ this.visualsManager.AddRego({
14873
+ rego: rego,
14874
+ requestRender: false
14875
+ });
14876
+ return rego;
14877
+ }
14878
+ else {
14879
+ this.visualsManager.RemoveRegos({
14880
+ entityId: rego.entityId,
14881
+ requestRender: false,
14882
+ menuItemId: this.item.id,
14883
+ doRemove: false
14884
+ });
14885
+ }
14845
14886
  };
14846
14887
  Manager.prototype.getMetaByGeomId = function (geomId, tileset) {
14847
14888
  var _a;
@@ -14926,7 +14967,8 @@
14926
14967
  }
14927
14968
  (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
14928
14969
  this.visualsManager.RemoveRegos({
14929
- menuItemId: this.item.id
14970
+ menuItemId: this.item.id,
14971
+ doRemove: false
14930
14972
  });
14931
14973
  };
14932
14974
  Manager.prototype.ReRender = function (params) {
@@ -25702,7 +25744,7 @@
25702
25744
  ViewRenderEngine.Render = Render;
25703
25745
  })(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
25704
25746
 
25705
- var VERSION = "4.2.3";
25747
+ var VERSION = "4.2.5";
25706
25748
 
25707
25749
  exports.VERSION = VERSION;
25708
25750
  exports.CesiumParabola = CesiumParabola;