bruce-cesium 0.3.7 → 0.3.9

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, Camera, MathUtils } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Entity, Primitive, Cesium3DTileFeature, Color, Cartesian3, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, createOsmBuildings, Cesium3DTileStyle, Rectangle, EllipsoidGeodesic, Matrix4, Cesium3DTileset } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, createOsmBuildings, Cesium3DTileStyle, Rectangle, EllipsoidGeodesic, Matrix4, Cesium3DTileset } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -4277,12 +4277,12 @@ var TileRenderEngine;
                                     var layer = curEnabledArr.find(function (x) { var _a, _b; return ((_a = x._bMeta) === null || _a === void 0 ? void 0 : _a.accountId) === enabled.accountId && ((_b = x._bMeta) === null || _b === void 0 ? void 0 : _b.tilesetId) === enabled.tilesetId; });
                                     if (layer) {
                                         params.viewer.imageryLayers.raiseToTop(layer);
-                                        layer.alpha = Number(enabled.alpha);
-                                        layer.brightness = Number(enabled.brightness);
-                                        layer.contrast = Number(enabled.contrast);
-                                        layer.hue = Number(enabled.hue);
-                                        layer.saturation = Number(enabled.saturation);
-                                        layer.gamma = Number(enabled.gamma);
+                                        layer.alpha = Number(enabled.alpha == null ? 1 : enabled.alpha);
+                                        layer.brightness = Number(enabled.brightness == null ? 1 : enabled.brightness);
+                                        layer.contrast = Number(enabled.contrast == null ? 1 : enabled.contrast);
+                                        layer.hue = Number(enabled.hue == null ? 0 : enabled.hue);
+                                        layer.saturation = Number(enabled.saturation == null ? 1 : enabled.saturation);
+                                        layer.gamma = Number(enabled.gamma == null ? 1 : enabled.gamma);
                                     }
                                 };
                                 for (i = 0; i < params.enabled.length; i++) {
@@ -4524,11 +4524,11 @@ function renderV1(params, bookmark, view) {
     });
 }
 function renderV2(params, bookmark, view) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, terrain, source, imagery, iSources, curEnabled, newItemIds, _i, curEnabled_1, id;
-        return __generator(this, function (_p) {
-            switch (_p.label) {
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, terrain, source, imagery, curEnabled, newItemIds, _i, curEnabled_1, id;
+        return __generator(this, function (_u) {
+            switch (_u.label) {
                 case 0:
                     viewer = params.manager.Viewer;
                     scene = viewer.scene;
@@ -4536,9 +4536,12 @@ function renderV2(params, bookmark, view) {
                     bSettings = ((_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) !== null && _a !== void 0 ? _a : {});
                     defaults = (_b = vSettings.defaults) !== null && _b !== void 0 ? _b : {};
                     camera = ((_c = bookmark.Camera) !== null && _c !== void 0 ? _c : {});
+                    if (!Carto.ValidateCarto(camera)) {
+                        camera = __assign(__assign({}, camera), { altitude: (_d = defaults.camera) === null || _d === void 0 ? void 0 : _d.altitude, latitude: (_e = defaults.camera) === null || _e === void 0 ? void 0 : _e.latitude, longitude: (_f = defaults.camera) === null || _f === void 0 ? void 0 : _f.longitude, heading: (_g = defaults.camera) === null || _g === void 0 ? void 0 : _g.heading, pitch: (_h = defaults.camera) === null || _h === void 0 ? void 0 : _h.pitch, roll: (_j = defaults.camera) === null || _j === void 0 ? void 0 : _j.roll });
+                    }
                     newLens = camera.cameraFrustum;
                     if (newLens == null) {
-                        newLens = (_d = defaults.camera) === null || _d === void 0 ? void 0 : _d.cameraFrustum;
+                        newLens = (_k = defaults.camera) === null || _k === void 0 ? void 0 : _k.cameraFrustum;
                     }
                     if (newLens == null) {
                         // TODO: Need global default.
@@ -4559,7 +4562,7 @@ function renderV2(params, bookmark, view) {
                     }
                     transition = params.skipTransition ? 0 : curLens === newLens ? camera.transition : 0;
                     if (transition == null) {
-                        transition = (_e = defaults.camera) === null || _e === void 0 ? void 0 : _e.transition;
+                        transition = (_l = defaults.camera) === null || _l === void 0 ? void 0 : _l.transition;
                     }
                     if (transition == null) {
                         // TODO: Need global default.
@@ -4570,25 +4573,25 @@ function renderV2(params, bookmark, view) {
                         scene.camera.flyTo({
                             destination: pos,
                             orientation: {
-                                heading: +camera.heading,
-                                pitch: +camera.pitch,
-                                roll: +camera.roll
+                                heading: Math$1.toRadians(+camera.heading),
+                                pitch: Math$1.toRadians(+camera.pitch),
+                                roll: Math$1.toRadians(+camera.roll)
                             },
                             duration: transition != 0 ? transition / 1000 : 0
                         });
                     }
                     gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                     if (gOcclusion == null) {
-                        gOcclusion = (_f = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _f === void 0 ? void 0 : _f.groundOcclusion;
+                        gOcclusion = (_m = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _m === void 0 ? void 0 : _m.groundOcclusion;
                     }
                     if (gOcclusion == null) {
                         // TODO: Need global default.
                         gOcclusion = true;
                     }
                     scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
-                    terrain = (_g = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) !== null && _g !== void 0 ? _g : (_h = defaults.settings) === null || _h === void 0 ? void 0 : _h.terrain;
+                    terrain = (_o = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) !== null && _o !== void 0 ? _o : (_p = defaults.settings) === null || _p === void 0 ? void 0 : _p.terrain;
                     if (!terrain) return [3 /*break*/, 2];
-                    source = (_j = vSettings.terrains) === null || _j === void 0 ? void 0 : _j.find(function (x) { return x.accountId === terrain.accountId && x.tilesetId === terrain.tilesetId; });
+                    source = (_q = vSettings.terrains) === null || _q === void 0 ? void 0 : _q.find(function (x) { return x.accountId === terrain.accountId && x.tilesetId === terrain.tilesetId; });
                     if (!source) return [3 /*break*/, 2];
                     return [4 /*yield*/, TileRenderEngine.Terrain.V2.Render({
                             apiGetter: params.apiGetter,
@@ -4597,10 +4600,10 @@ function renderV2(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 1:
-                    _p.sent();
-                    _p.label = 2;
+                    _u.sent();
+                    _u.label = 2;
                 case 2:
-                    imagery = (_k = bSettings.imagery) !== null && _k !== void 0 ? _k : (_l = defaults.settings) === null || _l === void 0 ? void 0 : _l.imagery;
+                    imagery = (_r = bSettings.imagery) !== null && _r !== void 0 ? _r : (_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.imagery;
                     if (imagery == null) {
                         // TODO: Need global default.
                         imagery = [
@@ -4616,31 +4619,26 @@ function renderV2(params, bookmark, view) {
                             }
                         ];
                     }
-                    iSources = (_m = vSettings.imageries) === null || _m === void 0 ? void 0 : _m.filter(function (x) {
-                        return imagery.find(function (y) {
-                            y.accountId === x.accountId && y.tilesetId === x.tilesetId;
-                        });
-                    });
                     return [4 /*yield*/, TileRenderEngine.Map.V2.Render({
                             apiGetter: params.apiGetter,
                             enabled: imagery,
-                            sources: iSources,
+                            sources: vSettings.imageries,
                             viewer: params.manager.Viewer,
                         })];
                 case 3:
-                    _p.sent();
+                    _u.sent();
                     curEnabled = params.manager.GetEnabledItemIds();
-                    newItemIds = (_o = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _o !== void 0 ? _o : [];
+                    newItemIds = (_t = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _t !== void 0 ? _t : [];
                     _i = 0, curEnabled_1 = curEnabled;
-                    _p.label = 4;
+                    _u.label = 4;
                 case 4:
                     if (!(_i < curEnabled_1.length)) return [3 /*break*/, 7];
                     id = curEnabled_1[_i];
                     if (!(newItemIds.indexOf(id) === -1)) return [3 /*break*/, 6];
                     return [4 /*yield*/, params.manager.RemoveItemById(id)];
                 case 5:
-                    _p.sent();
-                    _p.label = 6;
+                    _u.sent();
+                    _u.label = 6;
                 case 6:
                     _i++;
                     return [3 /*break*/, 4];
@@ -4651,8 +4649,8 @@ function renderV2(params, bookmark, view) {
                             manager: params.manager,
                         }, params.viewId, params.bookmarkId)];
                 case 8:
-                    _p.sent();
-                    _p.label = 9;
+                    _u.sent();
+                    _u.label = 9;
                 case 9: return [2 /*return*/];
             }
         });