bruce-cesium 5.5.7 → 5.5.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.
- package/dist/bruce-cesium.es5.js +251 -83
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +250 -82
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/menu-item-creator.js +13 -3
- package/dist/lib/rendering/menu-item-creator.js.map +1 -1
- package/dist/lib/rendering/menu-item-manager.js +56 -14
- package/dist/lib/rendering/menu-item-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/other/assembly-render-manager.js +14 -4
- package/dist/lib/rendering/render-managers/other/assembly-render-manager.js.map +1 -1
- package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js +9 -3
- package/dist/lib/rendering/render-managers/tilesets/tileset-cad-render-manager.js.map +1 -1
- package/dist/lib/rendering/tileset-render-engine.js +7 -2
- package/dist/lib/rendering/tileset-render-engine.js.map +1 -1
- package/dist/lib/rendering/view-render-engine.js +58 -31
- package/dist/lib/rendering/view-render-engine.js.map +1 -1
- package/dist/lib/utils/entity-utils.js +93 -24
- package/dist/lib/utils/entity-utils.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/dist/types/rendering/menu-item-manager.d.ts +1 -0
- package/dist/types/rendering/render-managers/other/assembly-render-manager.d.ts +3 -0
- package/dist/types/rendering/render-managers/tilesets/tileset-cad-render-manager.d.ts +3 -0
- package/dist/types/rendering/tileset-render-engine.d.ts +2 -0
- package/package.json +2 -2
package/dist/bruce-cesium.umd.js
CHANGED
|
@@ -2881,6 +2881,43 @@
|
|
|
2881
2881
|
}
|
|
2882
2882
|
return result;
|
|
2883
2883
|
};
|
|
2884
|
+
function calcEntityLocation(entity, modelSpace) {
|
|
2885
|
+
let aRootLocation = entity.Bruce.AssemblyRootLocation;
|
|
2886
|
+
// If we're in model-space we cull location.
|
|
2887
|
+
// This puts it at 0,0 lat/lon which we treat as 0,0,0 for model-space viewing.
|
|
2888
|
+
if (modelSpace) {
|
|
2889
|
+
aRootLocation = null;
|
|
2890
|
+
}
|
|
2891
|
+
const worldPosition = entity.Bruce.AssemblyWorldPosition;
|
|
2892
|
+
if (!worldPosition) {
|
|
2893
|
+
return null;
|
|
2894
|
+
}
|
|
2895
|
+
let offset = new Cesium.Cartesian3(+worldPosition[0][3], +worldPosition[1][3], +worldPosition[2][3]);
|
|
2896
|
+
let heading = 0;
|
|
2897
|
+
let pitch = 0;
|
|
2898
|
+
let roll = 0;
|
|
2899
|
+
{
|
|
2900
|
+
const eTransform = entity.Bruce.Transform;
|
|
2901
|
+
if (eTransform) {
|
|
2902
|
+
if (eTransform.heading) {
|
|
2903
|
+
heading = eTransform.heading;
|
|
2904
|
+
}
|
|
2905
|
+
if (eTransform.pitch) {
|
|
2906
|
+
pitch = eTransform.pitch;
|
|
2907
|
+
}
|
|
2908
|
+
if (eTransform.roll) {
|
|
2909
|
+
roll = eTransform.roll;
|
|
2910
|
+
}
|
|
2911
|
+
}
|
|
2912
|
+
}
|
|
2913
|
+
let pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.longitude), EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.latitude), EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.altitude));
|
|
2914
|
+
const m1 = Cesium.Transforms.eastNorthUpToFixedFrame(pos3d);
|
|
2915
|
+
const hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber(heading), EnsureNumber(pitch), EnsureNumber(roll), new Cesium.HeadingPitchRoll());
|
|
2916
|
+
const transform = Cesium.Matrix3.fromHeadingPitchRoll(hpr);
|
|
2917
|
+
const transformedOffset = Cesium.Matrix3.multiplyByVector(transform, offset, new Cesium.Cartesian3());
|
|
2918
|
+
pos3d = Cesium.Matrix4.multiplyByPoint(m1, transformedOffset, new Cesium.Cartesian3());
|
|
2919
|
+
return pos3d;
|
|
2920
|
+
}
|
|
2884
2921
|
(function (EntityUtils) {
|
|
2885
2922
|
/**
|
|
2886
2923
|
* Returns the location for given entity or entities.
|
|
@@ -2901,6 +2938,9 @@
|
|
|
2901
2938
|
let terrainSamples = 0;
|
|
2902
2939
|
const MAX_VALID_SAMPLES = 20;
|
|
2903
2940
|
let validSamples = 0;
|
|
2941
|
+
// When in model-space, Assembly Entities are all relative to 0,0 lat/lon.
|
|
2942
|
+
// Which means we have to ignore the location and calculate based on relative position to 0,0.
|
|
2943
|
+
const modelSpace = viewer["nextspace-model-space"] === true;
|
|
2904
2944
|
const data = {
|
|
2905
2945
|
pos3d: null,
|
|
2906
2946
|
rectangle: null,
|
|
@@ -3162,8 +3202,9 @@
|
|
|
3162
3202
|
* @param sample
|
|
3163
3203
|
*/
|
|
3164
3204
|
const getRecordEntityPositions = async (sample) => {
|
|
3165
|
-
var _a;
|
|
3205
|
+
var _a, _b;
|
|
3166
3206
|
let { entityId, entity, disallowRendered } = sample;
|
|
3207
|
+
const isAssemblyEntity = ((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.AssemblyRootLocation) != null;
|
|
3167
3208
|
/**
|
|
3168
3209
|
* Returns an array of positions from the entity's record.
|
|
3169
3210
|
*/
|
|
@@ -3240,38 +3281,59 @@
|
|
|
3240
3281
|
}
|
|
3241
3282
|
return posses;
|
|
3242
3283
|
};
|
|
3243
|
-
|
|
3244
|
-
|
|
3245
|
-
|
|
3246
|
-
|
|
3247
|
-
|
|
3248
|
-
const eLocation = BModels.Entity.GetValue({
|
|
3284
|
+
if (isAssemblyEntity) {
|
|
3285
|
+
let pos3d = calcEntityLocation(entity, modelSpace);
|
|
3286
|
+
if (pos3d) {
|
|
3287
|
+
pos3d = await processPosHeight(pos3d, Cesium.HeightReference.NONE);
|
|
3288
|
+
const geometryRadius = BModels.Entity.GetValue({
|
|
3249
3289
|
entity: entity,
|
|
3250
|
-
path: ["Bruce", "
|
|
3290
|
+
path: ["Bruce", "GeometryRadius"]
|
|
3251
3291
|
});
|
|
3252
|
-
if (
|
|
3253
|
-
|
|
3254
|
-
|
|
3255
|
-
|
|
3292
|
+
if (geometryRadius && (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
|
|
3293
|
+
const sphere = Cesium.BoundingSphere.fromPoints([pos3d]);
|
|
3294
|
+
// For now making sure it's less than x amount because we had a bug which made it huge.
|
|
3295
|
+
if (geometryRadius && geometryRadius < 500 && geometryRadius > 0.1) {
|
|
3296
|
+
sphere.radius = geometryRadius;
|
|
3297
|
+
spheres.push(sphere);
|
|
3256
3298
|
}
|
|
3257
|
-
|
|
3299
|
+
}
|
|
3300
|
+
return [pos3d];
|
|
3301
|
+
}
|
|
3302
|
+
}
|
|
3303
|
+
else {
|
|
3304
|
+
const recordPosses = await evaluateRecord();
|
|
3305
|
+
if (recordPosses === null || recordPosses === void 0 ? void 0 : recordPosses.length) {
|
|
3306
|
+
// See if we can also get the spherical bounds.
|
|
3307
|
+
try {
|
|
3308
|
+
let pos3d = null;
|
|
3309
|
+
const eLocation = BModels.Entity.GetValue({
|
|
3258
3310
|
entity: entity,
|
|
3259
|
-
path: ["Bruce", "
|
|
3311
|
+
path: ["Bruce", "Location"]
|
|
3260
3312
|
});
|
|
3261
|
-
if (
|
|
3262
|
-
|
|
3263
|
-
|
|
3264
|
-
|
|
3265
|
-
|
|
3266
|
-
|
|
3313
|
+
if ((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) && ((_b = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _b === void 0 ? void 0 : _b.AssemblyRootLocation) != null) {
|
|
3314
|
+
pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(eLocation.longitude), EnsureNumber(eLocation.latitude), EnsureNumber(eLocation.altitude));
|
|
3315
|
+
if (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x) {
|
|
3316
|
+
pos3d = await processPosHeight(pos3d, Cesium.HeightReference.NONE);
|
|
3317
|
+
}
|
|
3318
|
+
const geometryRadius = BModels.Entity.GetValue({
|
|
3319
|
+
entity: entity,
|
|
3320
|
+
path: ["Bruce", "GeometryRadius"]
|
|
3321
|
+
});
|
|
3322
|
+
if (geometryRadius && (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
|
|
3323
|
+
const sphere = Cesium.BoundingSphere.fromPoints([pos3d]);
|
|
3324
|
+
// For now making sure it's less than x amount because we had a bug which made it huge.
|
|
3325
|
+
if (geometryRadius && geometryRadius < 500 && geometryRadius > 0.1) {
|
|
3326
|
+
sphere.radius = geometryRadius;
|
|
3327
|
+
spheres.push(sphere);
|
|
3328
|
+
}
|
|
3267
3329
|
}
|
|
3268
3330
|
}
|
|
3269
3331
|
}
|
|
3332
|
+
catch (e) {
|
|
3333
|
+
console.error(e);
|
|
3334
|
+
}
|
|
3335
|
+
return recordPosses;
|
|
3270
3336
|
}
|
|
3271
|
-
catch (e) {
|
|
3272
|
-
console.error(e);
|
|
3273
|
-
}
|
|
3274
|
-
return recordPosses;
|
|
3275
3337
|
}
|
|
3276
3338
|
return [];
|
|
3277
3339
|
};
|
|
@@ -3435,10 +3497,13 @@
|
|
|
3435
3497
|
* @returns
|
|
3436
3498
|
*/
|
|
3437
3499
|
function GetPos(params) {
|
|
3500
|
+
var _a;
|
|
3438
3501
|
let { viewer, entity, visualRegister, allowRendered } = params;
|
|
3439
3502
|
if (allowRendered == null) {
|
|
3440
3503
|
allowRendered = true;
|
|
3441
3504
|
}
|
|
3505
|
+
const isModelSpace = viewer["nextspace-model-space"] === true;
|
|
3506
|
+
const isAssemblyEntity = ((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.AssemblyRootLocation) != null;
|
|
3442
3507
|
function evaluateRendered() {
|
|
3443
3508
|
const rego = visualRegister ? visualRegister.GetRego({
|
|
3444
3509
|
entityId: entity.Bruce.ID,
|
|
@@ -3484,6 +3549,9 @@
|
|
|
3484
3549
|
return null;
|
|
3485
3550
|
}
|
|
3486
3551
|
function evaluateRecord() {
|
|
3552
|
+
if (isAssemblyEntity) {
|
|
3553
|
+
return calcEntityLocation(entity, isModelSpace);
|
|
3554
|
+
}
|
|
3487
3555
|
const location = BModels.Entity.GetValue({
|
|
3488
3556
|
entity: entity,
|
|
3489
3557
|
path: ["Bruce", "Location"]
|
|
@@ -15843,7 +15911,7 @@
|
|
|
15843
15911
|
const cTileset = params.cTileset;
|
|
15844
15912
|
const root = cTileset.root;
|
|
15845
15913
|
const position = params.position;
|
|
15846
|
-
|
|
15914
|
+
let location = ((_a = position.ucs) === null || _a === void 0 ? void 0 : _a.location) ? position.ucs.location : position.location;
|
|
15847
15915
|
let transform = position.transform;
|
|
15848
15916
|
transform = {
|
|
15849
15917
|
heading: 0,
|
|
@@ -15859,6 +15927,10 @@
|
|
|
15859
15927
|
if (transform.scale <= 0) {
|
|
15860
15928
|
transform.scale = 0.000001;
|
|
15861
15929
|
}
|
|
15930
|
+
// If we're in model-space we'll just go at 0,0 lat/lon.
|
|
15931
|
+
if (params.modelSpace) {
|
|
15932
|
+
location = null;
|
|
15933
|
+
}
|
|
15862
15934
|
/**
|
|
15863
15935
|
* Very cursed.
|
|
15864
15936
|
*/
|
|
@@ -16054,7 +16126,8 @@
|
|
|
16054
16126
|
ucs: (_b = params.coords) === null || _b === void 0 ? void 0 : _b.ucs,
|
|
16055
16127
|
location: ((_c = params.coords) === null || _c === void 0 ? void 0 : _c.location) == null ? settings.location : params.coords.location,
|
|
16056
16128
|
transform: ((_d = params.coords) === null || _d === void 0 ? void 0 : _d.transform) == null ? settings.transform : params.coords.transform
|
|
16057
|
-
}
|
|
16129
|
+
},
|
|
16130
|
+
modelSpace: params.modelSpace
|
|
16058
16131
|
});
|
|
16059
16132
|
params.viewer.scene.requestRender();
|
|
16060
16133
|
}
|
|
@@ -17306,6 +17379,9 @@
|
|
|
17306
17379
|
get Disposed() {
|
|
17307
17380
|
return this.disposed;
|
|
17308
17381
|
}
|
|
17382
|
+
get ModelSpace() {
|
|
17383
|
+
return this.modelSpace;
|
|
17384
|
+
}
|
|
17309
17385
|
get Tileset() {
|
|
17310
17386
|
return this.cTileset;
|
|
17311
17387
|
}
|
|
@@ -17314,6 +17390,7 @@
|
|
|
17314
17390
|
}
|
|
17315
17391
|
constructor(params) {
|
|
17316
17392
|
this.disposed = false;
|
|
17393
|
+
this.modelSpace = false;
|
|
17317
17394
|
this.cTileset = null;
|
|
17318
17395
|
this.styler = new exports.TilesetRenderEngine.Styler();
|
|
17319
17396
|
// Quick look-up of the model tree nodes by entity/geomId.
|
|
@@ -17334,11 +17411,12 @@
|
|
|
17334
17411
|
this.historicPosses = [];
|
|
17335
17412
|
this.historicAnimation = null;
|
|
17336
17413
|
this.historicPossesLoadingProm = null;
|
|
17337
|
-
const { viewer, register: visualsManager, getters, item } = params;
|
|
17414
|
+
const { viewer, register: visualsManager, getters, item, modelSpace } = params;
|
|
17338
17415
|
this.viewer = viewer;
|
|
17339
17416
|
this.getters = getters;
|
|
17340
17417
|
this.item = item;
|
|
17341
17418
|
this.visualsManager = visualsManager;
|
|
17419
|
+
this.modelSpace = Boolean(modelSpace);
|
|
17342
17420
|
}
|
|
17343
17421
|
Init() {
|
|
17344
17422
|
var _a, _b;
|
|
@@ -17440,7 +17518,8 @@
|
|
|
17440
17518
|
coords: coords,
|
|
17441
17519
|
accountId: accountId,
|
|
17442
17520
|
viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled),
|
|
17443
|
-
noMemoryLimit: this.item["noMaximumMemory"]
|
|
17521
|
+
noMemoryLimit: this.item["noMaximumMemory"],
|
|
17522
|
+
modelSpace: this.modelSpace
|
|
17444
17523
|
});
|
|
17445
17524
|
if (this.disposed) {
|
|
17446
17525
|
this.doDispose();
|
|
@@ -17548,7 +17627,7 @@
|
|
|
17548
17627
|
mapTilesetFeature(feature, add) {
|
|
17549
17628
|
var _a, _b, _c, _d, _e;
|
|
17550
17629
|
const accountId = (_b = ((_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID)) !== null && _b !== void 0 ? _b : this.getters.GetAccountId();
|
|
17551
|
-
const canEdit = accountId === this.getters.GetAccountId();
|
|
17630
|
+
const canEdit = accountId === this.getters.GetAccountId() && !this.modelSpace;
|
|
17552
17631
|
let rego = {
|
|
17553
17632
|
canEdit: canEdit,
|
|
17554
17633
|
entityId: null,
|
|
@@ -21251,15 +21330,20 @@
|
|
|
21251
21330
|
get Disposed() {
|
|
21252
21331
|
return this.disposed;
|
|
21253
21332
|
}
|
|
21333
|
+
get ModelSpace() {
|
|
21334
|
+
return this.modelSpace;
|
|
21335
|
+
}
|
|
21254
21336
|
constructor(params) {
|
|
21255
21337
|
this.disposed = false;
|
|
21256
21338
|
// Cache of the hierarchy so that our scene-tree can reference it.
|
|
21257
21339
|
this.hierarchy = null;
|
|
21340
|
+
this.modelSpace = false;
|
|
21258
21341
|
const { viewer, register: visualsManager, getters, item } = params;
|
|
21259
21342
|
this.viewer = viewer;
|
|
21260
21343
|
this.getters = getters;
|
|
21261
21344
|
this.item = item;
|
|
21262
21345
|
this.visualsManager = visualsManager;
|
|
21346
|
+
this.modelSpace = Boolean(params.modelSpace);
|
|
21263
21347
|
}
|
|
21264
21348
|
Init() {
|
|
21265
21349
|
this.renderPriority = this.item.renderPriority;
|
|
@@ -21322,7 +21406,7 @@
|
|
|
21322
21406
|
// Won't bother with vector data for this experiment.
|
|
21323
21407
|
continue;
|
|
21324
21408
|
}
|
|
21325
|
-
const pos3d = calcEntityLocation(entity);
|
|
21409
|
+
const pos3d = calcEntityLocation$1(entity, this.modelSpace);
|
|
21326
21410
|
const orient = calcEntityOrientation(entity, pos3d);
|
|
21327
21411
|
if (!pos3d || !orient) {
|
|
21328
21412
|
continue;
|
|
@@ -21384,8 +21468,13 @@
|
|
|
21384
21468
|
AssemblyRenderManager.Manager = Manager;
|
|
21385
21469
|
})(exports.AssemblyRenderManager || (exports.AssemblyRenderManager = {}));
|
|
21386
21470
|
const axis_shift = new Cesium.Quaternion(0, 0, -Math.SQRT1_2, Math.SQRT1_2);
|
|
21387
|
-
function calcEntityLocation(entity) {
|
|
21388
|
-
|
|
21471
|
+
function calcEntityLocation$1(entity, modelSpace) {
|
|
21472
|
+
let aRootLocation = entity.Bruce.AssemblyRootLocation;
|
|
21473
|
+
// If we're in model-space we cull location.
|
|
21474
|
+
// This puts it at 0,0 lat/lon which we treat as 0,0,0 for model-space viewing.
|
|
21475
|
+
if (modelSpace) {
|
|
21476
|
+
aRootLocation = null;
|
|
21477
|
+
}
|
|
21389
21478
|
const worldPosition = entity.Bruce.AssemblyWorldPosition;
|
|
21390
21479
|
if (!worldPosition) {
|
|
21391
21480
|
return null;
|
|
@@ -21408,7 +21497,7 @@
|
|
|
21408
21497
|
}
|
|
21409
21498
|
}
|
|
21410
21499
|
}
|
|
21411
|
-
let pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(aRootLocation.longitude), EnsureNumber(aRootLocation.latitude), EnsureNumber(aRootLocation.altitude));
|
|
21500
|
+
let pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.longitude), EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.latitude), EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.altitude));
|
|
21412
21501
|
const m1 = Cesium.Transforms.eastNorthUpToFixedFrame(pos3d);
|
|
21413
21502
|
const hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber(heading), EnsureNumber(pitch), EnsureNumber(roll), new Cesium.HeadingPitchRoll());
|
|
21414
21503
|
const transform = Cesium.Matrix3.fromHeadingPitchRoll(hpr);
|
|
@@ -21510,7 +21599,7 @@
|
|
|
21510
21599
|
* @returns
|
|
21511
21600
|
*/
|
|
21512
21601
|
RenderItem(params) {
|
|
21513
|
-
var _a, _b, _c, _d;
|
|
21602
|
+
var _a, _b, _c, _d, _e;
|
|
21514
21603
|
if (this.viewer.isDestroyed()) {
|
|
21515
21604
|
return null;
|
|
21516
21605
|
}
|
|
@@ -21527,7 +21616,11 @@
|
|
|
21527
21616
|
else if (!params.apiGetter) {
|
|
21528
21617
|
params.apiGetter = params.getters.GetBruceGetter();
|
|
21529
21618
|
}
|
|
21619
|
+
if (params.modelSpace == null) {
|
|
21620
|
+
params.modelSpace = false;
|
|
21621
|
+
}
|
|
21530
21622
|
let rItem = this.items.find(x => x.id == params.item.id);
|
|
21623
|
+
let create = true;
|
|
21531
21624
|
if (rItem) {
|
|
21532
21625
|
// This means we're updating a tag menu item.
|
|
21533
21626
|
// Tag menu items have alternative states based on bookmark settings.
|
|
@@ -21540,6 +21633,7 @@
|
|
|
21540
21633
|
});
|
|
21541
21634
|
rItem.item = params.item;
|
|
21542
21635
|
}
|
|
21636
|
+
create = false;
|
|
21543
21637
|
}
|
|
21544
21638
|
// This means we're updating a entities tileset menu item.
|
|
21545
21639
|
// These have different point scaling settings based on bookmark settings.
|
|
@@ -21548,6 +21642,7 @@
|
|
|
21548
21642
|
item: params.item,
|
|
21549
21643
|
});
|
|
21550
21644
|
rItem.item = params.item;
|
|
21645
|
+
create = false;
|
|
21551
21646
|
}
|
|
21552
21647
|
// This means we're updating a rendered relationships menu item.
|
|
21553
21648
|
// Eg: different entities need to be rendered, or one of the relationship data entities changed.
|
|
@@ -21557,6 +21652,7 @@
|
|
|
21557
21652
|
item: params.item,
|
|
21558
21653
|
});
|
|
21559
21654
|
rItem.item = params.item;
|
|
21655
|
+
create = false;
|
|
21560
21656
|
}
|
|
21561
21657
|
// This means we're updating a rendered relationships menu item.
|
|
21562
21658
|
// Eg: different entities need to be rendered, or one of the relationship data entities changed.
|
|
@@ -21565,17 +21661,50 @@
|
|
|
21565
21661
|
item: params.item,
|
|
21566
21662
|
});
|
|
21567
21663
|
rItem.item = params.item;
|
|
21664
|
+
create = false;
|
|
21665
|
+
}
|
|
21666
|
+
// Re-init in case model-space changed to geo-spatial or vice-versa.
|
|
21667
|
+
else if (rItem.type == BModels.MenuItem.EType.CadTileset && params.item.Type == BModels.MenuItem.EType.CadTileset) {
|
|
21668
|
+
if (rItem.renderManager && rItem.renderManager.ModelSpace == params.modelSpace) {
|
|
21669
|
+
create = false;
|
|
21670
|
+
}
|
|
21671
|
+
}
|
|
21672
|
+
// Re-init in case model-space changed to geo-spatial or vice-versa.
|
|
21673
|
+
else if (rItem.type == BModels.MenuItem.EType.Assembly && params.item.Type == BModels.MenuItem.EType.Assembly) {
|
|
21674
|
+
if (rItem.renderManager && rItem.renderManager.ModelSpace == params.modelSpace) {
|
|
21675
|
+
create = false;
|
|
21676
|
+
}
|
|
21677
|
+
}
|
|
21678
|
+
else if (rItem.type != params.item.Type) {
|
|
21679
|
+
create = true;
|
|
21680
|
+
}
|
|
21681
|
+
if (create) {
|
|
21682
|
+
try {
|
|
21683
|
+
(_b = rItem.renderManager) === null || _b === void 0 ? void 0 : _b.Dispose();
|
|
21684
|
+
}
|
|
21685
|
+
catch (e) {
|
|
21686
|
+
console.error(e);
|
|
21687
|
+
}
|
|
21688
|
+
this.items = this.items.filter(x => x.id !== rItem.id);
|
|
21568
21689
|
}
|
|
21569
21690
|
}
|
|
21570
|
-
|
|
21571
|
-
rItem
|
|
21572
|
-
|
|
21573
|
-
|
|
21574
|
-
|
|
21575
|
-
|
|
21576
|
-
|
|
21577
|
-
|
|
21578
|
-
|
|
21691
|
+
if (create) {
|
|
21692
|
+
if (!rItem) {
|
|
21693
|
+
rItem = {
|
|
21694
|
+
id: (_c = params.item.id) !== null && _c !== void 0 ? _c : BModels.ObjectUtils.UId(),
|
|
21695
|
+
childIds: [],
|
|
21696
|
+
item: params.item,
|
|
21697
|
+
renderManager: null,
|
|
21698
|
+
type: params.item.Type,
|
|
21699
|
+
errors: []
|
|
21700
|
+
};
|
|
21701
|
+
}
|
|
21702
|
+
else {
|
|
21703
|
+
rItem.item = params.item;
|
|
21704
|
+
rItem.type = params.item.Type;
|
|
21705
|
+
rItem.renderManager = null;
|
|
21706
|
+
rItem.errors = [];
|
|
21707
|
+
}
|
|
21579
21708
|
this.items.push(rItem);
|
|
21580
21709
|
if (!params.item.Type) {
|
|
21581
21710
|
params.item.Type = BModels.MenuItem.EType.None;
|
|
@@ -21623,7 +21752,8 @@
|
|
|
21623
21752
|
viewer: this.viewer,
|
|
21624
21753
|
register: this.visualsRegister,
|
|
21625
21754
|
getters: params.getters,
|
|
21626
|
-
item: params.item
|
|
21755
|
+
item: params.item,
|
|
21756
|
+
modelSpace: params.modelSpace,
|
|
21627
21757
|
});
|
|
21628
21758
|
break;
|
|
21629
21759
|
case BModels.MenuItem.EType.Assembly:
|
|
@@ -21631,7 +21761,8 @@
|
|
|
21631
21761
|
viewer: this.viewer,
|
|
21632
21762
|
register: this.visualsRegister,
|
|
21633
21763
|
getters: params.getters,
|
|
21634
|
-
item: params.item
|
|
21764
|
+
item: params.item,
|
|
21765
|
+
modelSpace: params.modelSpace,
|
|
21635
21766
|
});
|
|
21636
21767
|
break;
|
|
21637
21768
|
case BModels.MenuItem.EType.Osm:
|
|
@@ -21759,8 +21890,8 @@
|
|
|
21759
21890
|
rItem.childIds.push(childId);
|
|
21760
21891
|
}
|
|
21761
21892
|
}
|
|
21762
|
-
if (rItem.renderManager && !((
|
|
21763
|
-
(
|
|
21893
|
+
if (rItem.renderManager && !((_d = rItem.renderManager) === null || _d === void 0 ? void 0 : _d.Disposed)) {
|
|
21894
|
+
(_e = this.onUpdate) === null || _e === void 0 ? void 0 : _e.Trigger({ isEnabling: true, itemId: rItem.id });
|
|
21764
21895
|
}
|
|
21765
21896
|
return rItem.id;
|
|
21766
21897
|
}
|
|
@@ -22829,7 +22960,7 @@
|
|
|
22829
22960
|
}
|
|
22830
22961
|
MenuItemCreator.RenderTileset = RenderTileset;
|
|
22831
22962
|
async function RenderBookmarkItems(params) {
|
|
22832
|
-
var _a;
|
|
22963
|
+
var _a, _b;
|
|
22833
22964
|
let { viewId, bookmarkId, apiGetter, getters, manager, viewer } = params;
|
|
22834
22965
|
if (!getters) {
|
|
22835
22966
|
getters = BModels.ENVIRONMENT.Api();
|
|
@@ -22876,10 +23007,19 @@
|
|
|
22876
23007
|
enabledIds = bSettings.selectedItemIds;
|
|
22877
23008
|
}
|
|
22878
23009
|
}
|
|
22879
|
-
|
|
23010
|
+
const bSettings = bookmark.Settings;
|
|
23011
|
+
const defaults = (_a = view.Settings) === null || _a === void 0 ? void 0 : _a.defaults;
|
|
23012
|
+
let alternations = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemAlternations;
|
|
22880
23013
|
if (!alternations) {
|
|
22881
23014
|
alternations = {};
|
|
22882
23015
|
}
|
|
23016
|
+
let contentType = bSettings.contentType;
|
|
23017
|
+
if (!contentType && ((_b = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _b === void 0 ? void 0 : _b.contentType)) {
|
|
23018
|
+
contentType = defaults.settings.contentType;
|
|
23019
|
+
}
|
|
23020
|
+
if (contentType == null) {
|
|
23021
|
+
contentType = BModels.ProjectViewBookmark.EContentType.WEB_3D;
|
|
23022
|
+
}
|
|
22883
23023
|
const renderedItemIds = [];
|
|
22884
23024
|
if ((menuItems === null || menuItems === void 0 ? void 0 : menuItems.length) && (enabledIds === null || enabledIds === void 0 ? void 0 : enabledIds.length)) {
|
|
22885
23025
|
const traverseItems = async (item) => {
|
|
@@ -22907,7 +23047,8 @@
|
|
|
22907
23047
|
if (enabledIds.includes(item.id)) {
|
|
22908
23048
|
const itemId = await manager.RenderItem({
|
|
22909
23049
|
item: item,
|
|
22910
|
-
getters: getters
|
|
23050
|
+
getters: getters,
|
|
23051
|
+
modelSpace: contentType === BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE
|
|
22911
23052
|
});
|
|
22912
23053
|
renderedItemIds.push(itemId);
|
|
22913
23054
|
}
|
|
@@ -24810,6 +24951,9 @@
|
|
|
24810
24951
|
// 1- new accounts get our token set.
|
|
24811
24952
|
// 2- we reference to the template account's token.
|
|
24812
24953
|
const CESIUM_DEFAULT_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJiODI1OWQyZC0wYzdlLTRlOTctODFlOC1kYjIwOGYzOWE0NGIiLCJpZCI6MTE3NDg0LCJpYXQiOjE2NzAzODczOTR9.sx0EZdD-Y33FQ7gB_R3CkTsk3KhNpODoQGrnpvSH4UQ";
|
|
24954
|
+
// Model-space flag so we know if we're changing from and to model-space.
|
|
24955
|
+
// This helps determine if we should instantly transition.
|
|
24956
|
+
const MODEL_SPACE_FLAG = "nextspace-model-space";
|
|
24813
24957
|
/**
|
|
24814
24958
|
* Creates a new iteration state.
|
|
24815
24959
|
* This will stop any existing renders from processing to their end.
|
|
@@ -24974,7 +25118,7 @@
|
|
|
24974
25118
|
* @param view
|
|
24975
25119
|
*/
|
|
24976
25120
|
async function renderNavigator(iteration, params, bookmark, view, getters) {
|
|
24977
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
|
|
25121
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
|
|
24978
25122
|
const viewer = params.manager.Viewer;
|
|
24979
25123
|
const scene = viewer.scene;
|
|
24980
25124
|
let cTokenSet = Cesium.Ion.defaultAccessToken ? await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken) : false;
|
|
@@ -25010,21 +25154,28 @@
|
|
|
25010
25154
|
const vSettings = view.Settings;
|
|
25011
25155
|
const bSettings = ((_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) !== null && _a !== void 0 ? _a : {});
|
|
25012
25156
|
const defaults = (_b = vSettings.defaults) !== null && _b !== void 0 ? _b : {};
|
|
25013
|
-
let
|
|
25157
|
+
let contentType = bSettings.contentType;
|
|
25158
|
+
if (!contentType && ((_c = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _c === void 0 ? void 0 : _c.contentType)) {
|
|
25159
|
+
contentType = defaults.settings.contentType;
|
|
25160
|
+
}
|
|
25161
|
+
if (contentType == null) {
|
|
25162
|
+
contentType = BModels.ProjectViewBookmark.EContentType.WEB_3D;
|
|
25163
|
+
}
|
|
25164
|
+
let camera = ((_d = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Camera) !== null && _d !== void 0 ? _d : {});
|
|
25014
25165
|
if (!BModels.Carto.ValidateCarto(camera)) {
|
|
25015
25166
|
camera = {
|
|
25016
25167
|
...camera,
|
|
25017
|
-
altitude: (
|
|
25018
|
-
latitude: (
|
|
25019
|
-
longitude: (
|
|
25020
|
-
heading: (
|
|
25021
|
-
pitch: (
|
|
25022
|
-
roll: (
|
|
25168
|
+
altitude: (_e = defaults.camera) === null || _e === void 0 ? void 0 : _e.altitude,
|
|
25169
|
+
latitude: (_f = defaults.camera) === null || _f === void 0 ? void 0 : _f.latitude,
|
|
25170
|
+
longitude: (_g = defaults.camera) === null || _g === void 0 ? void 0 : _g.longitude,
|
|
25171
|
+
heading: (_h = defaults.camera) === null || _h === void 0 ? void 0 : _h.heading,
|
|
25172
|
+
pitch: (_j = defaults.camera) === null || _j === void 0 ? void 0 : _j.pitch,
|
|
25173
|
+
roll: (_k = defaults.camera) === null || _k === void 0 ? void 0 : _k.roll
|
|
25023
25174
|
};
|
|
25024
25175
|
}
|
|
25025
25176
|
let newLens = camera.cameraFrustum;
|
|
25026
25177
|
if (newLens == null) {
|
|
25027
|
-
newLens = (
|
|
25178
|
+
newLens = (_l = defaults.camera) === null || _l === void 0 ? void 0 : _l.cameraFrustum;
|
|
25028
25179
|
}
|
|
25029
25180
|
if (newLens == null) {
|
|
25030
25181
|
// TODO: Need global default.
|
|
@@ -25044,7 +25195,7 @@
|
|
|
25044
25195
|
if (!params.skipCamera) {
|
|
25045
25196
|
let transition = params.skipTransition ? 0 : shouldBe2d === curIs2d ? camera.transition : 0;
|
|
25046
25197
|
if (transition == null) {
|
|
25047
|
-
transition = (
|
|
25198
|
+
transition = (_m = defaults.camera) === null || _m === void 0 ? void 0 : _m.transition;
|
|
25048
25199
|
}
|
|
25049
25200
|
if (transition == null) {
|
|
25050
25201
|
// TODO: Need global default.
|
|
@@ -25052,6 +25203,20 @@
|
|
|
25052
25203
|
}
|
|
25053
25204
|
if (BModels.Carto.ValidateCarto(camera)) {
|
|
25054
25205
|
const pos = Cesium.Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
|
|
25206
|
+
if (
|
|
25207
|
+
// Moving into model-space.
|
|
25208
|
+
(contentType == BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) ||
|
|
25209
|
+
// Moving away from model-space.
|
|
25210
|
+
// @ts-expect-error
|
|
25211
|
+
(contentType != BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE && viewer[MODEL_SPACE_FLAG] == true)) {
|
|
25212
|
+
const cameraPos3d = viewer.camera.position;
|
|
25213
|
+
if (!cameraPos3d || (cameraPos3d.x == 0 && cameraPos3d.y == 0 && cameraPos3d.z == 0)) {
|
|
25214
|
+
transition = 0;
|
|
25215
|
+
}
|
|
25216
|
+
else if (Cesium.Cartesian3.distance(cameraPos3d, pos) > 10000) {
|
|
25217
|
+
transition = 0;
|
|
25218
|
+
}
|
|
25219
|
+
}
|
|
25055
25220
|
scene.camera.flyTo({
|
|
25056
25221
|
destination: pos,
|
|
25057
25222
|
orientation: {
|
|
@@ -25065,7 +25230,8 @@
|
|
|
25065
25230
|
});
|
|
25066
25231
|
}
|
|
25067
25232
|
}
|
|
25068
|
-
|
|
25233
|
+
viewer[MODEL_SPACE_FLAG] = contentType == BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE;
|
|
25234
|
+
let terrain = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) != null ? bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain : (_o = defaults.settings) === null || _o === void 0 ? void 0 : _o.terrain;
|
|
25069
25235
|
if (terrain) {
|
|
25070
25236
|
// If there is no Cesium token set then we'll swap cesium terrain to flat terrain.
|
|
25071
25237
|
// This allows a scene to render even if it's not the correct one.
|
|
@@ -25088,7 +25254,7 @@
|
|
|
25088
25254
|
}
|
|
25089
25255
|
let hillShades = bSettings === null || bSettings === void 0 ? void 0 : bSettings.hillShades;
|
|
25090
25256
|
if (hillShades == null) {
|
|
25091
|
-
hillShades = (
|
|
25257
|
+
hillShades = (_p = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _p === void 0 ? void 0 : _p.hillShades;
|
|
25092
25258
|
}
|
|
25093
25259
|
if (hillShades == null) {
|
|
25094
25260
|
hillShades = true;
|
|
@@ -25096,7 +25262,7 @@
|
|
|
25096
25262
|
scene.globe.enableLighting = Boolean(hillShades);
|
|
25097
25263
|
let baseColor = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeColor;
|
|
25098
25264
|
if (baseColor == null) {
|
|
25099
|
-
baseColor = (
|
|
25265
|
+
baseColor = (_q = defaults.settings) === null || _q === void 0 ? void 0 : _q.globeColor;
|
|
25100
25266
|
}
|
|
25101
25267
|
if (baseColor == null) {
|
|
25102
25268
|
// TODO: Need global default.
|
|
@@ -25105,7 +25271,7 @@
|
|
|
25105
25271
|
scene.globe.baseColor = Cesium.Color.fromCssColorString(baseColor);
|
|
25106
25272
|
let globeHidden = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeHidden;
|
|
25107
25273
|
if (globeHidden == null) {
|
|
25108
|
-
globeHidden = (
|
|
25274
|
+
globeHidden = (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.globeHidden;
|
|
25109
25275
|
}
|
|
25110
25276
|
if (globeHidden == null) {
|
|
25111
25277
|
globeHidden = false;
|
|
@@ -25113,7 +25279,7 @@
|
|
|
25113
25279
|
scene.globe.show = !globeHidden;
|
|
25114
25280
|
let terrainWireframe = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrainWireframe;
|
|
25115
25281
|
if (terrainWireframe == null) {
|
|
25116
|
-
terrainWireframe = (
|
|
25282
|
+
terrainWireframe = (_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.terrainWireframe;
|
|
25117
25283
|
}
|
|
25118
25284
|
if (terrainWireframe == null) {
|
|
25119
25285
|
terrainWireframe = false;
|
|
@@ -25124,7 +25290,7 @@
|
|
|
25124
25290
|
});
|
|
25125
25291
|
let globeAlpha = +(bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeAlpha);
|
|
25126
25292
|
if (isNaN(globeAlpha)) {
|
|
25127
|
-
globeAlpha = +((
|
|
25293
|
+
globeAlpha = +((_t = defaults.settings) === null || _t === void 0 ? void 0 : _t.globeAlpha);
|
|
25128
25294
|
}
|
|
25129
25295
|
if (!scene.globe.translucency.enabled) {
|
|
25130
25296
|
scene.globe.translucency.enabled = true;
|
|
@@ -25134,7 +25300,7 @@
|
|
|
25134
25300
|
scene.globe.translucency.frontFaceAlphaByDistance.nearValue = EnsureNumber(globeAlpha, 1);
|
|
25135
25301
|
let shadows = bSettings === null || bSettings === void 0 ? void 0 : bSettings.shadows;
|
|
25136
25302
|
if (shadows == null) {
|
|
25137
|
-
shadows = (
|
|
25303
|
+
shadows = (_u = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _u === void 0 ? void 0 : _u.shadows;
|
|
25138
25304
|
}
|
|
25139
25305
|
if (shadows == null) {
|
|
25140
25306
|
shadows = {
|
|
@@ -25155,7 +25321,7 @@
|
|
|
25155
25321
|
viewer.shadowMap.darkness = EnsureNumber(shadows.darkness, 0.3);
|
|
25156
25322
|
let ambientOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.ambientOcclusion;
|
|
25157
25323
|
if (ambientOcclusion == null) {
|
|
25158
|
-
ambientOcclusion = (
|
|
25324
|
+
ambientOcclusion = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.ambientOcclusion;
|
|
25159
25325
|
}
|
|
25160
25326
|
if (ambientOcclusion == null) {
|
|
25161
25327
|
ambientOcclusion = {
|
|
@@ -25178,7 +25344,7 @@
|
|
|
25178
25344
|
}
|
|
25179
25345
|
let lighting = bSettings === null || bSettings === void 0 ? void 0 : bSettings.lighting;
|
|
25180
25346
|
if (lighting == null) {
|
|
25181
|
-
lighting = (
|
|
25347
|
+
lighting = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.lighting;
|
|
25182
25348
|
}
|
|
25183
25349
|
if (lighting == null) {
|
|
25184
25350
|
lighting = {
|
|
@@ -25193,7 +25359,7 @@
|
|
|
25193
25359
|
}
|
|
25194
25360
|
let quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
|
|
25195
25361
|
if (quality == null) {
|
|
25196
|
-
quality = (
|
|
25362
|
+
quality = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.quality;
|
|
25197
25363
|
}
|
|
25198
25364
|
if (quality == null) {
|
|
25199
25365
|
quality = {
|
|
@@ -25204,11 +25370,11 @@
|
|
|
25204
25370
|
fxaa.enabled = Boolean(quality.fxaa);
|
|
25205
25371
|
let dateTime = bSettings === null || bSettings === void 0 ? void 0 : bSettings.dateTime;
|
|
25206
25372
|
if (dateTime == null) {
|
|
25207
|
-
dateTime = (
|
|
25373
|
+
dateTime = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.dateTime;
|
|
25208
25374
|
}
|
|
25209
25375
|
let timeline = bSettings === null || bSettings === void 0 ? void 0 : bSettings.timeline;
|
|
25210
25376
|
if (timeline == null) {
|
|
25211
|
-
timeline = (
|
|
25377
|
+
timeline = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.timeline;
|
|
25212
25378
|
}
|
|
25213
25379
|
if (timeline == null) {
|
|
25214
25380
|
timeline = {
|
|
@@ -25232,7 +25398,7 @@
|
|
|
25232
25398
|
// Newer version that has states per Entity ID + Menu Item ID.
|
|
25233
25399
|
let states = bSettings === null || bSettings === void 0 ? void 0 : bSettings.states;
|
|
25234
25400
|
if (states == null) {
|
|
25235
|
-
states = (
|
|
25401
|
+
states = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.states;
|
|
25236
25402
|
}
|
|
25237
25403
|
if (states != null) {
|
|
25238
25404
|
params.manager.VisualsRegister.OverrideStates(states);
|
|
@@ -25241,7 +25407,7 @@
|
|
|
25241
25407
|
else {
|
|
25242
25408
|
let selectedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedEntityIds;
|
|
25243
25409
|
if (selectedIds == null) {
|
|
25244
|
-
selectedIds = (
|
|
25410
|
+
selectedIds = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.selectedEntityIds;
|
|
25245
25411
|
}
|
|
25246
25412
|
if (selectedIds != null) {
|
|
25247
25413
|
params.manager.VisualsRegister.ClearSelected();
|
|
@@ -25255,7 +25421,7 @@
|
|
|
25255
25421
|
params.manager.VisualsRegister.ClearHidden();
|
|
25256
25422
|
let hiddenIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.hiddenEntityIds;
|
|
25257
25423
|
if (hiddenIds == null) {
|
|
25258
|
-
hiddenIds = (
|
|
25424
|
+
hiddenIds = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.hiddenEntityIds;
|
|
25259
25425
|
}
|
|
25260
25426
|
if (hiddenIds != null) {
|
|
25261
25427
|
params.manager.VisualsRegister.SetHidden({
|
|
@@ -25267,7 +25433,7 @@
|
|
|
25267
25433
|
params.manager.VisualsRegister.ClearIsolated();
|
|
25268
25434
|
let isolatedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.isolatedEntityIds;
|
|
25269
25435
|
if (isolatedIds == null) {
|
|
25270
|
-
isolatedIds = (
|
|
25436
|
+
isolatedIds = (_3 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _3 === void 0 ? void 0 : _3.isolatedEntityIds;
|
|
25271
25437
|
}
|
|
25272
25438
|
if (isolatedIds != null) {
|
|
25273
25439
|
params.manager.VisualsRegister.SetIsolated({
|
|
@@ -25278,7 +25444,7 @@
|
|
|
25278
25444
|
}
|
|
25279
25445
|
let labelledIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.labelledEntityIds;
|
|
25280
25446
|
if (labelledIds == null) {
|
|
25281
|
-
labelledIds = (
|
|
25447
|
+
labelledIds = (_4 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _4 === void 0 ? void 0 : _4.labelledEntityIds;
|
|
25282
25448
|
}
|
|
25283
25449
|
if (!(labelledIds === null || labelledIds === void 0 ? void 0 : labelledIds.length)) {
|
|
25284
25450
|
params.manager.VisualsRegister.ClearLabelled({
|
|
@@ -25302,7 +25468,7 @@
|
|
|
25302
25468
|
params.manager.VisualsRegister.ClearOpacity();
|
|
25303
25469
|
let entityOpacityMap = bSettings === null || bSettings === void 0 ? void 0 : bSettings.entityOpacityMap;
|
|
25304
25470
|
if (entityOpacityMap == null) {
|
|
25305
|
-
entityOpacityMap = (
|
|
25471
|
+
entityOpacityMap = (_5 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _5 === void 0 ? void 0 : _5.entityOpacityMap;
|
|
25306
25472
|
}
|
|
25307
25473
|
if (entityOpacityMap != null) {
|
|
25308
25474
|
for (const entityId in entityOpacityMap) {
|
|
@@ -25317,7 +25483,7 @@
|
|
|
25317
25483
|
}
|
|
25318
25484
|
}
|
|
25319
25485
|
}
|
|
25320
|
-
let imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (
|
|
25486
|
+
let imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_6 = defaults.settings) === null || _6 === void 0 ? void 0 : _6.imagery;
|
|
25321
25487
|
if (imagery == null) {
|
|
25322
25488
|
// TODO: Need global default.
|
|
25323
25489
|
imagery = [
|
|
@@ -25378,11 +25544,13 @@
|
|
|
25378
25544
|
relations = [];
|
|
25379
25545
|
}
|
|
25380
25546
|
viewer.scene.requestRender();
|
|
25547
|
+
// TODO: When in model-space we should remove all unsupported items.
|
|
25548
|
+
// This prevents junk settings causing problems.
|
|
25381
25549
|
// Only disable menu items we don't want.
|
|
25382
25550
|
// Otherwise we cause a flicker of rendered graphics.
|
|
25383
25551
|
// Maybe TODO to such a function for menu item manager.
|
|
25384
25552
|
const curEnabled = params.manager.GetEnabledItemIds();
|
|
25385
|
-
const newItemIds = (
|
|
25553
|
+
const newItemIds = (_7 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _7 !== void 0 ? _7 : [];
|
|
25386
25554
|
for (const id of curEnabled) {
|
|
25387
25555
|
let shouldRemove;
|
|
25388
25556
|
if (id == RELATION_MENU_ITEM_ID) {
|
|
@@ -25453,7 +25621,7 @@
|
|
|
25453
25621
|
}
|
|
25454
25622
|
let gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
|
|
25455
25623
|
if (gOcclusion == null) {
|
|
25456
|
-
gOcclusion = (
|
|
25624
|
+
gOcclusion = (_8 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _8 === void 0 ? void 0 : _8.groundOcclusion;
|
|
25457
25625
|
}
|
|
25458
25626
|
if (gOcclusion == null) {
|
|
25459
25627
|
// TODO: Need global default.
|
|
@@ -31349,7 +31517,7 @@
|
|
|
31349
31517
|
}
|
|
31350
31518
|
}
|
|
31351
31519
|
|
|
31352
|
-
const VERSION = "5.5.
|
|
31520
|
+
const VERSION = "5.5.9";
|
|
31353
31521
|
|
|
31354
31522
|
exports.VERSION = VERSION;
|
|
31355
31523
|
exports.isHistoricMetadataChanged = isHistoricMetadataChanged;
|