bruce-cesium 1.2.1 → 1.2.3

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.
@@ -3913,79 +3913,81 @@
3913
3913
  if (legacy_1.usingBoundingBox == null) {
3914
3914
  legacy_1.usingBoundingBox = true;
3915
3915
  }
3916
- var offsetPoint_1 = function (pos, distance, bearing) {
3917
- // radius of earth
3918
- var radius = 6371e3;
3919
- var δ = distance / radius;
3920
- var θ = Cesium.Math.toRadians(bearing);
3921
- var φ1 = Cesium.Math.toRadians(pos.latitude);
3922
- var λ1 = Cesium.Math.toRadians(pos.longitude);
3923
- var sinφ2 = Math.sin(φ1) * Math.cos(δ) + Math.cos(φ1) * Math.sin(δ) * Math.cos(θ);
3924
- var φ2 = Math.asin(sinφ2);
3925
- var y = Math.sin(θ) * Math.sin(δ) * Math.cos(φ1);
3926
- var x = Math.cos(δ) - Math.sin(φ1) * sinφ2;
3927
- var λ2 = λ1 + Math.atan2(y, x);
3928
- var finalPos = new Cesium.Cartographic(λ2, φ2, pos.height);
3929
- finalPos.latitude = Cesium.Math.toDegrees(finalPos.latitude);
3930
- finalPos.longitude = Cesium.Math.toDegrees(finalPos.longitude);
3931
- return finalPos;
3932
- };
3933
- var getOffset = function (pos, n, e, alt) {
3934
- if (n == 0 && e == 0 && alt == 0) {
3935
- return new Cesium.Cartesian3(0, 0, 0);
3936
- }
3937
- var carto = Cesium.Cartographic.fromCartesian(pos);
3938
- carto.latitude = Cesium.Math.toDegrees(carto.latitude);
3939
- carto.longitude = Cesium.Math.toDegrees(carto.longitude);
3940
- // North
3941
- if (n != 0) {
3942
- carto = offsetPoint_1(carto, Number(n), 0);
3916
+ if (legacy_1.transform) {
3917
+ var offsetPoint_1 = function (pos, distance, bearing) {
3918
+ // radius of earth
3919
+ var radius = 6371e3;
3920
+ var δ = distance / radius;
3921
+ var θ = Cesium.Math.toRadians(bearing);
3922
+ var φ1 = Cesium.Math.toRadians(pos.latitude);
3923
+ var λ1 = Cesium.Math.toRadians(pos.longitude);
3924
+ var sinφ2 = Math.sin1) * Math.cos(δ) + Math.cos(φ1) * Math.sin(δ) * Math.cos(θ);
3925
+ var φ2 = Math.asin(sinφ2);
3926
+ var y = Math.sin(θ) * Math.sin(δ) * Math.cos(φ1);
3927
+ var x = Math.cos(δ) - Math.sin(φ1) * sinφ2;
3928
+ var λ2 = λ1 + Math.atan2(y, x);
3929
+ var finalPos = new Cesium.Cartographic(λ2, φ2, pos.height);
3930
+ finalPos.latitude = Cesium.Math.toDegrees(finalPos.latitude);
3931
+ finalPos.longitude = Cesium.Math.toDegrees(finalPos.longitude);
3932
+ return finalPos;
3933
+ };
3934
+ var getOffset = function (pos, n, e, alt) {
3935
+ if (n == 0 && e == 0 && alt == 0) {
3936
+ return new Cesium.Cartesian3(0, 0, 0);
3937
+ }
3938
+ var carto = Cesium.Cartographic.fromCartesian(pos);
3939
+ carto.latitude = Cesium.Math.toDegrees(carto.latitude);
3940
+ carto.longitude = Cesium.Math.toDegrees(carto.longitude);
3941
+ // North
3942
+ if (n != 0) {
3943
+ carto = offsetPoint_1(carto, Number(n), 0);
3944
+ }
3945
+ // East
3946
+ if (e != 0) {
3947
+ carto = offsetPoint_1(carto, Number(e), 90);
3948
+ }
3949
+ // Altitude
3950
+ carto.height += Number(alt);
3951
+ var finalOffset = Cesium.Cartesian3.fromDegrees(carto.longitude, carto.latitude, carto.height);
3952
+ finalOffset.x -= pos.x;
3953
+ finalOffset.y -= pos.y;
3954
+ finalOffset.z -= pos.z;
3955
+ return finalOffset;
3956
+ };
3957
+ var getCurPos3d = function () {
3958
+ if (legacy_1.usingBoundingBox == false) {
3959
+ return Cesium.Matrix4.getTranslation(root.transform, new Cesium.Cartesian3());
3960
+ }
3961
+ else {
3962
+ return Cesium.Cartesian3.clone(root.boundingSphere.center);
3963
+ }
3964
+ };
3965
+ var pos3d = void 0;
3966
+ if (location.latitude != null && location.longitude != null) {
3967
+ pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
3943
3968
  }
3944
- // East
3945
- if (e != 0) {
3946
- carto = offsetPoint_1(carto, Number(e), 90);
3969
+ if (!pos3d) {
3970
+ pos3d = getCurPos3d();
3947
3971
  }
3948
- // Altitude
3949
- carto.height += Number(alt);
3950
- var finalOffset = Cesium.Cartesian3.fromDegrees(carto.longitude, carto.latitude, carto.height);
3951
- finalOffset.x -= pos.x;
3952
- finalOffset.y -= pos.y;
3953
- finalOffset.z -= pos.z;
3954
- return finalOffset;
3955
- };
3956
- var getCurPos3d = function () {
3957
- if (legacy_1.usingBoundingBox == false) {
3958
- return Cesium.Matrix4.getTranslation(root.transform, new Cesium.Cartesian3());
3972
+ var offset = getOffset(pos3d, transform.x, transform.y, transform.z);
3973
+ if (bruceModels.Cartes.ValidateCartes3(offset)) {
3974
+ pos3d.x += offset.x;
3975
+ pos3d.y += offset.y;
3976
+ pos3d.z += offset.z;
3959
3977
  }
3960
- else {
3961
- return Cesium.Cartesian3.clone(root.boundingSphere.center);
3978
+ if (legacy_1.rotate) {
3979
+ var hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new Cesium.HeadingPitchRoll());
3980
+ root.transform = Cesium.Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
3981
+ root.updateTransform();
3962
3982
  }
3963
- };
3964
- var pos3d = void 0;
3965
- if (location.latitude != null && location.longitude != null) {
3966
- pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
3967
- }
3968
- if (!pos3d) {
3969
- pos3d = getCurPos3d();
3970
- }
3971
- var offset = getOffset(pos3d, transform.x, transform.y, transform.z);
3972
- if (bruceModels.Cartes.ValidateCartes3(offset)) {
3973
- pos3d.x += offset.x;
3974
- pos3d.y += offset.y;
3975
- pos3d.z += offset.z;
3976
- }
3977
- if (legacy_1.rotate) {
3978
- var hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new Cesium.HeadingPitchRoll());
3979
- root.transform = Cesium.Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
3983
+ var curPos3d = getCurPos3d();
3984
+ var newTransform = Cesium.Matrix4.pack(root.transform.clone(new Cesium.Matrix4()), []);
3985
+ newTransform[12] += pos3d.x - curPos3d.x;
3986
+ newTransform[13] += pos3d.y - curPos3d.y;
3987
+ newTransform[14] += pos3d.z - curPos3d.z;
3988
+ root.transform = Cesium.Matrix4.unpack(newTransform);
3980
3989
  root.updateTransform();
3981
3990
  }
3982
- var curPos3d = getCurPos3d();
3983
- var newTransform = Cesium.Matrix4.pack(root.transform.clone(new Cesium.Matrix4()), []);
3984
- newTransform[12] += pos3d.x - curPos3d.x;
3985
- newTransform[13] += pos3d.y - curPos3d.y;
3986
- newTransform[14] += pos3d.z - curPos3d.z;
3987
- root.transform = Cesium.Matrix4.unpack(newTransform);
3988
- root.updateTransform();
3989
3991
  }
3990
3992
  else {
3991
3993
  if (!(location === null || location === void 0 ? void 0 : location.latitude)) {
@@ -4369,7 +4371,7 @@
4369
4371
  }
4370
4372
  }
4371
4373
  catch (e) {
4372
- console.log(e);
4374
+ console.error(e);
4373
4375
  }
4374
4376
  }
4375
4377
  i = 0;
@@ -4888,7 +4890,6 @@
4888
4890
  var BATCH_SIZE = 30;
4889
4891
  var BATCH_DELAY = 200;
4890
4892
  var MAX_RANGE = 3000;
4891
- var TilesetOsmRenderManager;
4892
4893
  (function (TilesetOsmRenderManager) {
4893
4894
  var Manager = /** @class */ (function () {
4894
4895
  function Manager(params) {
@@ -5203,9 +5204,8 @@
5203
5204
  return Manager;
5204
5205
  }());
5205
5206
  TilesetOsmRenderManager.Manager = Manager;
5206
- })(TilesetOsmRenderManager || (TilesetOsmRenderManager = {}));
5207
+ })(exports.TilesetOsmRenderManager || (exports.TilesetOsmRenderManager = {}));
5207
5208
 
5208
- var TilesetEntitiesRenderManager;
5209
5209
  (function (TilesetEntitiesRenderManager) {
5210
5210
  var Manager = /** @class */ (function () {
5211
5211
  function Manager(params) {
@@ -5338,9 +5338,8 @@
5338
5338
  return Manager;
5339
5339
  }());
5340
5340
  TilesetEntitiesRenderManager.Manager = Manager;
5341
- })(TilesetEntitiesRenderManager || (TilesetEntitiesRenderManager = {}));
5341
+ })(exports.TilesetEntitiesRenderManager || (exports.TilesetEntitiesRenderManager = {}));
5342
5342
 
5343
- var TilesetPointcloudRenderManager;
5344
5343
  (function (TilesetPointcloudRenderManager) {
5345
5344
  var Manager = /** @class */ (function () {
5346
5345
  function Manager(params) {
@@ -5438,9 +5437,8 @@
5438
5437
  return Manager;
5439
5438
  }());
5440
5439
  TilesetPointcloudRenderManager.Manager = Manager;
5441
- })(TilesetPointcloudRenderManager || (TilesetPointcloudRenderManager = {}));
5440
+ })(exports.TilesetPointcloudRenderManager || (exports.TilesetPointcloudRenderManager = {}));
5442
5441
 
5443
- var DataSourceStaticKmlManager;
5444
5442
  (function (DataSourceStaticKmlManager) {
5445
5443
  var Manager = /** @class */ (function () {
5446
5444
  function Manager(params) {
@@ -5517,7 +5515,7 @@
5517
5515
  return Manager;
5518
5516
  }());
5519
5517
  DataSourceStaticKmlManager.Manager = Manager;
5520
- })(DataSourceStaticKmlManager || (DataSourceStaticKmlManager = {}));
5518
+ })(exports.DataSourceStaticKmlManager || (exports.DataSourceStaticKmlManager = {}));
5521
5519
 
5522
5520
  function getLegacyTileset(params) {
5523
5521
  return __awaiter(this, void 0, void 0, function () {
@@ -5536,7 +5534,7 @@
5536
5534
  return [2 /*return*/, legacyTileset];
5537
5535
  case 3:
5538
5536
  e_1 = _a.sent();
5539
- console.log(e_1);
5537
+ console.error(e_1);
5540
5538
  return [3 /*break*/, 4];
5541
5539
  case 4: return [2 /*return*/];
5542
5540
  }
@@ -5545,14 +5543,14 @@
5545
5543
  }
5546
5544
  function getTileset(params) {
5547
5545
  return __awaiter(this, void 0, void 0, function () {
5548
- var apiGetter, menuItem, api, tileset, e_2;
5546
+ var apiGetter, menuItem, api, tileset, typeMapping, e_2;
5549
5547
  return __generator(this, function (_a) {
5550
5548
  switch (_a.label) {
5551
5549
  case 0:
5552
5550
  apiGetter = params.apiGetter, menuItem = params.menuItem;
5553
5551
  _a.label = 1;
5554
5552
  case 1:
5555
- _a.trys.push([1, 3, , 4]);
5553
+ _a.trys.push([1, 4, , 5]);
5556
5554
  api = apiGetter.getApi(menuItem.tileset.ClientAccountID);
5557
5555
  return [4 /*yield*/, bruceModels.Tileset.Get({
5558
5556
  api: api,
@@ -5560,17 +5558,25 @@
5560
5558
  })];
5561
5559
  case 2:
5562
5560
  tileset = (_a.sent()).tileset;
5563
- return [2 /*return*/, tileset];
5561
+ return [4 /*yield*/, bruceModels.Tileset.GetTypes({
5562
+ api: api,
5563
+ tilesetIds: [menuItem.tileset.TilesetID]
5564
+ })];
5564
5565
  case 3:
5566
+ typeMapping = (_a.sent()).typeMapping;
5567
+ return [2 /*return*/, {
5568
+ tileset: tileset,
5569
+ type: typeMapping[menuItem.tileset.TilesetID]
5570
+ }];
5571
+ case 4:
5565
5572
  e_2 = _a.sent();
5566
5573
  console.error(e_2);
5567
- return [3 /*break*/, 4];
5568
- case 4: return [2 /*return*/];
5574
+ return [3 /*break*/, 5];
5575
+ case 5: return [2 /*return*/];
5569
5576
  }
5570
5577
  });
5571
5578
  });
5572
5579
  }
5573
- var TilesetArbRenderManager;
5574
5580
  (function (TilesetArbRenderManager) {
5575
5581
  var Manager = /** @class */ (function () {
5576
5582
  function Manager(params) {
@@ -5599,10 +5605,10 @@
5599
5605
  Manager.prototype.Init = function () {
5600
5606
  var _a, _b, _c;
5601
5607
  return __awaiter(this, void 0, void 0, function () {
5602
- var loadUrlOverride, itemUrl, url, urlParts, tilesetId, accountId, tileset, legacyTileset, _d, _e;
5608
+ var loadUrlOverride, itemUrl, url, urlParts, tilesetId, accountId, _d, tileset, type, LEGACY_TYPES, legacyTileset, _e, _f;
5603
5609
  var _this = this;
5604
- return __generator(this, function (_f) {
5605
- switch (_f.label) {
5610
+ return __generator(this, function (_g) {
5611
+ switch (_g.label) {
5606
5612
  case 0:
5607
5613
  loadUrlOverride = null;
5608
5614
  if (this.item.tileset) {
@@ -5632,35 +5638,31 @@
5632
5638
  menuItem: this.item
5633
5639
  })];
5634
5640
  case 1:
5635
- tileset = _f.sent();
5641
+ _d = _g.sent(), tileset = _d.tileset, type = _d.type;
5636
5642
  if (tileset && loadUrlOverride) {
5637
5643
  tileset.loadUrl = loadUrlOverride;
5638
5644
  }
5639
- if (!(tileset === null || tileset === void 0 ? void 0 : tileset.type)) return [3 /*break*/, 2];
5640
- this.cTileset = exports.TilesetRenderEngine.Render({
5641
- apiGetter: this.apiGetter,
5642
- tileset: tileset,
5643
- viewer: this.viewer,
5644
- coords: null
5645
- });
5646
- return [3 /*break*/, 7];
5647
- case 2:
5648
- if (!tileset) return [3 /*break*/, 7];
5649
- if (!tileset) return [3 /*break*/, 4];
5645
+ LEGACY_TYPES = [
5646
+ bruceModels.Tileset.EType.LegacyEntitiesSet,
5647
+ bruceModels.Tileset.EType.LegacyExternal,
5648
+ bruceModels.Tileset.EType.LegacyStatic
5649
+ ];
5650
+ if (!LEGACY_TYPES.includes(type)) return [3 /*break*/, 6];
5651
+ if (!tileset) return [3 /*break*/, 3];
5650
5652
  return [4 /*yield*/, getLegacyTileset({
5651
5653
  apiGetter: this.apiGetter,
5652
5654
  menuItem: this.item,
5653
5655
  tileset: tileset
5654
5656
  })];
5657
+ case 2:
5658
+ _e = _g.sent();
5659
+ return [3 /*break*/, 4];
5655
5660
  case 3:
5656
- _d = _f.sent();
5657
- return [3 /*break*/, 5];
5661
+ _e = null;
5662
+ _g.label = 4;
5658
5663
  case 4:
5659
- _d = null;
5660
- _f.label = 5;
5661
- case 5:
5662
- legacyTileset = _d;
5663
- _e = this;
5664
+ legacyTileset = _e;
5665
+ _f = this;
5664
5666
  return [4 /*yield*/, exports.TilesetRenderEngine.RenderLegacy({
5665
5667
  apiGetter: this.apiGetter,
5666
5668
  tileset: legacyTileset,
@@ -5668,17 +5670,27 @@
5668
5670
  ionId: (_c = this.item.IonResource) === null || _c === void 0 ? void 0 : _c.AssetID,
5669
5671
  loadUrl: loadUrlOverride
5670
5672
  })];
5673
+ case 5:
5674
+ _f.cTileset = _g.sent();
5675
+ return [3 /*break*/, 7];
5671
5676
  case 6:
5672
- _e.cTileset = _f.sent();
5673
- _f.label = 7;
5677
+ if (tileset) {
5678
+ this.cTileset = exports.TilesetRenderEngine.Render({
5679
+ apiGetter: this.apiGetter,
5680
+ tileset: tileset,
5681
+ viewer: this.viewer,
5682
+ coords: null
5683
+ });
5684
+ }
5685
+ _g.label = 7;
5674
5686
  case 7:
5675
5687
  this.cTileset.readyPromise.then(function () {
5676
5688
  try {
5677
5689
  if (_this.item.ApplyStyles) {
5678
5690
  var api = _this.apiGetter.getApi();
5679
5691
  _this.styler = new exports.TilesetRenderEngine.CadStyler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping);
5680
- _this.onCTilesetLoad();
5681
5692
  }
5693
+ _this.onCTilesetLoad();
5682
5694
  }
5683
5695
  catch (e) {
5684
5696
  console.error(e);
@@ -5698,7 +5710,7 @@
5698
5710
  });
5699
5711
  };
5700
5712
  Manager.prototype.onCTilesetLoad = function () {
5701
- if (this.item.FlyTo) {
5713
+ {
5702
5714
  this.viewer.zoomTo(this.cTileset, new Cesium.HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
5703
5715
  }
5704
5716
  };
@@ -5796,9 +5808,8 @@
5796
5808
  return Manager;
5797
5809
  }());
5798
5810
  TilesetArbRenderManager.Manager = Manager;
5799
- })(TilesetArbRenderManager || (TilesetArbRenderManager = {}));
5811
+ })(exports.TilesetArbRenderManager || (exports.TilesetArbRenderManager = {}));
5800
5812
 
5801
- var RelationsRenderManager;
5802
5813
  (function (RelationsRenderManager) {
5803
5814
  var Manager = /** @class */ (function () {
5804
5815
  function Manager(params) {
@@ -5953,7 +5964,7 @@
5953
5964
  return Manager;
5954
5965
  }());
5955
5966
  RelationsRenderManager.Manager = Manager;
5956
- })(RelationsRenderManager || (RelationsRenderManager = {}));
5967
+ })(exports.RelationsRenderManager || (exports.RelationsRenderManager = {}));
5957
5968
 
5958
5969
  (function (MenuItemManager) {
5959
5970
  var Manager = /** @class */ (function () {
@@ -6069,7 +6080,7 @@
6069
6080
  });
6070
6081
  break;
6071
6082
  case bruceModels.MenuItem.EType.Osm:
6072
- rItem.renderManager = new TilesetOsmRenderManager.Manager({
6083
+ rItem.renderManager = new exports.TilesetOsmRenderManager.Manager({
6073
6084
  viewer: this.viewer,
6074
6085
  register: this.visualsRegister,
6075
6086
  apiGetter: params.apiGetter,
@@ -6078,14 +6089,14 @@
6078
6089
  });
6079
6090
  break;
6080
6091
  case bruceModels.MenuItem.EType.PointCloud:
6081
- rItem.renderManager = new TilesetPointcloudRenderManager.Manager({
6092
+ rItem.renderManager = new exports.TilesetPointcloudRenderManager.Manager({
6082
6093
  viewer: this.viewer,
6083
6094
  apiGetter: params.apiGetter,
6084
6095
  item: params.item
6085
6096
  });
6086
6097
  break;
6087
6098
  case bruceModels.MenuItem.EType.EntityTileset:
6088
- rItem.renderManager = new TilesetEntitiesRenderManager.Manager({
6099
+ rItem.renderManager = new exports.TilesetEntitiesRenderManager.Manager({
6089
6100
  viewer: this.viewer,
6090
6101
  register: this.visualsRegister,
6091
6102
  apiGetter: params.apiGetter,
@@ -6093,7 +6104,7 @@
6093
6104
  });
6094
6105
  break;
6095
6106
  case bruceModels.MenuItem.EType.Kml:
6096
- rItem.renderManager = new DataSourceStaticKmlManager.Manager({
6107
+ rItem.renderManager = new exports.DataSourceStaticKmlManager.Manager({
6097
6108
  viewer: this.viewer,
6098
6109
  apiGetter: params.apiGetter,
6099
6110
  item: params.item
@@ -6101,7 +6112,7 @@
6101
6112
  break;
6102
6113
  case bruceModels.MenuItem.EType.IonTileset:
6103
6114
  case bruceModels.MenuItem.EType.ArbTileset:
6104
- rItem.renderManager = new TilesetArbRenderManager.Manager({
6115
+ rItem.renderManager = new exports.TilesetArbRenderManager.Manager({
6105
6116
  apiGetter: params.apiGetter,
6106
6117
  item: params.item,
6107
6118
  viewer: this.viewer,
@@ -6109,7 +6120,7 @@
6109
6120
  });
6110
6121
  break;
6111
6122
  case bruceModels.MenuItem.EType.Relations:
6112
- rItem.renderManager = new RelationsRenderManager.Manager({
6123
+ rItem.renderManager = new exports.RelationsRenderManager.Manager({
6113
6124
  apiGetter: params.apiGetter,
6114
6125
  item: params.item,
6115
6126
  register: this.visualsRegister,