bruce-cesium 0.9.0 → 0.9.2

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, 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, Cesium3DTileset, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, createOsmBuildings, Cesium3DTileStyle, KmlDataSource } from 'cesium';
+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, ProgramKey, Camera } from 'bruce-models';
+import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Color, HeightReference, 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, Cesium3DTileset, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, KmlDataSource, createOsmBuildings, Cesium3DTileStyle } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -921,19 +921,28 @@ function getStyle(api, entity, styleId) {
                 case 0:
                     style = null;
                     if (!styleId) return [3 /*break*/, 2];
-                    return [4 /*yield*/, Style.Get(api, styleId)];
+                    return [4 /*yield*/, Style.Get({
+                            api: api,
+                            styleId: styleId
+                        })];
                 case 1:
-                    style = _a.sent();
+                    style = (_a.sent()).style;
                     _a.label = 2;
                 case 2:
                     if (!!style) return [3 /*break*/, 5];
-                    return [4 /*yield*/, EntityType.Get(api, entity.Bruce["EntityType.ID"])];
+                    return [4 /*yield*/, EntityType.Get({
+                            api: api,
+                            entityTypeId: entity.Bruce["EntityType.ID"]
+                        })];
                 case 3:
-                    type = _a.sent();
+                    type = (_a.sent()).entityType;
                     if (!type["DisplaySetting.ID"]) return [3 /*break*/, 5];
-                    return [4 /*yield*/, Style.Get(api, type["DisplaySetting.ID"])];
+                    return [4 /*yield*/, Style.Get({
+                            api: api,
+                            styleId: type["DisplaySetting.ID"]
+                        })];
                 case 4:
-                    style = _a.sent();
+                    style = (_a.sent()).style;
                     _a.label = 5;
                 case 5: return [2 /*return*/, style];
             }
@@ -1118,7 +1127,10 @@ var EntityRenderEngine;
                     iconUrl = icon;
                 }
                 if (!iconUrl && style.iconId) {
-                    iconUrl = ClientFile.GetUrl(params.api, style.iconId);
+                    iconUrl = ClientFile.GetUrl({
+                        api: params.api,
+                        fileId: style.iconId
+                    });
                 }
                 if (iconUrl) {
                     var iconScale = EnsureNumber(Calculator.GetValue(style.iconScale, entity, params.tags));
@@ -1189,9 +1201,12 @@ var EntityRenderEngine;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
-                            return [4 /*yield*/, EntityTag.GetListByIds(api, tagIds)];
+                            return [4 /*yield*/, EntityTag.GetListByIds({
+                                    api: api,
+                                    tagIds: tagIds
+                                })];
                         case 3:
-                            tags = _c.sent();
+                            tags = (_c.sent()).tags;
                             _c.label = 4;
                         case 4:
                             pStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.pointStyle) !== null && _b !== void 0 ? _b : {};
@@ -1301,9 +1316,12 @@ var EntityRenderEngine;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
-                            return [4 /*yield*/, EntityTag.GetListByIds(api, tagIds)];
+                            return [4 /*yield*/, EntityTag.GetListByIds({
+                                    api: api,
+                                    tagIds: tagIds
+                                })];
                         case 3:
-                            tags = _c.sent();
+                            tags = (_c.sent()).tags;
                             _c.label = 4;
                         case 4:
                             lStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.polylineStyle) !== null && _b !== void 0 ? _b : {};
@@ -1421,9 +1439,12 @@ var EntityRenderEngine;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
-                            return [4 /*yield*/, EntityTag.GetListByIds(api, tagIds)];
+                            return [4 /*yield*/, EntityTag.GetListByIds({
+                                    api: api,
+                                    tagIds: tagIds
+                                })];
                         case 3:
-                            tags = _c.sent();
+                            tags = (_c.sent()).tags;
                             _c.label = 4;
                         case 4:
                             pStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.polygonStyle) !== null && _b !== void 0 ? _b : {};
@@ -1542,9 +1563,12 @@ var EntityRenderEngine;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
-                            return [4 /*yield*/, EntityTag.GetListByIds(api, tagIds)];
+                            return [4 /*yield*/, EntityTag.GetListByIds({
+                                    api: api,
+                                    tagIds: tagIds
+                                })];
                         case 3:
-                            tags = _e.sent();
+                            tags = (_e.sent()).tags;
                             _e.label = 4;
                         case 4:
                             mStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.polygonStyle) !== null && _b !== void 0 ? _b : {};
@@ -1570,9 +1594,12 @@ var EntityRenderEngine;
                         case 5:
                             i++;
                             return [3 /*break*/, 1];
-                        case 6: return [4 /*yield*/, EntityLod.GetLods(api, reqBody)];
+                        case 6: return [4 /*yield*/, EntityLod.GetLods({
+                                api: api,
+                                filter: reqBody
+                            })];
                         case 7:
-                            lodData = _e.sent();
+                            lodData = (_e.sent()).lods;
                             _loop_1 = function (i) {
                                 var entity, zoomItem, style, tagIds, tags, lod, mStyle, cEntity;
                                 return __generator(this, function (_a) {
@@ -1586,9 +1613,12 @@ var EntityRenderEngine;
                                             tagIds = entity.Bruce["Layer.ID"];
                                             tags = [];
                                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 3];
-                                            return [4 /*yield*/, EntityTag.GetListByIds(api, tagIds)];
+                                            return [4 /*yield*/, EntityTag.GetListByIds({
+                                                    api: api,
+                                                    tagIds: tagIds
+                                                })];
                                         case 2:
-                                            tags = _a.sent();
+                                            tags = (_a.sent()).tags;
                                             _a.label = 3;
                                         case 3:
                                             lod = lodData.find(function (x) { return x.entityId == entity.Bruce.ID; });
@@ -1601,7 +1631,10 @@ var EntityRenderEngine;
                                                 style: mStyle,
                                                 tags: tags,
                                                 viewer: params.viewer,
-                                                lodUrl: ClientFile.GetUrl(api, lod.clientFileId),
+                                                lodUrl: ClientFile.GetUrl({
+                                                    api: api,
+                                                    fileId: lod.clientFileId
+                                                }),
                                                 lodClientFileId: lod.clientFileId
                                             });
                                             if (cEntity) {
@@ -1760,9 +1793,12 @@ var EntitiesRenderManager;
                                     switch (_a.label) {
                                         case 0:
                                             entityIds = ids.splice(0, CHECK_BATCH_SIZE_1);
-                                            return [4 /*yield*/, Entity$1.GetListByIds(api, entityIds)];
+                                            return [4 /*yield*/, Entity$1.GetListByIds({
+                                                    api: api,
+                                                    entityIds: entityIds
+                                                })];
                                         case 1:
-                                            entities = _a.sent();
+                                            entities = (_a.sent()).entities;
                                             if (this.disposed) {
                                                 return [2 /*return*/];
                                             }
@@ -1952,9 +1988,12 @@ var EntitiesLoadedRenderManager;
                                     switch (_a.label) {
                                         case 0:
                                             entityIds = ids.splice(0, CHECK_BATCH_SIZE_1);
-                                            return [4 /*yield*/, Entity$1.GetListByIds(api, entityIds)];
+                                            return [4 /*yield*/, Entity$1.GetListByIds({
+                                                    api: api,
+                                                    entityIds: entityIds
+                                                })];
                                         case 1:
-                                            entities = _a.sent();
+                                            entities = (_a.sent()).entities;
                                             if (this.disposed) {
                                                 return [2 /*return*/];
                                             }
@@ -2640,9 +2679,12 @@ var EntitiesIdsRenderManager;
                         case 1:
                             _b.trys.push([1, 4, , 5]);
                             api = this.apiGetter.getApi();
-                            return [4 /*yield*/, Entity$1.GetListByIds(api, entityIds)];
+                            return [4 /*yield*/, Entity$1.GetListByIds({
+                                    api: api,
+                                    entityIds: entityIds
+                                })];
                         case 2:
-                            entities = _b.sent();
+                            entities = (_b.sent()).entities;
                             return [4 /*yield*/, EntityRenderEngine.Render({
                                     viewer: this.viewer,
                                     apiGetter: this.apiGetter,
@@ -2767,9 +2809,12 @@ var EntityRenderManager;
                                 return [2 /*return*/];
                             }
                             api = this.apiGetter.getApi();
-                            return [4 /*yield*/, Entity$1.Get(api, id)];
+                            return [4 /*yield*/, Entity$1.Get({
+                                    api: api,
+                                    entityId: id
+                                })];
                         case 1:
-                            entity = _b.sent();
+                            entity = (_b.sent()).entity;
                             return [4 /*yield*/, EntityRenderEngine.Render({
                                     viewer: this.viewer,
                                     apiGetter: this.apiGetter,
@@ -2906,7 +2951,11 @@ var TilesetRenderEngine;
         var api = params.apiGetter.getApi(params.apiGetter.accountId);
         if (params.tileset.type == Tileset.EType.Cad) {
             var cTileset_1 = new Cesium3DTileset({
-                url: Tileset.GetPublicFileUrl(api, params.tileset.id, "tileset.json") + "?generation=" + params.tileset.generateVersion
+                url: Tileset.GetPublicFileUrl({
+                    api: api,
+                    tilesetId: params.tileset.id,
+                    file: "tileset.json"
+                }) + "?generation=" + params.tileset.generateVersion
             });
             params.viewer.scene.primitives.add(cTileset_1);
             cTileset_1.readyPromise.then(function () {
@@ -2925,14 +2974,22 @@ var TilesetRenderEngine;
         }
         else if (params.tileset.type === Tileset.EType.EntitiesSet) {
             var cTileset = new Cesium3DTileset({
-                url: Tileset.GetPublicFileUrl(api, params.tileset.id, "tileset.json") + "?generation=" + params.tileset.generateVersion
+                url: Tileset.GetPublicFileUrl({
+                    api: api,
+                    tilesetId: params.tileset.id,
+                    file: "tileset.json"
+                }) + "?generation=" + params.tileset.generateVersion
             });
             params.viewer.scene.primitives.add(cTileset);
             return cTileset;
         }
         else if (params.tileset.type == Tileset.EType.PointCloud) {
             var cTileset_2 = new Cesium3DTileset({
-                url: Tileset.GetPublicFileUrl(api, params.tileset.id, "tileset.json") + "?generation=" + params.tileset.generateVersion
+                url: Tileset.GetPublicFileUrl({
+                    api: api,
+                    tilesetId: params.tileset.id,
+                    file: "tileset.json"
+                }) + "?generation=" + params.tileset.generateVersion
             });
             params.viewer.scene.primitives.add(cTileset_2);
             cTileset_2.readyPromise.then(function () {
@@ -3010,9 +3067,12 @@ var TilesetRenderEngine;
                             batch = this.getEntitiesForQueue();
                             entityIds = batch.map(function (x) { return x.entityId; });
                             if (!(entityIds.length > 0)) return [3 /*break*/, 3];
-                            return [4 /*yield*/, Entity$1.GetListByIds(this.api, entityIds)];
+                            return [4 /*yield*/, Entity$1.GetListByIds({
+                                    api: this.api,
+                                    entityIds: entityIds
+                                })];
                         case 2:
-                            entities = _a.sent();
+                            entities = (_a.sent()).entities;
                             _loop_1 = function (i) {
                                 var record = entities[i];
                                 var feature = batch.find(function (x) { var _a; return (x === null || x === void 0 ? void 0 : x.entityId) == ((_a = record === null || record === void 0 ? void 0 : record.Bruce) === null || _a === void 0 ? void 0 : _a.ID); });
@@ -3073,9 +3133,12 @@ var TilesetRenderEngine;
                             _c.label = 1;
                         case 1:
                             _c.trys.push([1, 3, , 4]);
-                            return [4 /*yield*/, Style.Get(this.api, fallbackStyleId)];
+                            return [4 /*yield*/, Style.Get({
+                                    api: this.api,
+                                    styleId: fallbackStyleId
+                                })];
                         case 2:
-                            data = _c.sent();
+                            data = (_c.sent()).style;
                             this.fallbackStyle = data;
                             return [3 /*break*/, 4];
                         case 3:
@@ -3128,9 +3191,12 @@ var TilesetRenderEngine;
                             _c.label = 6;
                         case 6:
                             _c.trys.push([6, 8, , 9]);
-                            return [4 /*yield*/, EntityType.Get(this.api, styleMap.EntityTypeID)];
+                            return [4 /*yield*/, EntityType.Get({
+                                    api: this.api,
+                                    entityTypeId: styleMap.EntityTypeID
+                                })];
                         case 7:
-                            entityType = _c.sent();
+                            entityType = (_c.sent()).entityType;
                             styleId = entityType === null || entityType === void 0 ? void 0 : entityType["DisplaySetting.ID"];
                             return [3 /*break*/, 9];
                         case 8:
@@ -3142,9 +3208,12 @@ var TilesetRenderEngine;
                             _c.label = 10;
                         case 10:
                             _c.trys.push([10, 12, , 13]);
-                            return [4 /*yield*/, Style.Get(this.api, styleId)];
+                            return [4 /*yield*/, Style.Get({
+                                    api: this.api,
+                                    styleId: styleId
+                                })];
                         case 11:
-                            data = _c.sent();
+                            data = (_c.sent()).style;
                             if (data) {
                                 styleMap.style = data;
                                 styleMap.StyleID = styleId;
@@ -3372,17 +3441,23 @@ var TilesetCadRenderManager;
                                 return [2 /*return*/];
                             }
                             api = this.apiGetter.getApi();
-                            return [4 /*yield*/, Tileset.Get(api, tilesetId)];
+                            return [4 /*yield*/, Tileset.Get({
+                                    api: api,
+                                    tilesetId: tilesetId
+                                })];
                         case 1:
-                            tileset = _b.sent();
+                            tileset = (_b.sent()).tileset;
                             if (!tileset) {
                                 return [2 /*return*/];
                             }
                             settings = tileset.settings;
                             rootId = settings.rootEntityId;
-                            return [4 /*yield*/, EntityCoords.GetEntityCoords(api, rootId)];
+                            return [4 /*yield*/, EntityCoords.GetEntityCoords({
+                                    api: api,
+                                    rootEntityId: rootId
+                                })];
                         case 2:
-                            coords = _b.sent();
+                            coords = (_b.sent()).coords;
                             cTileset = this.cTileset = TilesetRenderEngine.Render({
                                 apiGetter: this.apiGetter,
                                 tileset: tileset,
@@ -3856,9 +3931,13 @@ var TilesetOsmRenderManager;
                                 _loop_1(i);
                             }
                             api = this.apiGetter.getApi();
-                            return [4 /*yield*/, EntitySource.GetEntityIdsBySourceKeys(api, this.sourceId, featureIds)];
+                            return [4 /*yield*/, EntitySource.GetEntityIdsBySourceKeys({
+                                    api: api,
+                                    sourceId: this.sourceId,
+                                    sourceKeys: featureIds
+                                })];
                         case 1:
-                            bIds = _a.sent();
+                            bIds = (_a.sent()).idMapping;
                             for (i = 0; i < featureIds.length; i++) {
                                 id = featureIds[i];
                                 bId = bIds[id];
@@ -3956,9 +4035,12 @@ var TilesetEntitiesRenderManager;
                                 return [2 /*return*/];
                             }
                             api = this.apiGetter.getApi();
-                            return [4 /*yield*/, Tileset.Get(api, tilesetId)];
+                            return [4 /*yield*/, Tileset.Get({
+                                    api: api,
+                                    tilesetId: tilesetId
+                                })];
                         case 1:
-                            tileset = _b.sent();
+                            tileset = (_b.sent()).tileset;
                             if (!tileset) {
                                 return [2 /*return*/];
                             }
@@ -4079,9 +4161,12 @@ var TilesetPointcloudRenderManager;
                                 return [2 /*return*/];
                             }
                             api = this.apiGetter.getApi();
-                            return [4 /*yield*/, Tileset.Get(api, tilesetId)];
+                            return [4 /*yield*/, Tileset.Get({
+                                    api: api,
+                                    tilesetId: tilesetId
+                                })];
                         case 1:
-                            tileset = _b.sent();
+                            tileset = (_b.sent()).tileset;
                             if (!tileset) {
                                 return [2 /*return*/];
                             }
@@ -4165,7 +4250,10 @@ var DataSourceStaticKmlManager;
                         return [2 /*return*/];
                     }
                     api = this.apiGetter.getApi();
-                    fileUrl = ClientFile.GetUrl(api, fileId);
+                    fileUrl = ClientFile.GetUrl({
+                        api: api,
+                        fileId: fileId
+                    });
                     this.dataSource = new KmlDataSource();
                     this.dataSource.load(fileUrl);
                     this.viewer.dataSources.add(this.dataSource);
@@ -4445,12 +4533,13 @@ var MenuItemManager;
  */
 var RenderHelper;
 (function (RenderHelper) {
-    function RenderEntities(params, entityIds) {
+    function RenderEntities(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var item;
+            var entityIds, item;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        entityIds = params.entityIds;
                         item = {
                             Caption: "Rendering Loaded Entities",
                             Type: MenuItem.EType.EntitiesLoaded,
@@ -4480,12 +4569,13 @@ var RenderHelper;
         });
     }
     RenderHelper.RenderEntities = RenderEntities;
-    function RenderEntityTypes(params, typeIds) {
+    function RenderEntityTypes(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var renderedItemIds, i, typeId, menuItem, itemId;
+            var typeIds, renderedItemIds, i, typeId, menuItem, itemId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        typeIds = params.entityTypeIds;
                         renderedItemIds = [];
                         i = 0;
                         _a.label = 1;
@@ -4510,12 +4600,13 @@ var RenderHelper;
         });
     }
     RenderHelper.RenderEntityTypes = RenderEntityTypes;
-    function RenderEntityFilter(params, filter) {
+    function RenderEntityFilter(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var item;
+            var filter, item;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        filter = params.attrFilter;
                         item = {
                             BruceEntity: {
                                 "EntityType.ID": filter.entityTypeId,
@@ -4549,12 +4640,13 @@ var RenderHelper;
         });
     }
     RenderHelper.RenderEntityFilter = RenderEntityFilter;
-    function RenderMenuItems(params, menuItems) {
+    function RenderMenuItems(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var renderedItemIds, i, menuItem, itemId;
+            var menuItems, renderedItemIds, i, menuItem, itemId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        menuItems = params.menuItems;
                         renderedItemIds = [];
                         i = 0;
                         _a.label = 1;
@@ -4578,17 +4670,27 @@ var RenderHelper;
         });
     }
     RenderHelper.RenderMenuItems = RenderMenuItems;
-    function RenderTileset(params, tilesetId) {
+    function RenderTileset(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var api, tileset, menuItem;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var tilesetId, api, tileset, _a, menuItem;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        tilesetId = params.tilesetId;
                         api = params.apiGetter.getApi();
-                        return [4 /*yield*/, Tileset.Get(api, tilesetId)];
-                    case 1:
-                        tileset = _a.sent();
-                        if (!(tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 3];
+                        if (!params.tileset) return [3 /*break*/, 1];
+                        _a = params.tileset;
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, Tileset.Get({
+                            api: api,
+                            tilesetId: tilesetId
+                        })];
+                    case 2:
+                        _a = (_b.sent()).tileset;
+                        _b.label = 3;
+                    case 3:
+                        tileset = _a;
+                        if (!(tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 5];
                         menuItem = {
                             Caption: "Rendering Tileset",
                             FlyTo: true,
@@ -4604,27 +4706,47 @@ var RenderHelper;
                                 item: menuItem,
                                 apiGetter: params.apiGetter
                             })];
-                    case 2: return [2 /*return*/, _a.sent()];
-                    case 3: throw (new Error("Tileset type not supported."));
+                    case 4: return [2 /*return*/, _b.sent()];
+                    case 5: throw (new Error("Tileset type not supported."));
                 }
             });
         });
     }
     RenderHelper.RenderTileset = RenderTileset;
-    function RenderBookmarkItems(params, viewId, bookmarkId) {
+    function RenderBookmarkItems(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var api, view, bookmark, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, renderedItemIds, traverseItems_1, i;
+            var viewId, bookmarkId, api, view, _a, bookmark, _b, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, renderedItemIds, traverseItems_1, i;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
+                        viewId = params.viewId, bookmarkId = params.bookmarkId;
                         api = params.apiGetter.getApi();
-                        return [4 /*yield*/, ProjectView.Get(api, viewId)];
-                    case 1:
-                        view = _a.sent();
-                        return [4 /*yield*/, ProjectViewBookmark.Get(api, viewId, bookmarkId)];
+                        if (!params.view) return [3 /*break*/, 1];
+                        _a = params.view;
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, ProjectView.Get({
+                            api: api,
+                            viewId: viewId
+                        })];
                     case 2:
-                        bookmark = _a.sent();
+                        _a = (_c.sent()).view;
+                        _c.label = 3;
+                    case 3:
+                        view = _a;
+                        if (!params.bookmark) return [3 /*break*/, 4];
+                        _b = params.bookmark;
+                        return [3 /*break*/, 6];
+                    case 4: return [4 /*yield*/, ProjectViewBookmark.Get({
+                            api: api,
+                            viewId: viewId,
+                            bookmarkId: bookmarkId
+                        })];
+                    case 5:
+                        _b = (_c.sent()).bookmark;
+                        _c.label = 6;
+                    case 6:
+                        bookmark = _b;
                         if (view.DataVersion != bookmark.DataVersion) {
                             throw new Error("View and bookmark settings version mismatch.");
                         }
@@ -4646,7 +4768,7 @@ var RenderHelper;
                             }
                         }
                         renderedItemIds = [];
-                        if (!((menuItems === null || menuItems === void 0 ? void 0 : menuItems.length) && (enabledIds === null || enabledIds === void 0 ? void 0 : enabledIds.length))) return [3 /*break*/, 6];
+                        if (!((menuItems === null || menuItems === void 0 ? void 0 : menuItems.length) && (enabledIds === null || enabledIds === void 0 ? void 0 : enabledIds.length))) return [3 /*break*/, 10];
                         traverseItems_1 = function (item) { return __awaiter(_this, void 0, void 0, function () {
                             var itemId, i;
                             return __generator(this, function (_a) {
@@ -4679,17 +4801,17 @@ var RenderHelper;
                             });
                         }); };
                         i = 0;
-                        _a.label = 3;
-                    case 3:
-                        if (!(i < menuItems.length)) return [3 /*break*/, 6];
+                        _c.label = 7;
+                    case 7:
+                        if (!(i < menuItems.length)) return [3 /*break*/, 10];
                         return [4 /*yield*/, traverseItems_1(menuItems[i])];
-                    case 4:
-                        _a.sent();
-                        _a.label = 5;
-                    case 5:
+                    case 8:
+                        _c.sent();
+                        _c.label = 9;
+                    case 9:
                         i++;
-                        return [3 /*break*/, 3];
-                    case 6: return [2 /*return*/, renderedItemIds];
+                        return [3 /*break*/, 7];
+                    case 10: return [2 /*return*/, renderedItemIds];
                 }
             });
         });
@@ -4828,9 +4950,12 @@ function findKey(apiGetter, keyId, defaultKey) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, ProgramKey.Get(apiGetter.getApi(), keyId)];
+                    return [4 /*yield*/, ProgramKey.Get({
+                            api: apiGetter.getApi(),
+                            programId: keyId
+                        })];
                 case 2:
-                    pKey = _a.sent();
+                    pKey = (_a.sent()).programKey;
                     key = pKey.Key;
                     return [3 /*break*/, 4];
                 case 3:
@@ -5186,14 +5311,21 @@ var TileRenderEngine;
                         switch (_b.label) {
                             case 0:
                                 api = params.apiGetter.getApi();
-                                return [4 /*yield*/, ProjectView.Get(api, params.viewId)];
+                                return [4 /*yield*/, ProjectView.Get({
+                                        api: api,
+                                        viewId: params.viewId
+                                    })];
                             case 1:
-                                view = _b.sent();
+                                view = (_b.sent()).view;
                                 bookmark = null;
                                 if (!params.bookmarkId) return [3 /*break*/, 3];
-                                return [4 /*yield*/, ProjectViewBookmark.Get(api, params.viewId, params.bookmarkId)];
+                                return [4 /*yield*/, ProjectViewBookmark.Get({
+                                        api: api,
+                                        viewId: params.viewId,
+                                        bookmarkId: params.bookmarkId
+                                    })];
                             case 2:
-                                bookmark = (_b.sent());
+                                bookmark = (_b.sent()).bookmark;
                                 _b.label = 3;
                             case 3:
                                 vSettings = view.Settings;
@@ -5210,7 +5342,11 @@ var TileRenderEngine;
                                     dataNames.push(vSettings.DefaultMapTiles);
                                 }
                                 tiles = (_a = vSettings === null || vSettings === void 0 ? void 0 : vSettings.CesiumMapSources) !== null && _a !== void 0 ? _a : [];
-                                return [4 /*yield*/, ProjectViewLegacyTile.MergeMapTemplateData(params.apiGetter, tiles, (vSettings === null || vSettings === void 0 ? void 0 : vSettings.CesiumMapSources) == null)];
+                                return [4 /*yield*/, ProjectViewLegacyTile.MergeMapTemplateData({
+                                        getter: params.apiGetter,
+                                        sources: tiles,
+                                        addIfMissing: (vSettings === null || vSettings === void 0 ? void 0 : vSettings.CesiumMapSources) == null
+                                    })];
                             case 4:
                                 _b.sent();
                                 for (i = 0; i < dataNames.length; i++) {
@@ -5323,12 +5459,19 @@ var TileRenderEngine;
                                 return [3 /*break*/, 15];
                             case 2:
                                 api = apiGetter.getApi(meta.accountId);
-                                return [4 /*yield*/, Tileset.Get(api, meta.tilesetId)];
+                                return [4 /*yield*/, Tileset.Get({
+                                        api: api,
+                                        tilesetId: meta.tilesetId
+                                    })];
                             case 3:
-                                tileset = _f.sent();
+                                tileset = (_f.sent()).tileset;
                                 if (!(tileset.type === Tileset.EType.GeoMap)) return [3 /*break*/, 4];
                                 provider = new TileMapServiceImageryProvider({
-                                    url: Tileset.GetPublicFileUrl(api, meta.tilesetId, ""),
+                                    url: Tileset.GetPublicFileUrl({
+                                        api: api,
+                                        tilesetId: meta.tilesetId,
+                                        file: ""
+                                    }),
                                     fileExtension: "png"
                                 });
                                 return [3 /*break*/, 15];
@@ -5337,10 +5480,10 @@ var TileRenderEngine;
                                 settings = tileset.settings;
                                 _a = settings.mapType;
                                 switch (_a) {
-                                    case TilesetExtMapTiles.EType.CesiumIon: return [3 /*break*/, 5];
-                                    case TilesetExtMapTiles.EType.MapBoxImagery: return [3 /*break*/, 7];
-                                    case TilesetExtMapTiles.EType.OpenStreetMapImagery: return [3 /*break*/, 11];
-                                    case TilesetExtMapTiles.EType.TileMapImagery: return [3 /*break*/, 12];
+                                    case Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 5];
+                                    case Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 7];
+                                    case Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 11];
+                                    case Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 12];
                                 }
                                 return [3 /*break*/, 13];
                             case 5:
@@ -5386,7 +5529,11 @@ var TileRenderEngine;
                             case 14:
                                 if (tileset.type === Tileset.EType.EntitiesMap) {
                                     provider = new UrlTemplateImageryProvider({
-                                        url: Tileset.GetPublicFileUrl(api, meta.tilesetId, "{z}/{x}/{y}.png"),
+                                        url: Tileset.GetPublicFileUrl({
+                                            api: api,
+                                            tilesetId: meta.tilesetId,
+                                            file: "{z}/{x}/{y}.png"
+                                        }),
                                         tileHeight: 256,
                                         tileWidth: 256
                                     });
@@ -5509,14 +5656,21 @@ var TileRenderEngine;
                         switch (_c.label) {
                             case 0:
                                 api = params.apiGetter.getApi();
-                                return [4 /*yield*/, ProjectView.Get(api, params.viewId)];
+                                return [4 /*yield*/, ProjectView.Get({
+                                        api: api,
+                                        viewId: params.viewId
+                                    })];
                             case 1:
-                                view = _c.sent();
+                                view = (_c.sent()).view;
                                 bookmark = null;
                                 if (!params.bookmarkId) return [3 /*break*/, 3];
-                                return [4 /*yield*/, ProjectViewBookmark.Get(api, params.viewId, params.bookmarkId)];
+                                return [4 /*yield*/, ProjectViewBookmark.Get({
+                                        api: api,
+                                        viewId: params.viewId,
+                                        bookmarkId: params.bookmarkId
+                                    })];
                             case 2:
-                                bookmark = (_c.sent());
+                                bookmark = (_c.sent()).bookmark;
                                 _c.label = 3;
                             case 3:
                                 vSettings = view.Settings;
@@ -5530,7 +5684,11 @@ var TileRenderEngine;
                                 else {
                                     terrainTileName = vSettings === null || vSettings === void 0 ? void 0 : vSettings.DefaultTerrain;
                                 }
-                                return [4 /*yield*/, ProjectViewLegacyTile.MergeTerrainTemplateData(params.apiGetter, terrainTiles, (vSettings === null || vSettings === void 0 ? void 0 : vSettings.CesiumTerrainSources) == null)];
+                                return [4 /*yield*/, ProjectViewLegacyTile.MergeTerrainTemplateData({
+                                        getter: params.apiGetter,
+                                        sources: terrainTiles,
+                                        addIfMissing: (vSettings === null || vSettings === void 0 ? void 0 : vSettings.CesiumTerrainSources) == null
+                                    })];
                             case 4:
                                 _c.sent();
                                 for (i = 0; i < terrainTiles.length; i++) {
@@ -5574,13 +5732,20 @@ var TileRenderEngine;
                                 return [3 /*break*/, 3];
                             case 1:
                                 api = params.apiGetter.getApi(params.tile.accountId);
-                                return [4 /*yield*/, Tileset.Get(api, params.tile.tilesetId)];
+                                return [4 /*yield*/, Tileset.Get({
+                                        api: api,
+                                        tilesetId: params.tile.tilesetId
+                                    })];
                             case 2:
-                                tileset = _b.sent();
+                                tileset = (_b.sent()).tileset;
                                 url = void 0;
                                 vertexes = true;
                                 if (tileset.type === Tileset.EType.Terrain) {
-                                    url = Tileset.GetPublicFileUrl(api, tileset.id, "");
+                                    url = Tileset.GetPublicFileUrl({
+                                        api: api,
+                                        tilesetId: tileset.id,
+                                        file: ""
+                                    });
                                 }
                                 else if (tileset.type === Tileset.EType.ExternalTerrain) {
                                     settings = tileset.settings;
@@ -5616,7 +5781,7 @@ var TileRenderEngine;
 })(TileRenderEngine || (TileRenderEngine = {}));
 
 // TODO: Move these to the data model.
-var MIN_SHADOW_SIZE = 1024;
+var MIN_SHADOW_SIZE = 2048;
 var MAX_SHADOW_SIZE = 32768;
 function renderV1(params, bookmark, view) {
     var _a, _b;
@@ -5661,17 +5826,19 @@ function renderV1(params, bookmark, view) {
                         }
                         params.skipTransition = true;
                     }
-                    camera = bookmark.Camera;
-                    pos = Cartesian3.fromDegrees(+camera.position.longitude, +camera.position.latitude, +camera.position.height);
-                    params.manager.Viewer.scene.camera.flyTo({
-                        destination: pos,
-                        orientation: {
-                            heading: +camera.heading,
-                            pitch: +camera.pitch,
-                            roll: +camera.roll
-                        },
-                        duration: params.skipTransition ? 0 : 2
-                    });
+                    if (!params.skipCamera) {
+                        camera = bookmark.Camera;
+                        pos = Cartesian3.fromDegrees(+camera.position.longitude, +camera.position.latitude, +camera.position.height);
+                        params.manager.Viewer.scene.camera.flyTo({
+                            destination: pos,
+                            orientation: {
+                                heading: +camera.heading,
+                                pitch: +camera.pitch,
+                                roll: +camera.roll
+                            },
+                            duration: params.skipTransition ? 0 : 2
+                        });
+                    }
                     go = (_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _a === void 0 ? void 0 : _a.groundOcclusion;
                     if (go == null) {
                         go = vSettings === null || vSettings === void 0 ? void 0 : vSettings.GroundOcclusion;
@@ -5692,7 +5859,9 @@ function renderV1(params, bookmark, view) {
                     return [4 /*yield*/, RenderHelper.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
                             manager: params.manager,
-                        }, params.viewId, params.bookmarkId)];
+                            view: view,
+                            bookmark: bookmark
+                        })];
                 case 3:
                     _c.sent();
                     _c.label = 4;
@@ -5738,25 +5907,27 @@ function renderV2(params, bookmark, view) {
                             scene.screenSpaceCameraController.enableTilt = false;
                         }
                     }
-                    transition = params.skipTransition ? 0 : curLens === newLens ? camera.transition : 0;
-                    if (transition == null) {
-                        transition = (_l = defaults.camera) === null || _l === void 0 ? void 0 : _l.transition;
-                    }
-                    if (transition == null) {
-                        // TODO: Need global default.
-                        transition = 2000;
-                    }
-                    if (Carto.ValidateCarto(camera)) {
-                        pos = Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
-                        scene.camera.flyTo({
-                            destination: pos,
-                            orientation: {
-                                heading: Math$1.toRadians(+camera.heading),
-                                pitch: Math$1.toRadians(+camera.pitch),
-                                roll: Math$1.toRadians(+camera.roll)
-                            },
-                            duration: transition != 0 ? transition / 1000 : 0
-                        });
+                    if (!params.skipCamera) {
+                        transition = params.skipTransition ? 0 : curLens === newLens ? camera.transition : 0;
+                        if (transition == null) {
+                            transition = (_l = defaults.camera) === null || _l === void 0 ? void 0 : _l.transition;
+                        }
+                        if (transition == null) {
+                            // TODO: Need global default.
+                            transition = 2000;
+                        }
+                        if (Carto.ValidateCarto(camera)) {
+                            pos = Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+                            scene.camera.flyTo({
+                                destination: pos,
+                                orientation: {
+                                    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) {
@@ -5772,7 +5943,7 @@ function renderV2(params, bookmark, view) {
                         hillShades = (_p = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _p === void 0 ? void 0 : _p.hillShades;
                     }
                     if (hillShades == null) {
-                        hillShades = false;
+                        hillShades = true;
                     }
                     scene.globe.enableLighting = Boolean(hillShades);
                     baseColor = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeColor;
@@ -5933,7 +6104,9 @@ function renderV2(params, bookmark, view) {
                     return [4 /*yield*/, RenderHelper.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
                             manager: params.manager,
-                        }, params.viewId, params.bookmarkId)];
+                            view: view,
+                            bookmark: bookmark
+                        })];
                 case 8:
                     _2.sent();
                     _2.label = 9;
@@ -5946,35 +6119,59 @@ var ViewRenderEngine;
 (function (ViewRenderEngine) {
     function Render(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var api, view, bookmark, version;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var api, view, _a, bookmark, bookmarkId, _b, version;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         api = params.apiGetter.getApi();
-                        return [4 /*yield*/, ProjectView.Get(api, params.viewId)];
-                    case 1:
-                        view = _a.sent();
-                        bookmark = null;
-                        if (!params.bookmarkId) return [3 /*break*/, 3];
-                        return [4 /*yield*/, ProjectViewBookmark.Get(api, params.viewId, params.bookmarkId)];
+                        if (!params.view) return [3 /*break*/, 1];
+                        _a = params.view;
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, ProjectView.Get({
+                            api: api,
+                            viewId: params.viewId
+                        })];
                     case 2:
-                        bookmark = _a.sent();
-                        _a.label = 3;
+                        _a = (_c.sent()).view;
+                        _c.label = 3;
                     case 3:
+                        view = _a;
+                        bookmark = params.bookmark;
+                        if (!!bookmark) return [3 /*break*/, 7];
+                        bookmarkId = params.bookmarkId;
+                        if (!bookmarkId) {
+                            bookmarkId = view.DefaultUISlideID;
+                        }
+                        if (!bookmarkId) return [3 /*break*/, 5];
+                        return [4 /*yield*/, ProjectViewBookmark.Get({
+                                api: api,
+                                viewId: params.viewId,
+                                bookmarkId: bookmarkId
+                            })];
+                    case 4:
+                        _b = (_c.sent()).bookmark;
+                        return [3 /*break*/, 6];
+                    case 5:
+                        _b = null;
+                        _c.label = 6;
+                    case 6:
+                        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 === 2)) return [3 /*break*/, 5];
+                        if (!(version === 2)) return [3 /*break*/, 9];
                         return [4 /*yield*/, renderV2(params, bookmark, view)];
-                    case 4:
-                        _a.sent();
-                        return [3 /*break*/, 7];
-                    case 5: return [4 /*yield*/, renderV1(params, bookmark, view)];
-                    case 6:
-                        _a.sent();
-                        _a.label = 7;
-                    case 7: return [2 /*return*/];
+                    case 8:
+                        _c.sent();
+                        return [3 /*break*/, 11];
+                    case 9: return [4 /*yield*/, renderV1(params, bookmark, view)];
+                    case 10:
+                        _c.sent();
+                        _c.label = 11;
+                    case 11: return [2 /*return*/];
                 }
             });
         });