bruce-cesium 4.4.0 → 4.4.2

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 (17) hide show
  1. package/dist/bruce-cesium.es5.js +143 -185
  2. package/dist/bruce-cesium.es5.js.map +1 -1
  3. package/dist/bruce-cesium.umd.js +142 -184
  4. package/dist/bruce-cesium.umd.js.map +1 -1
  5. package/dist/lib/bruce-cesium.js +1 -1
  6. package/dist/lib/rendering/render-managers/other/google-search-render-manager.js +22 -110
  7. package/dist/lib/rendering/render-managers/other/google-search-render-manager.js.map +1 -1
  8. package/dist/lib/rendering/render-managers/tilesets/tileset-google-photos-render-manager.js +12 -6
  9. package/dist/lib/rendering/render-managers/tilesets/tileset-google-photos-render-manager.js.map +1 -1
  10. package/dist/lib/rendering/tile-render-engine.js +107 -66
  11. package/dist/lib/rendering/tile-render-engine.js.map +1 -1
  12. package/dist/lib/rendering/tileset-render-engine.js +0 -1
  13. package/dist/lib/rendering/tileset-render-engine.js.map +1 -1
  14. package/dist/lib/widgets/widget-searchbar.js.map +1 -1
  15. package/dist/types/bruce-cesium.d.ts +1 -1
  16. package/dist/types/rendering/render-managers/other/google-search-render-manager.d.ts +0 -1
  17. package/package.json +2 -2
package/dist/bruce-cesium.umd.js CHANGED
@@ -13638,7 +13638,6 @@
13638
13638
  return __generator(this, function (_a) {
13639
13639
  switch (_a.label) {
13640
13640
  case 0:
13641
- console.log(params.noMemoryLimit);
13642
13641
  api = params.apiGetter.getApi(params.accountId);
13643
13642
  // Ensure regional url is loaded.
13644
13643
  return [4 /*yield*/, api.Loading];
@@ -17378,7 +17377,7 @@
17378
17377
  Manager.prototype.Init = function () {
17379
17378
  var _this = this;
17380
17379
  (function () { return __awaiter(_this, void 0, void 0, function () {
17381
- var CESIUM, programKey, e_1, _a, colorCss;
17380
+ var CESIUM, programKeys, _i, programKeys_1, programKey, e_1, _a, colorCss;
17382
17381
  var _b;
17383
17382
  return __generator(this, function (_c) {
17384
17383
  switch (_c.label) {
@@ -17392,14 +17391,20 @@
17392
17391
  _c.label = 1;
17393
17392
  case 1:
17394
17393
  _c.trys.push([1, 3, , 4]);
17395
- return [4 /*yield*/, BModels.ProgramKey.Get({
17396
- programId: BModels.ProgramKey.EProgramId.Google,
17394
+ return [4 /*yield*/, BModels.ProgramKey.GetList({
17397
17395
  api: this.getters.GetBruceApi()
17398
17396
  })];
17399
17397
  case 2:
17400
- programKey = (_c.sent()).programKey;
17401
- if (programKey === null || programKey === void 0 ? void 0 : programKey.Key) {
17402
- CESIUM.GoogleMaps.defaultApiKey = programKey.Key;
17398
+ programKeys = (_c.sent()).programKeys;
17399
+ for (_i = 0, programKeys_1 = programKeys; _i < programKeys_1.length; _i++) {
17400
+ programKey = programKeys_1[_i];
17401
+ if (!programKey.Key) {
17402
+ continue;
17403
+ }
17404
+ if (programKey.ProgramId === BModels.ProgramKey.EProgramId.Google || programKey.ProgramId === BModels.ProgramKey.EProgramId.GooglePhotogrammetry) {
17405
+ CESIUM.GoogleMaps.defaultApiKey = programKey.Key;
17406
+ break;
17407
+ }
17403
17408
  }
17404
17409
  return [3 /*break*/, 4];
17405
17410
  case 3:
@@ -18518,64 +18523,43 @@
18518
18523
  Manager.prototype.Init = function () {
18519
18524
  var _this = this;
18520
18525
  (function () { return __awaiter(_this, void 0, void 0, function () {
18521
- var key, valid, programKey, valid, e_1;
18526
+ var programKey, valid, e_1;
18522
18527
  var _this = this;
18523
- var _a, _b, _c, _d;
18524
- return __generator(this, function (_e) {
18525
- switch (_e.label) {
18528
+ var _a;
18529
+ return __generator(this, function (_b) {
18530
+ switch (_b.label) {
18526
18531
  case 0:
18527
- _e.trys.push([0, 7, , 8]);
18528
- if (!!((_c = (_b = (_a = getGoogle()) === null || _a === void 0 ? void 0 : _a.maps) === null || _b === void 0 ? void 0 : _b.places) === null || _c === void 0 ? void 0 : _c.PlacesService)) return [3 /*break*/, 6];
18529
- key = this.item.accessToken;
18530
- if (!key) return [3 /*break*/, 2];
18531
- return [4 /*yield*/, validateKey(key)];
18532
- case 1:
18533
- valid = _e.sent();
18534
- if (!valid) {
18535
- console.warn("Menu Item key not valid for Google Places API. Will try use the account default.");
18536
- key = null;
18537
- }
18538
- _e.label = 2;
18539
- case 2:
18540
- if (!!key) return [3 /*break*/, 5];
18532
+ _b.trys.push([0, 5, , 6]);
18541
18533
  return [4 /*yield*/, BModels.ProgramKey.Get({
18542
- programId: BModels.ProgramKey.EProgramId.Google,
18534
+ programId: BModels.ProgramKey.EProgramId.GoogleApi,
18543
18535
  api: this.getters.GetBruceApi()
18544
18536
  })];
18545
- case 3:
18546
- programKey = (_e.sent()).programKey;
18547
- if (programKey === null || programKey === void 0 ? void 0 : programKey.Key) {
18548
- key = programKey.Key;
18549
- }
18550
- if (!key) return [3 /*break*/, 5];
18551
- return [4 /*yield*/, validateKey(key)];
18552
- case 4:
18553
- valid = _e.sent();
18537
+ case 1:
18538
+ programKey = (_b.sent()).programKey;
18539
+ if (!(programKey === null || programKey === void 0 ? void 0 : programKey.Key)) return [3 /*break*/, 3];
18540
+ return [4 /*yield*/, validateKey(programKey === null || programKey === void 0 ? void 0 : programKey.Key)];
18541
+ case 2:
18542
+ valid = _b.sent();
18554
18543
  if (!valid) {
18555
18544
  throw new Error("Account default key not valid for Google Places API.");
18556
18545
  }
18557
- _e.label = 5;
18558
- case 5:
18559
- if (!key) {
18560
- throw new Error("No valid key found for Google Places API.");
18561
- }
18562
- this.accessToken = key;
18563
- _e.label = 6;
18564
- case 6:
18546
+ return [3 /*break*/, 4];
18547
+ case 3: throw new Error("No valid key found for Google Places API.");
18548
+ case 4:
18565
18549
  if (this.Disposed) {
18566
18550
  return [2 /*return*/];
18567
18551
  }
18568
- (_d = this.monitorRemoval) === null || _d === void 0 ? void 0 : _d.call(this);
18552
+ (_a = this.monitorRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
18569
18553
  this.monitorRemoval = this.monitor.Updated().Subscribe(function () {
18570
18554
  _this.startGetterLoop();
18571
18555
  });
18572
18556
  this.startGetterLoop();
18573
- return [3 /*break*/, 8];
18574
- case 7:
18575
- e_1 = _e.sent();
18557
+ return [3 /*break*/, 6];
18558
+ case 5:
18559
+ e_1 = _b.sent();
18576
18560
  console.error(e_1);
18577
- return [3 /*break*/, 8];
18578
- case 8: return [2 /*return*/];
18561
+ return [3 /*break*/, 6];
18562
+ case 6: return [2 /*return*/];
18579
18563
  }
18580
18564
  });
18581
18565
  }); })();
@@ -18675,8 +18659,7 @@
18675
18659
  return [4 /*yield*/, getPlaces({
18676
18660
  location: location_1,
18677
18661
  bounds: bounds_1,
18678
- keyword: this.item.keyword,
18679
- accessToken: this.accessToken
18662
+ keyword: this.item.keyword
18680
18663
  })];
18681
18664
  case 8:
18682
18665
  result = _a.sent();
@@ -18830,72 +18813,6 @@
18830
18813
  * @param params
18831
18814
  */
18832
18815
  function getPlaces(params) {
18833
- var _a, _b, _c;
18834
- return __awaiter(this, void 0, void 0, function () {
18835
- return __generator(this, function (_d) {
18836
- // Works better with CORS.
18837
- // Does not allow a token to be passed in.
18838
- if ((_c = (_b = (_a = getGoogle()) === null || _a === void 0 ? void 0 : _a.maps) === null || _b === void 0 ? void 0 : _b.places) === null || _c === void 0 ? void 0 : _c.PlacesService) {
18839
- return [2 /*return*/, getPlacesThroughLib(params)];
18840
- }
18841
- // Dies in localhost with CORS errors.
18842
- return [2 /*return*/, getPlacesThroughHTTP(params)];
18843
- });
18844
- });
18845
- }
18846
- function getPlacesThroughHTTP(params) {
18847
- return __awaiter(this, void 0, void 0, function () {
18848
- var location, bounds, keyword, accessToken, isKeyValid, url, baseUrl, boundsStr, locationStr, baseUrl, locationStr, response, data;
18849
- return __generator(this, function (_a) {
18850
- switch (_a.label) {
18851
- case 0:
18852
- location = params.location, bounds = params.bounds, keyword = params.keyword, accessToken = params.accessToken;
18853
- if (!accessToken) {
18854
- throw new Error("No access token provided");
18855
- }
18856
- return [4 /*yield*/, validateKeyForSearches(accessToken)];
18857
- case 1:
18858
- isKeyValid = _a.sent();
18859
- if (!isKeyValid) {
18860
- throw new Error("Invalid Google API Key");
18861
- }
18862
- if (bounds) {
18863
- baseUrl = "https://maps.googleapis.com/maps/api/place/textsearch/json";
18864
- url = new URL(baseUrl);
18865
- url.searchParams.append("key", accessToken);
18866
- url.searchParams.append("query", keyword);
18867
- boundsStr = "".concat(BModels.MathUtils.Round(bounds.south, 4), ",").concat(BModels.MathUtils.Round(bounds.west, 4), "|").concat(BModels.MathUtils.Round(bounds.north, 4), ",").concat(BModels.MathUtils.Round(bounds.east, 4));
18868
- url.searchParams.append("bounds", boundsStr);
18869
- locationStr = "".concat(BModels.MathUtils.Round(location.latitude, 4), ",").concat(BModels.MathUtils.Round(location.longitude, 4));
18870
- url.searchParams.append("location", locationStr);
18871
- }
18872
- else {
18873
- baseUrl = "https://maps.googleapis.com/maps/api/place/nearbysearch/json";
18874
- url = new URL(baseUrl);
18875
- url.searchParams.append("key", accessToken);
18876
- url.searchParams.append("keyword", keyword);
18877
- locationStr = "".concat(BModels.MathUtils.Round(location.latitude, 4), ",").concat(BModels.MathUtils.Round(location.longitude, 4));
18878
- url.searchParams.append("location", locationStr);
18879
- url.searchParams.append("radius", "1000");
18880
- }
18881
- return [4 /*yield*/, fetch(url.toString())];
18882
- case 2:
18883
- response = _a.sent();
18884
- if (!response.ok) {
18885
- throw new Error("HTTP error! status: ".concat(response.status));
18886
- }
18887
- return [4 /*yield*/, response.json()];
18888
- case 3:
18889
- data = _a.sent();
18890
- if (data.status !== "OK") {
18891
- throw new Error("API error! status: ".concat(data.status));
18892
- }
18893
- return [2 /*return*/, data.results];
18894
- }
18895
- });
18896
- });
18897
- }
18898
- function getPlacesThroughLib(params) {
18899
18816
  var _a, _b, _c;
18900
18817
  return __awaiter(this, void 0, void 0, function () {
18901
18818
  var location, bounds, keyword;
@@ -21282,7 +21199,7 @@
21282
21199
  (function (Navigator) {
21283
21200
  function GetOrCreateLayer(params) {
21284
21201
  return __awaiter(this, void 0, void 0, function () {
21285
- var viewer, apiGetter, meta, CESIUM, enabled, i, layer, layerMeta, defaultImg, provider, NEEDS_CESIUM_TOKEN, shouldCreate, api, tileset, boundaries, settings, minLat, maxLat, minLon, maxLon, minLevel, maxLevel, hasLevels, url, settings_1, _a, cesiumIonKey, _b, mapboxKey, _c, layer;
21202
+ var viewer, apiGetter, meta, CESIUM, enabled, i, layer, layerMeta, defaultImg, provider, NEEDS_CESIUM_TOKEN, BING_MAPS_OPTIONS, shouldCreate, e_2, api, tileset, boundaries, settings, minLat, maxLat, minLon, maxLon, minLevel, maxLevel, hasLevels, url, settings_1, _a, cesiumIonKey, _b, mapboxKey, _c, layer;
21286
21203
  return __generator(this, function (_d) {
21287
21204
  switch (_d.label) {
21288
21205
  case 0:
@@ -21301,12 +21218,13 @@
21301
21218
  }
21302
21219
  defaultImg = meta.accountId ? null : BModels.ProjectViewTile.DefaultImagery.find(function (x) { return x.id === meta.tilesetId; });
21303
21220
  provider = null;
21304
- if (!defaultImg) return [3 /*break*/, 5];
21221
+ if (!defaultImg) return [3 /*break*/, 14];
21305
21222
  NEEDS_CESIUM_TOKEN = [
21306
21223
  BModels.ProjectViewTile.EDefaultImagery.BingMapsAerial,
21307
21224
  BModels.ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels,
21308
- BModels.ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels,
21225
+ BModels.ProjectViewTile.EDefaultImagery.BingMapsRoads
21309
21226
  ];
21227
+ BING_MAPS_OPTIONS = [].concat(NEEDS_CESIUM_TOKEN);
21310
21228
  shouldCreate = true;
21311
21229
  if (!NEEDS_CESIUM_TOKEN.includes(defaultImg.id)) return [3 /*break*/, 2];
21312
21230
  return [4 /*yield*/, exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken)];
@@ -21314,19 +21232,50 @@
21314
21232
  shouldCreate = _d.sent();
21315
21233
  _d.label = 2;
21316
21234
  case 2:
21317
- if (!shouldCreate) return [3 /*break*/, 4];
21318
- return [4 /*yield*/, renderDefaultMapTile(apiGetter, defaultImg.id)];
21235
+ if (!shouldCreate) return [3 /*break*/, 13];
21236
+ _d.label = 3;
21319
21237
  case 3:
21238
+ _d.trys.push([3, 5, , 13]);
21239
+ if (BING_MAPS_OPTIONS.includes(defaultImg.id)) {
21240
+ throw new Error("Bing Maps is dead. Crashing now to avoid waiting 30 seconds for it to timeout.");
21241
+ }
21242
+ return [4 /*yield*/, renderDefaultMapTile(apiGetter, defaultImg.id)];
21243
+ case 4:
21320
21244
  provider = _d.sent();
21321
- _d.label = 4;
21322
- case 4: return [3 /*break*/, 31];
21245
+ return [3 /*break*/, 13];
21323
21246
  case 5:
21247
+ e_2 = _d.sent();
21248
+ console.error(e_2);
21249
+ if (!(defaultImg.id === BModels.ProjectViewTile.EDefaultImagery.BingMapsAerial)) return [3 /*break*/, 7];
21250
+ return [4 /*yield*/, renderDefaultMapTile(apiGetter, BModels.ProjectViewTile.EDefaultImagery.MapboxSatellite)];
21251
+ case 6:
21252
+ provider = _d.sent();
21253
+ console.warn("Bing Maps Aerial failed to load. Falling back to Mapbox Satellite.");
21254
+ return [3 /*break*/, 12];
21255
+ case 7:
21256
+ if (!(defaultImg.id === BModels.ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels)) return [3 /*break*/, 9];
21257
+ return [4 /*yield*/, renderDefaultMapTile(apiGetter, BModels.ProjectViewTile.EDefaultImagery.MapBoxStreets)];
21258
+ case 8:
21259
+ provider = _d.sent();
21260
+ console.warn("Bing Maps Aerial with Labels failed to load. Falling back to Mapbox Streets.");
21261
+ return [3 /*break*/, 12];
21262
+ case 9:
21263
+ if (!(defaultImg.id === BModels.ProjectViewTile.EDefaultImagery.BingMapsRoads)) return [3 /*break*/, 11];
21264
+ return [4 /*yield*/, renderDefaultMapTile(apiGetter, BModels.ProjectViewTile.EDefaultImagery.OpenStreetMap)];
21265
+ case 10:
21266
+ provider = _d.sent();
21267
+ console.warn("Bing Maps Roads failed to load. Falling back to OpenStreetMap.");
21268
+ return [3 /*break*/, 12];
21269
+ case 11: throw e_2;
21270
+ case 12: return [3 /*break*/, 13];
21271
+ case 13: return [3 /*break*/, 40];
21272
+ case 14:
21324
21273
  api = apiGetter.getApi(meta.accountId);
21325
21274
  // Ensure regional url is loaded.
21326
21275
  // When loading stuff in the same account as the default it's likely already loaded,
21327
21276
  // but if we just made an API instance for some external account then it won't be loaded yet.
21328
21277
  return [4 /*yield*/, api.Loading];
21329
- case 6:
21278
+ case 15:
21330
21279
  // Ensure regional url is loaded.
21331
21280
  // When loading stuff in the same account as the default it's likely already loaded,
21332
21281
  // but if we just made an API instance for some external account then it won't be loaded yet.
@@ -21335,7 +21284,7 @@
21335
21284
  api: api,
21336
21285
  tilesetId: meta.tilesetId
21337
21286
  })];
21338
- case 7:
21287
+ case 16:
21339
21288
  tileset = (_d.sent()).tileset;
21340
21289
  boundaries = undefined;
21341
21290
  settings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
@@ -21349,8 +21298,8 @@
21349
21298
  minLevel = settings === null || settings === void 0 ? void 0 : settings.levelMin;
21350
21299
  maxLevel = settings === null || settings === void 0 ? void 0 : settings.levelMax;
21351
21300
  hasLevels = !isNaN(minLevel) && !isNaN(maxLevel);
21352
- if (!(tileset.type === BModels.Tileset.EType.GeoMap)) return [3 /*break*/, 11];
21353
- if (!Cesium.TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 9];
21301
+ if (!(tileset.type === BModels.Tileset.EType.GeoMap)) return [3 /*break*/, 20];
21302
+ if (!Cesium.TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 18];
21354
21303
  url = BModels.Tileset.GetPublicFileUrl({
21355
21304
  api: api,
21356
21305
  tilesetId: meta.tilesetId,
@@ -21365,10 +21314,10 @@
21365
21314
  maximumLevel: hasLevels ? maxLevel : undefined,
21366
21315
  minimumLevel: hasLevels ? minLevel : undefined,
21367
21316
  })];
21368
- case 8:
21317
+ case 17:
21369
21318
  provider = _d.sent();
21370
- return [3 /*break*/, 10];
21371
- case 9:
21319
+ return [3 /*break*/, 19];
21320
+ case 18:
21372
21321
  provider = new CESIUM.TileMapServiceImageryProvider({
21373
21322
  url: BModels.Tileset.GetPublicFileUrl({
21374
21323
  api: api,
@@ -21383,53 +21332,53 @@
21383
21332
  maximumLevel: hasLevels ? maxLevel : undefined,
21384
21333
  minimumLevel: hasLevels ? minLevel : undefined,
21385
21334
  });
21386
- _d.label = 10;
21387
- case 10: return [3 /*break*/, 31];
21388
- case 11:
21389
- if (!(tileset.type === BModels.Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 30];
21335
+ _d.label = 19;
21336
+ case 19: return [3 /*break*/, 40];
21337
+ case 20:
21338
+ if (!(tileset.type === BModels.Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 39];
21390
21339
  settings_1 = tileset.settings;
21391
21340
  _a = settings_1.mapType;
21392
21341
  switch (_a) {
21393
- case BModels.Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 12];
21394
- case BModels.Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 19];
21395
- case BModels.Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 23];
21396
- case BModels.Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 24];
21397
- case BModels.Tileset.Settings.EExternalMapType.CustomTemplate: return [3 /*break*/, 28];
21342
+ case BModels.Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 21];
21343
+ case BModels.Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 28];
21344
+ case BModels.Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 32];
21345
+ case BModels.Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 33];
21346
+ case BModels.Tileset.Settings.EExternalMapType.CustomTemplate: return [3 /*break*/, 37];
21398
21347
  }
21399
- return [3 /*break*/, 29];
21400
- case 12:
21401
- if (!settings_1.key) return [3 /*break*/, 13];
21348
+ return [3 /*break*/, 38];
21349
+ case 21:
21350
+ if (!settings_1.key) return [3 /*break*/, 22];
21402
21351
  _b = settings_1.key;
21403
- return [3 /*break*/, 15];
21404
- case 13: return [4 /*yield*/, findKey(apiGetter, BModels.ProgramKey.EProgramId.CesiumIon, null)];
21405
- case 14:
21352
+ return [3 /*break*/, 24];
21353
+ case 22: return [4 /*yield*/, findKey(apiGetter, BModels.ProgramKey.EProgramId.CesiumIon, null)];
21354
+ case 23:
21406
21355
  _b = _d.sent();
21407
- _d.label = 15;
21408
- case 15:
21356
+ _d.label = 24;
21357
+ case 24:
21409
21358
  cesiumIonKey = _b;
21410
- if (!Cesium.IonImageryProvider.hasOwnProperty("fromAssetId")) return [3 /*break*/, 17];
21359
+ if (!Cesium.IonImageryProvider.hasOwnProperty("fromAssetId")) return [3 /*break*/, 26];
21411
21360
  return [4 /*yield*/, CESIUM.IonImageryProvider.fromAssetId(Number(settings_1.externalId), {
21412
21361
  accessToken: cesiumIonKey
21413
21362
  })];
21414
- case 16:
21363
+ case 25:
21415
21364
  provider = _d.sent();
21416
- return [3 /*break*/, 18];
21417
- case 17:
21365
+ return [3 /*break*/, 27];
21366
+ case 26:
21418
21367
  provider = new CESIUM.IonImageryProvider({
21419
21368
  assetId: Number(settings_1.externalId),
21420
21369
  accessToken: cesiumIonKey
21421
21370
  });
21422
- _d.label = 18;
21423
- case 18: return [3 /*break*/, 29];
21424
- case 19:
21425
- if (!settings_1.key) return [3 /*break*/, 20];
21371
+ _d.label = 27;
21372
+ case 27: return [3 /*break*/, 38];
21373
+ case 28:
21374
+ if (!settings_1.key) return [3 /*break*/, 29];
21426
21375
  _c = settings_1.key;
21427
- return [3 /*break*/, 22];
21428
- case 20: return [4 /*yield*/, findKey(apiGetter, BModels.ProgramKey.EProgramId.Mapbox, null)];
21429
- case 21:
21376
+ return [3 /*break*/, 31];
21377
+ case 29: return [4 /*yield*/, findKey(apiGetter, BModels.ProgramKey.EProgramId.Mapbox, null)];
21378
+ case 30:
21430
21379
  _c = _d.sent();
21431
- _d.label = 22;
21432
- case 22:
21380
+ _d.label = 31;
21381
+ case 31:
21433
21382
  mapboxKey = _c;
21434
21383
  provider = new Cesium.UrlTemplateImageryProvider({
21435
21384
  url: "https://api.mapbox.com/styles/v1/"
@@ -21437,8 +21386,8 @@
21437
21386
  "/tiles/256/{z}/{x}/{y}?access_token="
21438
21387
  + mapboxKey
21439
21388
  });
21440
- return [3 /*break*/, 29];
21441
- case 23:
21389
+ return [3 /*break*/, 38];
21390
+ case 32:
21442
21391
  provider = new Cesium.OpenStreetMapImageryProvider({
21443
21392
  url: settings_1.url,
21444
21393
  fileExtension: prepareFileExt(settings_1.fileExtension),
@@ -21447,9 +21396,9 @@
21447
21396
  // maximumLevel: hasLevels ? maxLevel : undefined,
21448
21397
  // minimumLevel: hasLevels ? minLevel : undefined,
21449
21398
  });
21450
- return [3 /*break*/, 29];
21451
- case 24:
21452
- if (!Cesium.TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 26];
21399
+ return [3 /*break*/, 38];
21400
+ case 33:
21401
+ if (!Cesium.TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 35];
21453
21402
  return [4 /*yield*/, CESIUM.TileMapServiceImageryProvider.fromUrl(settings_1.url, {
21454
21403
  fileExtension: prepareFileExt(settings_1.fileExtension),
21455
21404
  // Unused until tested properly. In the past these settings caused large lag.
@@ -21457,10 +21406,10 @@
21457
21406
  // maximumLevel: hasLevels ? maxLevel : undefined,
21458
21407
  // minimumLevel: hasLevels ? minLevel : undefined,
21459
21408
  })];
21460
- case 25:
21409
+ case 34:
21461
21410
  provider = _d.sent();
21462
- return [3 /*break*/, 27];
21463
- case 26:
21411
+ return [3 /*break*/, 36];
21412
+ case 35:
21464
21413
  provider = new CESIUM.TileMapServiceImageryProvider({
21465
21414
  url: settings_1.url,
21466
21415
  fileExtension: prepareFileExt(settings_1.fileExtension),
@@ -21469,15 +21418,15 @@
21469
21418
  // maximumLevel: hasLevels ? maxLevel : undefined,
21470
21419
  // minimumLevel: hasLevels ? minLevel : undefined,
21471
21420
  });
21472
- _d.label = 27;
21473
- case 27: return [3 /*break*/, 29];
21474
- case 28:
21421
+ _d.label = 36;
21422
+ case 36: return [3 /*break*/, 38];
21423
+ case 37:
21475
21424
  provider = new Cesium.UrlTemplateImageryProvider({
21476
21425
  url: settings_1.url
21477
21426
  });
21478
- return [3 /*break*/, 29];
21479
- case 29: return [3 /*break*/, 31];
21480
- case 30:
21427
+ return [3 /*break*/, 38];
21428
+ case 38: return [3 /*break*/, 40];
21429
+ case 39:
21481
21430
  if (tileset.type === BModels.Tileset.EType.EntitiesMap) {
21482
21431
  provider = new Cesium.UrlTemplateImageryProvider({
21483
21432
  url: BModels.Tileset.GetPublicFileUrl({
@@ -21495,8 +21444,8 @@
21495
21444
  // maximumLevel: hasLevels ? maxLevel : undefined,
21496
21445
  });
21497
21446
  }
21498
- _d.label = 31;
21499
- case 31:
21447
+ _d.label = 40;
21448
+ case 40:
21500
21449
  if (provider) {
21501
21450
  layer = viewer.imageryLayers.addImageryProvider(provider);
21502
21451
  layer._bMeta = meta;
@@ -21512,7 +21461,7 @@
21512
21461
  Navigator.GetOrCreateLayer = GetOrCreateLayer;
21513
21462
  function Render(params) {
21514
21463
  return __awaiter(this, void 0, void 0, function () {
21515
- var tmpTiles, _loop_2, i, organize, iteration, curEnabled, toDisable, _loop_3, i, i, organized, i, enabled;
21464
+ var tmpTiles, _loop_2, i, organize, iteration, curEnabled, toDisable, _loop_3, i, i, organized, i, enabled, e_3;
21516
21465
  return __generator(this, function (_a) {
21517
21466
  switch (_a.label) {
21518
21467
  case 0:
@@ -21575,8 +21524,11 @@
21575
21524
  i = 0;
21576
21525
  _a.label = 1;
21577
21526
  case 1:
21578
- if (!(i < params.tiles.length)) return [3 /*break*/, 4];
21527
+ if (!(i < params.tiles.length)) return [3 /*break*/, 7];
21579
21528
  enabled = params.tiles[i];
21529
+ _a.label = 2;
21530
+ case 2:
21531
+ _a.trys.push([2, 4, , 5]);
21580
21532
  return [4 /*yield*/, GetOrCreateLayer({
21581
21533
  viewer: params.viewer,
21582
21534
  apiGetter: params.apiGetter,
@@ -21585,8 +21537,14 @@
21585
21537
  tilesetId: enabled.tilesetId,
21586
21538
  }
21587
21539
  })];
21588
- case 2:
21540
+ case 3:
21589
21541
  _a.sent();
21542
+ return [3 /*break*/, 5];
21543
+ case 4:
21544
+ e_3 = _a.sent();
21545
+ console.error(e_3);
21546
+ return [3 /*break*/, 5];
21547
+ case 5:
21590
21548
  if (!assertIteration(params.viewer, iteration)) {
21591
21549
  return [2 /*return*/];
21592
21550
  }
@@ -21594,11 +21552,11 @@
21594
21552
  // We want to ensure what the user sees is as close to correct as we can get.
21595
21553
  organize();
21596
21554
  organized = true;
21597
- _a.label = 3;
21598
- case 3:
21555
+ _a.label = 6;
21556
+ case 6:
21599
21557
  i++;
21600
21558
  return [3 /*break*/, 1];
21601
- case 4:
21559
+ case 7:
21602
21560
  if (!organized) {
21603
21561
  organize();
21604
21562
  }
@@ -26261,7 +26219,7 @@
26261
26219
  ViewerUtils.AssertIonToken = AssertIonToken;
26262
26220
  })(exports.ViewerUtils || (exports.ViewerUtils = {}));
26263
26221
 
26264
- var VERSION = "4.4.0";
26222
+ var VERSION = "4.4.2";
26265
26223
 
26266
26224
  exports.VERSION = VERSION;
26267
26225
  exports.CesiumParabola = CesiumParabola;