bruce-cesium 2.6.7 → 2.6.9

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.
@@ -1,6 +1,6 @@
1
1
  import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
2
2
  import * as Cesium from 'cesium';
3
- import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, Matrix4, Matrix3, IonResource, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
3
+ import { Cartographic, JulianDate, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, HeadingPitchRange, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, EllipsoidTerrainProvider, CesiumInspector, OrthographicFrustum, defined, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, Matrix4, Matrix3, IonResource, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, PolygonPipeline, Ion, BoundingSphere } from 'cesium';
4
4
 
5
5
  var TIME_LAG = 300;
6
6
  var POSITION_CHECK_TIMER = 950;
@@ -6997,10 +6997,11 @@ var TilesetRenderEngine;
6997
6997
  enumerable: false,
6998
6998
  configurable: true
6999
6999
  });
7000
- Styler.prototype.QueueEntities = function (entities) {
7000
+ Styler.prototype.QueueEntities = function (entities, highPriority) {
7001
+ if (highPriority === void 0) { highPriority = false; }
7001
7002
  for (var i = 0; i < entities.length; i++) {
7002
7003
  var entity = entities[i];
7003
- this.queueTilesetFeatureStyle(entity);
7004
+ this.queueTilesetFeatureStyle(entity, highPriority);
7004
7005
  }
7005
7006
  if (this.recordLoadQueue.length > 0) {
7006
7007
  this.processQueue();
@@ -7279,7 +7280,7 @@ var TilesetRenderEngine;
7279
7280
  var entityId = batch[i];
7280
7281
  var entity = _this.getEntityRego(entityId);
7281
7282
  if (entity) {
7282
- _this.queueTilesetFeatureStyle(entity);
7283
+ _this.queueTilesetFeatureStyle(entity, false);
7283
7284
  }
7284
7285
  }
7285
7286
  _this.viewer.scene.requestRender();
@@ -7293,7 +7294,7 @@ var TilesetRenderEngine;
7293
7294
  });
7294
7295
  });
7295
7296
  };
7296
- Styler.prototype.queueTilesetFeatureStyle = function (entity) {
7297
+ Styler.prototype.queueTilesetFeatureStyle = function (entity, highPriority) {
7297
7298
  if (this.styleMappingLoaded || this.styleMappingsLoaded[entity.entityTypeId] == true) {
7298
7299
  var needsData = this.getTilesetFeatureNeedsFullData(entity.entityId, entity.entityTypeId);
7299
7300
  if (needsData) {
@@ -7306,7 +7307,12 @@ var TilesetRenderEngine;
7306
7307
  }
7307
7308
  }
7308
7309
  else {
7309
- this.recordCheckQueue.push(entity.entityId);
7310
+ if (highPriority) {
7311
+ this.recordCheckQueue.unshift(entity.entityId);
7312
+ }
7313
+ else {
7314
+ this.recordCheckQueue.push(entity.entityId);
7315
+ }
7310
7316
  }
7311
7317
  };
7312
7318
  Styler.prototype.styleTilesetFeature = function (entity) {
@@ -7757,7 +7763,7 @@ var TilesetCadRenderManager;
7757
7763
  if (entityIds != null) {
7758
7764
  regos = regos.filter(function (r) { return entityIds.indexOf(r.entityId) >= 0; });
7759
7765
  }
7760
- this.styler.QueueEntities(regos);
7766
+ this.styler.QueueEntities(regos, true);
7761
7767
  return [2 /*return*/];
7762
7768
  });
7763
7769
  });
@@ -8224,19 +8230,53 @@ var TilesetEntitiesRenderManager;
8224
8230
  return [2 /*return*/];
8225
8231
  }
8226
8232
  (function () { return __awaiter(_this, void 0, void 0, function () {
8227
- var api, tileset, cTileset, _a;
8233
+ var canAccess, e_1, accountId, api, tileset, cTileset, _a;
8228
8234
  var _this = this;
8229
- var _b, _c;
8230
- return __generator(this, function (_d) {
8231
- switch (_d.label) {
8235
+ var _b, _c, _d;
8236
+ return __generator(this, function (_e) {
8237
+ switch (_e.label) {
8232
8238
  case 0:
8233
- api = this.getters.GetBruceApi();
8239
+ if (!tilesetId) return [3 /*break*/, 5];
8240
+ canAccess = false;
8241
+ _e.label = 1;
8242
+ case 1:
8243
+ _e.trys.push([1, 3, , 4]);
8244
+ return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
8245
+ sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
8246
+ tilesetId: tilesetId,
8247
+ forAccountId: this.getters.GetAccountId(),
8248
+ api: this.getters.GetGlobalApi()
8249
+ })];
8250
+ case 2:
8251
+ canAccess = _e.sent();
8252
+ return [3 /*break*/, 4];
8253
+ case 3:
8254
+ e_1 = _e.sent();
8255
+ console.error(e_1);
8256
+ return [3 /*break*/, 4];
8257
+ case 4:
8258
+ if (!canAccess) {
8259
+ console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID, "."));
8260
+ return [2 /*return*/];
8261
+ }
8262
+ return [3 /*break*/, 6];
8263
+ case 5:
8264
+ console.warn("No tileset id found. Skipping access check.");
8265
+ _e.label = 6;
8266
+ case 6:
8267
+ accountId = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID;
8268
+ if (!accountId) {
8269
+ accountId = this.getters.GetAccountId();
8270
+ }
8271
+ api = this.getters.GetBruceApi({
8272
+ accountId: accountId
8273
+ });
8234
8274
  return [4 /*yield*/, Tileset.Get({
8235
8275
  api: api,
8236
8276
  tilesetId: tilesetId
8237
8277
  })];
8238
- case 1:
8239
- tileset = (_d.sent()).tileset;
8278
+ case 7:
8279
+ tileset = (_e.sent()).tileset;
8240
8280
  if (!tileset || this.disposed) {
8241
8281
  return [2 /*return*/];
8242
8282
  }
@@ -8246,11 +8286,11 @@ var TilesetEntitiesRenderManager;
8246
8286
  apiGetter: this.getters.GetBruceGetter(),
8247
8287
  tileset: tileset,
8248
8288
  viewer: this.viewer,
8249
- accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
8289
+ accountId: accountId,
8250
8290
  viaCdn: this.item.cdnEnabled
8251
8291
  })];
8252
- case 2:
8253
- cTileset = _a.cTileset = _d.sent();
8292
+ case 8:
8293
+ cTileset = _a.cTileset = _e.sent();
8254
8294
  if (this.disposed) {
8255
8295
  this.doDispose();
8256
8296
  return [2 /*return*/];
@@ -15176,7 +15216,7 @@ var ViewerUtils;
15176
15216
  ViewerUtils.CreateWidgets = CreateWidgets;
15177
15217
  })(ViewerUtils || (ViewerUtils = {}));
15178
15218
 
15179
- var VERSION$1 = "2.6.7";
15219
+ var VERSION$1 = "2.6.9";
15180
15220
 
15181
15221
  export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
15182
15222
  //# sourceMappingURL=bruce-cesium.es5.js.map