bruce-cesium 2.1.3 → 2.1.4

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, Entity, Primitive, Cesium3DTileFeature, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, NearFarScalar, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, HeightReference, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, NearFarScalar, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -4924,6 +4924,11 @@ var TilesetRenderEngine;
                 switch (_a.label) {
                     case 0:
                         api = params.apiGetter.getApi(params.apiGetter.accountId);
+                        // Ensure regional url is loaded.
+                        return [4 /*yield*/, api.Loading];
+                    case 1:
+                        // Ensure regional url is loaded.
+                        _a.sent();
                         loadUrl = params.tileset.loadUrl;
                         // CDN url must match the api getter account id.
                         if (!params.accountId || params.accountId == params.apiGetter.accountId) {
@@ -4934,13 +4939,13 @@ var TilesetRenderEngine;
                                 loadUrl += "&generation=" + params.tileset.generateVersion;
                             }
                         }
-                        if (!(params.tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 2];
+                        if (!(params.tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 3];
                         return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
                                 api: api,
                                 tilesetId: params.tileset.id,
                                 file: "tileset.json"
                             }) + "?generation=" + params.tileset.generateVersion, null)];
-                    case 1:
+                    case 2:
                         cTileset_1 = _a.sent();
                         params.viewer.scene.primitives.add(cTileset_1);
                         cTileset_1.readyPromise.then(function () {
@@ -4970,25 +4975,25 @@ var TilesetRenderEngine;
                             }
                         });
                         return [2 /*return*/, cTileset_1];
-                    case 2:
-                        if (!(params.tileset.type === Tileset.EType.EntitiesSet)) return [3 /*break*/, 4];
+                    case 3:
+                        if (!(params.tileset.type === Tileset.EType.EntitiesSet)) return [3 /*break*/, 5];
                         return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
                                 api: api,
                                 tilesetId: params.tileset.id,
                                 file: "tileset.json"
                             }) + "?generation=" + params.tileset.generateVersion, null)];
-                    case 3:
+                    case 4:
                         cTileset = _a.sent();
                         params.viewer.scene.primitives.add(cTileset);
                         return [2 /*return*/, cTileset];
-                    case 4:
-                        if (!(params.tileset.type == Tileset.EType.PointCloud)) return [3 /*break*/, 6];
+                    case 5:
+                        if (!(params.tileset.type == Tileset.EType.PointCloud)) return [3 /*break*/, 7];
                         return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
                                 api: api,
                                 tilesetId: params.tileset.id,
                                 file: "tileset.json"
                             }) + "?generation=" + params.tileset.generateVersion, null)];
-                    case 5:
+                    case 6:
                         cTileset_2 = _a.sent();
                         params.viewer.scene.primitives.add(cTileset_2);
                         cTileset_2.readyPromise.then(function () {
@@ -5018,7 +5023,7 @@ var TilesetRenderEngine;
                             }
                         });
                         return [2 /*return*/, cTileset_2];
-                    case 6: throw ("Not implemented.");
+                    case 7: throw ("Not implemented.");
                 }
             });
         });
@@ -8693,7 +8698,7 @@ var TileRenderEngine;
         (function (Navigator) {
             function GetOrCreateLayer(params) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var viewer, apiGetter, meta, enabled, i, layer, layerMeta, defaultImg, provider, api, tileset, settings, _a, _b, _c, mapboxKey, _d, layer;
+                    var viewer, apiGetter, meta, enabled, i, layer, layerMeta, defaultImg, provider, api, tileset, boundaries, settings, minLat, maxLat, minLon, maxLon, minLevel, maxLevel, hasLevels, settings_1, _a, _b, _c, mapboxKey, _d, layer;
                     var _e;
                     return __generator(this, function (_f) {
                         switch (_f.label) {
@@ -8716,90 +8721,131 @@ var TileRenderEngine;
                                 return [4 /*yield*/, renderDefaultMapTile(apiGetter, defaultImg.id)];
                             case 1:
                                 provider = _f.sent();
-                                return [3 /*break*/, 15];
+                                return [3 /*break*/, 16];
                             case 2:
                                 api = apiGetter.getApi(meta.accountId);
+                                // Ensure regional url is loaded.
+                                // When loading stuff in the same account as the default it's likely already loaded,
+                                // but if we just made an API instance for some external account then it won't be loaded yet.
+                                return [4 /*yield*/, api.Loading];
+                            case 3:
+                                // Ensure regional url is loaded.
+                                // When loading stuff in the same account as the default it's likely already loaded,
+                                // but if we just made an API instance for some external account then it won't be loaded yet.
+                                _f.sent();
                                 return [4 /*yield*/, Tileset.Get({
                                         api: api,
                                         tilesetId: meta.tilesetId
                                     })];
-                            case 3:
+                            case 4:
                                 tileset = (_f.sent()).tileset;
-                                if (!(tileset.type === Tileset.EType.GeoMap)) return [3 /*break*/, 4];
+                                boundaries = undefined;
+                                settings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
+                                if (settings && settings.boundaries) {
+                                    minLat = settings.boundaries.minLatitude;
+                                    maxLat = settings.boundaries.maxLatitude;
+                                    minLon = settings.boundaries.minLongitude;
+                                    maxLon = settings.boundaries.maxLongitude;
+                                    boundaries = Rectangle.fromDegrees(minLon, minLat, maxLon, maxLat);
+                                }
+                                minLevel = settings === null || settings === void 0 ? void 0 : settings.levelMin;
+                                maxLevel = settings === null || settings === void 0 ? void 0 : settings.levelMax;
+                                hasLevels = !isNaN(minLevel) && !isNaN(maxLevel);
+                                if (!(tileset.type === Tileset.EType.GeoMap)) return [3 /*break*/, 5];
                                 provider = new TileMapServiceImageryProvider({
                                     url: Tileset.GetPublicFileUrl({
                                         api: api,
                                         tilesetId: meta.tilesetId,
-                                        file: ""
+                                        file: "",
+                                        viaCdn: true,
+                                        viaCdnCacheToken: tileset.generateVersion
                                     }),
-                                    fileExtension: "png"
+                                    fileExtension: "png",
+                                    // Tested to not cause increased lag.
+                                    rectangle: boundaries,
+                                    maximumLevel: hasLevels ? maxLevel : undefined,
+                                    minimumLevel: hasLevels ? minLevel : undefined,
                                 });
-                                return [3 /*break*/, 15];
-                            case 4:
-                                if (!(tileset.type === Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 14];
-                                settings = tileset.settings;
-                                _a = settings.mapType;
+                                return [3 /*break*/, 16];
+                            case 5:
+                                if (!(tileset.type === Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 15];
+                                settings_1 = tileset.settings;
+                                _a = settings_1.mapType;
                                 switch (_a) {
-                                    case Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 5];
-                                    case Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 7];
-                                    case Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 11];
-                                    case Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 12];
+                                    case Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 6];
+                                    case Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 8];
+                                    case Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 12];
+                                    case Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 13];
                                 }
-                                return [3 /*break*/, 13];
-                            case 5:
+                                return [3 /*break*/, 14];
+                            case 6:
                                 _c = (_b = IonImageryProvider).bind;
                                 _e = {
-                                    assetId: settings.ionId
+                                    assetId: settings_1.ionId
                                 };
                                 return [4 /*yield*/, findKey(apiGetter, ProgramKey.EProgramId.CesiumIon, null)];
-                            case 6:
+                            case 7:
                                 provider = new (_c.apply(_b, [void 0, (_e.accessToken = _f.sent(),
                                         _e)]))();
-                                return [3 /*break*/, 13];
-                            case 7:
-                                if (!settings.mapBoxKey) return [3 /*break*/, 8];
-                                _d = settings.mapBoxKey;
-                                return [3 /*break*/, 10];
-                            case 8: return [4 /*yield*/, findKey(apiGetter, ProgramKey.EProgramId.Mapbox, null)];
-                            case 9:
-                                _d = _f.sent();
-                                _f.label = 10;
+                                return [3 /*break*/, 14];
+                            case 8:
+                                if (!settings_1.mapBoxKey) return [3 /*break*/, 9];
+                                _d = settings_1.mapBoxKey;
+                                return [3 /*break*/, 11];
+                            case 9: return [4 /*yield*/, findKey(apiGetter, ProgramKey.EProgramId.Mapbox, null)];
                             case 10:
+                                _d = _f.sent();
+                                _f.label = 11;
+                            case 11:
                                 mapboxKey = _d;
                                 provider = new UrlTemplateImageryProvider({
                                     url: "https://api.mapbox.com/styles/v1/"
-                                        + settings.mapBoxAccount + "/" + settings.mapBoxStyleId +
+                                        + settings_1.mapBoxAccount + "/" + settings_1.mapBoxStyleId +
                                         "/tiles/256/{z}/{x}/{y}?access_token="
                                         + mapboxKey
                                 });
-                                return [3 /*break*/, 13];
-                            case 11:
+                                return [3 /*break*/, 14];
+                            case 12:
                                 provider = new OpenStreetMapImageryProvider({
-                                    url: settings.url,
-                                    fileExtension: prepareFileExt(settings.sourceExt)
+                                    url: settings_1.url,
+                                    fileExtension: prepareFileExt(settings_1.sourceExt),
+                                    // Unused until tested properly. In the past these settings caused large lag.
+                                    // rectangle: boundaries,
+                                    // maximumLevel: hasLevels ? maxLevel : undefined,
+                                    // minimumLevel: hasLevels ? minLevel : undefined,
                                 });
-                                return [3 /*break*/, 13];
-                            case 12:
+                                return [3 /*break*/, 14];
+                            case 13:
                                 provider = new TileMapServiceImageryProvider({
-                                    url: settings.url,
-                                    fileExtension: prepareFileExt(settings.sourceExt)
+                                    url: settings_1.url,
+                                    fileExtension: prepareFileExt(settings_1.sourceExt),
+                                    // Unused until tested properly. In the past these settings caused large lag.
+                                    // rectangle: boundaries,
+                                    // maximumLevel: hasLevels ? maxLevel : undefined,
+                                    // minimumLevel: hasLevels ? minLevel : undefined,
                                 });
-                                return [3 /*break*/, 13];
-                            case 13: return [3 /*break*/, 15];
-                            case 14:
+                                return [3 /*break*/, 14];
+                            case 14: return [3 /*break*/, 16];
+                            case 15:
                                 if (tileset.type === Tileset.EType.EntitiesMap) {
                                     provider = new UrlTemplateImageryProvider({
                                         url: Tileset.GetPublicFileUrl({
                                             api: api,
                                             tilesetId: meta.tilesetId,
-                                            file: "{z}/{x}/{y}.png"
+                                            file: "{z}/{x}/{y}.png",
+                                            viaCdn: true,
+                                            viaCdnCacheToken: tileset.generateVersion
                                         }),
                                         tileHeight: 256,
                                         tileWidth: 256
+                                        // Unused until tested properly. In the past these settings caused large lag.
+                                        // rectangle: boundaries,
+                                        // minimumLevel: hasLevels ? minLevel : undefined,
+                                        // maximumLevel: hasLevels ? maxLevel : undefined,
                                     });
                                 }
-                                _f.label = 15;
-                            case 15:
+                                _f.label = 16;
+                            case 16:
                                 if (provider) {
                                     layer = viewer.imageryLayers.addImageryProvider(provider);
                                     layer._bMeta = meta;
@@ -9037,14 +9083,23 @@ var TileRenderEngine;
                                 return [4 /*yield*/, renderDefaultTerrTile(defaultTerr.id)];
                             case 1:
                                 provider = (_b.sent());
-                                return [3 /*break*/, 4];
+                                return [3 /*break*/, 5];
                             case 2:
                                 api = params.apiGetter.getApi(params.tile.accountId);
+                                // Ensure regional url is loaded.
+                                // When loading stuff in the same account as the default it's likely already loaded,
+                                // but if we just made an API instance for some external account then it won't be loaded yet.
+                                return [4 /*yield*/, api.Loading];
+                            case 3:
+                                // Ensure regional url is loaded.
+                                // When loading stuff in the same account as the default it's likely already loaded,
+                                // but if we just made an API instance for some external account then it won't be loaded yet.
+                                _b.sent();
                                 return [4 /*yield*/, Tileset.Get({
                                         api: api,
                                         tilesetId: params.tile.tilesetId
                                     })];
-                            case 3:
+                            case 4:
                                 tileset = (_b.sent()).tileset;
                                 url = void 0;
                                 vertexes = true;
@@ -9052,7 +9107,9 @@ var TileRenderEngine;
                                     url = Tileset.GetPublicFileUrl({
                                         api: api,
                                         tilesetId: tileset.id,
-                                        file: ""
+                                        file: "",
+                                        viaCdn: true,
+                                        viaCdnCacheToken: tileset.generateVersion
                                     });
                                 }
                                 else if (tileset.type === Tileset.EType.ExternalTerrain) {
@@ -9069,8 +9126,8 @@ var TileRenderEngine;
                                         requestVertexNormals: vertexes
                                     });
                                 }
-                                _b.label = 4;
-                            case 4:
+                                _b.label = 5;
+                            case 5:
                                 if (provider) {
                                     provider._bMeta = {
                                         accountId: params.tile.accountId,