bruce-cesium 1.0.7 → 1.0.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, EntityRelationType, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, CallbackProperty, KmlDataSource, createOsmBuildings } 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, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, CallbackProperty, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, createOsmBuildings, KmlDataSource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -234,14 +234,18 @@ var ViewerUtils;
      * @param viewer
      */
     function InitViewer(params) {
-        var viewer = params.viewer;
-        ViewerUtils.DestroyWidget(viewer.timeline);
-        ViewerUtils.DestroyWidget(viewer.vrButton);
-        ViewerUtils.DestroyWidget(viewer.sceneModePicker);
-        ViewerUtils.DestroyWidget(viewer.homeButton);
-        ViewerUtils.DestroyWidget(viewer.fullscreenButton);
-        ViewerUtils.DestroyWidget(viewer.baseLayerPicker);
-        ViewerUtils.StyleContainer({ viewer: viewer });
+        var viewer = params.viewer, destroyWidgets = params.destroyWidgets, styleContainer = params.styleContainer;
+        if (destroyWidgets != false) {
+            ViewerUtils.DestroyWidget(viewer.timeline);
+            ViewerUtils.DestroyWidget(viewer.vrButton);
+            ViewerUtils.DestroyWidget(viewer.sceneModePicker);
+            ViewerUtils.DestroyWidget(viewer.homeButton);
+            ViewerUtils.DestroyWidget(viewer.fullscreenButton);
+            ViewerUtils.DestroyWidget(viewer.baseLayerPicker);
+        }
+        if (styleContainer != false) {
+            ViewerUtils.StyleContainer({ viewer: viewer });
+        }
     }
     ViewerUtils.InitViewer = InitViewer;
     function DestroyWidget(widget) {
@@ -677,6 +681,8 @@ var EntityUtils;
      */
     function GetPos(params) {
         var viewer = params.viewer, entity = params.entity, visualRegister = params.visualRegister;
+        // TODO: Tidy this up, move to a separate function.
+        // We need a generic "get pos AS blah height reference" function.
         function evaluateRendered() {
             var rego = visualRegister ? visualRegister.GetRego({
                 entityId: entity.Bruce.ID,
@@ -4790,7 +4796,8 @@ function createFilterGetterCacheKey(params) {
     cacheKey += params.api.GetBaseUrl();
     cacheKey += params.typeId;
     cacheKey += params.batchSize;
-    cacheKey += JSON.stringify(params.attrFilter);
+    // This could potentially crash, but if it crashes here then it would crash during API request anyways.
+    cacheKey += JSON.stringify(params.attrFilter ? params.attrFilter : {});
     return cacheKey;
 }
 var SharedGetters;
@@ -5842,9 +5849,10 @@ var RelationsRenderManager;
 var MenuItemManager;
 (function (MenuItemManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsRegister) {
+        function Manager(params) {
             this.items = [];
             this.onUpdate = null;
+            var viewer = params.viewer, visualsRegister = params.visualsRegister;
             this.viewer = viewer;
             if (!visualsRegister) {
                 visualsRegister = new VisualsRegister.Register(viewer);
@@ -5881,12 +5889,10 @@ var MenuItemManager;
          * Renders a given menu item and all ids children.
          * Will return the enabled item id.
          * @param params
-         * @param recursive
          * @returns
          */
-        Manager.prototype.RenderItem = function (params, recursive) {
+        Manager.prototype.RenderItem = function (params) {
             var _a, _b, _c;
-            if (recursive === void 0) { recursive = true; }
             return __awaiter(this, void 0, void 0, function () {
                 var rItem, isFolder, i, childId;
                 return __generator(this, function (_d) {
@@ -6014,7 +6020,7 @@ var MenuItemManager;
                             _d.label = 2;
                         case 2:
                             isFolder = !params.item.Type || params.item.Type == MenuItem.EType.None;
-                            if (!(params.item.Children && recursive && isFolder)) return [3 /*break*/, 6];
+                            if (!(params.item.Children && params.recursive != false && isFolder)) return [3 /*break*/, 6];
                             i = 0;
                             _d.label = 3;
                         case 3:
@@ -6042,17 +6048,20 @@ var MenuItemManager;
          * @param id
          * @param recursive
          */
-        Manager.prototype.RemoveItemById = function (id, recursive) {
+        Manager.prototype.RemoveItemById = function (params) {
             var _a, _b;
-            if (recursive === void 0) { recursive = true; }
             return __awaiter(this, void 0, void 0, function () {
-                var item, _loop_1, this_1, i;
+                var id, recursive, item, _loop_1, this_1, i;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
+                            id = params.menuItemId, recursive = params.recursive;
                             if (this.viewer.isDestroyed()) {
                                 return [2 /*return*/];
                             }
+                            if (recursive == null) {
+                                recursive = true;
+                            }
                             item = this.items.find(function (x) { return x.id === id; });
                             if (!item) return [3 /*break*/, 5];
                             if (!recursive) return [3 /*break*/, 4];
@@ -6063,7 +6072,9 @@ var MenuItemManager;
                                         case 0:
                                             child = this_1.items.find(function (x) { return x.id === item.childIds[i]; });
                                             if (!child) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this_1.RemoveItemById(child.id)];
+                                            return [4 /*yield*/, this_1.RemoveItemById({
+                                                    menuItemId: child.id
+                                                })];
                                         case 1:
                                             _a.sent();
                                             _a.label = 2;
@@ -6108,15 +6119,15 @@ var MenuItemManager;
          * Rerenders given entities.
          * If no menu items are specified then the rerender is called on all enabled menu items.
          * It is highly recommended to supply menu item ids.
-         * @param entityIds
-         * @param menuItemIds
+         * @param params
          */
-        Manager.prototype.ReRender = function (entityIds, menuItemIds) {
+        Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var items, i, item;
+                var entityIds, menuItemIds, items, i, item;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            entityIds = params.entityIds, menuItemIds = params.menuItemIds;
                             if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
                                 return [2 /*return*/];
                             }
@@ -6458,6 +6469,14 @@ var MenuItemCreator;
         });
     }
     MenuItemCreator.RenderBookmarkItems = RenderBookmarkItems;
+    function RenderRelations(params) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/];
+            });
+        });
+    }
+    MenuItemCreator.RenderRelations = RenderRelations;
 })(MenuItemCreator || (MenuItemCreator = {}));
 
 var DEFAULT_BING_KEY = "AqL0uYT5T84jiJeX55_b9zJeeP3MX2p1WLOHH4ljIEPZ7ZL2M81bYLzyYeSwuzzl";
@@ -7424,37 +7443,61 @@ var TileRenderEngine;
 // TODO: Move these to the data model.
 var MIN_SHADOW_SIZE = 2048;
 var MAX_SHADOW_SIZE = 32768;
+var RELATION_MENU_ITEM_ID = "BOOKMARK_ENTITY_RELATIONS";
+/**
+ * Renders DATA_VERSION = 1 navigator.
+ * @param params
+ * @param bookmark
+ * @param view
+ */
 function renderLegacyNavigator(params, bookmark, view) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
-        var vSettings, bSettings, frustum, scene, curFrustum, camera, pos, go, enabledItems, newItemIds, _i, enabledItems_1, id;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var vSettings, bSettings, manager, VR, scene, baseColor, frustum, curFrustum, camera, pos, go, fxaa, pointer, clock, timeStr, enabledItems, newItemIds, _i, enabledItems_1, id, menuItem;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     vSettings = view.Settings;
                     bSettings = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings;
+                    manager = params.manager;
+                    VR = manager.VisualsRegister;
+                    scene = manager.Viewer.scene;
                     return [4 /*yield*/, TileRenderEngine.Terrain.LegacyNavigator.RenderView({
                             apiGetter: params.apiGetter,
                             bookmarkId: params.bookmarkId,
-                            viewer: params.manager.Viewer,
+                            viewer: manager.Viewer,
                             viewId: params.viewId,
                         })];
                 case 1:
-                    _c.sent();
+                    _f.sent();
                     return [4 /*yield*/, TileRenderEngine.Map.LegacyNavigator.RenderView({
                             apiGetter: params.apiGetter,
                             bookmarkId: params.bookmarkId,
-                            viewer: params.manager.Viewer,
+                            viewer: manager.Viewer,
                             viewId: params.viewId,
                             ignoreIds: []
                         })];
                 case 2:
-                    _c.sent();
+                    _f.sent();
+                    baseColor = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeColor;
+                    if (baseColor == null) {
+                        // TODO: Need global default.
+                        baseColor = "#0326BE";
+                    }
+                    scene.globe.baseColor = Color.fromCssColorString(baseColor);
+                    // TODO: Other scene settings.
+                    // TODO: Rendered relationships.
+                    VR.ClearHidden();
+                    if ((_a = bSettings.hiddenEntityIds) === null || _a === void 0 ? void 0 : _a.length) {
+                        VR.SetHidden({
+                            entityIds: bSettings.hiddenEntityIds,
+                            hidden: true
+                        });
+                    }
                     frustum = bSettings === null || bSettings === void 0 ? void 0 : bSettings.cameraFrustum;
                     if (frustum == null) {
                         frustum = Camera.EFrustum.Perspective;
                     }
-                    scene = params.manager.Viewer.scene;
                     curFrustum = scene.camera.frustum instanceof OrthographicFrustum ? Camera.EFrustum.Orthographic : Camera.EFrustum.Perspective;
                     if (curFrustum != frustum) {
                         if (frustum == Camera.EFrustum.Perspective) {
@@ -7470,7 +7513,7 @@ function renderLegacyNavigator(params, bookmark, view) {
                     if (!params.skipCamera) {
                         camera = bookmark.Camera;
                         pos = Cartesian3.fromDegrees(+camera.position.longitude, +camera.position.latitude, +camera.position.height);
-                        params.manager.Viewer.scene.camera.flyTo({
+                        manager.Viewer.scene.camera.flyTo({
                             destination: pos,
                             orientation: {
                                 heading: +camera.heading,
@@ -7480,41 +7523,83 @@ function renderLegacyNavigator(params, bookmark, view) {
                             duration: params.skipTransition ? 0 : 2
                         });
                     }
-                    go = (_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _a === void 0 ? void 0 : _a.groundOcclusion;
+                    go = (_b = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _b === void 0 ? void 0 : _b.groundOcclusion;
                     if (go == null) {
                         go = vSettings === null || vSettings === void 0 ? void 0 : vSettings.GroundOcclusion;
                     }
                     if (go == null) {
                         go = false;
                     }
-                    params.manager.Viewer.scene.globe.depthTestAgainstTerrain = go;
-                    enabledItems = params.manager.GetEnabledItemIds();
-                    newItemIds = (_b = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedItemIds) !== null && _b !== void 0 ? _b : [];
-                    for (_i = 0, enabledItems_1 = enabledItems; _i < enabledItems_1.length; _i++) {
-                        id = enabledItems_1[_i];
-                        if (newItemIds.indexOf(id) === -1) {
-                            params.manager.RemoveItemById(id);
-                        }
+                    manager.Viewer.scene.globe.depthTestAgainstTerrain = go;
+                    fxaa = manager.Viewer.scene.postProcessStages.fxaa;
+                    fxaa.enabled = true;
+                    pointer = (_c = bSettings === null || bSettings === void 0 ? void 0 : bSettings.timelineSettings) === null || _c === void 0 ? void 0 : _c.timelinePointer;
+                    if (pointer != null) {
+                        clock = manager.Viewer.clock;
+                        timeStr = JulianDate.toIso8601(pointer);
+                        clock.currentTime = JulianDate.fromIso8601(timeStr);
                     }
-                    if (!params.bookmarkId) return [3 /*break*/, 4];
+                    enabledItems = manager.GetEnabledItemIds();
+                    newItemIds = (_d = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedItemIds) !== null && _d !== void 0 ? _d : [];
+                    _i = 0, enabledItems_1 = enabledItems;
+                    _f.label = 3;
+                case 3:
+                    if (!(_i < enabledItems_1.length)) return [3 /*break*/, 6];
+                    id = enabledItems_1[_i];
+                    if (!(newItemIds.indexOf(id) === -1 ||
+                        id == RELATION_MENU_ITEM_ID)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, params.manager.RemoveItemById({
+                            menuItemId: id
+                        })];
+                case 4:
+                    _f.sent();
+                    _f.label = 5;
+                case 5:
+                    _i++;
+                    return [3 /*break*/, 3];
+                case 6:
+                    if (!params.bookmarkId) return [3 /*break*/, 8];
                     return [4 /*yield*/, MenuItemCreator.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
-                            manager: params.manager,
+                            manager: manager,
                             view: view,
                             bookmark: bookmark
                         })];
-                case 3:
-                    _c.sent();
-                    _c.label = 4;
-                case 4: return [2 /*return*/];
+                case 7:
+                    _f.sent();
+                    _f.label = 8;
+                case 8:
+                    if (!((_e = bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 10];
+                    menuItem = {
+                        id: RELATION_MENU_ITEM_ID,
+                        Caption: "Entity relations",
+                        BruceEntity: {
+                            EntityIds: bSettings.drawnRelationEntityIDs
+                        },
+                        Type: MenuItem.EType.Relations
+                    };
+                    return [4 /*yield*/, params.manager.RenderItem({
+                            apiGetter: params.apiGetter,
+                            item: menuItem
+                        })];
+                case 9:
+                    _f.sent();
+                    _f.label = 10;
+                case 10: return [2 /*return*/];
             }
         });
     });
 }
+/**
+ * Renders DATA_VERSION > 1 navigator.
+ * @param params
+ * @param bookmark
+ * @param view
+ */
 function renderNavigator(params, bookmark, view) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, hillShades, baseColor, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, terrain, selectedIds, i, id, imagery, RELATION_MENU_ITEM_ID, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, hillShades, baseColor, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, terrain, selectedIds, i, id, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
         return __generator(this, function (_2) {
             switch (_2.label) {
                 case 0:
@@ -7729,7 +7814,6 @@ function renderNavigator(params, bookmark, view) {
                         })];
                 case 3:
                     _2.sent();
-                    RELATION_MENU_ITEM_ID = "BOOKMARK_ENTITY_RELATIONS";
                     renderedRelationEntityIds = bSettings.renderedEntityRelations;
                     if (!renderedRelationEntityIds) {
                         renderedRelationEntityIds = [];
@@ -7743,7 +7827,9 @@ function renderNavigator(params, bookmark, view) {
                     id = curEnabled_1[_i];
                     if (!(newItemIds.indexOf(id) === -1 ||
                         id == RELATION_MENU_ITEM_ID)) return [3 /*break*/, 6];
-                    return [4 /*yield*/, params.manager.RemoveItemById(id)];
+                    return [4 /*yield*/, params.manager.RemoveItemById({
+                            menuItemId: id
+                        })];
                 case 5:
                     _2.sent();
                     _2.label = 6;
@@ -7826,9 +7912,6 @@ var ViewRenderEngine;
                         bookmark = _b;
                         _c.label = 7;
                     case 7:
-                        if (bookmark && view.DataVersion != bookmark.DataVersion) {
-                            throw new Error("View and bookmark settings version mismatch.");
-                        }
                         version = view.DataVersion;
                         if (!(version == 1)) return [3 /*break*/, 9];
                         return [4 /*yield*/, renderLegacyNavigator(params, bookmark, view)];
@@ -7849,7 +7932,8 @@ var ViewRenderEngine;
 
 var ViewUtils;
 (function (ViewUtils) {
-    function GatherLegacyMapTiles(viewer) {
+    function GatherLegacyMapTiles(params) {
+        var viewer = params.viewer;
         var collection = viewer.imageryLayers;
         var tiles = [];
         for (var i = 0; i < collection.length; i++) {
@@ -7866,15 +7950,22 @@ var ViewUtils;
                 });
             }
         }
-        return tiles.reverse();
+        return {
+            imagery: tiles.reverse()
+        };
     }
     ViewUtils.GatherLegacyMapTiles = GatherLegacyMapTiles;
-    function GatherLegacyTerrainTile(viewer) {
+    function GatherLegacyTerrainTile(params) {
+        var viewer = params.viewer;
         var enabled = viewer.terrainProvider;
         if (enabled === null || enabled === void 0 ? void 0 : enabled._bName) {
-            return enabled._bName;
+            return {
+                terrain: enabled._bName
+            };
         }
-        return "flatterrain";
+        return {
+            terrain: "flatterrain"
+        };
     }
     ViewUtils.GatherLegacyTerrainTile = GatherLegacyTerrainTile;
     function GatherMapTiles(params) {