bruce-cesium 0.9.8 → 1.0.0

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, Cesium3DTileStyle, IonResource, EllipsoidGeodesic, PolygonPipeline, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, KmlDataSource, createOsmBuildings } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, EllipsoidGeodesic, PolygonPipeline, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, createOsmBuildings, KmlDataSource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -2742,7 +2742,7 @@ var VisualsRegister;
                 if (!entityRegos) {
                     return;
                 }
-                var menuItems = menuItemId ? menuItemId : Object.keys(entityRegos);
+                var menuItems = menuItemId ? [menuItemId] : entityRegos.map(function (x) { return x.menuItemId; });
                 var _loop_3 = function (i) {
                     var menuItemId_2 = menuItems[i];
                     var rego = entityRegos.find(function (r) { return r.menuItemId === menuItemId_2; });
@@ -3215,10 +3215,10 @@ function colorToCColor$1(color) {
  * @returns
  */
 function isAlive(viewer, cTileset) {
-    if (viewer.isDestroyed()) {
+    if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene)) {
         return false;
     }
-    if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene)) {
+    if (viewer.isDestroyed()) {
         return false;
     }
     if (cTileset.isDestroyed()) {
@@ -3228,81 +3228,84 @@ function isAlive(viewer, cTileset) {
 }
 var TilesetRenderEngine;
 (function (TilesetRenderEngine) {
-    function ApplyPosition(cTileset, tileset, coords) {
-        var location;
-        var transform;
-        if (tileset.type == Tileset.EType.Cad) {
-            var settings = tileset.settings;
-            // Position using root entity + ucs.
-            if (coords === null || coords === void 0 ? void 0 : coords.ucs) {
-                location = coords.ucs.location;
-                transform = coords.transform;
-            }
-            // Position using tileset.
-            else {
-                transform = settings.transform;
-                location = settings.location;
-            }
-        }
-        else if (tileset.type == Tileset.EType.PointCloud) {
-            var settings = tileset.settings;
-            transform = settings.transform;
-            location = settings.location;
-        }
-        if (!(location === null || location === void 0 ? void 0 : location.latitude)) {
-            return;
-        }
+    function ApplyPosition(params) {
+        var _a;
+        var cTileset = params.cTileset;
+        var root = cTileset.root;
+        var position = params.position;
+        var location = ((_a = position.ucs) === null || _a === void 0 ? void 0 : _a.location) ? position.ucs.location : position.location;
+        var transform = position.transform;
         transform = __assign({ heading: 0, pitch: 0, roll: 0, scale: 1, x: 0, y: 0, z: 0 }, transform);
         transform.scale = EnsureNumber(transform.scale);
         if (transform.scale <= 0) {
             transform.scale = 0.000001;
         }
-        var pos = Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
-        var hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new HeadingPitchRoll());
-        var root = cTileset.root;
-        root.transform = Transforms.headingPitchRollToFixedFrame(pos, hpr);
-        var scaleMatrix = Matrix4.fromScale(new Cartesian3(transform.scale, transform.scale, transform.scale), new Matrix4());
-        root.transform = Matrix4.multiply(root.transform, scaleMatrix, root.transform);
-        root.transform = Matrix4.multiplyByTranslation(root.transform, new Cartesian3(EnsureNumber(transform.x), EnsureNumber(transform.y), EnsureNumber(transform.z)), root.transform);
-        // Force matrix to update
-        root.updateTransform();
+        if (position.isLegacy) {
+            var legacy_1 = position.legacyProps;
+            if (legacy_1.usingBoundingBox == null) {
+                legacy_1.usingBoundingBox = true;
+            }
+            var getCurPos3d = function () {
+                if (legacy_1.usingBoundingBox == false) {
+                    return Matrix4.getTranslation(root.transform, new Cartesian3());
+                }
+                else {
+                    return Cartesian3.clone(root.boundingSphere.center);
+                }
+            };
+            var pos3d = void 0;
+            if (location.latitude != null && location.longitude != null) {
+                pos3d = Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
+            }
+            if (!pos3d) {
+                pos3d = getCurPos3d();
+            }
+            // Store data in the tileset as we can't interpret it using the cesium primitive later.
+            var cTilesetExt_1 = cTileset;
+            cTilesetExt_1._bruceCoords.transform = null;
+            if (legacy_1.rotate) {
+                var hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new HeadingPitchRoll());
+                root.transform = Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
+                root.updateTransform();
+            }
+            var curPos3d = getCurPos3d();
+            var newTransform = Matrix4.pack(root.transform.clone(new Matrix4()), []);
+            newTransform[12] += pos3d.x - curPos3d.x;
+            newTransform[13] += pos3d.y - curPos3d.y;
+            newTransform[14] += pos3d.z - curPos3d.z;
+            root.transform = Matrix4.unpack(newTransform);
+            root.updateTransform();
+        }
+        else {
+            if (!(location === null || location === void 0 ? void 0 : location.latitude)) {
+                return;
+            }
+            var pos = Cartesian3.fromDegrees(EnsureNumber(location.longitude), EnsureNumber(location.latitude), EnsureNumber(location.altitude));
+            var hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(transform.heading), EnsureNumber(transform.pitch), EnsureNumber(transform.roll), new HeadingPitchRoll());
+            root.transform = Transforms.headingPitchRollToFixedFrame(pos, hpr);
+            var scaleMatrix = Matrix4.fromScale(new Cartesian3(transform.scale, transform.scale, transform.scale), new Matrix4());
+            root.transform = Matrix4.multiply(root.transform, scaleMatrix, root.transform);
+            root.transform = Matrix4.multiplyByTranslation(root.transform, new Cartesian3(EnsureNumber(transform.x), EnsureNumber(transform.y), EnsureNumber(transform.z)), root.transform);
+            // Force matrix to update
+            root.updateTransform();
+        }
         // Store data in the tileset as we can't interpret it using the cesium primitive later.
         var cTilesetExt = cTileset;
-        cTilesetExt._bruceCoords = __assign({}, cTilesetExt._bruceCoords);
-        cTilesetExt._bruceCoords.ucs = coords.ucs ? {
-            location: coords.ucs.location ? JSON.parse(JSON.stringify(coords.ucs.location)) : null,
-            transform: null
-        } : null;
-        cTilesetExt._bruceCoords.location = location ? JSON.parse(JSON.stringify(location)) : null;
-        cTilesetExt._bruceCoords.transform = transform ? JSON.parse(JSON.stringify(transform)) : null;
+        cTilesetExt._bruceCoords = __assign({}, position);
     }
     TilesetRenderEngine.ApplyPosition = ApplyPosition;
-    function ApplySettings(cTileset, tileset) {
-        if (tileset.type == Tileset.EType.Cad) {
-            var settings = tileset.settings;
-            var maxScreenSpaceError = settings.maximumScreenSpaceError;
-            if (maxScreenSpaceError || maxScreenSpaceError == 0) {
-                cTileset.maximumScreenSpaceError = EnsureNumber(maxScreenSpaceError);
-            }
-        }
-        else if (tileset.type == Tileset.EType.PointCloud) {
-            var settings = tileset.settings;
-            var maxScreenSpaceError = settings.maximumScreenSpaceError;
-            if (maxScreenSpaceError || maxScreenSpaceError == 0) {
-                cTileset.maximumScreenSpaceError = EnsureNumber(maxScreenSpaceError);
-            }
-            var attenuation = settings.attenuation;
-            if (attenuation != null) {
-                cTileset.pointCloudShading.attenuation = Boolean(attenuation);
-            }
-            var attenuationMax = settings.attenuationMax;
-            if (attenuationMax || attenuationMax == 0) {
-                cTileset.pointCloudShading.maximumAttenuation = EnsureNumber(attenuationMax);
-            }
-        }
-        else {
-            console.warn("Not implemented.");
+    function ApplySettings(params) {
+        var cTileset = params.cTileset, settings = params.settings;
+        cTileset.maximumScreenSpaceError = EnsureNumber(settings.maxScreenSpaceError, 5);
+        cTileset.pointCloudShading.attenuation = Boolean(settings.attenuation);
+        cTileset.pointCloudShading.maximumAttenuation = EnsureNumber(settings.maximumAttenuation, 4);
+        if (settings.colorMask) {
+            cTileset.style = new Cesium3DTileStyle({
+                color: settings.colorMask
+            });
         }
+        var cTilesetExt = cTileset;
+        cTilesetExt._bruceSettings = __assign({}, settings);
     }
     TilesetRenderEngine.ApplySettings = ApplySettings;
     function Render(params) {
@@ -3317,12 +3320,26 @@ var TilesetRenderEngine;
             });
             params.viewer.scene.primitives.add(cTileset_1);
             cTileset_1.readyPromise.then(function () {
+                var _a, _b, _c;
                 try {
                     if (!isAlive(params.viewer, cTileset_1)) {
                         return;
                     }
-                    ApplySettings(cTileset_1, params.tileset);
-                    ApplyPosition(cTileset_1, params.tileset, params.coords);
+                    var settings = params.tileset.settings;
+                    ApplySettings({
+                        cTileset: cTileset_1,
+                        settings: {
+                            maxScreenSpaceError: settings.maximumScreenSpaceError
+                        }
+                    });
+                    ApplyPosition({
+                        cTileset: cTileset_1,
+                        position: {
+                            ucs: (_a = params.coords) === null || _a === void 0 ? void 0 : _a.ucs,
+                            location: ((_b = params.coords) === null || _b === void 0 ? void 0 : _b.location) == null ? settings.location : params.coords.location,
+                            transform: ((_c = params.coords) === null || _c === void 0 ? void 0 : _c.transform) == null ? settings.transform : params.coords.transform
+                        }
+                    });
                 }
                 catch (e) {
                     console.error(e);
@@ -3355,8 +3372,22 @@ var TilesetRenderEngine;
                     if (!isAlive(params.viewer, cTileset_2)) {
                         return;
                     }
-                    ApplySettings(cTileset_2, params.tileset);
-                    ApplyPosition(cTileset_2, params.tileset, null);
+                    var settings = params.tileset.settings;
+                    ApplySettings({
+                        cTileset: cTileset_2,
+                        settings: {
+                            attenuation: settings.attenuation,
+                            maximumAttenuation: settings.attenuationMax,
+                            maxScreenSpaceError: settings.maximumScreenSpaceError
+                        }
+                    });
+                    ApplyPosition({
+                        cTileset: cTileset_2,
+                        position: {
+                            location: settings.location,
+                            transform: settings.transform
+                        }
+                    });
                 }
                 catch (e) {
                     console.error(e);
@@ -3369,87 +3400,6 @@ var TilesetRenderEngine;
         }
     }
     TilesetRenderEngine.Render = Render;
-    function ApplyLegacyPosition(params) {
-        var cTileset = params.cTileset, tileset = params.tileset;
-        var settings = tileset.Settings;
-        settings = __assign({}, settings);
-        var origin = settings.origin;
-        origin = __assign({}, origin);
-        var etc = settings.etc;
-        etc = __assign({}, etc);
-        var root = cTileset.root;
-        var transform = etc.dontTransform != true;
-        if (!transform) {
-            return;
-        }
-        if (origin.usingBoundingBox == null) {
-            origin.usingBoundingBox = true;
-        }
-        var getCurPos3d = function () {
-            if (origin.usingBoundingBox == false) {
-                return Matrix4.getTranslation(root.transform, new Cartesian3());
-            }
-            else {
-                return Cartesian3.clone(root.boundingSphere.center);
-            }
-        };
-        var pos3d;
-        if (origin.latitude != null && origin.longitude != null) {
-            pos3d = Cartesian3.fromDegrees(EnsureNumber(origin.longitude), EnsureNumber(origin.latitude), EnsureNumber(origin.altitude));
-        }
-        if (!pos3d) {
-            pos3d = getCurPos3d();
-        }
-        // Store data in the tileset as we can't interpret it using the cesium primitive later.
-        var cTilesetExt = cTileset;
-        cTilesetExt._bruceCoords.transform = null;
-        var rotate = etc.dontRotate != true;
-        if (rotate) {
-            var rotation = settings.rotation;
-            var hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(rotation.z), EnsureNumber(rotation.x), EnsureNumber(rotation.y), new HeadingPitchRoll());
-            root.transform = Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
-            root.updateTransform();
-            cTilesetExt._bruceCoords.transform = {
-                heading: rotation.z,
-                pitch: rotation.x,
-                roll: rotation.y,
-                scale: 1
-            };
-        }
-        var curPos3d = getCurPos3d();
-        var newTransform = Matrix4.pack(root.transform.clone(new Matrix4()), []);
-        newTransform[12] += pos3d.x - curPos3d.x;
-        newTransform[13] += pos3d.y - curPos3d.y;
-        newTransform[14] += pos3d.z - curPos3d.z;
-        root.transform = Matrix4.unpack(newTransform);
-        root.updateTransform();
-        var carto = Cartographic.fromCartesian(pos3d);
-        cTilesetExt._bruceCoords.location = carto ? {
-            altitude: carto.height,
-            latitude: carto.latitude,
-            longitude: carto.longitude
-        } : null;
-        cTilesetExt._bruceCoords.legacy = true;
-        cTilesetExt._bruceCoords.legacyUsingBoundingBox = origin.usingBoundingBox;
-    }
-    TilesetRenderEngine.ApplyLegacyPosition = ApplyLegacyPosition;
-    function ApplyLegacySettings(params) {
-        var cTileset = params.cTileset, tileset = params.tileset;
-        var settings = tileset.Settings;
-        settings = __assign({}, settings);
-        var visual = settings.visual;
-        visual = __assign({}, visual);
-        cTileset.maximumScreenSpaceError = EnsureNumber(visual.maximumScreenSpaceError, 5);
-        cTileset.pointCloudShading.attenuation = visual.attenuation != false;
-        cTileset.pointCloudShading.maximumAttenuation = EnsureNumber(visual.attenuationMax, 4);
-        var colorMask = visual.colorMask;
-        if (colorMask && (tileset.Type == "S" || tileset.Type == "X")) {
-            tileset.style = new Cesium3DTileStyle({
-                color: colorMask
-            });
-        }
-    }
-    TilesetRenderEngine.ApplyLegacySettings = ApplyLegacySettings;
     function RenderLegacy(params) {
         return __awaiter(this, void 0, void 0, function () {
             var apiGetter, viewer, tileset, ionId, settings, visual, etc, loadUrl, api, cTileset;
@@ -3492,13 +3442,43 @@ var TilesetRenderEngine;
                                     return;
                                 }
                                 if (tileset) {
-                                    ApplyLegacySettings({
+                                    var settings_1 = tileset.Settings;
+                                    settings_1 = __assign({}, settings_1);
+                                    var origin_1 = settings_1.origin;
+                                    origin_1 = __assign({}, origin_1);
+                                    var etc_1 = settings_1.etc;
+                                    etc_1 = __assign({}, etc_1);
+                                    var rotation = settings_1.rotation;
+                                    ApplySettings({
                                         cTileset: cTileset,
-                                        tileset: tileset
+                                        settings: {
+                                            attenuation: visual.attenuation != false,
+                                            colorMask: visual.colorMask,
+                                            maximumAttenuation: visual.attenuationMax,
+                                            maxScreenSpaceError: visual.maximumScreenSpaceError
+                                        }
                                     });
-                                    ApplyLegacyPosition({
-                                        cTileset: cTileset,
-                                        tileset: tileset
+                                    ApplyPosition({
+                                        cTileset: tileset,
+                                        position: {
+                                            transform: rotation ? {
+                                                heading: rotation.z,
+                                                pitch: rotation.x,
+                                                roll: rotation.y,
+                                                scale: 1
+                                            } : null,
+                                            location: (origin_1 === null || origin_1 === void 0 ? void 0 : origin_1.latitude) ? {
+                                                latitude: origin_1.latitude,
+                                                longitude: origin_1.longitude,
+                                                altitude: origin_1.altitude
+                                            } : null,
+                                            isLegacy: true,
+                                            legacyProps: {
+                                                rotate: etc_1.dontRotate != true,
+                                                transform: etc_1.dontTransform != true,
+                                                usingBoundingBox: etc_1.usingBoundingBox != false
+                                            }
+                                        }
                                     });
                                 }
                             }