bruce-cesium 0.3.8 → 0.4.0

package/dist/bruce-cesium.es5.js

@@ -4141,10 +4141,18 @@ var TileRenderEngine;
         (function (V2) {
             function GetOrCreateLayer(viewer, apiGetter, meta) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var defaultImg, provider, api, tileset, settings, layer;
+                    var enabled, i, layer, layerMeta, defaultImg, provider, api, tileset, settings, layer;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
+                                enabled = gatherEnabledImageries(viewer);
+                                for (i = 0; i < enabled.length; i++) {
+                                    layer = enabled[i];
+                                    layerMeta = layer._bMeta;
+                                    if (layerMeta && layerMeta.tilesetId === meta.tilesetId && layerMeta.accountId === meta.accountId) {
+                                        return [2 /*return*/, layer];
+                                    }
+                                }
                                 defaultImg = meta.accountId ? null : ProjectViewTile.DefaultImagery.find(function (x) { return x.id === meta.tilesetId; });
                                 provider = null;
                                 if (!defaultImg) return [3 /*break*/, 1];
@@ -4206,6 +4214,7 @@ var TileRenderEngine;
                                 if (provider) {
                                     layer = viewer.imageryLayers.addImageryProvider(provider);
                                     layer._bMeta = meta;
+                                    viewer.imageryLayers.lowerToBottom(layer);
                                     return [2 /*return*/, layer];
                                 }
                                 return [2 /*return*/, null];
@@ -4524,11 +4533,11 @@ function renderV1(params, bookmark, view) {
     });
 }
 function renderV2(params, bookmark, view) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    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, curEnabled, newItemIds, _i, curEnabled_1, id;
-        return __generator(this, function (_o) {
-            switch (_o.label) {
+        return __generator(this, function (_u) {
+            switch (_u.label) {
                 case 0:
                     viewer = params.manager.Viewer;
                     scene = viewer.scene;
@@ -4536,9 +4545,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 +4571,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 +4582,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 +4609,10 @@ function renderV2(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 1:
-                    _o.sent();
-                    _o.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 = [
@@ -4623,19 +4635,19 @@ function renderV2(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 3:
-                    _o.sent();
+                    _u.sent();
                     curEnabled = params.manager.GetEnabledItemIds();
-                    newItemIds = (_m = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _m !== void 0 ? _m : [];
+                    newItemIds = (_t = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _t !== void 0 ? _t : [];
                     _i = 0, curEnabled_1 = curEnabled;
-                    _o.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:
-                    _o.sent();
-                    _o.label = 6;
+                    _u.sent();
+                    _u.label = 6;
                 case 6:
                     _i++;
                     return [3 /*break*/, 4];
@@ -4646,8 +4658,8 @@ function renderV2(params, bookmark, view) {
                             manager: params.manager,
                         }, params.viewId, params.bookmarkId)];
                 case 8:
-                    _o.sent();
-                    _o.label = 9;
+                    _u.sent();
+                    _u.label = 9;
                 case 9: return [2 /*return*/];
             }
         });
@@ -4900,6 +4912,44 @@ var ViewUtils;
         return "flatterrain";
     }
     ViewUtils.GatherLegacyTerrainTile = GatherLegacyTerrainTile;
+    function GatherMapTiles(viewer) {
+        var imagery = viewer.imageryLayers;
+        var tiles = [];
+        var _loop_1 = function (i) {
+            var provider = imagery.get(i);
+            if (provider._bMeta) {
+                var idCombo_1 = provider._bMeta.accountId + provider._bMeta.tilesetId;
+                if (!tiles.find(function (x) { return x.accountId + x.tilesetId === idCombo_1; })) {
+                    tiles.push({
+                        accountId: provider._bMeta.accountId,
+                        tilesetId: provider._bMeta.tilesetId,
+                        alpha: provider.alpha,
+                        brightness: provider.brightness,
+                        contrast: provider.contrast,
+                        hue: provider.hue,
+                        saturation: provider.saturation,
+                        gamma: provider.gamma
+                    });
+                }
+            }
+        };
+        for (var i = 0; i < imagery.length; i++) {
+            _loop_1(i);
+        }
+        return tiles;
+    }
+    ViewUtils.GatherMapTiles = GatherMapTiles;
+    function GatherTerrainTile(viewer) {
+        var provider = viewer.terrainProvider;
+        if (provider._bMeta) {
+            return {
+                accountId: provider._bMeta.accountId,
+                tilesetId: provider._bMeta.tilesetId,
+            };
+        }
+        return null;
+    }
+    ViewUtils.GatherTerrainTile = GatherTerrainTile;
 })(ViewUtils || (ViewUtils = {}));
 
 export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, RenderHelper, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, MeasureAddon, SharedGetters, ViewUtils };