bruce-cesium 3.9.9 → 4.0.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 +80 -29
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +79 -28
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/tileset-render-engine.js +78 -27
- package/dist/lib/rendering/tileset-render-engine.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- 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,
|
|
3
|
+
import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, JulianDate, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, 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.
|
|
@@ -13289,16 +13289,29 @@ var TilesetRenderEngine;
|
|
|
13289
13289
|
_a.sent();
|
|
13290
13290
|
loadUrl = params.tileset.loadUrl;
|
|
13291
13291
|
// CDN enabled and tileset url template is available.
|
|
13292
|
-
if (params.viaCdn && api.
|
|
13293
|
-
|
|
13294
|
-
|
|
13295
|
-
|
|
13292
|
+
if (params.viaCdn && api.GetCdnBaseUrl()) {
|
|
13293
|
+
/*
|
|
13294
|
+
loadUrl = api.TilesetCdnUrl.replace("<TILESETID>", params.tileset.id).replace("<FILEPATH>", "files/tileset.json");
|
|
13295
|
+
// First url param reserved for accountId. This is set within the API instance.
|
|
13296
|
+
loadUrl += "&generation=" + params.tileset.generateVersion;
|
|
13297
|
+
*/
|
|
13298
|
+
loadUrl = Tileset.GetFileUrl({
|
|
13299
|
+
file: "tileset.json",
|
|
13300
|
+
tilesetId: params.tileset.id,
|
|
13301
|
+
viaCdn: true,
|
|
13302
|
+
legacy: false,
|
|
13303
|
+
cacheToken: params.tileset.generateVersion,
|
|
13304
|
+
api: api
|
|
13305
|
+
});
|
|
13296
13306
|
}
|
|
13297
13307
|
if (!(params.tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 3];
|
|
13298
|
-
return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.
|
|
13308
|
+
return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetFileUrl({
|
|
13299
13309
|
api: api,
|
|
13300
13310
|
tilesetId: params.tileset.id,
|
|
13301
|
-
file: "tileset.json"
|
|
13311
|
+
file: "tileset.json",
|
|
13312
|
+
cacheToken: params.tileset.generateVersion,
|
|
13313
|
+
legacy: false,
|
|
13314
|
+
viaCdn: false
|
|
13302
13315
|
}) + "?generation=" + params.tileset.generateVersion, null)];
|
|
13303
13316
|
case 2:
|
|
13304
13317
|
cTileset_1 = _a.sent();
|
|
@@ -13334,10 +13347,13 @@ var TilesetRenderEngine;
|
|
|
13334
13347
|
return [2 /*return*/, cTileset_1];
|
|
13335
13348
|
case 3:
|
|
13336
13349
|
if (!(params.tileset.type === Tileset.EType.EntitiesSet)) return [3 /*break*/, 5];
|
|
13337
|
-
return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.
|
|
13350
|
+
return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetFileUrl({
|
|
13338
13351
|
api: api,
|
|
13339
13352
|
tilesetId: params.tileset.id,
|
|
13340
|
-
file: "tileset.json"
|
|
13353
|
+
file: "tileset.json",
|
|
13354
|
+
cacheToken: params.tileset.generateVersion,
|
|
13355
|
+
legacy: false,
|
|
13356
|
+
viaCdn: false
|
|
13341
13357
|
}) + "?generation=" + params.tileset.generateVersion, null)];
|
|
13342
13358
|
case 4:
|
|
13343
13359
|
cTileset = _a.sent();
|
|
@@ -13345,10 +13361,13 @@ var TilesetRenderEngine;
|
|
|
13345
13361
|
return [2 /*return*/, cTileset];
|
|
13346
13362
|
case 5:
|
|
13347
13363
|
if (!(params.tileset.type == Tileset.EType.PointCloud)) return [3 /*break*/, 7];
|
|
13348
|
-
return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.
|
|
13364
|
+
return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetFileUrl({
|
|
13349
13365
|
api: api,
|
|
13350
13366
|
tilesetId: params.tileset.id,
|
|
13351
|
-
file: "tileset.json"
|
|
13367
|
+
file: "tileset.json",
|
|
13368
|
+
cacheToken: params.tileset.generateVersion,
|
|
13369
|
+
legacy: false,
|
|
13370
|
+
viaCdn: false
|
|
13352
13371
|
}) + "?generation=" + params.tileset.generateVersion, null)];
|
|
13353
13372
|
case 6:
|
|
13354
13373
|
cTileset_2 = _a.sent();
|
|
@@ -13391,7 +13410,7 @@ var TilesetRenderEngine;
|
|
|
13391
13410
|
TilesetRenderEngine.Render = Render;
|
|
13392
13411
|
function RenderLegacy(params) {
|
|
13393
13412
|
return __awaiter(this, void 0, void 0, function () {
|
|
13394
|
-
var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, settings, visual, etc, api,
|
|
13413
|
+
var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, settings, visual, etc, api, api, cTileset;
|
|
13395
13414
|
return __generator(this, function (_a) {
|
|
13396
13415
|
switch (_a.label) {
|
|
13397
13416
|
case 0:
|
|
@@ -13415,23 +13434,55 @@ var TilesetRenderEngine;
|
|
|
13415
13434
|
}
|
|
13416
13435
|
_a.label = 3;
|
|
13417
13436
|
case 3:
|
|
13418
|
-
if (!loadUrl && tileset)
|
|
13419
|
-
|
|
13420
|
-
|
|
13421
|
-
|
|
13422
|
-
|
|
13423
|
-
|
|
13424
|
-
|
|
13425
|
-
|
|
13426
|
-
rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
|
|
13427
|
-
loadUrl = api.LegacyTilesetCdnUrl
|
|
13428
|
-
.replace("<TILESETID>", tileset.ID)
|
|
13429
|
-
.replace("<FILEPATH>", rootFile)
|
|
13430
|
-
.replace("<ACCOUNT>", accountId);
|
|
13431
|
-
}
|
|
13432
|
-
}
|
|
13433
|
-
return [4 /*yield*/, createTileset(loadUrl, null)];
|
|
13437
|
+
if (!(!loadUrl && tileset)) return [3 /*break*/, 5];
|
|
13438
|
+
api = apiGetter.getApi(accountId);
|
|
13439
|
+
return [4 /*yield*/, api.Loading
|
|
13440
|
+
/*
|
|
13441
|
+
const rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
|
|
13442
|
+
loadUrl = api.GetBaseUrl() + `ui.tileset/${tileset.ID}/file/${rootFile}`;
|
|
13443
|
+
*/
|
|
13444
|
+
];
|
|
13434
13445
|
case 4:
|
|
13446
|
+
_a.sent();
|
|
13447
|
+
/*
|
|
13448
|
+
const rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
|
|
13449
|
+
loadUrl = api.GetBaseUrl() + `ui.tileset/${tileset.ID}/file/${rootFile}`;
|
|
13450
|
+
*/
|
|
13451
|
+
loadUrl = Tileset.GetFileUrl({
|
|
13452
|
+
file: "tileset.json",
|
|
13453
|
+
tilesetId: (tileset === null || tileset === void 0 ? void 0 : tileset.ID) ? tileset.ID : params.tileset.id,
|
|
13454
|
+
viaCdn: false,
|
|
13455
|
+
legacy: true,
|
|
13456
|
+
cacheToken: tileset.GenerateVersion,
|
|
13457
|
+
api: api
|
|
13458
|
+
});
|
|
13459
|
+
_a.label = 5;
|
|
13460
|
+
case 5:
|
|
13461
|
+
if (!(viaCdn && (tileset === null || tileset === void 0 ? void 0 : tileset.ID))) return [3 /*break*/, 7];
|
|
13462
|
+
api = apiGetter.getApi(accountId);
|
|
13463
|
+
return [4 /*yield*/, api.Loading];
|
|
13464
|
+
case 6:
|
|
13465
|
+
_a.sent();
|
|
13466
|
+
if (api.GetCdnBaseUrl()) {
|
|
13467
|
+
/*
|
|
13468
|
+
const rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
|
|
13469
|
+
loadUrl = api.LegacyTilesetCdnUrl
|
|
13470
|
+
.replace("<TILESETID>", tileset.ID)
|
|
13471
|
+
.replace("<FILEPATH>", rootFile)
|
|
13472
|
+
.replace("<ACCOUNT>", accountId);
|
|
13473
|
+
*/
|
|
13474
|
+
loadUrl = Tileset.GetFileUrl({
|
|
13475
|
+
file: "tileset.json",
|
|
13476
|
+
tilesetId: (tileset === null || tileset === void 0 ? void 0 : tileset.ID) ? tileset.ID : params.tileset.id,
|
|
13477
|
+
viaCdn: true,
|
|
13478
|
+
legacy: true,
|
|
13479
|
+
cacheToken: params.tileset.generateVersion,
|
|
13480
|
+
api: api
|
|
13481
|
+
});
|
|
13482
|
+
}
|
|
13483
|
+
_a.label = 7;
|
|
13484
|
+
case 7: return [4 /*yield*/, createTileset(loadUrl, null)];
|
|
13485
|
+
case 8:
|
|
13435
13486
|
cTileset = _a.sent();
|
|
13436
13487
|
viewer.scene.primitives.add(cTileset);
|
|
13437
13488
|
OnTilesetReady(cTileset).then(function () {
|
|
@@ -24506,7 +24557,7 @@ var ViewRenderEngine;
|
|
|
24506
24557
|
ViewRenderEngine.Render = Render;
|
|
24507
24558
|
})(ViewRenderEngine || (ViewRenderEngine = {}));
|
|
24508
24559
|
|
|
24509
|
-
var VERSION = "
|
|
24560
|
+
var VERSION = "4.0.0";
|
|
24510
24561
|
|
|
24511
24562
|
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, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline };
|
|
24512
24563
|
//# sourceMappingURL=bruce-cesium.es5.js.map
|