bruce-cesium 1.6.7 → 1.6.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, SceneMode, Color, HeightReference, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, CallbackProperty, KmlDataSource, OrthographicFrustum, JulianDate, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Matrix4, IonResource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CallbackProperty, Cesium3DTileset, Matrix4, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -886,7 +886,10 @@ var EntityUtils;
                         if (!entity) {
                             return [2 /*return*/, null];
                         }
-                        pos3d = GetPos({
+                        if (!tilesetId) {
+                            tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;
+                        }
+                        pos3d = tilesetId ? null : GetPos({
                             viewer: viewer,
                             entity: entity,
                             visualRegister: visualRegister,
@@ -897,9 +900,6 @@ var EntityUtils;
                             return [2 /*return*/, pos3d];
                         }
                         if (!!tileset) return [3 /*break*/, 7];
-                        if (!tilesetId) {
-                            tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;
-                        }
                         if (!tilesetId) return [3 /*break*/, 7];
                         return [4 /*yield*/, Tileset.Get({
                                 api: api,
@@ -942,7 +942,7 @@ var EntityUtils;
                                     heading = 0;
                                 }
                                 matrix4 = entity.worldPosition;
-                                offset = new Cartesian3(matrix4[0][3], matrix4[1][3], matrix4[2][3]);
+                                offset = new Cartesian3(+matrix4[0][3], +matrix4[1][3], +matrix4[2][3]);
                                 m1 = Transforms.eastNorthUpToFixedFrame(pos3d);
                                 hpr = HeadingPitchRoll.fromDegrees(heading, 0, 0, new HeadingPitchRoll());
                                 transform = Matrix3.fromHeadingPitchRoll(hpr);
@@ -5478,7 +5478,7 @@ var TilesetCadRenderManager;
             }
         };
         Manager.prototype.mapTilesetFeature = function (feature) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g;
             var version = (_c = (_b = (_a = feature === null || feature === void 0 ? void 0 : feature.tileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree) === null || _c === void 0 ? void 0 : _c.version;
             if (!version) {
                 version = 1;
@@ -5489,7 +5489,8 @@ var TilesetCadRenderManager;
                 menuItemId: this.item.id,
                 priority: 0,
                 visual: feature,
-                accountId: (_e = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID) !== null && _e !== void 0 ? _e : this.apiGetter.accountId
+                accountId: (_e = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID) !== null && _e !== void 0 ? _e : this.apiGetter.accountId,
+                tilesetId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.TilesetID
             };
             if (version == 1) {
                 var pathStr = feature.getProperty("BrucePath");
@@ -5518,7 +5519,7 @@ var TilesetCadRenderManager;
             }
             // Optional menu item restriction.
             // Allows only showing certain entities from a tileset.
-            var onlyIds = (_f = this.item.BruceEntity) === null || _f === void 0 ? void 0 : _f.EntityIds;
+            var onlyIds = (_g = this.item.BruceEntity) === null || _g === void 0 ? void 0 : _g.EntityIds;
             if ((onlyIds === null || onlyIds === void 0 ? void 0 : onlyIds.length) && !onlyIds.includes(rego.entityId)) {
                 if (this.item.BruceEntity.Ghosts) {
                     feature.color = Color.WHITE.clone().withAlpha(0.5);