bruce-cesium 0.3.6 → 0.3.7

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, ProjectViewTileSource, Camera, MathUtils } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Primitive, Cesium3DTileFeature, HeadingPitchRange, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, OrthographicFrustum, EllipsoidGeodesic, createOsmBuildings, Cesium3DTileStyle, Rectangle, Matrix4, Cesium3DTileset } 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, TilesetExtMapTiles, Camera, MathUtils } from 'bruce-models';
+import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Entity, Primitive, Cesium3DTileFeature, Color, Cartesian3, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, createOsmBuildings, Cesium3DTileStyle, Rectangle, EllipsoidGeodesic, Matrix4, Cesium3DTileset } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -923,7 +923,7 @@ var EntityRenderEngine;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
+                            api = params.apiGetter.getApi();
                             cEntities = {};
                             i = 0;
                             _c.label = 1;
@@ -1034,7 +1034,7 @@ var EntityRenderEngine;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
+                            api = params.apiGetter.getApi();
                             cEntities = {};
                             i = 0;
                             _c.label = 1;
@@ -1153,7 +1153,7 @@ var EntityRenderEngine;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
+                            api = params.apiGetter.getApi();
                             cEntities = {};
                             i = 0;
                             _c.label = 1;
@@ -1266,7 +1266,7 @@ var EntityRenderEngine;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
-                            api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
+                            api = params.apiGetter.getApi();
                             cEntities = {};
                             reqBody = {
                                 "strict": false,
@@ -1413,7 +1413,7 @@ var EntitiesRenderManager;
                     if (this.disposed) {
                         throw (new Error("This item is disposed."));
                     }
-                    api = this.apiGetter.getApi(this.apiGetter.accountId, this.apiGetter.env);
+                    api = this.apiGetter.getApi();
                     this.getter = this.sharedGetters.GetOrCreateFilterGetter({
                         api: api,
                         attrFilter: (_a = this.item.BruceEntity.Filter) !== null && _a !== void 0 ? _a : {},
@@ -1463,7 +1463,7 @@ var EntitiesRenderManager;
                                 return [2 /*return*/];
                             }
                             this.isRunningCheck = true;
-                            api = this.apiGetter.getApi(this.apiGetter.accountId, this.apiGetter.env);
+                            api = this.apiGetter.getApi();
                             _a.label = 1;
                         case 1:
                             _a.trys.push([1, 5, , 6]);
@@ -2115,7 +2115,7 @@ var EntitiesIdsRenderManager;
                             if (this.disposed) {
                                 return [2 /*return*/];
                             }
-                            api = this.apiGetter.getApi(this.apiGetter.accountId, this.apiGetter.env);
+                            api = this.apiGetter.getApi();
                             return [4 /*yield*/, Entity$1.GetListByIds(api, entityIds)];
                         case 1:
                             entities = _b.sent();
@@ -2219,7 +2219,7 @@ var EntityRenderManager;
                             if (this.disposed) {
                                 return [2 /*return*/];
                             }
-                            api = this.apiGetter.getApi(this.apiGetter.accountId, this.apiGetter.env);
+                            api = this.apiGetter.getApi();
                             return [4 /*yield*/, Entity$1.Get(api, id)];
                         case 1:
                             entity = _b.sent();
@@ -2315,7 +2315,7 @@ var TilesetRenderEngine;
     }
     TilesetRenderEngine.ApplySettings = ApplySettings;
     function Render(params) {
-        var api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
+        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
@@ -2742,7 +2742,7 @@ var TilesetCadRenderManager;
                             if (!tilesetId) {
                                 return [2 /*return*/];
                             }
-                            api = this.apiGetter.getApi(this.apiGetter.accountId, this.apiGetter.env);
+                            api = this.apiGetter.getApi();
                             return [4 /*yield*/, Tileset.Get(api, tilesetId)];
                         case 1:
                             tileset = _b.sent();
@@ -3154,7 +3154,7 @@ var TilesetOsmRenderManager;
                             for (i = 0; i < features.length; i++) {
                                 _loop_1(i);
                             }
-                            api = this.apiGetter.getApi(this.apiGetter.accountId, this.apiGetter.env);
+                            api = this.apiGetter.getApi();
                             return [4 /*yield*/, EntitySource.GetEntityIdsBySourceKeys(api, this.sourceId, featureIds)];
                         case 1:
                             bIds = _a.sent();
@@ -3512,73 +3512,6 @@ var RenderHelper;
         });
     }
     RenderHelper.RenderEntityFilter = RenderEntityFilter;
-    function RenderBookmarkItems(params, viewId, bookmarkId) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function () {
-            function traverseItems(item) {
-                return __awaiter(this, void 0, void 0, function () {
-                    var itemId, i;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                if (!enabledItemIds.includes(item.id)) return [3 /*break*/, 2];
-                                return [4 /*yield*/, params.manager.RenderItem({
-                                        item: item,
-                                        apiGetter: params.apiGetter
-                                    })];
-                            case 1:
-                                itemId = _a.sent();
-                                renderedItemIds.push(itemId);
-                                _a.label = 2;
-                            case 2:
-                                if (!item.Children) return [3 /*break*/, 6];
-                                i = 0;
-                                _a.label = 3;
-                            case 3:
-                                if (!(i < item.Children.length)) return [3 /*break*/, 6];
-                                return [4 /*yield*/, traverseItems(item.Children[i])];
-                            case 4:
-                                _a.sent();
-                                _a.label = 5;
-                            case 5:
-                                i++;
-                                return [3 /*break*/, 3];
-                            case 6: return [2 /*return*/];
-                        }
-                    });
-                });
-            }
-            var api, view, bookmark, items, enabledItemIds, renderedItemIds, i;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
-                        return [4 /*yield*/, ProjectView.Get(api, viewId)];
-                    case 1:
-                        view = _e.sent();
-                        return [4 /*yield*/, ProjectViewBookmark.Get(api, viewId, bookmarkId)];
-                    case 2:
-                        bookmark = _e.sent();
-                        items = (_b = (_a = view.Settings) === null || _a === void 0 ? void 0 : _a.LayersMenu) !== null && _b !== void 0 ? _b : [];
-                        enabledItemIds = (_d = (_c = bookmark.Settings) === null || _c === void 0 ? void 0 : _c.selectedItemIds) !== null && _d !== void 0 ? _d : [];
-                        renderedItemIds = [];
-                        i = 0;
-                        _e.label = 3;
-                    case 3:
-                        if (!(i < items.length)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, traverseItems(items[i])];
-                    case 4:
-                        _e.sent();
-                        _e.label = 5;
-                    case 5:
-                        i++;
-                        return [3 /*break*/, 3];
-                    case 6: return [2 /*return*/, renderedItemIds];
-                }
-            });
-        });
-    }
-    RenderHelper.RenderBookmarkItems = RenderBookmarkItems;
     function RenderMenuItems(params, menuItems) {
         return __awaiter(this, void 0, void 0, function () {
             var renderedItemIds, i, menuItem, itemId;
@@ -3614,7 +3547,7 @@ var RenderHelper;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
+                        api = params.apiGetter.getApi();
                         return [4 /*yield*/, Tileset.Get(api, tilesetId)];
                     case 1:
                         tileset = _a.sent();
@@ -3641,9 +3574,101 @@ var RenderHelper;
         });
     }
     RenderHelper.RenderTileset = RenderTileset;
+    function RenderBookmarkItems(params, viewId, bookmarkId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var api, view, bookmark, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, renderedItemIds, traverseItems_1, i;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        api = params.apiGetter.getApi();
+                        return [4 /*yield*/, ProjectView.Get(api, viewId)];
+                    case 1:
+                        view = _a.sent();
+                        return [4 /*yield*/, ProjectViewBookmark.Get(api, viewId, bookmarkId)];
+                    case 2:
+                        bookmark = _a.sent();
+                        if (view.DataVersion != bookmark.DataVersion) {
+                            throw new Error("View and bookmark settings version mismatch.");
+                        }
+                        enabledIds = [];
+                        menuItems = [];
+                        version = view.DataVersion;
+                        if (view.Settings && bookmark.Settings) {
+                            if (version === 2) {
+                                vSettings = view.Settings;
+                                bSettings = bookmark.Settings;
+                                menuItems = vSettings.menuItems;
+                                enabledIds = bSettings.menuItemIds;
+                            }
+                            else {
+                                vSettings = view.Settings;
+                                bSettings = bookmark.Settings;
+                                menuItems = vSettings.LayersMenu;
+                                enabledIds = bSettings.selectedItemIds;
+                            }
+                        }
+                        renderedItemIds = [];
+                        if (!((menuItems === null || menuItems === void 0 ? void 0 : menuItems.length) && (enabledIds === null || enabledIds === void 0 ? void 0 : enabledIds.length))) return [3 /*break*/, 6];
+                        traverseItems_1 = function (item) { return __awaiter(_this, void 0, void 0, function () {
+                            var itemId, i;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (!enabledIds.includes(item.id)) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, params.manager.RenderItem({
+                                                item: item,
+                                                apiGetter: params.apiGetter
+                                            })];
+                                    case 1:
+                                        itemId = _a.sent();
+                                        renderedItemIds.push(itemId);
+                                        _a.label = 2;
+                                    case 2:
+                                        if (!item.Children) return [3 /*break*/, 6];
+                                        i = 0;
+                                        _a.label = 3;
+                                    case 3:
+                                        if (!(i < item.Children.length)) return [3 /*break*/, 6];
+                                        return [4 /*yield*/, traverseItems_1(item.Children[i])];
+                                    case 4:
+                                        _a.sent();
+                                        _a.label = 5;
+                                    case 5:
+                                        i++;
+                                        return [3 /*break*/, 3];
+                                    case 6: return [2 /*return*/];
+                                }
+                            });
+                        }); };
+                        i = 0;
+                        _a.label = 3;
+                    case 3:
+                        if (!(i < menuItems.length)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, traverseItems_1(menuItems[i])];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5:
+                        i++;
+                        return [3 /*break*/, 3];
+                    case 6: return [2 /*return*/, renderedItemIds];
+                }
+            });
+        });
+    }
+    RenderHelper.RenderBookmarkItems = RenderBookmarkItems;
 })(RenderHelper || (RenderHelper = {}));
 
+var DEFAULT_BING_KEY = "AqL0uYT5T84jiJeX55_b9zJeeP3MX2p1WLOHH4ljIEPZ7ZL2M81bYLzyYeSwuzzl";
+var DEFAULT_MAPBOX_KEY = "pk.eyJ1IjoiYWxleHRodW5kZXIiLCJhIjoiY2psbHJxbnN5MTBvbzNxczZwMHNpeTI0MCJ9.fdoj2QW_7n8RV4e0NCFgZA";
 var re = /[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/g;
+/**
+ * Prepares a legacy imagery name for comparison.
+ * Legacy data did not have ids... we do what we can.
+ * @param name
+ * @returns
+ */
 function prepLegacyName(name) {
     if (!name) {
         return "";
@@ -3656,26 +3681,68 @@ function prepLegacyName(name) {
     }
     return name;
 }
-var EDefaultTerrain;
-(function (EDefaultTerrain) {
-    EDefaultTerrain["CesiumWorldTerrain"] = "cesiumworldterrain";
-    EDefaultTerrain["Linz"] = "linz";
-    EDefaultTerrain["FlatTerrain"] = "flatterrain";
-})(EDefaultTerrain || (EDefaultTerrain = {}));
-var DEFAULT_TERRAIN_NAMES = [
-    EDefaultTerrain.CesiumWorldTerrain,
-    EDefaultTerrain.Linz,
-    EDefaultTerrain.FlatTerrain
-];
-function isDefaultTerrain(name) {
+/**
+ * Constructs an terrain provider for a default terrain type.
+ * Warning: This does not add it to the viewer.
+ * @param id
+ * @returns
+ */
+function renderDefaultTerrTile(id) {
+    var provider;
+    switch (id) {
+        case ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain:
+            provider = createWorldTerrain({
+                requestVertexNormals: true,
+                requestWaterMask: false
+            });
+            break;
+        case ProjectViewTile.EDefaultTerrain.FlatTerrain:
+            provider = new EllipsoidTerrainProvider();
+            break;
+        case ProjectViewTile.EDefaultTerrain.LINZ:
+            provider = new CesiumTerrainProvider({
+                url: "https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-dem",
+                requestVertexNormals: true,
+            });
+            break;
+    }
+    return provider;
+}
+/**
+ * Maps a legacy terrain's name to a default terrain id.
+ * @param name
+ * @returns
+ */
+function legacyTerrIdToDefaultId(name) {
     name = prepLegacyName(name);
-    return DEFAULT_TERRAIN_NAMES.includes(name);
+    switch (name) {
+        case "cesiumworldterrain":
+            return ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain;
+        case "linz":
+            return ProjectViewTile.EDefaultTerrain.LINZ;
+        case "flatterrain":
+            return ProjectViewTile.EDefaultTerrain.FlatTerrain;
+    }
 }
-function createTerrainBId(source) {
+/**
+ * Returns if a given legacy terrain's name correspondings to a default source.
+ * @param name
+ * @returns
+ */
+function isLegacyTerrainDefault(name) {
+    name = legacyTerrIdToDefaultId(name);
+    return ProjectViewTile.DefaultTerrains.find(function (x) { return x.id == name; }) != null;
+}
+/**
+ * Returns a best attempt at a unique id from a given legacy terrain source.
+ * @param source
+ * @returns
+ */
+function createLegacyTerrId(source) {
     if (!source) {
         return "";
     }
-    if (isDefaultTerrain(source.Name)) {
+    if (isLegacyTerrainDefault(source.Name)) {
         return source.Name;
     }
     if (source.SourceUrl) {
@@ -3683,11 +3750,16 @@ function createTerrainBId(source) {
     }
     return "";
 }
-function createImageryBId(source) {
+/**
+ * Returns a best attempt at a unique id from a given legacy imagery source.
+ * @param source
+ * @returns
+ */
+function createLegacyImageryId(source) {
     if (!source) {
         return "";
     }
-    if (isDefaultImagery(source.Name)) {
+    if (isLegacyImageryDefault(source.Name)) {
         return source.Name;
     }
     if (source.SourceUrl) {
@@ -3695,43 +3767,11 @@ function createImageryBId(source) {
     }
     return "";
 }
-var EDefaultImagery;
-(function (EDefaultImagery) {
-    EDefaultImagery["BingMapsAerial"] = "bingmapsaerial";
-    EDefaultImagery["BingMapsAerialWithLabels"] = "bingmapsaerialwithlabels";
-    EDefaultImagery["BingMapsRoads"] = "bingmapsroads";
-    EDefaultImagery["MapboxSatellite"] = "mapboxsatellite";
-    EDefaultImagery["MapBoxStreets"] = "mapboxstreets";
-    EDefaultImagery["MapBoxStreetsClassic"] = "mapboxstreetsclassic";
-    EDefaultImagery["EsriWorldImagery"] = "esriworldimagery";
-    EDefaultImagery["EsriWorldStreetMap"] = "esriworldstreetmap";
-    EDefaultImagery["EsriNationalGeographic"] = "esrinationalgeographic";
-    EDefaultImagery["OpenStreetMap"] = "openstreetmap";
-    EDefaultImagery["StamenWaterColor"] = "stamenwatercolor";
-    EDefaultImagery["StamenToner"] = "stamentoner";
-    EDefaultImagery["Grid"] = "grid";
-})(EDefaultImagery || (EDefaultImagery = {}));
-var DEFAULT_IMAGERY_NAMES = [
-    EDefaultImagery.BingMapsAerial,
-    EDefaultImagery.BingMapsAerialWithLabels,
-    EDefaultImagery.BingMapsRoads,
-    EDefaultImagery.MapboxSatellite,
-    EDefaultImagery.MapBoxStreets,
-    EDefaultImagery.MapBoxStreetsClassic,
-    EDefaultImagery.EsriWorldImagery,
-    EDefaultImagery.EsriWorldStreetMap,
-    EDefaultImagery.EsriNationalGeographic,
-    EDefaultImagery.OpenStreetMap,
-    EDefaultImagery.StamenWaterColor,
-    EDefaultImagery.StamenToner,
-    EDefaultImagery.Grid
-];
-function isDefaultImagery(name) {
-    name = prepLegacyName(name);
-    return DEFAULT_IMAGERY_NAMES.includes(name);
-}
-var DEFAULT_BING_KEY = "AqL0uYT5T84jiJeX55_b9zJeeP3MX2p1WLOHH4ljIEPZ7ZL2M81bYLzyYeSwuzzl";
-var DEFAULT_MAPBOX_KEY = "pk.eyJ1IjoiYWxleHRodW5kZXIiLCJhIjoiY2psbHJxbnN5MTBvbzNxczZwMHNpeTI0MCJ9.fdoj2QW_7n8RV4e0NCFgZA";
+/**
+ * Turns Cesium collection of enabled imageries into an array.
+ * @param viewer
+ * @returns
+ */
 function gatherEnabledImageries(viewer) {
     var collection = viewer.imageryLayers;
     var layers = [];
@@ -3741,6 +3781,154 @@ function gatherEnabledImageries(viewer) {
     }
     return layers;
 }
+/**
+ * Constructs an imagery provider for a default imagery type.
+ * Warning: This does not add it to the viewer.
+ * @param id
+ * @returns
+ */
+function renderDefaultMapTile(id) {
+    var provider;
+    switch (id) {
+        case ProjectViewTile.EDefaultImagery.BingMapsAerial:
+            // TODO: Read account key if available.
+            provider = new BingMapsImageryProvider({
+                url: "https://dev.virtualearth.net",
+                mapStyle: BingMapsStyle.AERIAL,
+                key: DEFAULT_BING_KEY
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels:
+            // TODO: Read account key if available.
+            provider = new BingMapsImageryProvider({
+                url: "https://dev.virtualearth.net",
+                mapStyle: BingMapsStyle.AERIAL_WITH_LABELS,
+                key: DEFAULT_BING_KEY
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.BingMapsRoads:
+            // TODO: Read account key if available.
+            provider = new BingMapsImageryProvider({
+                url: "https://dev.virtualearth.net",
+                mapStyle: BingMapsStyle.ROAD_ON_DEMAND,
+                key: DEFAULT_BING_KEY
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.MapboxSatellite:
+            // TODO: Read account key if available.
+            provider = new MapboxImageryProvider({
+                mapId: "mapbox.satellite",
+                accessToken: DEFAULT_MAPBOX_KEY
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.MapBoxStreets:
+            // TODO: Read account key if available.
+            provider = new MapboxImageryProvider({
+                mapId: "satellite-streets-v11",
+                accessToken: DEFAULT_MAPBOX_KEY
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.MapBoxStreetsClassic:
+            // TODO: Read account key if available.
+            provider = new MapboxImageryProvider({
+                mapId: "streets-v11",
+                accessToken: DEFAULT_MAPBOX_KEY
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.EsriWorldImagery:
+            provider = new ArcGisMapServerImageryProvider({
+                url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
+                enablePickFeatures: false
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.EsriWorldStreetMap:
+            provider = new ArcGisMapServerImageryProvider({
+                url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer",
+                enablePickFeatures: false
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.EsriNationalGeographic:
+            provider = new ArcGisMapServerImageryProvider({
+                url: "https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/",
+                enablePickFeatures: false
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.OpenStreetMap:
+            provider = new OpenStreetMapImageryProvider({
+                url: "https://a.tile.openstreetmap.org/"
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.StamenWaterColor:
+            provider = new OpenStreetMapImageryProvider({
+                url: "https://stamen-tiles.a.ssl.fastly.net/watercolor/"
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.StamenToner:
+            provider = new OpenStreetMapImageryProvider({
+                url: "https://stamen-tiles.a.ssl.fastly.net/toner/"
+            });
+            break;
+        case ProjectViewTile.EDefaultImagery.Grid:
+            provider = new GridImageryProvider({
+                tilingScheme: new GeographicTilingScheme(),
+                cells: 0,
+                color: Color.fromCssColorString("rgb(97, 151, 237)"),
+                glowColor: Color.fromCssColorString("rgb(54, 54, 54)"),
+                glowWidth: 4,
+                backgroundColor: Color.TRANSPARENT,
+                tileWidth: 256,
+                tileHeight: 256,
+                canvasSize: 256
+            });
+            break;
+    }
+    return provider;
+}
+/**
+ * Maps a legacy imagery's name to a default imagery id.
+ * @param name
+ * @returns
+ */
+function legacyMapIdToDefaultId(name) {
+    name = prepLegacyName(name);
+    switch (name) {
+        case "bingmapsaerial":
+            return ProjectViewTile.EDefaultImagery.BingMapsAerial;
+        case "bingmapsaerialwithlabels":
+            return ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels;
+        case "bingmapsroads":
+            return ProjectViewTile.EDefaultImagery.BingMapsRoads;
+        case "mapboxsatellite":
+            return ProjectViewTile.EDefaultImagery.MapboxSatellite;
+        case "mapboxstreets":
+            return ProjectViewTile.EDefaultImagery.MapBoxStreets;
+        case "mapboxstreetsclassic":
+            return ProjectViewTile.EDefaultImagery.MapBoxStreetsClassic;
+        case "esriworldimagery":
+            return ProjectViewTile.EDefaultImagery.EsriWorldImagery;
+        case "esriworldstreetmap":
+            return ProjectViewTile.EDefaultImagery.EsriWorldStreetMap;
+        case "esrinationalgeographic":
+            return ProjectViewTile.EDefaultImagery.EsriNationalGeographic;
+        case "openstreetmap":
+            return ProjectViewTile.EDefaultImagery.OpenStreetMap;
+        case "stamenwatercolor":
+            return ProjectViewTile.EDefaultImagery.StamenWaterColor;
+        case "stamentoner":
+            return ProjectViewTile.EDefaultImagery.StamenToner;
+        case "grid":
+            return ProjectViewTile.EDefaultImagery.Grid;
+    }
+}
+/**
+ * Returns if a given legacy imagery's name correspondings to a default source.
+ * @param name
+ * @returns
+ */
+function isLegacyImageryDefault(name) {
+    name = legacyMapIdToDefaultId(name);
+    return ProjectViewTile.DefaultImagery.find(function (x) { return x.id == name; }) != null;
+}
 var TileRenderEngine;
 (function (TileRenderEngine) {
     /**
@@ -3757,480 +3945,751 @@ var TileRenderEngine;
     TileRenderEngine.CompareLegacyNames = CompareLegacyNames;
     var Map;
     (function (Map) {
-        function Render(params) {
-            throw ("Not implemented");
-        }
-        Map.Render = Render;
-        function RenderLegacy(params) {
-            var enabled = gatherEnabledImageries(params.viewer);
-            var tile = params.data;
-            var bId = createImageryBId(tile);
-            var layer = enabled.find(function (x) { return x._bId == bId; });
-            if (layer) ;
-            else if (isDefaultImagery(tile.Name)) {
-                var provider = null;
-                // TODO: Rest of defaults.
-                // TODO: Should be enum.
-                switch (prepLegacyName(tile.Name)) {
-                    case EDefaultImagery.BingMapsAerial:
-                        // TODO: Read account key if available.
-                        provider = new BingMapsImageryProvider({
-                            url: "https://dev.virtualearth.net",
-                            mapStyle: BingMapsStyle.AERIAL,
-                            key: DEFAULT_BING_KEY
-                        });
-                        break;
-                    case EDefaultImagery.BingMapsAerialWithLabels:
-                        // TODO: Read account key if available.
-                        provider = new BingMapsImageryProvider({
-                            url: "https://dev.virtualearth.net",
-                            mapStyle: BingMapsStyle.AERIAL_WITH_LABELS,
-                            key: DEFAULT_BING_KEY
-                        });
-                        break;
-                    case EDefaultImagery.BingMapsRoads:
-                        // TODO: Read account key if available.
-                        provider = new BingMapsImageryProvider({
-                            url: "https://dev.virtualearth.net",
-                            mapStyle: BingMapsStyle.ROAD_ON_DEMAND,
-                            key: DEFAULT_BING_KEY
-                        });
-                        break;
-                    case EDefaultImagery.MapboxSatellite:
-                        // TODO: Read account key if available.
-                        provider = new MapboxImageryProvider({
-                            mapId: "mapbox.satellite",
-                            accessToken: DEFAULT_MAPBOX_KEY
-                        });
-                        break;
-                    case EDefaultImagery.MapBoxStreets:
-                        // TODO: Read account key if available.
-                        provider = new MapboxImageryProvider({
-                            mapId: "satellite-streets-v11",
-                            accessToken: DEFAULT_MAPBOX_KEY
-                        });
-                        break;
-                    case EDefaultImagery.MapBoxStreetsClassic:
-                        // TODO: Read account key if available.
-                        provider = new MapboxImageryProvider({
-                            mapId: "streets-v11",
-                            accessToken: DEFAULT_MAPBOX_KEY
-                        });
-                        break;
-                    case EDefaultImagery.EsriWorldImagery:
-                        provider = new ArcGisMapServerImageryProvider({
-                            url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
-                            enablePickFeatures: false
-                        });
-                        break;
-                    case EDefaultImagery.EsriWorldStreetMap:
-                        provider = new ArcGisMapServerImageryProvider({
-                            url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer",
-                            enablePickFeatures: false
-                        });
-                        break;
-                    case EDefaultImagery.EsriNationalGeographic:
-                        provider = new ArcGisMapServerImageryProvider({
-                            url: "https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/",
-                            enablePickFeatures: false
-                        });
-                        break;
-                    case EDefaultImagery.OpenStreetMap:
-                        provider = new OpenStreetMapImageryProvider({
-                            url: "https://a.tile.openstreetmap.org/"
-                        });
-                        break;
-                    case EDefaultImagery.StamenWaterColor:
-                        provider = new OpenStreetMapImageryProvider({
-                            url: "https://stamen-tiles.a.ssl.fastly.net/watercolor/"
-                        });
-                        break;
-                    case EDefaultImagery.StamenToner:
-                        provider = new OpenStreetMapImageryProvider({
-                            url: "https://stamen-tiles.a.ssl.fastly.net/toner/"
-                        });
-                        break;
-                    case EDefaultImagery.Grid:
-                        provider = new GridImageryProvider({
-                            tilingScheme: new GeographicTilingScheme(),
-                            cells: 0,
-                            color: Color.fromCssColorString("rgb(97, 151, 237)"),
-                            glowColor: Color.fromCssColorString("rgb(54, 54, 54)"),
-                            glowWidth: 4,
-                            backgroundColor: Color.TRANSPARENT,
-                            tileWidth: 256,
-                            tileHeight: 256,
-                            canvasSize: 256
-                        });
-                        break;
-                }
-                if (provider) {
-                    layer = new ImageryLayer(provider);
-                }
-            }
-            else if (tile.SourceUrl) {
-                var provider = null;
-                var min = tile.Minimum;
-                var max = tile.Maximum;
-                if (min != undefined && min <= -1) {
-                    min = undefined;
-                }
-                if (max != undefined && max <= -1) {
-                    max = undefined;
-                }
-                switch (tile.Type) {
-                    case "BruceImagery":
-                        provider = new UrlTemplateImageryProvider({
-                            url: tile.SourceUrl,
-                            tileHeight: 256,
-                            tileWidth: 256
-                        });
-                        break;
-                    case "ArcGisImagery":
-                        provider = new OpenStreetMapImageryProvider({
-                            url: tile.SourceUrl,
-                            fileExtension: tile.FileExtension,
-                            minimumLevel: min,
-                            maximumLevel: max
-                        });
-                        break;
-                    case "TileMapImagery":
-                        provider = new TileMapServiceImageryProvider({
-                            url: tile.SourceUrl,
-                            fileExtension: tile.FileExtension,
-                            minimumLevel: min,
-                            maximumLevel: max
-                        });
-                        break;
-                    case "OpenStreetMapImagery":
-                        provider = new OpenStreetMapImageryProvider({
-                            url: tile.SourceUrl,
-                            fileExtension: tile.FileExtension,
-                            minimumLevel: min,
-                            maximumLevel: max
-                        });
-                        break;
-                    case "MapBoxImagery":
-                        // TODO: Read default account key when missing.
-                        provider = new UrlTemplateImageryProvider({
-                            url: "https://api.mapbox.com/styles/v1/"
-                                + tile.MapBoxUsername + "/" + tile.MapBoxID +
-                                "/tiles/256/{z}/{x}/{y}?access_token="
-                                + tile.ProgramKey
-                        });
-                        break;
+        var V1;
+        (function (V1) {
+            function Render(params) {
+                var enabled = gatherEnabledImageries(params.viewer);
+                var tile = params.data;
+                var bId = createLegacyImageryId(tile);
+                var layer = enabled.find(function (x) { return x._bId == bId; });
+                if (layer) ;
+                else if (isLegacyImageryDefault(tile.Name)) {
+                    var defaultId = legacyMapIdToDefaultId(tile.Name);
+                    var provider = renderDefaultMapTile(defaultId);
+                    if (provider) {
+                        layer = new ImageryLayer(provider);
+                    }
                 }
-                if (provider) {
-                    layer = new ImageryLayer(provider);
+                else if (tile.SourceUrl) {
+                    var provider = null;
+                    var min = tile.Minimum;
+                    var max = tile.Maximum;
+                    if (min != undefined && min <= -1) {
+                        min = undefined;
+                    }
+                    if (max != undefined && max <= -1) {
+                        max = undefined;
+                    }
+                    switch (tile.Type) {
+                        case "BruceImagery":
+                            provider = new UrlTemplateImageryProvider({
+                                url: tile.SourceUrl,
+                                tileHeight: 256,
+                                tileWidth: 256
+                            });
+                            break;
+                        case "ArcGisImagery":
+                            provider = new OpenStreetMapImageryProvider({
+                                url: tile.SourceUrl,
+                                fileExtension: tile.FileExtension,
+                                minimumLevel: min,
+                                maximumLevel: max
+                            });
+                            break;
+                        case "TileMapImagery":
+                            provider = new TileMapServiceImageryProvider({
+                                url: tile.SourceUrl,
+                                fileExtension: tile.FileExtension,
+                                minimumLevel: min,
+                                maximumLevel: max
+                            });
+                            break;
+                        case "OpenStreetMapImagery":
+                            provider = new OpenStreetMapImageryProvider({
+                                url: tile.SourceUrl,
+                                fileExtension: tile.FileExtension,
+                                minimumLevel: min,
+                                maximumLevel: max
+                            });
+                            break;
+                        case "MapBoxImagery":
+                            // TODO: Read default account key when missing.
+                            provider = new UrlTemplateImageryProvider({
+                                url: "https://api.mapbox.com/styles/v1/"
+                                    + tile.MapBoxUsername + "/" + tile.MapBoxID +
+                                    "/tiles/256/{z}/{x}/{y}?access_token="
+                                    + tile.ProgramKey
+                            });
+                            break;
+                    }
+                    if (provider) {
+                        layer = new ImageryLayer(provider);
+                    }
                 }
-            }
-            if (layer) {
-                layer._bId = bId;
-                layer._bName = tile.Name;
-                if (!params.viewer.imageryLayers.contains(layer)) {
-                    params.viewer.imageryLayers.add(layer);
+                if (layer) {
+                    layer._bId = bId;
+                    layer._bName = tile.Name;
+                    if (!params.viewer.imageryLayers.contains(layer)) {
+                        params.viewer.imageryLayers.add(layer);
+                    }
                 }
+                return layer;
             }
-            return layer;
-        }
-        Map.RenderLegacy = RenderLegacy;
-        function RenderLegacyView(params) {
-            var _a, _b, _c, _d, _e;
-            return __awaiter(this, void 0, void 0, function () {
-                var api, view, bookmark, data, dataNames, i, source, tiles, i, name_1, j, tile, enabled, layers, _loop_1, i, i, tile, layer, i, layer;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
-                        case 0:
-                            api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
-                            return [4 /*yield*/, ProjectView.Get(api, params.viewId)];
-                        case 1:
-                            view = _f.sent();
-                            bookmark = null;
-                            if (!params.bookmarkId) return [3 /*break*/, 3];
-                            return [4 /*yield*/, ProjectViewBookmark.Get(api, params.viewId, params.bookmarkId)];
-                        case 2:
-                            bookmark = _f.sent();
-                            _f.label = 3;
-                        case 3:
-                            data = [];
-                            dataNames = [];
-                            if ((_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _a === void 0 ? void 0 : _a.imagery) {
-                                for (i = 0; i < bookmark.Settings.imagery.length; i++) {
-                                    source = bookmark.Settings.imagery[i];
-                                    dataNames.push(source.title);
+            V1.Render = Render;
+            function RenderView(params) {
+                var _a;
+                return __awaiter(this, void 0, void 0, function () {
+                    var api, view, bookmark, vSettings, bSettings, data, dataNames, i, source, tiles, i, name_1, j, tile, enabled, layers, _loop_1, i, i, tile, layer, i, layer;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                api = params.apiGetter.getApi();
+                                return [4 /*yield*/, ProjectView.Get(api, params.viewId)];
+                            case 1:
+                                view = _b.sent();
+                                bookmark = null;
+                                if (!params.bookmarkId) return [3 /*break*/, 3];
+                                return [4 /*yield*/, ProjectViewBookmark.Get(api, params.viewId, params.bookmarkId)];
+                            case 2:
+                                bookmark = (_b.sent());
+                                _b.label = 3;
+                            case 3:
+                                vSettings = view.Settings;
+                                bSettings = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings;
+                                data = [];
+                                dataNames = [];
+                                if (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) {
+                                    for (i = 0; i < bSettings.imagery.length; i++) {
+                                        source = bSettings.imagery[i];
+                                        dataNames.push(source.title);
+                                    }
                                 }
-                            }
-                            else if ((_b = view.Settings) === null || _b === void 0 ? void 0 : _b.DefaultMapTiles) {
-                                dataNames.push(view.Settings.DefaultMapTiles);
-                            }
-                            tiles = (_d = (_c = view.Settings) === null || _c === void 0 ? void 0 : _c.CesiumMapSources) !== null && _d !== void 0 ? _d : [];
-                            return [4 /*yield*/, ProjectViewTileSource.MergeMapTemplateData(params.apiGetter, tiles, ((_e = view.Settings) === null || _e === void 0 ? void 0 : _e.CesiumMapSources) == null)];
-                        case 4:
-                            _f.sent();
-                            for (i = 0; i < dataNames.length; i++) {
-                                name_1 = dataNames[i];
-                                for (j = 0; j < tiles.length; j++) {
-                                    tile = tiles[j];
-                                    if (CompareLegacyNames(tile.Name, name_1)) {
-                                        data.push(tile);
-                                        break;
+                                else if (vSettings === null || vSettings === void 0 ? void 0 : vSettings.DefaultMapTiles) {
+                                    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)];
+                            case 4:
+                                _b.sent();
+                                for (i = 0; i < dataNames.length; i++) {
+                                    name_1 = dataNames[i];
+                                    for (j = 0; j < tiles.length; j++) {
+                                        tile = tiles[j];
+                                        if (CompareLegacyNames(tile.Name, name_1)) {
+                                            data.push(tile);
+                                            break;
+                                        }
                                     }
                                 }
-                            }
-                            enabled = gatherEnabledImageries(params.viewer);
-                            layers = [];
-                            // Gather layers we want to render.
-                            // Any new layer is added to viewer at the bottom.
-                            if (params.ignoreIds) {
-                                _loop_1 = function (i) {
-                                    var id = params.ignoreIds[i];
-                                    var layer = enabled.find(function (x) {
-                                        var layer = x;
-                                        if (layer._bId === id) {
-                                            return true;
+                                enabled = gatherEnabledImageries(params.viewer);
+                                layers = [];
+                                // Gather layers we want to render.
+                                // Any new layer is added to viewer at the bottom.
+                                if (params.ignoreIds) {
+                                    _loop_1 = function (i) {
+                                        var id = params.ignoreIds[i];
+                                        var layer = enabled.find(function (x) {
+                                            var layer = x;
+                                            if (layer._bId === id) {
+                                                return true;
+                                            }
+                                        });
+                                        if (layer) {
+                                            layers.push(layer);
                                         }
+                                    };
+                                    for (i = 0; i < params.ignoreIds.length; i++) {
+                                        _loop_1(i);
+                                    }
+                                }
+                                for (i = 0; i < data.length; i++) {
+                                    tile = data[i];
+                                    layer = Render({
+                                        apiGetter: params.apiGetter,
+                                        viewer: params.viewer,
+                                        data: tile,
                                     });
                                     if (layer) {
                                         layers.push(layer);
                                     }
-                                };
-                                for (i = 0; i < params.ignoreIds.length; i++) {
-                                    _loop_1(i);
                                 }
-                            }
-                            for (i = 0; i < data.length; i++) {
-                                tile = data[i];
-                                layer = RenderLegacy({
-                                    apiGetter: params.apiGetter,
-                                    viewer: params.viewer,
-                                    data: tile,
+                                // Sort currently enabled (after new ones added) to match desired order.
+                                enabled = gatherEnabledImageries(params.viewer);
+                                enabled.sort(function (a, b) {
+                                    var indexA = layers.indexOf(a);
+                                    var indexB = layers.indexOf(b);
+                                    if (indexA < 0 && indexB < 0) {
+                                        return 0;
+                                    }
+                                    if (indexA < 0) {
+                                        return 1;
+                                    }
+                                    if (indexB < 0) {
+                                        return -1;
+                                    }
+                                    return indexA - indexB;
                                 });
-                                if (layer) {
-                                    layers.push(layer);
+                                // Move enabled layers to match desired order.
+                                // Remove any layers that aren't in enabled list.
+                                for (i = 0; i < enabled.length; i++) {
+                                    layer = enabled[i];
+                                    if (layers.includes(layer)) {
+                                        params.viewer.imageryLayers.raiseToTop(layer);
+                                    }
+                                    else {
+                                        params.viewer.imageryLayers.remove(layer);
+                                    }
                                 }
-                            }
-                            // Sort currently enabled (after new ones added) to match desired order.
-                            enabled = gatherEnabledImageries(params.viewer);
-                            enabled.sort(function (a, b) {
-                                var indexA = layers.indexOf(a);
-                                var indexB = layers.indexOf(b);
-                                if (indexA < 0 && indexB < 0) {
-                                    return 0;
+                                return [2 /*return*/];
+                        }
+                    });
+                });
+            }
+            V1.RenderView = RenderView;
+        })(V1 = Map.V1 || (Map.V1 = {}));
+        var V2;
+        (function (V2) {
+            function GetOrCreateLayer(viewer, apiGetter, meta) {
+                return __awaiter(this, void 0, void 0, function () {
+                    var defaultImg, provider, api, tileset, settings, layer;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                defaultImg = meta.accountId ? null : ProjectViewTile.DefaultImagery.find(function (x) { return x.id === meta.tilesetId; });
+                                provider = null;
+                                if (!defaultImg) return [3 /*break*/, 1];
+                                provider = renderDefaultMapTile(defaultImg.id);
+                                return [3 /*break*/, 3];
+                            case 1:
+                                api = apiGetter.getApi(meta.accountId);
+                                return [4 /*yield*/, Tileset.Get(api, meta.tilesetId)];
+                            case 2:
+                                tileset = _a.sent();
+                                if (tileset.type === Tileset.EType.GeoMap) {
+                                    provider = new TileMapServiceImageryProvider({
+                                        url: Tileset.GetPublicFileUrl(api, meta.tilesetId, ""),
+                                        fileExtension: ".png"
+                                    });
                                 }
-                                if (indexA < 0) {
-                                    return 1;
+                                else if (tileset.type === Tileset.EType.ExternalGeoMap) {
+                                    settings = tileset.settings;
+                                    switch (settings.mapType) {
+                                        case TilesetExtMapTiles.EType.CesiumIon:
+                                            provider = new IonImageryProvider({
+                                                assetId: settings.ionId,
+                                                // TODO
+                                                accessToken: null
+                                            });
+                                            break;
+                                        case TilesetExtMapTiles.EType.MapBoxImagery:
+                                            // TODO: Read default account key when missing.
+                                            provider = new UrlTemplateImageryProvider({
+                                                url: "https://api.mapbox.com/styles/v1/"
+                                                    + settings.mapBoxAccount + "/" + settings.mapBoxStyleId +
+                                                    "/tiles/256/{z}/{x}/{y}?access_token="
+                                                    + settings.mapBoxKey
+                                            });
+                                            break;
+                                        case TilesetExtMapTiles.EType.OpenStreetMapImagery:
+                                            provider = new OpenStreetMapImageryProvider({
+                                                url: settings.url,
+                                                fileExtension: settings.sourceExt
+                                            });
+                                            break;
+                                        case TilesetExtMapTiles.EType.TileMapImagery:
+                                            provider = new TileMapServiceImageryProvider({
+                                                url: settings.url,
+                                                fileExtension: settings.sourceExt
+                                            });
+                                            break;
+                                    }
                                 }
-                                if (indexB < 0) {
-                                    return -1;
+                                else if (tileset.type === Tileset.EType.EntitiesMap) {
+                                    provider = new UrlTemplateImageryProvider({
+                                        url: Tileset.GetPublicFileUrl(api, meta.tilesetId, "{z}/{x}/{y}.png"),
+                                        tileHeight: 256,
+                                        tileWidth: 256
+                                    });
                                 }
-                                return indexA - indexB;
-                            });
-                            // Move enabled layers to match desired order.
-                            // Remove any layers that aren't in enabled list.
-                            enabled = enabled.reverse();
-                            for (i = 0; i < enabled.length; i++) {
-                                layer = enabled[i];
-                                if (layers.includes(layer)) {
-                                    params.viewer.imageryLayers.raiseToTop(layer);
+                                _a.label = 3;
+                            case 3:
+                                if (provider) {
+                                    layer = viewer.imageryLayers.addImageryProvider(provider);
+                                    layer._bMeta = meta;
+                                    return [2 /*return*/, layer];
                                 }
-                                else {
-                                    params.viewer.imageryLayers.remove(layer);
+                                return [2 /*return*/, null];
+                        }
+                    });
+                });
+            }
+            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;
+                    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)];
+                            case 2:
+                                _a.sent();
+                                _a.label = 3;
+                            case 3:
+                                i++;
+                                return [3 /*break*/, 1];
+                            case 4:
+                                curEnabled = params.viewer.imageryLayers;
+                                toDisable = [];
+                                curEnabledArr = [];
+                                _loop_3 = 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); });
+                                    if (disable) {
+                                        toDisable.push(layer);
+                                    }
+                                    else {
+                                        curEnabledArr.push(layer);
+                                    }
+                                };
+                                for (i = 0; i < curEnabled.length; i++) {
+                                    _loop_3(i);
                                 }
-                            }
-                            return [2 /*return*/];
-                    }
+                                for (i = 0; i < toDisable.length; i++) {
+                                    params.viewer.imageryLayers.remove(toDisable[i]);
+                                }
+                                _loop_4 = function (i) {
+                                    var enabled = params.enabled[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);
+                                        layer.alpha = Number(enabled.alpha);
+                                        layer.brightness = Number(enabled.brightness);
+                                        layer.contrast = Number(enabled.contrast);
+                                        layer.hue = Number(enabled.hue);
+                                        layer.saturation = Number(enabled.saturation);
+                                        layer.gamma = Number(enabled.gamma);
+                                    }
+                                };
+                                for (i = 0; i < params.enabled.length; i++) {
+                                    _loop_4(i);
+                                }
+                                return [2 /*return*/];
+                        }
+                    });
                 });
-            });
-        }
-        Map.RenderLegacyView = RenderLegacyView;
+            }
+            V2.Render = Render;
+        })(V2 = Map.V2 || (Map.V2 = {}));
     })(Map = TileRenderEngine.Map || (TileRenderEngine.Map = {}));
     var Terrain;
     (function (Terrain) {
-        function Render(params) {
-            throw ("Not implemented");
-        }
-        Terrain.Render = Render;
-        function RenderLegacy(params) {
-            var _a;
-            var bId = createTerrainBId(params.data);
-            var curProvider = params.viewer.terrainProvider;
-            if (curProvider._bId && curProvider._bId === bId) {
-                return;
-            }
-            var provider = null;
-            if (isDefaultTerrain(params.data.Name)) {
-                var name_2 = prepLegacyName(params.data.Name);
-                switch (name_2) {
-                    case EDefaultTerrain.CesiumWorldTerrain:
-                        provider = createWorldTerrain({
-                            requestVertexNormals: true
-                        });
-                        break;
-                    case EDefaultTerrain.Linz:
-                        provider = new CesiumTerrainProvider({
-                            url: "https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-dem",
-                            requestVertexNormals: true
-                        });
-                        break;
-                    case EDefaultTerrain.FlatTerrain:
-                        provider = new EllipsoidTerrainProvider();
-                        break;
+        var V1;
+        (function (V1) {
+            function Render(params) {
+                var _a;
+                var bId = createLegacyTerrId(params.data);
+                var curProvider = params.viewer.terrainProvider;
+                if (curProvider._bId && curProvider._bId === bId) {
+                    return;
+                }
+                var provider = null;
+                if (isLegacyTerrainDefault(params.data.Name)) {
+                    var id = legacyTerrIdToDefaultId(params.data.Name);
+                    provider = renderDefaultTerrTile(id);
+                }
+                else if (params.data.SourceUrl) {
+                    provider = new CesiumTerrainProvider({
+                        url: params.data.SourceUrl,
+                        requestWaterMask: params.data.RequestWaterMask,
+                        requestVertexNormals: true
+                    });
+                }
+                if (provider) {
+                    provider._bId = bId;
+                    provider._bName = (_a = params.data) === null || _a === void 0 ? void 0 : _a.Name;
+                    params.viewer.terrainProvider = provider;
                 }
             }
-            else if (params.data.SourceUrl) {
-                provider = new CesiumTerrainProvider({
-                    url: params.data.SourceUrl,
-                    requestWaterMask: params.data.RequestWaterMask,
-                    requestVertexNormals: true
+            V1.Render = Render;
+            function RenderView(params) {
+                var _a, _b;
+                return __awaiter(this, void 0, void 0, function () {
+                    var api, view, bookmark, vSettings, bSettings, terrainTiles, terrainTile, terrainTileName, i, tile;
+                    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 = _c.sent();
+                                bookmark = null;
+                                if (!params.bookmarkId) return [3 /*break*/, 3];
+                                return [4 /*yield*/, ProjectViewBookmark.Get(api, params.viewId, params.bookmarkId)];
+                            case 2:
+                                bookmark = (_c.sent());
+                                _c.label = 3;
+                            case 3:
+                                vSettings = view.Settings;
+                                bSettings = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings;
+                                terrainTiles = (_a = vSettings === null || vSettings === void 0 ? void 0 : vSettings.CesiumTerrainSources) !== null && _a !== void 0 ? _a : [];
+                                terrainTile = null;
+                                terrainTileName = null;
+                                if ((_b = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _b === void 0 ? void 0 : _b.terrain) {
+                                    terrainTileName = bSettings.terrain;
+                                }
+                                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)];
+                            case 4:
+                                _c.sent();
+                                for (i = 0; i < terrainTiles.length; i++) {
+                                    tile = terrainTiles[i];
+                                    if (TileRenderEngine.CompareLegacyNames(tile.Name, terrainTileName)) {
+                                        terrainTile = tile;
+                                        break;
+                                    }
+                                }
+                                if (terrainTile) {
+                                    Render({
+                                        data: terrainTile,
+                                        viewer: params.viewer,
+                                    });
+                                }
+                                return [2 /*return*/];
+                        }
+                    });
                 });
             }
-            if (provider) {
-                provider._bId = bId;
-                provider._bName = (_a = params.data) === null || _a === void 0 ? void 0 : _a.Name;
-                params.viewer.terrainProvider = provider;
-            }
-        }
-        Terrain.RenderLegacy = RenderLegacy;
-        function RenderLegacyView(params) {
-            var _a, _b, _c, _d, _e;
-            return __awaiter(this, void 0, void 0, function () {
-                var api, view, bookmark, terrainTiles, terrainTile, terrainTileName, i, tile;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
-                        case 0:
-                            api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
-                            return [4 /*yield*/, ProjectView.Get(api, params.viewId)];
-                        case 1:
-                            view = _f.sent();
-                            bookmark = null;
-                            if (!params.bookmarkId) return [3 /*break*/, 3];
-                            return [4 /*yield*/, ProjectViewBookmark.Get(api, params.viewId, params.bookmarkId)];
-                        case 2:
-                            bookmark = _f.sent();
-                            _f.label = 3;
-                        case 3:
-                            terrainTiles = (_b = (_a = view.Settings) === null || _a === void 0 ? void 0 : _a.CesiumTerrainSources) !== null && _b !== void 0 ? _b : [];
-                            terrainTile = null;
-                            terrainTileName = null;
-                            if ((_c = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _c === void 0 ? void 0 : _c.terrain) {
-                                terrainTileName = bookmark.Settings.terrain;
-                            }
-                            else {
-                                terrainTileName = (_d = view.Settings) === null || _d === void 0 ? void 0 : _d.DefaultTerrain;
-                            }
-                            return [4 /*yield*/, ProjectViewTileSource.MergeTerrainTemplateData(params.apiGetter, terrainTiles, ((_e = view.Settings) === null || _e === void 0 ? void 0 : _e.CesiumTerrainSources) == null)];
-                        case 4:
-                            _f.sent();
-                            for (i = 0; i < terrainTiles.length; i++) {
-                                tile = terrainTiles[i];
-                                if (TileRenderEngine.CompareLegacyNames(tile.Name, terrainTileName)) {
-                                    terrainTile = tile;
-                                    break;
+            V1.RenderView = RenderView;
+        })(V1 = Terrain.V1 || (Terrain.V1 = {}));
+        var V2;
+        (function (V2) {
+            function Render(params) {
+                var _a;
+                return __awaiter(this, void 0, void 0, function () {
+                    var enabledMeta, defaultTerr, provider, api, tileset, url, vertexes, settings;
+                    return __generator(this, function (_b) {
+                        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) {
+                                    return [2 /*return*/];
                                 }
-                            }
-                            if (terrainTile) {
-                                TileRenderEngine.Terrain.RenderLegacy({
-                                    data: terrainTile,
-                                    viewer: params.viewer,
-                                });
-                            }
-                            return [2 /*return*/];
-                    }
+                                defaultTerr = params.source.accountId ? null : ProjectViewTile.DefaultTerrains.find(function (x) { return x.id === params.source.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)];
+                            case 2:
+                                tileset = _b.sent();
+                                url = void 0;
+                                vertexes = true;
+                                if (tileset.type === Tileset.EType.Terrain) {
+                                    url = Tileset.GetPublicFileUrl(api, tileset.id, "");
+                                }
+                                else if (tileset.type === Tileset.EType.ExternalTerrain) {
+                                    settings = tileset.settings;
+                                    url = settings.url;
+                                    vertexes = settings.requestVertexNormals == null ? true : settings.requestVertexNormals;
+                                }
+                                else {
+                                    console.error("Invalid tileset type.", tileset);
+                                }
+                                if (url) {
+                                    provider = new CesiumTerrainProvider({
+                                        url: url,
+                                        requestVertexNormals: vertexes
+                                    });
+                                }
+                                _b.label = 3;
+                            case 3:
+                                if (provider) {
+                                    provider._bMeta = {
+                                        accountId: params.source.accountId,
+                                        tilesetId: params.source.tilesetId
+                                    };
+                                    params.viewer.terrainProvider = provider;
+                                }
+                                return [2 /*return*/];
+                        }
+                    });
                 });
-            });
-        }
-        Terrain.RenderLegacyView = RenderLegacyView;
+            }
+            V2.Render = Render;
+        })(V2 = Terrain.V2 || (Terrain.V2 = {}));
     })(Terrain = TileRenderEngine.Terrain || (TileRenderEngine.Terrain = {}));
 })(TileRenderEngine || (TileRenderEngine = {}));
 
-var ViewRenderEngine;
-(function (ViewRenderEngine) {
-    function Render(params) {
-        var _a, _b, _c, _d, _e;
-        return __awaiter(this, void 0, void 0, function () {
-            var api, view, bookmark, frustum, scene, curFrustum, camera, pos, go, enabledItems, newItemIds, _i, enabledItems_1, id;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        api = params.apiGetter.getApi(params.apiGetter.accountId, params.apiGetter.env);
-                        return [4 /*yield*/, ProjectView.Get(api, params.viewId)];
-                    case 1:
-                        view = _f.sent();
-                        bookmark = null;
-                        if (!params.bookmarkId) return [3 /*break*/, 3];
-                        return [4 /*yield*/, ProjectViewBookmark.Get(api, params.viewId, params.bookmarkId)];
-                    case 2:
-                        bookmark = _f.sent();
-                        _f.label = 3;
-                    case 3: return [4 /*yield*/, TileRenderEngine.Terrain.RenderLegacyView({
+function renderV1(params, bookmark, view) {
+    var _a, _b;
+    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) {
+                case 0:
+                    vSettings = view.Settings;
+                    bSettings = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings;
+                    return [4 /*yield*/, TileRenderEngine.Terrain.V1.RenderView({
                             apiGetter: params.apiGetter,
                             bookmarkId: params.bookmarkId,
                             viewer: params.manager.Viewer,
                             viewId: params.viewId,
                         })];
-                    case 4:
-                        _f.sent();
-                        return [4 /*yield*/, TileRenderEngine.Map.RenderLegacyView({
-                                apiGetter: params.apiGetter,
-                                bookmarkId: params.bookmarkId,
-                                viewer: params.manager.Viewer,
-                                viewId: params.viewId,
-                                ignoreIds: []
-                            })];
-                    case 5:
-                        _f.sent();
-                        frustum = (_a = bookmark.Settings) === null || _a === void 0 ? void 0 : _a.cameraFrustum;
-                        if (frustum == null) {
-                            frustum = Camera.EFrustum.Perspective;
+                case 1:
+                    _c.sent();
+                    return [4 /*yield*/, TileRenderEngine.Map.V1.RenderView({
+                            apiGetter: params.apiGetter,
+                            bookmarkId: params.bookmarkId,
+                            viewer: params.manager.Viewer,
+                            viewId: params.viewId,
+                            ignoreIds: []
+                        })];
+                case 2:
+                    _c.sent();
+                    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) {
+                            scene.camera.switchToPerspectiveFrustum();
+                            scene.screenSpaceCameraController.enableTilt = true;
                         }
-                        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) {
-                                scene.camera.switchToPerspectiveFrustum();
-                                scene.screenSpaceCameraController.enableTilt = true;
-                            }
-                            else {
-                                scene.camera.switchToOrthographicFrustum();
-                                scene.screenSpaceCameraController.enableTilt = false;
-                            }
-                            params.skipTransition = true;
+                        else {
+                            scene.camera.switchToOrthographicFrustum();
+                            scene.screenSpaceCameraController.enableTilt = false;
+                        }
+                        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
+                    });
+                    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;
+                    }
+                    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);
+                        }
+                    }
+                    if (!params.bookmarkId) return [3 /*break*/, 4];
+                    return [4 /*yield*/, RenderHelper.RenderBookmarkItems({
+                            apiGetter: params.apiGetter,
+                            manager: params.manager,
+                        }, params.viewId, params.bookmarkId)];
+                case 3:
+                    _c.sent();
+                    _c.label = 4;
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function renderV2(params, bookmark, view) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    return __awaiter(this, void 0, void 0, function () {
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, terrain, source, imagery, iSources, curEnabled, newItemIds, _i, curEnabled_1, id;
+        return __generator(this, function (_p) {
+            switch (_p.label) {
+                case 0:
+                    viewer = params.manager.Viewer;
+                    scene = viewer.scene;
+                    vSettings = view.Settings;
+                    bSettings = ((_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) !== null && _a !== void 0 ? _a : {});
+                    defaults = (_b = vSettings.defaults) !== null && _b !== void 0 ? _b : {};
+                    camera = ((_c = bookmark.Camera) !== null && _c !== void 0 ? _c : {});
+                    newLens = camera.cameraFrustum;
+                    if (newLens == null) {
+                        newLens = (_d = defaults.camera) === null || _d === void 0 ? void 0 : _d.cameraFrustum;
+                    }
+                    if (newLens == null) {
+                        // TODO: Need global default.
+                        newLens = Camera.EFrustum.Perspective;
+                    }
+                    curLens = scene.camera.frustum instanceof OrthographicFrustum ?
+                        Camera.EFrustum.Orthographic :
+                        Camera.EFrustum.Perspective;
+                    if (newLens != curLens) {
+                        if (newLens == Camera.EFrustum.Perspective) {
+                            scene.camera.switchToPerspectiveFrustum();
+                            scene.screenSpaceCameraController.enableTilt = true;
                         }
-                        camera = bookmark.Camera;
-                        pos = Cartesian3.fromDegrees(+camera.position.longitude, +camera.position.latitude, +camera.position.height);
-                        params.manager.Viewer.scene.camera.flyTo({
+                        else {
+                            scene.camera.switchToOrthographicFrustum();
+                            scene.screenSpaceCameraController.enableTilt = false;
+                        }
+                    }
+                    transition = params.skipTransition ? 0 : curLens === newLens ? camera.transition : 0;
+                    if (transition == null) {
+                        transition = (_e = defaults.camera) === null || _e === void 0 ? void 0 : _e.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: +camera.heading,
                                 pitch: +camera.pitch,
                                 roll: +camera.roll
                             },
-                            duration: params.skipTransition ? 0 : 2
+                            duration: transition != 0 ? transition / 1000 : 0
                         });
-                        go = (_b = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _b === void 0 ? void 0 : _b.groundOcclusion;
-                        if (go == null) {
-                            go = (_c = view.Settings) === null || _c === void 0 ? void 0 : _c.GroundOcclusion;
-                        }
-                        if (go == null) {
-                            go = false;
-                        }
-                        params.manager.Viewer.scene.globe.depthTestAgainstTerrain = go;
-                        enabledItems = params.manager.GetEnabledItemIds();
-                        newItemIds = (_e = (_d = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _d === void 0 ? void 0 : _d.selectedItemIds) !== null && _e !== void 0 ? _e : [];
-                        for (_i = 0, enabledItems_1 = enabledItems; _i < enabledItems_1.length; _i++) {
-                            id = enabledItems_1[_i];
-                            if (newItemIds.indexOf(id) === -1) {
-                                params.manager.RemoveItemById(id);
+                    }
+                    gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
+                    if (gOcclusion == null) {
+                        gOcclusion = (_f = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _f === void 0 ? void 0 : _f.groundOcclusion;
+                    }
+                    if (gOcclusion == null) {
+                        // TODO: Need global default.
+                        gOcclusion = true;
+                    }
+                    scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
+                    terrain = (_g = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) !== null && _g !== void 0 ? _g : (_h = defaults.settings) === null || _h === void 0 ? void 0 : _h.terrain;
+                    if (!terrain) return [3 /*break*/, 2];
+                    source = (_j = vSettings.terrains) === null || _j === void 0 ? void 0 : _j.find(function (x) { return x.accountId === terrain.accountId && x.tilesetId === terrain.tilesetId; });
+                    if (!source) return [3 /*break*/, 2];
+                    return [4 /*yield*/, TileRenderEngine.Terrain.V2.Render({
+                            apiGetter: params.apiGetter,
+                            enabled: terrain,
+                            source: source,
+                            viewer: params.manager.Viewer,
+                        })];
+                case 1:
+                    _p.sent();
+                    _p.label = 2;
+                case 2:
+                    imagery = (_k = bSettings.imagery) !== null && _k !== void 0 ? _k : (_l = defaults.settings) === null || _l === void 0 ? void 0 : _l.imagery;
+                    if (imagery == null) {
+                        // TODO: Need global default.
+                        imagery = [
+                            {
+                                accountId: null,
+                                tilesetId: ProjectViewTile.EDefaultImagery.MapboxSatellite,
+                                alpha: 1,
+                                brightness: 1,
+                                contrast: 1,
+                                gamma: 1,
+                                hue: 0,
+                                saturation: 1
                             }
+                        ];
+                    }
+                    iSources = (_m = vSettings.imageries) === null || _m === void 0 ? void 0 : _m.filter(function (x) {
+                        return imagery.find(function (y) {
+                            y.accountId === x.accountId && y.tilesetId === x.tilesetId;
+                        });
+                    });
+                    return [4 /*yield*/, TileRenderEngine.Map.V2.Render({
+                            apiGetter: params.apiGetter,
+                            enabled: imagery,
+                            sources: iSources,
+                            viewer: params.manager.Viewer,
+                        })];
+                case 3:
+                    _p.sent();
+                    curEnabled = params.manager.GetEnabledItemIds();
+                    newItemIds = (_o = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _o !== void 0 ? _o : [];
+                    _i = 0, curEnabled_1 = curEnabled;
+                    _p.label = 4;
+                case 4:
+                    if (!(_i < curEnabled_1.length)) return [3 /*break*/, 7];
+                    id = curEnabled_1[_i];
+                    if (!(newItemIds.indexOf(id) === -1)) return [3 /*break*/, 6];
+                    return [4 /*yield*/, params.manager.RemoveItemById(id)];
+                case 5:
+                    _p.sent();
+                    _p.label = 6;
+                case 6:
+                    _i++;
+                    return [3 /*break*/, 4];
+                case 7:
+                    if (!params.bookmarkId) return [3 /*break*/, 9];
+                    return [4 /*yield*/, RenderHelper.RenderBookmarkItems({
+                            apiGetter: params.apiGetter,
+                            manager: params.manager,
+                        }, params.viewId, params.bookmarkId)];
+                case 8:
+                    _p.sent();
+                    _p.label = 9;
+                case 9: return [2 /*return*/];
+            }
+        });
+    });
+}
+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) {
+                    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)];
+                    case 2:
+                        bookmark = _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        if (bookmark && view.DataVersion != bookmark.DataVersion) {
+                            throw new Error("View and bookmark settings version mismatch.");
                         }
-                        if (!params.bookmarkId) return [3 /*break*/, 7];
-                        return [4 /*yield*/, RenderHelper.RenderBookmarkItems({
-                                apiGetter: params.apiGetter,
-                                manager: params.manager,
-                            }, params.viewId, params.bookmarkId)];
+                        version = view.DataVersion;
+                        if (!(version === 2)) return [3 /*break*/, 5];
+                        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:
-                        _f.sent();
-                        _f.label = 7;
+                        _a.sent();
+                        _a.label = 7;
                     case 7: return [2 /*return*/];
                 }
             });