bruce-cesium 0.3.7 → 0.3.8

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, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, createOsmBuildings, Cesium3DTileStyle, Rectangle, Matrix4, Cesium3DTileset, EllipsoidGeodesic } 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;
     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 (_o) {
+            switch (_o.label) {
                 case 0:
                     viewer = params.manager.Viewer;
                     scene = viewer.scene;
@@ -4597,8 +4597,8 @@ function renderV2(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 1:
-                    _p.sent();
-                    _p.label = 2;
+                    _o.sent();
+                    _o.label = 2;
                 case 2:
                     imagery = (_k = bSettings.imagery) !== null && _k !== void 0 ? _k : (_l = defaults.settings) === null || _l === void 0 ? void 0 : _l.imagery;
                     if (imagery == null) {
@@ -4616,31 +4616,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();
+                    _o.sent();
                     curEnabled = params.manager.GetEnabledItemIds();
-                    newItemIds = (_o = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _o !== void 0 ? _o : [];
+                    newItemIds = (_m = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _m !== void 0 ? _m : [];
                     _i = 0, curEnabled_1 = curEnabled;
-                    _p.label = 4;
+                    _o.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;
+                    _o.sent();
+                    _o.label = 6;
                 case 6:
                     _i++;
                     return [3 /*break*/, 4];
@@ -4651,8 +4646,8 @@ function renderV2(params, bookmark, view) {
                             manager: params.manager,
                         }, params.viewId, params.bookmarkId)];
                 case 8:
-                    _p.sent();
-                    _p.label = 9;
+                    _o.sent();
+                    _o.label = 9;
                 case 9: return [2 /*return*/];
             }
         });