bruce-cesium 3.8.8 → 3.9.0
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.
- package/dist/bruce-cesium.es5.js +46 -16
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +45 -15
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js +42 -16
- package/dist/lib/rendering/render-managers/tilesets/tileset-entities-render-manager.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/dist/types/rendering/render-managers/tilesets/tileset-entities-render-manager.d.ts +3 -0
- package/package.json +2 -2
package/dist/bruce-cesium.es5.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
|
|
2
2
|
import * as Cesium from 'cesium';
|
|
3
|
-
import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate,
|
|
3
|
+
import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
|
|
4
4
|
|
|
5
5
|
/*! *****************************************************************************
|
|
6
6
|
Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -15167,6 +15167,7 @@ var TilesetEntitiesRenderManager;
|
|
|
15167
15167
|
this.initCounter = 0;
|
|
15168
15168
|
this.disposed = false;
|
|
15169
15169
|
this.cTileset = null;
|
|
15170
|
+
this.styler = null;
|
|
15170
15171
|
var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, item = params.item;
|
|
15171
15172
|
this.viewer = viewer;
|
|
15172
15173
|
this.getters = apiGetter;
|
|
@@ -15187,6 +15188,13 @@ var TilesetEntitiesRenderManager;
|
|
|
15187
15188
|
enumerable: false,
|
|
15188
15189
|
configurable: true
|
|
15189
15190
|
});
|
|
15191
|
+
Object.defineProperty(Manager.prototype, "Styler", {
|
|
15192
|
+
get: function () {
|
|
15193
|
+
return this.styler;
|
|
15194
|
+
},
|
|
15195
|
+
enumerable: false,
|
|
15196
|
+
configurable: true
|
|
15197
|
+
});
|
|
15190
15198
|
Manager.prototype.Init = function (params) {
|
|
15191
15199
|
var _this = this;
|
|
15192
15200
|
var _a;
|
|
@@ -15203,18 +15211,18 @@ var TilesetEntitiesRenderManager;
|
|
|
15203
15211
|
return;
|
|
15204
15212
|
}
|
|
15205
15213
|
(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
15206
|
-
var canAccess, e_1, accountId, api, tileset, cTileset, _a, attenuation, attenuationMax;
|
|
15214
|
+
var canAccess, e_1, accountId, api, tileset, fallbackTypeId, cTileset, _a, attenuation, attenuationMax;
|
|
15207
15215
|
var _this = this;
|
|
15208
|
-
var _b, _c, _d;
|
|
15209
|
-
return __generator(this, function (
|
|
15210
|
-
switch (
|
|
15216
|
+
var _b, _c, _d, _e, _f;
|
|
15217
|
+
return __generator(this, function (_g) {
|
|
15218
|
+
switch (_g.label) {
|
|
15211
15219
|
case 0:
|
|
15212
15220
|
if (!!this.cTileset) return [3 /*break*/, 9];
|
|
15213
15221
|
if (!tilesetId) return [3 /*break*/, 5];
|
|
15214
15222
|
canAccess = false;
|
|
15215
|
-
|
|
15223
|
+
_g.label = 1;
|
|
15216
15224
|
case 1:
|
|
15217
|
-
|
|
15225
|
+
_g.trys.push([1, 3, , 4]);
|
|
15218
15226
|
return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
|
|
15219
15227
|
sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
|
|
15220
15228
|
tilesetId: tilesetId,
|
|
@@ -15222,10 +15230,10 @@ var TilesetEntitiesRenderManager;
|
|
|
15222
15230
|
api: this.getters.GetGlobalApi()
|
|
15223
15231
|
})];
|
|
15224
15232
|
case 2:
|
|
15225
|
-
canAccess =
|
|
15233
|
+
canAccess = _g.sent();
|
|
15226
15234
|
return [3 /*break*/, 4];
|
|
15227
15235
|
case 3:
|
|
15228
|
-
e_1 =
|
|
15236
|
+
e_1 = _g.sent();
|
|
15229
15237
|
console.error(e_1);
|
|
15230
15238
|
return [3 /*break*/, 4];
|
|
15231
15239
|
case 4:
|
|
@@ -15236,7 +15244,7 @@ var TilesetEntitiesRenderManager;
|
|
|
15236
15244
|
return [3 /*break*/, 6];
|
|
15237
15245
|
case 5:
|
|
15238
15246
|
console.warn("No tileset id found. Skipping access check.");
|
|
15239
|
-
|
|
15247
|
+
_g.label = 6;
|
|
15240
15248
|
case 6:
|
|
15241
15249
|
if (this.disposed || counter !== this.initCounter) {
|
|
15242
15250
|
return [2 /*return*/];
|
|
@@ -15253,11 +15261,18 @@ var TilesetEntitiesRenderManager;
|
|
|
15253
15261
|
tilesetId: tilesetId
|
|
15254
15262
|
})];
|
|
15255
15263
|
case 7:
|
|
15256
|
-
tileset = (
|
|
15264
|
+
tileset = (_g.sent()).tileset;
|
|
15257
15265
|
if (!tileset || this.disposed || counter !== this.initCounter) {
|
|
15258
15266
|
return [2 /*return*/];
|
|
15259
15267
|
}
|
|
15260
15268
|
this.typeId = tileset.settings.entityTypeId;
|
|
15269
|
+
// Other account so we'll prefer the fallback entity-type ID if it's set.
|
|
15270
|
+
if (accountId != this.getters.GetAccountId()) {
|
|
15271
|
+
fallbackTypeId = (_f = (_e = this.item) === null || _e === void 0 ? void 0 : _e.BruceEntity) === null || _f === void 0 ? void 0 : _f["EntityType.ID"];
|
|
15272
|
+
if (fallbackTypeId) {
|
|
15273
|
+
this.typeId = fallbackTypeId;
|
|
15274
|
+
}
|
|
15275
|
+
}
|
|
15261
15276
|
_a = this;
|
|
15262
15277
|
return [4 /*yield*/, TilesetRenderEngine.Render({
|
|
15263
15278
|
apiGetter: this.getters.GetBruceGetter(),
|
|
@@ -15267,7 +15282,7 @@ var TilesetEntitiesRenderManager;
|
|
|
15267
15282
|
viaCdn: this.item.cdnEnabled
|
|
15268
15283
|
})];
|
|
15269
15284
|
case 8:
|
|
15270
|
-
cTileset = _a.cTileset =
|
|
15285
|
+
cTileset = _a.cTileset = _g.sent();
|
|
15271
15286
|
if (this.disposed) {
|
|
15272
15287
|
this.doDispose();
|
|
15273
15288
|
return [2 /*return*/];
|
|
@@ -15278,6 +15293,10 @@ var TilesetEntitiesRenderManager;
|
|
|
15278
15293
|
if (_this.disposed || _this.viewer.isDestroyed()) {
|
|
15279
15294
|
return;
|
|
15280
15295
|
}
|
|
15296
|
+
if (_this.item.ApplyStyles) {
|
|
15297
|
+
var api_1 = _this.getters.GetBruceApi();
|
|
15298
|
+
_this.styler = new TilesetRenderEngine.Styler(_this.viewer, api_1, _this.cTileset, +_this.item.styleId, [], _this.item.id, _this.visualsManager);
|
|
15299
|
+
}
|
|
15281
15300
|
_this.onCTilesetLoad();
|
|
15282
15301
|
_this.viewer.scene.requestRender();
|
|
15283
15302
|
}
|
|
@@ -15288,7 +15307,7 @@ var TilesetEntitiesRenderManager;
|
|
|
15288
15307
|
cTileset.tileLoad.addEventListener(function (tile) {
|
|
15289
15308
|
_this.mapCTile(tile);
|
|
15290
15309
|
});
|
|
15291
|
-
|
|
15310
|
+
_g.label = 9;
|
|
15292
15311
|
case 9:
|
|
15293
15312
|
attenuation = this.item.attenuation;
|
|
15294
15313
|
if (!attenuation && attenuation != false) {
|
|
@@ -15320,7 +15339,7 @@ var TilesetEntitiesRenderManager;
|
|
|
15320
15339
|
this.doDispose();
|
|
15321
15340
|
};
|
|
15322
15341
|
Manager.prototype.doDispose = function () {
|
|
15323
|
-
var _a;
|
|
15342
|
+
var _a, _b;
|
|
15324
15343
|
if (this.cTileset) {
|
|
15325
15344
|
var viewer = this.viewer;
|
|
15326
15345
|
if (!(viewer === null || viewer === void 0 ? void 0 : viewer.isDestroyed()) && this.viewer.scene.primitives.contains(this.cTileset)) {
|
|
@@ -15331,6 +15350,7 @@ var TilesetEntitiesRenderManager;
|
|
|
15331
15350
|
}
|
|
15332
15351
|
this.cTileset = null;
|
|
15333
15352
|
}
|
|
15353
|
+
(_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
|
|
15334
15354
|
this.visualsManager.RemoveRegos({
|
|
15335
15355
|
menuItemId: this.item.id
|
|
15336
15356
|
});
|
|
@@ -15384,9 +15404,19 @@ var TilesetEntitiesRenderManager;
|
|
|
15384
15404
|
};
|
|
15385
15405
|
Manager.prototype.ReRender = function (params) {
|
|
15386
15406
|
return __awaiter(this, void 0, void 0, function () {
|
|
15387
|
-
var entityIds, force;
|
|
15407
|
+
var entityIds, force, regos;
|
|
15388
15408
|
return __generator(this, function (_a) {
|
|
15389
15409
|
entityIds = params.entityIds, force = params.force;
|
|
15410
|
+
if (!this.styler) {
|
|
15411
|
+
return [2 /*return*/];
|
|
15412
|
+
}
|
|
15413
|
+
regos = this.visualsManager.GetRegos({
|
|
15414
|
+
menuItemId: this.item.id
|
|
15415
|
+
});
|
|
15416
|
+
if (entityIds != null) {
|
|
15417
|
+
regos = regos.filter(function (r) { return entityIds.indexOf(r.entityId) >= 0; });
|
|
15418
|
+
}
|
|
15419
|
+
this.styler.QueueEntities(regos);
|
|
15390
15420
|
return [2 /*return*/];
|
|
15391
15421
|
});
|
|
15392
15422
|
});
|
|
@@ -24120,7 +24150,7 @@ var ViewRenderEngine;
|
|
|
24120
24150
|
ViewRenderEngine.Render = Render;
|
|
24121
24151
|
})(ViewRenderEngine || (ViewRenderEngine = {}));
|
|
24122
24152
|
|
|
24123
|
-
var VERSION = "3.
|
|
24153
|
+
var VERSION = "3.9.0";
|
|
24124
24154
|
|
|
24125
24155
|
export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, Draw3dPolygon, Draw3dPolyline };
|
|
24126
24156
|
//# sourceMappingURL=bruce-cesium.es5.js.map
|