bruce-cesium 0.1.3 → 0.1.5

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, EntityFilterGetter, BatchedDataGetter, ObjectUtils, Tileset, MenuItem, ProjectView, ProjectViewBookmark } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, Cartesian3, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic } from 'cesium';
+import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, EntityFilterGetter, BatchedDataGetter, ObjectUtils, Tileset, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTileSource, Camera } from 'bruce-models';
+import { Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, OrthographicFrustum, Matrix4, Cesium3DTileset, EllipsoidGeodesic } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -3132,13 +3132,21 @@ function prepLegacyName(name) {
     name = name.replace(/" "/g, "");
     name = name.replace(re, "");
     name = name.toLowerCase();
+    if (name === "cwt") {
+        name = "cesiumworldterrain";
+    }
     return name;
 }
+var EDefaultTerrain;
+(function (EDefaultTerrain) {
+    EDefaultTerrain["CesiumWorldTerrain"] = "cesiumworldterrain";
+    EDefaultTerrain["Linz"] = "linz";
+    EDefaultTerrain["FlatTerrain"] = "flatterrain";
+})(EDefaultTerrain || (EDefaultTerrain = {}));
 var DEFAULT_TERRAIN_NAMES = [
-    "cesiumworldterrain",
-    "linz",
-    "flatterrain",
-    "grid"
+    EDefaultTerrain.CesiumWorldTerrain,
+    EDefaultTerrain.Linz,
+    EDefaultTerrain.FlatTerrain
 ];
 function isDefaultTerrain(name) {
     name = prepLegacyName(name);
@@ -3168,20 +3176,36 @@ 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 = [
-    "bingmapsaerial",
-    "bingmapsaerialwithlabels",
-    "bingmapsroads",
-    "mapboxsatellite",
-    "mapboxstreets",
-    "mapboxstreetsclassic",
-    "esriworldimagery",
-    "esriworldstreetmap",
-    "esrinationalgeographic",
-    "openstreetmap",
-    "stamenwatercolor",
-    "stamentoner",
-    "grid"
+    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);
@@ -3233,7 +3257,7 @@ var TileRenderEngine;
                 // TODO: Rest of defaults.
                 // TODO: Should be enum.
                 switch (prepLegacyName(tile.Name)) {
-                    case "bingmapsaerial":
+                    case EDefaultImagery.BingMapsAerial:
                         // TODO: Read account key if available.
                         provider = new BingMapsImageryProvider({
                             url: "https://dev.virtualearth.net",
@@ -3241,18 +3265,89 @@ var TileRenderEngine;
                             key: DEFAULT_BING_KEY
                         });
                         break;
-                    case "mapboxsatellite":
+                    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 "openstreetmap":
+                    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);
@@ -3268,7 +3363,6 @@ var TileRenderEngine;
                 if (max != undefined && max <= -1) {
                     max = undefined;
                 }
-                // TODO: Should be enum.
                 switch (tile.Type) {
                     case "BruceImagery":
                         provider = new UrlTemplateImageryProvider({
@@ -3324,20 +3418,20 @@ var TileRenderEngine;
             return layer;
         }
         function RenderLegacyView(params) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             return __awaiter(this, void 0, void 0, function () {
                 var 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 (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0: return [4 /*yield*/, ProjectView.Get(params.api, params.viewId)];
                         case 1:
-                            view = _e.sent();
+                            view = _f.sent();
                             bookmark = null;
                             if (!params.bookmarkId) return [3 /*break*/, 3];
                             return [4 /*yield*/, ProjectViewBookmark.Get(params.api, params.viewId, params.bookmarkId)];
                         case 2:
-                            bookmark = _e.sent();
-                            _e.label = 3;
+                            bookmark = _f.sent();
+                            _f.label = 3;
                         case 3:
                             data = [];
                             dataNames = [];
@@ -3351,6 +3445,9 @@ var TileRenderEngine;
                                 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(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++) {
@@ -3444,19 +3541,18 @@ var TileRenderEngine;
             if (isDefaultTerrain(params.data.Name)) {
                 var name_2 = prepLegacyName(params.data.Name);
                 switch (name_2) {
-                    // TODO: Should be enum.
-                    case "cesiumworldterrain":
+                    case EDefaultTerrain.CesiumWorldTerrain:
                         provider = createWorldTerrain({
                             requestVertexNormals: true
                         });
                         break;
-                    case "linz":
+                    case EDefaultTerrain.Linz:
                         provider = new CesiumTerrainProvider({
                             url: "https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-dem",
                             requestVertexNormals: true
                         });
                         break;
-                    case "flatterrain":
+                    case EDefaultTerrain.FlatTerrain:
                         provider = new EllipsoidTerrainProvider();
                         break;
                 }
@@ -3480,45 +3576,38 @@ var TileRenderEngine;
 var ViewRenderEngine;
 (function (ViewRenderEngine) {
     function Render(params) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return __awaiter(this, void 0, void 0, function () {
-            var view, bookmark, terrainTile, terrainTileName, i, tile, camera, pos, go, enabledItems, newItemIds, _i, enabledItems_1, id;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
-                    case 0: return [4 /*yield*/, TileRenderEngine.Map.RenderLegacyView({
-                            api: params.api,
-                            bookmarkId: params.bookmarkId,
-                            viewer: params.manager.Viewer,
-                            viewId: params.viewId,
-                            ignoreIds: []
-                        })];
+            var view, bookmark, terrainTiles, terrainTile, terrainTileName, i, tile, frustum, scene, curFrustum, camera, pos, go, enabledItems, newItemIds, _i, enabledItems_1, id;
+            return __generator(this, function (_l) {
+                switch (_l.label) {
+                    case 0: return [4 /*yield*/, ProjectView.Get(params.api, params.viewId)];
                     case 1:
-                        _h.sent();
-                        return [4 /*yield*/, ProjectView.Get(params.api, params.viewId)];
-                    case 2:
-                        view = _h.sent();
+                        view = _l.sent();
                         bookmark = null;
-                        if (!params.bookmarkId) return [3 /*break*/, 4];
+                        if (!params.bookmarkId) return [3 /*break*/, 3];
                         return [4 /*yield*/, ProjectViewBookmark.Get(params.api, params.viewId, params.bookmarkId)];
+                    case 2:
+                        bookmark = _l.sent();
+                        _l.label = 3;
                     case 3:
-                        bookmark = _h.sent();
-                        _h.label = 4;
-                    case 4:
+                        terrainTiles = (_b = (_a = view.Settings) === null || _a === void 0 ? void 0 : _a.CesiumTerrainSources) !== null && _b !== void 0 ? _b : [];
                         terrainTile = null;
                         terrainTileName = null;
-                        if ((_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _a === void 0 ? void 0 : _a.terrain) {
+                        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 = (_b = view.Settings) === null || _b === void 0 ? void 0 : _b.DefaultTerrain;
+                            terrainTileName = (_d = view.Settings) === null || _d === void 0 ? void 0 : _d.DefaultTerrain;
                         }
-                        if ((_c = view.Settings) === null || _c === void 0 ? void 0 : _c.CesiumTerrainSources) {
-                            for (i = 0; i < view.Settings.CesiumTerrainSources.length; i++) {
-                                tile = view.Settings.CesiumTerrainSources[i];
-                                if (TileRenderEngine.CompareLegacyNames(tile.Name, terrainTileName)) {
-                                    terrainTile = tile;
-                                    break;
-                                }
+                        return [4 /*yield*/, ProjectViewTileSource.MergeTerrainTemplateData(terrainTiles, ((_e = view.Settings) === null || _e === void 0 ? void 0 : _e.CesiumTerrainSources) == null)];
+                    case 4:
+                        _l.sent();
+                        for (i = 0; i < terrainTiles.length; i++) {
+                            tile = terrainTiles[i];
+                            if (TileRenderEngine.CompareLegacyNames(tile.Name, terrainTileName)) {
+                                terrainTile = tile;
+                                break;
                             }
                         }
                         if (terrainTile) {
@@ -3527,6 +3616,32 @@ var ViewRenderEngine;
                                 viewer: params.manager.Viewer,
                             });
                         }
+                        return [4 /*yield*/, TileRenderEngine.Map.RenderLegacyView({
+                                api: params.api,
+                                bookmarkId: params.bookmarkId,
+                                viewer: params.manager.Viewer,
+                                viewId: params.viewId,
+                                ignoreIds: []
+                            })];
+                    case 5:
+                        _l.sent();
+                        frustum = (_f = bookmark.Settings) === null || _f === void 0 ? void 0 : _f.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;
+                            }
+                            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({
@@ -3538,32 +3653,32 @@ var ViewRenderEngine;
                             },
                             duration: params.skipTransition ? 0 : 2
                         });
-                        go = (_d = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _d === void 0 ? void 0 : _d.groundOcclusion;
+                        go = (_g = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _g === void 0 ? void 0 : _g.groundOcclusion;
                         if (go == null) {
-                            go = (_e = view.Settings) === null || _e === void 0 ? void 0 : _e.GroundOcclusion;
+                            go = (_h = view.Settings) === null || _h === void 0 ? void 0 : _h.GroundOcclusion;
                         }
                         if (go == null) {
                             go = false;
                         }
                         params.manager.Viewer.scene.globe.depthTestAgainstTerrain = go;
                         enabledItems = params.manager.GetEnabledItemIds();
-                        newItemIds = (_g = (_f = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _f === void 0 ? void 0 : _f.selectedItemIds) !== null && _g !== void 0 ? _g : [];
+                        newItemIds = (_k = (_j = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _j === void 0 ? void 0 : _j.selectedItemIds) !== null && _k !== void 0 ? _k : [];
                         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*/, 6];
+                        if (!params.bookmarkId) return [3 /*break*/, 7];
                         return [4 /*yield*/, RenderHelper.RenderBookmarkItems({
                                 api: params.api,
                                 apiGetter: params.apiGetter,
                                 manager: params.manager,
                             }, params.viewId, params.bookmarkId)];
-                    case 5:
-                        _h.sent();
-                        _h.label = 6;
-                    case 6: return [2 /*return*/];
+                    case 6:
+                        _l.sent();
+                        _l.label = 7;
+                    case 7: return [2 /*return*/];
                 }
             });
         });