bruce-cesium 0.6.0 → 0.6.2

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, TilesetExtMapTiles, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Color, HeightReference, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, OrthographicFrustum, Matrix4, Cesium3DTileset, HeadingPitchRange, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, JulianDate, createOsmBuildings, Cesium3DTileStyle } 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, HeadingPitchRange, OrthographicFrustum, Matrix4, Cesium3DTileset, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, JulianDate, createOsmBuildings, Cesium3DTileStyle } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -2573,40 +2573,42 @@ function colorToCColor$1(color) {
 var TilesetRenderEngine;
 (function (TilesetRenderEngine) {
     function ApplyPosition(cTileset, tileset, coords) {
+        var location;
+        var transform;
         if (tileset.type == Tileset.EType.Cad) {
             var settings = tileset.settings;
-            var location_1;
-            var transform = void 0;
             // Position using root entity + ucs.
             if (coords === null || coords === void 0 ? void 0 : coords.ucs) {
-                location_1 = coords.ucs.location;
+                location = coords.ucs.location;
                 transform = coords.transform;
             }
             // Position using tileset.
             else {
                 transform = settings.transform;
-                location_1 = settings.location;
+                location = settings.location;
             }
-            if (!(location_1 === null || location_1 === void 0 ? void 0 : location_1.latitude)) {
-                return;
-            }
-            transform = __assign({ heading: 0, pitch: 0, roll: 0, scale: 1, x: 0, y: 0, z: 0 }, transform);
-            if (transform.scale <= 0) {
-                transform.scale = 0.000001;
-            }
-            var pos = Cartesian3.fromDegrees(location_1.longitude, location_1.latitude, location_1.altitude);
-            var hpr = HeadingPitchRoll.fromDegrees(transform.heading, transform.pitch, 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(transform.x, transform.y, transform.z), root.transform);
-            // Force matrix to update
-            root.updateTransform();
         }
-        else {
-            console.warn("Not implemented.");
+        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;
+        }
+        transform = __assign({ heading: 0, pitch: 0, roll: 0, scale: 1, x: 0, y: 0, z: 0 }, transform);
+        if (transform.scale <= 0) {
+            transform.scale = 0.000001;
         }
+        var pos = Cartesian3.fromDegrees(location.longitude, location.latitude, location.altitude);
+        var hpr = HeadingPitchRoll.fromDegrees(transform.heading, transform.pitch, 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(transform.x, transform.y, transform.z), root.transform);
+        // Force matrix to update
+        root.updateTransform();
     }
     TilesetRenderEngine.ApplyPosition = ApplyPosition;
     function ApplySettings(cTileset, tileset) {
@@ -2617,6 +2619,21 @@ var TilesetRenderEngine;
                 cTileset.maximumScreenSpaceError = maxScreenSpaceError;
             }
         }
+        else if (tileset.type == Tileset.EType.PointCloud) {
+            var settings = tileset.settings;
+            var maxScreenSpaceError = settings.maximumScreenSpaceError;
+            if (maxScreenSpaceError || maxScreenSpaceError == 0) {
+                cTileset.maximumScreenSpaceError = maxScreenSpaceError;
+            }
+            var attenuation = settings.attenuation;
+            if (attenuation != null) {
+                cTileset.pointCloudShading.attenuation = attenuation;
+            }
+            var attenuationMax = settings.attenuationMax;
+            if (attenuationMax || attenuationMax == 0) {
+                cTileset.pointCloudShading.maximumAttenuation = attenuationMax;
+            }
+        }
         else {
             console.warn("Not implemented.");
         }
@@ -2642,6 +2659,17 @@ var TilesetRenderEngine;
             params.viewer.scene.primitives.add(cTileset);
             return cTileset;
         }
+        else if (params.tileset.type == Tileset.EType.PointCloud) {
+            var cTileset_2 = new Cesium3DTileset({
+                url: Tileset.GetPublicFileUrl(api, params.tileset.id, "tileset.json") + "?generation=" + params.tileset.generateVersion
+            });
+            params.viewer.scene.primitives.add(cTileset_2);
+            cTileset_2.readyPromise.then(function () {
+                ApplySettings(cTileset_2, params.tileset);
+                ApplyPosition(cTileset_2, params.tileset, null);
+            });
+            return cTileset_2;
+        }
         else {
             throw ("Not implemented.");
         }
@@ -2978,7 +3006,7 @@ var TilesetRenderEngine;
             if (!style) {
                 return;
             }
-            var bColor = (((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? Calculator.GetValue(style.modelStyle.fillColor, data, []) : null);
+            var bColor = ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? Calculator.GetColor(style.modelStyle.fillColor, data, []) : null;
             if (bColor != null) {
                 var cColor = colorToCColor$1(bColor);
                 var visual = entity.visual;
@@ -3623,6 +3651,78 @@ var TilesetEntitiesRenderManager;
     TilesetEntitiesRenderManager.Manager = Manager;
 })(TilesetEntitiesRenderManager || (TilesetEntitiesRenderManager = {}));
 
+var TilesetPointcloudRenderManager;
+(function (TilesetPointcloudRenderManager) {
+    var Manager = /** @class */ (function () {
+        function Manager(viewer, apiGetter, item) {
+            this.disposed = false;
+            this.cTileset = null;
+            this.viewer = viewer;
+            this.apiGetter = apiGetter;
+            this.item = item;
+        }
+        Object.defineProperty(Manager.prototype, "Disposed", {
+            get: function () {
+                return this.disposed;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Manager.prototype.Init = function () {
+            var _a;
+            return __awaiter(this, void 0, void 0, function () {
+                var tilesetId, api, tileset, cTileset;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
+                            if (!tilesetId) {
+                                return [2 /*return*/];
+                            }
+                            api = this.apiGetter.getApi();
+                            return [4 /*yield*/, Tileset.Get(api, tilesetId)];
+                        case 1:
+                            tileset = _b.sent();
+                            if (!tileset) {
+                                return [2 /*return*/];
+                            }
+                            cTileset = this.cTileset = TilesetRenderEngine.Render({
+                                apiGetter: this.apiGetter,
+                                tileset: tileset,
+                                viewer: this.viewer,
+                                coords: null
+                            });
+                            cTileset.readyPromise.then(function () {
+                                if (_this.disposed) {
+                                    return;
+                                }
+                                _this.onCTilesetLoad();
+                            });
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.onCTilesetLoad = function () {
+            if (this.item.FlyTo) {
+                this.viewer.zoomTo(this.cTileset, new HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
+            }
+        };
+        Manager.prototype.Dispose = function () {
+            if (this.disposed) {
+                return;
+            }
+            this.disposed = true;
+            if (this.cTileset) {
+                this.cTileset.show = false;
+            }
+        };
+        return Manager;
+    }());
+    TilesetPointcloudRenderManager.Manager = Manager;
+})(TilesetPointcloudRenderManager || (TilesetPointcloudRenderManager = {}));
+
 /**
  * Utility to keep track of enabled menu items within a Cesium viewer.
  */
@@ -3709,7 +3809,7 @@ var MenuItemManager;
                                     rItem.renderManager = new TilesetOsmRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
                                     break;
                                 case MenuItem.EType.PointCloud:
-                                    // TODO;
+                                    rItem.renderManager = new TilesetPointcloudRenderManager.Manager(this.viewer, params.apiGetter, params.item);
                                     break;
                                 case MenuItem.EType.EntityTileset:
                                     rItem.renderManager = new TilesetEntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
@@ -4415,6 +4515,18 @@ function isLegacyImageryDefault(name) {
     name = legacyMapIdToDefaultId(name);
     return ProjectViewTile.DefaultImagery.find(function (x) { return x.id == name; }) != null;
 }
+/**
+ * We don't need to provide the "." in the file extension to Cesium's providers.
+ * @param ext
+ * @returns
+ */
+function prepareFileExt(ext) {
+    if (!ext) {
+        return null;
+    }
+    ext = ext.replace(".", "");
+    return ext;
+}
 var TileRenderEngine;
 (function (TileRenderEngine) {
     /**
@@ -4485,7 +4597,7 @@ var TileRenderEngine;
                             case 5:
                                 provider = new OpenStreetMapImageryProvider({
                                     url: tile.SourceUrl,
-                                    fileExtension: tile.FileExtension,
+                                    fileExtension: prepareFileExt(tile.FileExtension),
                                     minimumLevel: min,
                                     maximumLevel: max
                                 });
@@ -4493,7 +4605,7 @@ var TileRenderEngine;
                             case 6:
                                 provider = new TileMapServiceImageryProvider({
                                     url: tile.SourceUrl,
-                                    fileExtension: tile.FileExtension,
+                                    fileExtension: prepareFileExt(tile.FileExtension),
                                     minimumLevel: min,
                                     maximumLevel: max
                                 });
@@ -4501,7 +4613,7 @@ var TileRenderEngine;
                             case 7:
                                 provider = new OpenStreetMapImageryProvider({
                                     url: tile.SourceUrl,
-                                    fileExtension: tile.FileExtension,
+                                    fileExtension: prepareFileExt(tile.FileExtension),
                                     minimumLevel: min,
                                     maximumLevel: max
                                 });
@@ -4693,7 +4805,7 @@ var TileRenderEngine;
                                 if (!(tileset.type === Tileset.EType.GeoMap)) return [3 /*break*/, 4];
                                 provider = new TileMapServiceImageryProvider({
                                     url: Tileset.GetPublicFileUrl(api, meta.tilesetId, ""),
-                                    fileExtension: ".png"
+                                    fileExtension: "png"
                                 });
                                 return [3 /*break*/, 15];
                             case 4:
@@ -4737,13 +4849,13 @@ var TileRenderEngine;
                             case 11:
                                 provider = new OpenStreetMapImageryProvider({
                                     url: settings.url,
-                                    fileExtension: settings.sourceExt
+                                    fileExtension: prepareFileExt(settings.sourceExt)
                                 });
                                 return [3 /*break*/, 13];
                             case 12:
                                 provider = new TileMapServiceImageryProvider({
                                     url: settings.url,
-                                    fileExtension: settings.sourceExt
+                                    fileExtension: prepareFileExt(settings.sourceExt)
                                 });
                                 return [3 /*break*/, 13];
                             case 13: return [3 /*break*/, 15];