bruce-cesium 0.3.9 → 0.4.1

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, 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';
+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;
@@ -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];
@@ -4216,35 +4225,19 @@ var TileRenderEngine;
             V2.GetOrCreateLayer = GetOrCreateLayer;
             function Render(params) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var _loop_2, i, curEnabled, toDisable, curEnabledArr, _loop_3, i, i, _loop_4, i;
+                    var i, enabled, curEnabled, toDisable, curEnabledArr, _loop_2, i, i, _loop_3, i;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                _loop_2 = function (i) {
-                                    var enabled, source;
-                                    return __generator(this, function (_a) {
-                                        switch (_a.label) {
-                                            case 0:
-                                                enabled = params.enabled[i];
-                                                source = params.sources.find(function (x) { return x.accountId === enabled.accountId && x.tilesetId === enabled.tilesetId; });
-                                                if (!source) {
-                                                    console.error("Missing source for enabled imagery.", enabled);
-                                                }
-                                                return [4 /*yield*/, GetOrCreateLayer(params.viewer, params.apiGetter, {
-                                                        accountId: source.accountId,
-                                                        tilesetId: source.tilesetId,
-                                                    })];
-                                            case 1:
-                                                _a.sent();
-                                                return [2 /*return*/];
-                                        }
-                                    });
-                                };
                                 i = 0;
                                 _a.label = 1;
                             case 1:
-                                if (!(i < params.enabled.length)) return [3 /*break*/, 4];
-                                return [5 /*yield**/, _loop_2(i)];
+                                if (!(i < params.tiles.length)) return [3 /*break*/, 4];
+                                enabled = params.tiles[i];
+                                return [4 /*yield*/, GetOrCreateLayer(params.viewer, params.apiGetter, {
+                                        accountId: enabled.accountId,
+                                        tilesetId: enabled.tilesetId,
+                                    })];
                             case 2:
                                 _a.sent();
                                 _a.label = 3;
@@ -4255,10 +4248,10 @@ var TileRenderEngine;
                                 curEnabled = params.viewer.imageryLayers;
                                 toDisable = [];
                                 curEnabledArr = [];
-                                _loop_3 = function (i) {
+                                _loop_2 = function (i) {
                                     var layer = curEnabled.get(i);
                                     var meta = layer === null || layer === void 0 ? void 0 : layer._bMeta;
-                                    var disable = !params.enabled.find(function (x) { return x.accountId === (meta === null || meta === void 0 ? void 0 : meta.accountId) && x.tilesetId === (meta === null || meta === void 0 ? void 0 : meta.tilesetId); });
+                                    var disable = !params.tiles.find(function (x) { return x.accountId === (meta === null || meta === void 0 ? void 0 : meta.accountId) && x.tilesetId === (meta === null || meta === void 0 ? void 0 : meta.tilesetId); });
                                     if (disable) {
                                         toDisable.push(layer);
                                     }
@@ -4267,13 +4260,13 @@ var TileRenderEngine;
                                     }
                                 };
                                 for (i = 0; i < curEnabled.length; i++) {
-                                    _loop_3(i);
+                                    _loop_2(i);
                                 }
                                 for (i = 0; i < toDisable.length; i++) {
                                     params.viewer.imageryLayers.remove(toDisable[i]);
                                 }
-                                _loop_4 = function (i) {
-                                    var enabled = params.enabled[i];
+                                _loop_3 = function (i) {
+                                    var enabled = params.tiles[i];
                                     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);
@@ -4285,8 +4278,8 @@ var TileRenderEngine;
                                         layer.gamma = Number(enabled.gamma == null ? 1 : enabled.gamma);
                                     }
                                 };
-                                for (i = 0; i < params.enabled.length; i++) {
-                                    _loop_4(i);
+                                for (i = 0; i < params.tiles.length; i++) {
+                                    _loop_3(i);
                                 }
                                 return [2 /*return*/];
                         }
@@ -4388,18 +4381,18 @@ var TileRenderEngine;
                         switch (_b.label) {
                             case 0:
                                 enabledMeta = (_a = params.viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a._bMeta;
-                                if ((enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.tilesetId) === params.source.tilesetId &&
-                                    (enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.accountId) === params.source.accountId) {
+                                if ((enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.tilesetId) === params.tile.tilesetId &&
+                                    (enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.accountId) === params.tile.accountId) {
                                     return [2 /*return*/];
                                 }
-                                defaultTerr = params.source.accountId ? null : ProjectViewTile.DefaultTerrains.find(function (x) { return x.id === params.source.tilesetId; });
+                                defaultTerr = params.tile.accountId ? null : ProjectViewTile.DefaultTerrains.find(function (x) { return x.id === params.tile.tilesetId; });
                                 provider = null;
                                 if (!defaultTerr) return [3 /*break*/, 1];
                                 provider = renderDefaultTerrTile(defaultTerr.id);
                                 return [3 /*break*/, 3];
                             case 1:
-                                api = params.apiGetter.getApi(params.source.accountId);
-                                return [4 /*yield*/, Tileset.Get(api, params.source.tilesetId)];
+                                api = params.apiGetter.getApi(params.tile.accountId);
+                                return [4 /*yield*/, Tileset.Get(api, params.tile.tilesetId)];
                             case 2:
                                 tileset = _b.sent();
                                 url = void 0;
@@ -4425,8 +4418,8 @@ var TileRenderEngine;
                             case 3:
                                 if (provider) {
                                     provider._bMeta = {
-                                        accountId: params.source.accountId,
-                                        tilesetId: params.source.tilesetId
+                                        accountId: params.tile.accountId,
+                                        tilesetId: params.tile.tilesetId
                                     };
                                     params.viewer.terrainProvider = provider;
                                 }
@@ -4524,11 +4517,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, _p, _q, _r, _s, _t;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     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 (_u) {
-            switch (_u.label) {
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, terrain, imagery, curEnabled, newItemIds, _i, curEnabled_1, id;
+        return __generator(this, function (_t) {
+            switch (_t.label) {
                 case 0:
                     viewer = params.manager.Viewer;
                     scene = viewer.scene;
@@ -4591,19 +4584,16 @@ function renderV2(params, bookmark, view) {
                     scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
                     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 = (_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,
-                            enabled: terrain,
-                            source: source,
+                            tile: terrain,
                             viewer: params.manager.Viewer,
                         })];
                 case 1:
-                    _u.sent();
-                    _u.label = 2;
+                    _t.sent();
+                    _t.label = 2;
                 case 2:
-                    imagery = (_r = bSettings.imagery) !== null && _r !== void 0 ? _r : (_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.imagery;
+                    imagery = (_q = bSettings.imagery) !== null && _q !== void 0 ? _q : (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.imagery;
                     if (imagery == null) {
                         // TODO: Need global default.
                         imagery = [
@@ -4621,24 +4611,23 @@ function renderV2(params, bookmark, view) {
                     }
                     return [4 /*yield*/, TileRenderEngine.Map.V2.Render({
                             apiGetter: params.apiGetter,
-                            enabled: imagery,
-                            sources: vSettings.imageries,
+                            tiles: imagery,
                             viewer: params.manager.Viewer,
                         })];
                 case 3:
-                    _u.sent();
+                    _t.sent();
                     curEnabled = params.manager.GetEnabledItemIds();
-                    newItemIds = (_t = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _t !== void 0 ? _t : [];
+                    newItemIds = (_s = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _s !== void 0 ? _s : [];
                     _i = 0, curEnabled_1 = curEnabled;
-                    _u.label = 4;
+                    _t.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:
-                    _u.sent();
-                    _u.label = 6;
+                    _t.sent();
+                    _t.label = 6;
                 case 6:
                     _i++;
                     return [3 /*break*/, 4];
@@ -4649,8 +4638,8 @@ function renderV2(params, bookmark, view) {
                             manager: params.manager,
                         }, params.viewId, params.bookmarkId)];
                 case 8:
-                    _u.sent();
-                    _u.label = 9;
+                    _t.sent();
+                    _t.label = 9;
                 case 9: return [2 /*return*/];
             }
         });
@@ -4903,6 +4892,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 };