bruce-cesium 4.3.6 → 4.3.8

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 (10) hide show
  1. package/dist/bruce-cesium.es5.js +53 -259
  2. package/dist/bruce-cesium.es5.js.map +1 -1
  3. package/dist/bruce-cesium.umd.js +51 -257
  4. package/dist/bruce-cesium.umd.js.map +1 -1
  5. package/dist/lib/bruce-cesium.js +1 -1
  6. package/dist/lib/utils/entity-utils.js +50 -256
  7. package/dist/lib/utils/entity-utils.js.map +1 -1
  8. package/dist/types/bruce-cesium.d.ts +1 -1
  9. package/dist/types/utils/entity-utils.d.ts +1 -1
  10. package/package.json +2 -2
package/dist/bruce-cesium.umd.js CHANGED
@@ -2412,13 +2412,12 @@
2412
2412
  });
2413
2413
  }); };
2414
2414
  getEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
2415
- var entityId, entity, tileset, tilesetId, disallowRendered, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, tilesetIds, tSettings, pos3d, eLocation, alt, alt, worldPosition, eTransform, heading, pitch, roll, matrix4, offset, worldPivot, m1, hpr, transform, transformedOffset, geometryRadius, sphere;
2415
+ var entityId, entity, disallowRendered, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, pos3d, eLocation, geometryRadius, sphere;
2416
2416
  var _this = this;
2417
- var _a, _b, _c, _d;
2418
- return __generator(this, function (_e) {
2419
- switch (_e.label) {
2417
+ return __generator(this, function (_a) {
2418
+ switch (_a.label) {
2420
2419
  case 0:
2421
- entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId, disallowRendered = sample.disallowRendered;
2420
+ entityId = sample.entityId, entity = sample.entity, disallowRendered = sample.disallowRendered;
2422
2421
  evaluateRendered = function () { return __awaiter(_this, void 0, void 0, function () {
2423
2422
  var rego, posses, parts, i, part, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i_1, pPosses, pPossesSample, step, i_2, pPosses, pPossesSample, step, i_3, pos3d_1, toAdjust, modelExt, sphere, semiMajorAxis, semiMinorAxis, height, radius, sphere, data_1, pos3d_2, toAdjust, sphere;
2424
2423
  return __generator(this, function (_a) {
@@ -2570,24 +2569,11 @@
2570
2569
  });
2571
2570
  }); };
2572
2571
  evaluateRecord = function () { return __awaiter(_this, void 0, void 0, function () {
2573
- var posses, assemblyLocation, latitude, longitude, pos3d_3, location, latitude, longitude, pos3d_4, geometry, pointStr, points, point, pos3d_5, lineStr, points, pPosses, pRings, boundary, points, pPosses, boundaries, point, bPosses;
2572
+ var posses, location, latitude, longitude, pos3d_3, geometry, pointStr, points, point, pos3d_4, lineStr, points, pPosses, pRings, boundary, points, pPosses, boundaries, point, bPosses;
2574
2573
  return __generator(this, function (_a) {
2575
2574
  switch (_a.label) {
2576
2575
  case 0:
2577
2576
  posses = [];
2578
- assemblyLocation = BModels.Entity.GetValue({
2579
- entity: entity,
2580
- path: ["Bruce", "AssemblyLocation"]
2581
- });
2582
- if (assemblyLocation && typeof assemblyLocation == "object" && BModels.Carto.ValidateCarto(assemblyLocation)) {
2583
- latitude = EnsureNumber(assemblyLocation.latitude);
2584
- longitude = EnsureNumber(assemblyLocation.longitude);
2585
- // Disallowing exact 0.
2586
- if (latitude || longitude) {
2587
- pos3d_3 = Cesium.Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(assemblyLocation.altitude));
2588
- posses.push(pos3d_3);
2589
- }
2590
- }
2591
2577
  location = BModels.Entity.GetValue({
2592
2578
  entity: entity,
2593
2579
  path: ["Bruce", "Location"]
@@ -2597,8 +2583,8 @@
2597
2583
  longitude = EnsureNumber(location.longitude);
2598
2584
  // Disallowing exact 0.
2599
2585
  if (latitude || longitude) {
2600
- pos3d_4 = Cesium.Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
2601
- posses.push(pos3d_4);
2586
+ pos3d_3 = Cesium.Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
2587
+ posses.push(pos3d_3);
2602
2588
  }
2603
2589
  }
2604
2590
  geometry = BModels.Entity.GetValue({
@@ -2613,8 +2599,8 @@
2613
2599
  points = BModels.Geometry.ParsePoints(pointStr);
2614
2600
  point = points.length > 0 ? points[0] : null;
2615
2601
  if (point && BModels.Carto.ValidateCarto(point)) {
2616
- pos3d_5 = Cesium.Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
2617
- posses.push(pos3d_5);
2602
+ pos3d_4 = Cesium.Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
2603
+ posses.push(pos3d_4);
2618
2604
  }
2619
2605
  }
2620
2606
  lineStr = geometry.LineString;
@@ -2667,18 +2653,18 @@
2667
2653
  if (!(disallowRendered != true)) return [3 /*break*/, 2];
2668
2654
  return [4 /*yield*/, evaluateRendered()];
2669
2655
  case 1:
2670
- renderedPosses = _e.sent();
2656
+ renderedPosses = _a.sent();
2671
2657
  if (renderedPosses === null || renderedPosses === void 0 ? void 0 : renderedPosses.length) {
2672
2658
  return [2 /*return*/, renderedPosses];
2673
2659
  }
2674
- _e.label = 2;
2660
+ _a.label = 2;
2675
2661
  case 2:
2676
2662
  if (!!entity) return [3 /*break*/, 6];
2677
2663
  if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 6];
2678
2664
  apiCalls += 1;
2679
- _e.label = 3;
2665
+ _a.label = 3;
2680
2666
  case 3:
2681
- _e.trys.push([3, 5, , 6]);
2667
+ _a.trys.push([3, 5, , 6]);
2682
2668
  return [4 /*yield*/, BModels.Entity.Get({
2683
2669
  api: api,
2684
2670
  entityId: entityId,
@@ -2687,10 +2673,10 @@
2687
2673
  migrated: true
2688
2674
  })];
2689
2675
  case 4:
2690
- entity = (_e.sent()).entity;
2676
+ entity = (_a.sent()).entity;
2691
2677
  return [3 /*break*/, 6];
2692
2678
  case 5:
2693
- e_1 = _e.sent();
2679
+ e_1 = _a.sent();
2694
2680
  console.error(e_1);
2695
2681
  return [3 /*break*/, 6];
2696
2682
  case 6:
@@ -2699,132 +2685,43 @@
2699
2685
  }
2700
2686
  return [4 /*yield*/, evaluateRecord()];
2701
2687
  case 7:
2702
- recordPosses = _e.sent();
2688
+ recordPosses = _a.sent();
2703
2689
  if (recordPosses === null || recordPosses === void 0 ? void 0 : recordPosses.length) {
2704
2690
  return [2 /*return*/, recordPosses];
2705
2691
  }
2706
2692
  if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 11];
2707
- _e.label = 8;
2693
+ _a.label = 8;
2708
2694
  case 8:
2709
- _e.trys.push([8, 10, , 11]);
2695
+ _a.trys.push([8, 10, , 11]);
2710
2696
  apiCalls += 1;
2711
2697
  return [4 /*yield*/, BModels.Entity.Get({
2712
2698
  api: api,
2713
2699
  entityId: entityId,
2714
- // We'll be expanding relative positioning and related tilesets now.
2700
+ // We'll be expanding relative positioning and related assemblies now.
2715
2701
  expandLocation: true,
2716
2702
  migrated: true
2717
2703
  })];
2718
2704
  case 9:
2719
- entity = (_e.sent()).entity;
2705
+ entity = (_a.sent()).entity;
2720
2706
  return [3 /*break*/, 11];
2721
2707
  case 10:
2722
- e_2 = _e.sent();
2708
+ e_2 = _a.sent();
2723
2709
  console.warn(e_2);
2724
2710
  return [3 /*break*/, 11];
2725
2711
  case 11:
2726
- if (!tilesetId) {
2727
- tilesetIds = BModels.Entity.GetValue({
2728
- entity: entity,
2729
- path: ["Bruce", "TilesetIDs"]
2730
- });
2731
- tilesetId = (tilesetIds === null || tilesetIds === void 0 ? void 0 : tilesetIds.length) ? tilesetIds[0] : tilesetId;
2732
- }
2733
- if (!!tileset) return [3 /*break*/, 13];
2734
- if (!(tilesetId && apiCalls < MAX_API_CALLS)) return [3 /*break*/, 13];
2735
- apiCalls += 1;
2736
- return [4 /*yield*/, BModels.Tileset.Get({
2737
- api: api,
2738
- tilesetId: tilesetId
2739
- })];
2740
- case 12:
2741
- tileset = (_e.sent()).tileset;
2742
- _e.label = 13;
2743
- case 13:
2744
- tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
2745
2712
  pos3d = null;
2746
2713
  eLocation = BModels.Entity.GetValue({
2747
2714
  entity: entity,
2748
2715
  path: ["Bruce", "Location"]
2749
2716
  });
2750
- if (!((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) || ((_a = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _a === void 0 ? void 0 : _a.longitude))) return [3 /*break*/, 16];
2751
- if (eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) {
2752
- alt = +eLocation.altitude;
2753
- if (isNaN(alt)) {
2754
- alt = 0;
2755
- }
2756
- pos3d = Cesium.Cartesian3.fromDegrees(+eLocation.longitude, +eLocation.latitude, alt);
2757
- }
2758
- else {
2759
- alt = +tSettings.location.altitude;
2760
- if (isNaN(alt)) {
2761
- alt = 0;
2762
- }
2763
- pos3d = Cesium.Cartesian3.fromDegrees(+tSettings.location.longitude, +tSettings.location.latitude, alt);
2764
- }
2765
- worldPosition = BModels.Entity.GetValue({
2766
- entity: entity,
2767
- path: ["Bruce", "AssemblyWorldPosition"]
2768
- });
2769
- if (!worldPosition) return [3 /*break*/, 16];
2770
- eTransform = BModels.Entity.GetValue({
2771
- entity: entity,
2772
- path: ["Bruce", "Transform"]
2773
- });
2774
- heading = 0;
2775
- pitch = 0;
2776
- roll = 0;
2777
- if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.heading) {
2778
- heading = eTransform.heading;
2779
- }
2780
- else if ((_b = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _b === void 0 ? void 0 : _b.heading) {
2781
- heading = tSettings.transform.heading;
2782
- }
2783
- if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.pitch) {
2784
- pitch = eTransform.pitch;
2785
- }
2786
- else if ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _c === void 0 ? void 0 : _c.pitch) {
2787
- pitch = tSettings.transform.pitch;
2788
- }
2789
- if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.roll) {
2790
- roll = eTransform.roll;
2791
- }
2792
- else if ((_d = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _d === void 0 ? void 0 : _d.roll) {
2793
- roll = tSettings.transform.roll;
2794
- }
2795
- heading = +heading;
2796
- if (isNaN(heading)) {
2797
- heading = 0;
2798
- }
2799
- pitch = +pitch;
2800
- if (isNaN(pitch)) {
2801
- pitch = 0;
2802
- }
2803
- roll = +roll;
2804
- if (isNaN(roll)) {
2805
- roll = 0;
2806
- }
2807
- matrix4 = worldPosition;
2808
- offset = new Cesium.Cartesian3(+matrix4[0][3], +matrix4[1][3], +matrix4[2][3]);
2809
- worldPivot = BModels.Entity.GetValue({
2810
- entity: entity,
2811
- path: ["Bruce", "GeometryWorldPivot"]
2812
- });
2813
- if (worldPivot) //the position from worldMatrix + center of geometry offset
2814
- {
2815
- offset = new Cesium.Cartesian3(worldPivot[0], worldPivot[1], worldPivot[2]);
2816
- }
2817
- m1 = Cesium.Transforms.eastNorthUpToFixedFrame(pos3d);
2818
- hpr = Cesium.HeadingPitchRoll.fromDegrees(heading, pitch, roll, new Cesium.HeadingPitchRoll());
2819
- transform = Cesium.Matrix3.fromHeadingPitchRoll(hpr);
2820
- transformedOffset = Cesium.Matrix3.multiplyByVector(transform, offset, new Cesium.Cartesian3());
2821
- pos3d = Cesium.Matrix4.multiplyByPoint(m1, transformedOffset, new Cesium.Cartesian3());
2822
- if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 15];
2717
+ if (!(eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude)) return [3 /*break*/, 14];
2718
+ pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(eLocation.longitude), EnsureNumber(eLocation.latitude), EnsureNumber(eLocation.altitude));
2719
+ if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 13];
2823
2720
  return [4 /*yield*/, processPosHeight(pos3d, Cesium.HeightReference.NONE)];
2824
- case 14:
2825
- pos3d = _e.sent();
2826
- _e.label = 15;
2827
- case 15:
2721
+ case 12:
2722
+ pos3d = _a.sent();
2723
+ _a.label = 13;
2724
+ case 13:
2828
2725
  geometryRadius = BModels.Entity.GetValue({
2829
2726
  entity: entity,
2830
2727
  path: ["Bruce", "GeometryRadius"]
@@ -2837,8 +2734,8 @@
2837
2734
  spheres.push(sphere);
2838
2735
  }
2839
2736
  }
2840
- _e.label = 16;
2841
- case 16:
2737
+ _a.label = 14;
2738
+ case 14:
2842
2739
  if (pos3d) {
2843
2740
  return [2 /*return*/, [pos3d]];
2844
2741
  }
@@ -2960,9 +2857,9 @@
2960
2857
  if ((rego === null || rego === void 0 ? void 0 : rego.visual) instanceof Cesium.Entity) {
2961
2858
  var visual = rego.visual;
2962
2859
  if (visual.position) {
2963
- var pos3d_6 = GetValue(viewer, visual.position);
2860
+ var pos3d_5 = GetValue(viewer, visual.position);
2964
2861
  // Fix height reference.
2965
- if (pos3d_6 === null || pos3d_6 === void 0 ? void 0 : pos3d_6.x) {
2862
+ if (pos3d_5 === null || pos3d_5 === void 0 ? void 0 : pos3d_5.x) {
2966
2863
  var visualHeightRef = Cesium.HeightReference.RELATIVE_TO_GROUND;
2967
2864
  if (visual.model) {
2968
2865
  visualHeightRef = GetValue(viewer, visual.model.heightReference);
@@ -2989,7 +2886,7 @@
2989
2886
  return exports.DrawingUtils.EnsurePosHeight({
2990
2887
  desiredHeightRef: params.returnHeightRef,
2991
2888
  heightRef: visualHeightRef,
2992
- pos3d: pos3d_6,
2889
+ pos3d: pos3d_5,
2993
2890
  viewer: viewer
2994
2891
  });
2995
2892
  }
@@ -2998,19 +2895,6 @@
2998
2895
  return null;
2999
2896
  }
3000
2897
  function evaluateRecord() {
3001
- // Checking for a pre-calculated lat/lon for assembly entities.
3002
- var assemblyLocation = BModels.Entity.GetValue({
3003
- entity: entity,
3004
- path: ["Bruce", "AssemblyLocation"]
3005
- });
3006
- if (assemblyLocation && typeof assemblyLocation == "object" && BModels.Carto.ValidateCarto(assemblyLocation)) {
3007
- var latitude = EnsureNumber(assemblyLocation.latitude);
3008
- var longitude = EnsureNumber(assemblyLocation.longitude);
3009
- // Disallowing exact 0.
3010
- if (latitude || longitude) {
3011
- return Cesium.Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(assemblyLocation.altitude));
3012
- }
3013
- }
3014
2898
  var location = BModels.Entity.GetValue({
3015
2899
  entity: entity,
3016
2900
  path: ["Bruce", "Location"]
@@ -3104,25 +2988,24 @@
3104
2988
  EntityUtils.GetPos = GetPos;
3105
2989
  /**
3106
2990
  * Returns the position of the entity.
3107
- * This is an async variant that checks for related tilesets.
2991
+ * This is an async variant that checks for related assemblies.
3108
2992
  * @param params
3109
2993
  * @deprecated use GetLocation instead.
3110
2994
  * @returns
3111
2995
  */
3112
2996
  function GetPosAsync(params) {
3113
- var _a, _b, _c, _d;
3114
2997
  return __awaiter(this, void 0, void 0, function () {
3115
- var viewer, entityId, entity, tileset, tilesetId, visualRegister, returnHeightRef, recordHeightRef, api, lat, lon, location_1, e_3, e_4, tilesetIds, pos3d, tSettings, eLocation, alt, alt, worldPosition, heading, pitch, roll, eTransform, matrix4, offset, worldPivot, m1, hpr, transform, transformedOffset;
3116
- return __generator(this, function (_e) {
3117
- switch (_e.label) {
2998
+ var viewer, entityId, entity, visualRegister, returnHeightRef, recordHeightRef, api, lat, lon, location_1, e_3, e_4, pos3d, eLocation;
2999
+ return __generator(this, function (_a) {
3000
+ switch (_a.label) {
3118
3001
  case 0:
3119
- viewer = params.viewer, entityId = params.entityId, entity = params.entity, tileset = params.tileset, tilesetId = params.tilesetId, visualRegister = params.visualRegister, returnHeightRef = params.returnHeightRef, recordHeightRef = params.recordHeightRef, api = params.api;
3002
+ viewer = params.viewer, entityId = params.entityId, entity = params.entity, visualRegister = params.visualRegister, returnHeightRef = params.returnHeightRef, recordHeightRef = params.recordHeightRef, api = params.api;
3120
3003
  if (!!entity) return [3 /*break*/, 9];
3121
3004
  lat = 0;
3122
3005
  lon = 0;
3123
- _e.label = 1;
3006
+ _a.label = 1;
3124
3007
  case 1:
3125
- _e.trys.push([1, 3, , 4]);
3008
+ _a.trys.push([1, 3, , 4]);
3126
3009
  return [4 /*yield*/, BModels.Entity.Get({
3127
3010
  api: api,
3128
3011
  entityId: entityId,
@@ -3130,7 +3013,7 @@
3130
3013
  migrated: true
3131
3014
  })];
3132
3015
  case 2:
3133
- entity = (_e.sent()).entity;
3016
+ entity = (_a.sent()).entity;
3134
3017
  if (entity) {
3135
3018
  location_1 = BModels.Entity.GetValue({
3136
3019
  entity: entity,
@@ -3141,14 +3024,14 @@
3141
3024
  }
3142
3025
  return [3 /*break*/, 4];
3143
3026
  case 3:
3144
- e_3 = _e.sent();
3027
+ e_3 = _a.sent();
3145
3028
  console.error(e_3);
3146
3029
  return [3 /*break*/, 4];
3147
3030
  case 4:
3148
3031
  if (!(entity && (isNaN(lat) || isNaN(lon) || (lat == 0 && lon == 0)))) return [3 /*break*/, 9];
3149
- _e.label = 5;
3032
+ _a.label = 5;
3150
3033
  case 5:
3151
- _e.trys.push([5, 7, , 9]);
3034
+ _a.trys.push([5, 7, , 9]);
3152
3035
  return [4 /*yield*/, BModels.Entity.Get({
3153
3036
  api: api,
3154
3037
  entityId: entityId,
@@ -3156,10 +3039,10 @@
3156
3039
  migrated: true
3157
3040
  })];
3158
3041
  case 6:
3159
- entity = (_e.sent()).entity;
3042
+ entity = (_a.sent()).entity;
3160
3043
  return [3 /*break*/, 9];
3161
3044
  case 7:
3162
- e_4 = _e.sent();
3045
+ e_4 = _a.sent();
3163
3046
  console.warn(e_4);
3164
3047
  return [4 /*yield*/, BModels.Entity.Get({
3165
3048
  api: api,
@@ -3168,20 +3051,13 @@
3168
3051
  migrated: true
3169
3052
  })];
3170
3053
  case 8:
3171
- entity = (_e.sent()).entity;
3054
+ entity = (_a.sent()).entity;
3172
3055
  return [3 /*break*/, 9];
3173
3056
  case 9:
3174
3057
  if (!entity) {
3175
3058
  return [2 /*return*/, null];
3176
3059
  }
3177
- if (!tilesetId) {
3178
- tilesetIds = BModels.Entity.GetValue({
3179
- entity: entity,
3180
- path: ["Bruce", "TilesetIDs"]
3181
- });
3182
- tilesetId = (tilesetIds === null || tilesetIds === void 0 ? void 0 : tilesetIds.length) ? tilesetIds[0] : tilesetId;
3183
- }
3184
- pos3d = tilesetId ? null : GetPos({
3060
+ pos3d = GetPos({
3185
3061
  viewer: viewer,
3186
3062
  entity: entity,
3187
3063
  visualRegister: visualRegister,
@@ -3191,94 +3067,12 @@
3191
3067
  if (BModels.Cartes.ValidateCartes3(pos3d)) {
3192
3068
  return [2 /*return*/, pos3d];
3193
3069
  }
3194
- if (!!tileset) return [3 /*break*/, 11];
3195
- if (!tilesetId) return [3 /*break*/, 11];
3196
- return [4 /*yield*/, BModels.Tileset.Get({
3197
- api: api,
3198
- tilesetId: tilesetId
3199
- })];
3200
- case 10:
3201
- tileset = (_e.sent()).tileset;
3202
- _e.label = 11;
3203
- case 11:
3204
- tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
3205
3070
  eLocation = BModels.Entity.GetValue({
3206
3071
  entity: entity,
3207
3072
  path: ["Bruce", "Location"]
3208
3073
  });
3209
- if ((eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) || ((_a = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _a === void 0 ? void 0 : _a.longitude)) {
3210
- if (eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude) {
3211
- alt = +eLocation.altitude;
3212
- if (isNaN(alt)) {
3213
- alt = 0;
3214
- }
3215
- pos3d = Cesium.Cartesian3.fromDegrees(+eLocation.longitude, +eLocation.latitude, alt);
3216
- }
3217
- else {
3218
- alt = +tSettings.location.altitude;
3219
- if (isNaN(alt)) {
3220
- alt = 0;
3221
- }
3222
- pos3d = Cesium.Cartesian3.fromDegrees(+tSettings.location.longitude, +tSettings.location.latitude, alt);
3223
- }
3224
- worldPosition = BModels.Entity.GetValue({
3225
- entity: entity,
3226
- path: ["Bruce", "AssemblyWorldPosition"]
3227
- });
3228
- if (worldPosition) {
3229
- heading = 0;
3230
- pitch = 0;
3231
- roll = 0;
3232
- eTransform = BModels.Entity.GetValue({
3233
- entity: entity,
3234
- path: ["Bruce", "Transform"]
3235
- });
3236
- if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.heading) {
3237
- heading = eTransform.heading;
3238
- }
3239
- else if ((_b = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _b === void 0 ? void 0 : _b.heading) {
3240
- heading = tSettings.transform.heading;
3241
- }
3242
- if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.pitch) {
3243
- pitch = eTransform.pitch;
3244
- }
3245
- else if ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _c === void 0 ? void 0 : _c.pitch) {
3246
- pitch = tSettings.transform.pitch;
3247
- }
3248
- if (eTransform === null || eTransform === void 0 ? void 0 : eTransform.roll) {
3249
- roll = eTransform.roll;
3250
- }
3251
- else if ((_d = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _d === void 0 ? void 0 : _d.roll) {
3252
- roll = tSettings.transform.roll;
3253
- }
3254
- heading = +heading;
3255
- if (isNaN(heading)) {
3256
- heading = 0;
3257
- }
3258
- pitch = +pitch;
3259
- if (isNaN(pitch)) {
3260
- pitch = 0;
3261
- }
3262
- roll = +roll;
3263
- if (isNaN(roll)) {
3264
- roll = 0;
3265
- }
3266
- matrix4 = worldPosition;
3267
- offset = new Cesium.Cartesian3(+matrix4[0][3], +matrix4[1][3], +matrix4[2][3]);
3268
- worldPivot = BModels.Entity.GetValue({
3269
- entity: entity,
3270
- path: ["Bruce", "GeometryWorldPivot"]
3271
- });
3272
- if (worldPivot) //the position from worldMatrix + center of geometry offset
3273
- {
3274
- offset = new Cesium.Cartesian3(worldPivot[0], worldPivot[1], worldPivot[2]);
3275
- }
3276
- m1 = Cesium.Transforms.eastNorthUpToFixedFrame(pos3d);
3277
- hpr = Cesium.HeadingPitchRoll.fromDegrees(heading, pitch, roll, new Cesium.HeadingPitchRoll());
3278
- transform = Cesium.Matrix3.fromHeadingPitchRoll(hpr);
3279
- transformedOffset = Cesium.Matrix3.multiplyByVector(transform, offset, new Cesium.Cartesian3());
3280
- pos3d = Cesium.Matrix4.multiplyByPoint(m1, transformedOffset, new Cesium.Cartesian3());
3281
- }
3074
+ if (+(eLocation === null || eLocation === void 0 ? void 0 : eLocation.longitude)) {
3075
+ pos3d = Cesium.Cartesian3.fromDegrees(EnsureNumber(eLocation.longitude), EnsureNumber(eLocation.latitude), EnsureNumber(eLocation.altitude));
3282
3076
  }
3283
3077
  return [2 /*return*/, exports.DrawingUtils.EnsurePosHeight({
3284
3078
  desiredHeightRef: params.returnHeightRef,
@@ -26466,7 +26260,7 @@
26466
26260
  ViewerUtils.AssertIonToken = AssertIonToken;
26467
26261
  })(exports.ViewerUtils || (exports.ViewerUtils = {}));
26468
26262
 
26469
- var VERSION = "4.3.6";
26263
+ var VERSION = "4.3.8";
26470
26264
 
26471
26265
  exports.VERSION = VERSION;
26472
26266
  exports.CesiumParabola = CesiumParabola;