bruce-cesium 1.5.4 → 1.5.6

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, Tileset, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, OrthographicFrustum, JulianDate, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, Matrix4, Cesium3DTileset, IonResource, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, PolygonPipeline } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1190,6 +1190,7 @@ function getRenderGroupId(zoomItem, terrain) {
     }
     return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + isFlatTerrain;
 }
+var _fileValidationCache = {};
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
@@ -1450,162 +1451,194 @@ var EntityRenderEngine;
     var Point;
     (function (Point) {
         function Render(params) {
-            var entity = params.entity;
-            var style = params.style;
-            var type = style.Type;
-            if (type == null) {
-                // Very old backward compatibility.
-                if (style.useIcon == true) {
-                    type = Style.EPointType.Icon;
-                }
-            }
-            var cEntity = null;
-            var siblings = [];
-            if (type == Style.EPointType.Icon) {
-                // Fixing poor data.
-                var iconUrlRows = style.iconUrl == null ? [] : style.iconUrl;
-                iconUrlRows.forEach(function (row) {
-                    if (row.type == Calculator.EValueType.Color) {
-                        row.type = Calculator.EValueType.Input;
-                    }
-                });
-                var icon = Calculator.GetString(iconUrlRows, entity, params.tags);
-                var iconUrl = null;
-                if (typeof icon == "string") {
-                    iconUrl = icon;
-                }
-                if (!iconUrl && style.iconId) {
-                    iconUrl = ClientFile.GetUrl({
-                        api: params.api,
-                        fileId: style.iconId
-                    });
-                }
-                if (iconUrl) {
-                    var iconScale = EnsureNumber(Calculator.GetNumber(style.iconScale, entity, params.tags));
-                    if (!iconScale && iconScale != 0) {
-                        iconScale = 1;
-                    }
-                    if (iconScale > 0) {
-                        var heightRef = getHeightRef(style);
-                        cEntity = new Entity({
-                            billboard: {
-                                horizontalOrigin: HorizontalOrigin.CENTER,
-                                verticalOrigin: VerticalOrigin.BOTTOM,
-                                image: iconUrl,
-                                heightReference: getHeightRef(style),
-                                scale: iconScale
-                            },
-                            position: EntityUtils.GetPos({
-                                viewer: params.viewer,
-                                entity: entity,
-                                recordHeightRef: heightRef,
-                                returnHeightRef: heightRef
-                            }),
-                            show: false
-                        });
+            return __awaiter(this, void 0, void 0, function () {
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_1, iconScale, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            entity = params.entity;
+                            style = params.style;
+                            type = style.Type;
+                            if (type == null) {
+                                // Very old backward compatibility.
+                                if (style.useIcon == true) {
+                                    type = Style.EPointType.Icon;
+                                }
+                            }
+                            cEntity = null;
+                            siblings = [];
+                            if (!(type == Style.EPointType.Icon)) return [3 /*break*/, 7];
+                            iconUrlRows = style.iconUrl == null ? [] : style.iconUrl;
+                            iconUrlRows.forEach(function (row) {
+                                if (row.type == Calculator.EValueType.Color) {
+                                    row.type = Calculator.EValueType.Input;
+                                }
+                            });
+                            icon = Calculator.GetString(iconUrlRows, entity, params.tags);
+                            iconUrl = null;
+                            if (typeof icon == "string") {
+                                iconUrl = icon;
+                            }
+                            if (!iconUrl && style.iconId) {
+                                iconUrl = ClientFile.GetUrl({
+                                    api: params.api,
+                                    fileId: style.iconId
+                                });
+                            }
+                            if (!iconUrl) return [3 /*break*/, 6];
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 5, , 6]);
+                            if (!(_fileValidationCache[iconUrl] == null)) return [3 /*break*/, 3];
+                            return [4 /*yield*/, fetch(iconUrl)];
+                        case 2:
+                            res = _a.sent();
+                            if (res.status != 200) {
+                                iconUrl = null;
+                            }
+                            _fileValidationCache[iconUrl] = Boolean(iconUrl);
+                            return [3 /*break*/, 4];
+                        case 3:
+                            if (!_fileValidationCache[iconUrl]) {
+                                iconUrl = null;
+                            }
+                            _a.label = 4;
+                        case 4: return [3 /*break*/, 6];
+                        case 5:
+                            e_1 = _a.sent();
+                            iconUrl = null;
+                            return [3 /*break*/, 6];
+                        case 6:
+                            if (iconUrl) {
+                                iconScale = EnsureNumber(Calculator.GetNumber(style.iconScale, entity, params.tags));
+                                if (!iconScale && iconScale != 0) {
+                                    iconScale = 1;
+                                }
+                                if (iconScale > 0) {
+                                    heightRef = getHeightRef(style);
+                                    cEntity = new Entity({
+                                        billboard: {
+                                            horizontalOrigin: HorizontalOrigin.CENTER,
+                                            verticalOrigin: VerticalOrigin.BOTTOM,
+                                            image: iconUrl,
+                                            heightReference: getHeightRef(style),
+                                            scale: iconScale
+                                        },
+                                        position: EntityUtils.GetPos({
+                                            viewer: params.viewer,
+                                            entity: entity,
+                                            recordHeightRef: heightRef,
+                                            returnHeightRef: heightRef
+                                        }),
+                                        show: false
+                                    });
+                                }
+                            }
+                            _a.label = 7;
+                        case 7:
+                            if (type == Style.EPointType.Cylinder) {
+                                radius = EnsureNumber(Calculator.GetNumber(style.CylinderRadius, entity, params.tags));
+                                if (radius <= 0) {
+                                    return [2 /*return*/, null];
+                                }
+                                bFill = style.CylinderFillColor ? Calculator.GetColor(style.CylinderFillColor, entity, params.tags) : null;
+                                cFill = bFill ? colorToCColor(bFill) : Color.RED;
+                                outline = Boolean(style.CylinderBorderEnabled);
+                                cOutline = null;
+                                outlineWidth = 1;
+                                outlineHeight = 0;
+                                if (outline) {
+                                    bOutline = style.CylinderBorderColor ? Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
+                                    cOutline = bOutline ? colorToCColor(bOutline) : Color.BLACK;
+                                    outlineWidth = EnsureNumber(Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
+                                    outlineHeight = EnsureNumber(Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
+                                }
+                                fillHeight = EnsureNumber(Calculator.GetNumber(style.CylinderFillExtrusion, entity, params.tags));
+                                exHeightRef = undefined;
+                                if (fillHeight > 0) {
+                                    exHeightRef = HeightReference.RELATIVE_TO_GROUND;
+                                }
+                                pos = EntityUtils.GetPos({
+                                    viewer: params.viewer,
+                                    entity: entity,
+                                    recordHeightRef: HeightReference.CLAMP_TO_GROUND,
+                                    returnHeightRef: HeightReference.CLAMP_TO_GROUND
+                                });
+                                cEntity = new Entity({
+                                    ellipse: {
+                                        semiMajorAxis: radius,
+                                        semiMinorAxis: radius,
+                                        material: cFill,
+                                        outlineWidth: null,
+                                        extrudedHeight: fillHeight,
+                                        heightReference: HeightReference.CLAMP_TO_GROUND,
+                                        extrudedHeightReference: exHeightRef,
+                                        zIndex: 1
+                                    },
+                                    position: pos === null || pos === void 0 ? void 0 : pos.clone(),
+                                    show: false
+                                });
+                                if (outline && outlineWidth > 0) {
+                                    if (!exHeightRef && outlineHeight > 0) {
+                                        exHeightRef = HeightReference.RELATIVE_TO_GROUND;
+                                        // We need height reference to match between rings.
+                                        cEntity.ellipse.extrudedHeightReference = exHeightRef;
+                                    }
+                                    siblings.push(new Entity({
+                                        ellipse: {
+                                            semiMajorAxis: radius + outlineWidth,
+                                            semiMinorAxis: radius + outlineWidth,
+                                            material: cOutline,
+                                            outlineWidth: undefined,
+                                            extrudedHeight: outlineHeight,
+                                            heightReference: HeightReference.CLAMP_TO_GROUND,
+                                            extrudedHeightReference: exHeightRef,
+                                            zIndex: 2
+                                        },
+                                        position: pos === null || pos === void 0 ? void 0 : pos.clone()
+                                    }));
+                                }
+                            }
+                            if (!cEntity) {
+                                bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
+                                cColor = bColor ? colorToCColor(bColor) : Color.RED;
+                                size = style.size ? Calculator.GetNumber(style.size, entity, params.tags) : null;
+                                if (size == null) {
+                                    size = 30;
+                                }
+                                size = EnsureNumber(size);
+                                if (size <= 0) {
+                                    return [2 /*return*/, null];
+                                }
+                                heightRef = getHeightRef(style);
+                                cEntity = new Entity({
+                                    point: {
+                                        pixelSize: size,
+                                        color: cColor,
+                                        heightReference: getHeightRef(style)
+                                    },
+                                    position: EntityUtils.GetPos({
+                                        viewer: params.viewer,
+                                        entity: entity,
+                                        recordHeightRef: heightRef,
+                                        returnHeightRef: heightRef
+                                    }),
+                                    show: false
+                                });
+                            }
+                            if (cEntity) {
+                                params.viewer.entities.add(cEntity);
+                                if (siblings) {
+                                    siblings.forEach(function (sibling) {
+                                        params.viewer.entities.add(sibling);
+                                    });
+                                }
+                                cEntity._siblingGraphics = siblings;
+                            }
+                            return [2 /*return*/, cEntity];
                     }
-                }
-            }
-            if (type == Style.EPointType.Cylinder) {
-                var radius = EnsureNumber(Calculator.GetNumber(style.CylinderRadius, entity, params.tags));
-                if (radius <= 0) {
-                    return null;
-                }
-                var bFill = style.CylinderFillColor ? Calculator.GetColor(style.CylinderFillColor, entity, params.tags) : null;
-                var cFill = bFill ? colorToCColor(bFill) : Color.RED;
-                var outline = Boolean(style.CylinderBorderEnabled);
-                var cOutline = null;
-                var outlineWidth = 1;
-                var outlineHeight = 0;
-                if (outline) {
-                    var bOutline = style.CylinderBorderColor ? Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
-                    cOutline = bOutline ? colorToCColor(bOutline) : Color.BLACK;
-                    outlineWidth = EnsureNumber(Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
-                    outlineHeight = EnsureNumber(Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
-                }
-                var fillHeight = EnsureNumber(Calculator.GetNumber(style.CylinderFillExtrusion, entity, params.tags));
-                var exHeightRef = undefined;
-                if (fillHeight > 0) {
-                    exHeightRef = HeightReference.RELATIVE_TO_GROUND;
-                }
-                var pos = EntityUtils.GetPos({
-                    viewer: params.viewer,
-                    entity: entity,
-                    recordHeightRef: HeightReference.CLAMP_TO_GROUND,
-                    returnHeightRef: HeightReference.CLAMP_TO_GROUND
                 });
-                cEntity = new Entity({
-                    ellipse: {
-                        semiMajorAxis: radius,
-                        semiMinorAxis: radius,
-                        material: cFill,
-                        outlineWidth: null,
-                        extrudedHeight: fillHeight,
-                        heightReference: HeightReference.CLAMP_TO_GROUND,
-                        extrudedHeightReference: exHeightRef,
-                        zIndex: 1
-                    },
-                    position: pos === null || pos === void 0 ? void 0 : pos.clone(),
-                    show: false
-                });
-                if (outline && outlineWidth > 0) {
-                    if (!exHeightRef && outlineHeight > 0) {
-                        exHeightRef = HeightReference.RELATIVE_TO_GROUND;
-                        // We need height reference to match between rings.
-                        cEntity.ellipse.extrudedHeightReference = exHeightRef;
-                    }
-                    siblings.push(new Entity({
-                        ellipse: {
-                            semiMajorAxis: radius + outlineWidth,
-                            semiMinorAxis: radius + outlineWidth,
-                            material: cOutline,
-                            outlineWidth: undefined,
-                            extrudedHeight: outlineHeight,
-                            heightReference: HeightReference.CLAMP_TO_GROUND,
-                            extrudedHeightReference: exHeightRef,
-                            zIndex: 2
-                        },
-                        position: pos === null || pos === void 0 ? void 0 : pos.clone()
-                    }));
-                }
-            }
-            if (!cEntity) {
-                var bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
-                var cColor = bColor ? colorToCColor(bColor) : Color.RED;
-                var size = style.size ? Calculator.GetNumber(style.size, entity, params.tags) : null;
-                if (size == null) {
-                    size = 30;
-                }
-                size = EnsureNumber(size);
-                if (size <= 0) {
-                    return null;
-                }
-                var heightRef = getHeightRef(style);
-                cEntity = new Entity({
-                    point: {
-                        pixelSize: size,
-                        color: cColor,
-                        heightReference: getHeightRef(style)
-                    },
-                    position: EntityUtils.GetPos({
-                        viewer: params.viewer,
-                        entity: entity,
-                        recordHeightRef: heightRef,
-                        returnHeightRef: heightRef
-                    }),
-                    show: false
-                });
-            }
-            if (cEntity) {
-                params.viewer.entities.add(cEntity);
-                if (siblings) {
-                    siblings.forEach(function (sibling) {
-                        params.viewer.entities.add(sibling);
-                    });
-                }
-                cEntity._siblingGraphics = siblings;
-            }
-            return cEntity;
+            });
         }
         Point.Render = Render;
         function RenderGroup(params) {
@@ -1620,7 +1653,7 @@ var EntityRenderEngine;
                             i = 0;
                             _d.label = 1;
                         case 1:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 6];
+                            if (!(i < params.entities.length)) return [3 /*break*/, 7];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
@@ -1638,20 +1671,22 @@ var EntityRenderEngine;
                             _d.label = 4;
                         case 4:
                             pStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.pointStyle) !== null && _b !== void 0 ? _b : {};
-                            cEntity = Render({
-                                entity: entity,
-                                style: pStyle,
-                                tags: tags,
-                                viewer: params.viewer,
-                                api: api
-                            });
+                            return [4 /*yield*/, Render({
+                                    entity: entity,
+                                    style: pStyle,
+                                    tags: tags,
+                                    viewer: params.viewer,
+                                    api: api
+                                })];
+                        case 5:
+                            cEntity = _d.sent();
                             cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
                             cEntities[entity.Bruce.ID] = cEntity;
-                            _d.label = 5;
-                        case 5:
+                            _d.label = 6;
+                        case 6:
                             i++;
                             return [3 /*break*/, 1];
-                        case 6: return [2 /*return*/, cEntities];
+                        case 7: return [2 /*return*/, cEntities];
                     }
                 });
             });
@@ -4227,6 +4262,20 @@ function isAlive(viewer, cTileset) {
     }
     return viewer.scene.primitives.contains(cTileset);
 }
+// ND-1641. BOOKMARKS - (DEMO) View does not match bookmark.
+// We have some evil hard-coded style mappings that need to be fixed.
+// These exist within legacy project views.
+function correctStyle(style) {
+    if (style && !style.Settings && !style.ID) {
+        return {
+            ID: 0,
+            Name: "Unknown",
+            Settings: __assign({}, style),
+            Type: Style.EType.Entity
+        };
+    }
+    return style;
+}
 var TilesetRenderEngine;
 (function (TilesetRenderEngine) {
     function ApplyPosition(params) {
@@ -4452,11 +4501,11 @@ var TilesetRenderEngine;
     TilesetRenderEngine.Render = Render;
     function RenderLegacy(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, settings, visual, etc, api, rootFile, api, rootFile, cTileset;
+            var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, accountId, settings, visual, etc, api, rootFile, api, rootFile, cTileset;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn;
+                        apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn, accountId = params.accountId;
                         settings = tileset === null || tileset === void 0 ? void 0 : tileset.Settings;
                         settings = __assign({}, settings);
                         visual = settings.visual;
@@ -4476,15 +4525,18 @@ var TilesetRenderEngine;
                         _a.label = 3;
                     case 3:
                         if (!loadUrl && tileset) {
-                            api = apiGetter.getApi(apiGetter.accountId);
+                            api = apiGetter.getApi(accountId);
                             rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
                             loadUrl = api.GetBaseUrl() + ("ui.tileset/" + tileset.ID + "/file/" + rootFile);
                         }
                         if (viaCdn && (tileset === null || tileset === void 0 ? void 0 : tileset.ID)) {
-                            api = apiGetter.getApi(apiGetter.accountId);
+                            api = apiGetter.getApi(accountId);
                             if (api.LegacyTilesetCdnUrl) {
                                 rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
-                                loadUrl = api.LegacyTilesetCdnUrl.replace("<TILESETID>", tileset.ID).replace("<FILEPATH>", rootFile);
+                                loadUrl = api.LegacyTilesetCdnUrl
+                                    .replace("<TILESETID>", tileset.ID)
+                                    .replace("<FILEPATH>", rootFile)
+                                    .replace("<ACCOUNT>", accountId);
                             }
                         }
                         cTileset = new Cesium3DTileset({
@@ -4552,8 +4604,9 @@ var TilesetRenderEngine;
         });
     }
     TilesetRenderEngine.RenderLegacy = RenderLegacy;
-    var CadStyler = /** @class */ (function () {
-        function CadStyler(api, cTileset, fallbackStyleId, styleMapping, menuItemId, register) {
+    var Styler = /** @class */ (function () {
+        function Styler(api, cTileset, fallbackStyleId, styleMapping, menuItemId, register) {
+            var _a;
             this.disposed = false;
             this.styleMappingLoaded = false;
             this.styleMappingsLoaded = {};
@@ -4565,18 +4618,27 @@ var TilesetRenderEngine;
             this.cTileset = cTileset;
             this.fallbackStyleId = fallbackStyleId;
             this.styleMapping = styleMapping;
+            // ND-1641. BOOKMARKS - (DEMO) View does not match bookmark.
+            // We have some evil hard-coded style mappings that need to be fixed.
+            // These exist within legacy project views.
+            if ((_a = this.styleMapping) === null || _a === void 0 ? void 0 : _a.length) {
+                for (var i = 0; i < this.styleMapping.length; i++) {
+                    var mapItem = this.styleMapping[i];
+                    this.styleMapping[i].style = correctStyle(mapItem === null || mapItem === void 0 ? void 0 : mapItem.style);
+                }
+            }
             this.register = register;
             this.menuItemId = menuItemId;
             this.loadStyles();
         }
-        Object.defineProperty(CadStyler.prototype, "Disposed", {
+        Object.defineProperty(Styler.prototype, "Disposed", {
             get: function () {
                 return this.disposed;
             },
             enumerable: false,
             configurable: true
         });
-        CadStyler.prototype.QueueEntities = function (entities) {
+        Styler.prototype.QueueEntities = function (entities) {
             for (var i = 0; i < entities.length; i++) {
                 var entity = entities[i];
                 this.queueTilesetFeatureStyle(entity);
@@ -4585,7 +4647,7 @@ var TilesetRenderEngine;
                 this.processQueue();
             }
         };
-        CadStyler.prototype.processQueue = function () {
+        Styler.prototype.processQueue = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var MAX_BATCHES, BATCH_DELAY, batch, rerun, entities, _loop_1, this_1, i;
                 var _this = this;
@@ -4642,17 +4704,17 @@ var TilesetRenderEngine;
                 });
             });
         };
-        CadStyler.prototype.getEntityIdsForQueue = function () {
+        Styler.prototype.getEntityIdsForQueue = function () {
             var BATCH_SIZE = 30;
             return this.recordLoadQueue.splice(0, BATCH_SIZE);
         };
-        CadStyler.prototype.getEntityRego = function (entityId) {
+        Styler.prototype.getEntityRego = function (entityId) {
             return this.register.GetRego({
                 entityId: entityId,
                 menuItemId: this.menuItemId
             });
         };
-        CadStyler.prototype.Dispose = function () {
+        Styler.prototype.Dispose = function () {
             if (this.disposed) {
                 return;
             }
@@ -4660,7 +4722,7 @@ var TilesetRenderEngine;
             clearInterval(this.queueLoadInterval);
             clearInterval(this.queueCheckInterval);
         };
-        CadStyler.prototype.loadStyles = function () {
+        Styler.prototype.loadStyles = function () {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
                 var fallbackStyleId, data, e_1, styleMapping, modelTree, entityTypeIds, _loop_2, i, i, styleMap, styleId, entityType, e_2, data, e_3;
@@ -4785,12 +4847,12 @@ var TilesetRenderEngine;
                 });
             });
         };
-        CadStyler.prototype.getEntityTypeIdsFromModelTree = function (modelTree) {
+        Styler.prototype.getEntityTypeIdsFromModelTree = function (modelTree) {
             var entityTypeIds = [];
             this.digEntityTypeIdsFromModelTreeBranch(modelTree, entityTypeIds);
             return entityTypeIds;
         };
-        CadStyler.prototype.digEntityTypeIdsFromModelTreeBranch = function (branch, arr) {
+        Styler.prototype.digEntityTypeIdsFromModelTreeBranch = function (branch, arr) {
             if (branch) {
                 // Does not yet include this entity type id.
                 if (branch.typeId && !arr.includes(branch.typeId)) {
@@ -4804,7 +4866,7 @@ var TilesetRenderEngine;
                 }
             }
         };
-        CadStyler.prototype.processTilesetFeatureCheckQueue = function () {
+        Styler.prototype.processTilesetFeatureCheckQueue = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var BATCH_CHECK_SIZE;
                 var _this = this;
@@ -4868,7 +4930,7 @@ var TilesetRenderEngine;
                 });
             });
         };
-        CadStyler.prototype.queueTilesetFeatureStyle = function (entity) {
+        Styler.prototype.queueTilesetFeatureStyle = function (entity) {
             if (this.styleMappingLoaded || this.styleMappingsLoaded[entity.entityTypeId] == true) {
                 var needsData = this.getTilesetFeatureNeedsFullData(entity.entityId, entity.entityTypeId);
                 if (needsData) {
@@ -4884,10 +4946,10 @@ var TilesetRenderEngine;
                 this.recordCheckQueue.push(entity.entityId);
             }
         };
-        CadStyler.prototype.styleTilesetFeature = function (entity) {
+        Styler.prototype.styleTilesetFeature = function (entity) {
             this.styleTilesetFeatureFullData(entity, null);
         };
-        CadStyler.prototype.styleTilesetFeatureFullData = function (entity, data) {
+        Styler.prototype.styleTilesetFeatureFullData = function (entity, data) {
             var _a;
             var style = this.getTilesetFeatureStyle(entity.entityId, entity.entityTypeId);
             if (!style) {
@@ -4902,25 +4964,22 @@ var TilesetRenderEngine;
                 }
             }
         };
-        CadStyler.prototype.getTilesetFeatureStyle = function (entityId, entityTypeId) {
-            var _a, _b, _c;
+        Styler.prototype.getTilesetFeatureStyle = function (entityId, entityTypeId) {
+            var _a, _b, _c, _d;
             // Locate what style is applicable to the feature.
             var style = null;
             if (entityTypeId) {
-                style = (_a = this.styleMapping.find(function (x) { return x.EntityTypeID == entityTypeId; })) === null || _a === void 0 ? void 0 : _a.style;
-            }
-            if (!style) {
-                style = this.fallbackStyle;
+                style = ((_b = (_a = this.styleMapping.find(function (x) { return x.EntityTypeID == entityTypeId; })) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.Settings);
             }
             if (!style) {
-                return null;
+                style = ((_c = this.fallbackStyle) === null || _c === void 0 ? void 0 : _c.Settings);
             }
-            if (!((_c = (_b = style.Settings) === null || _b === void 0 ? void 0 : _b.modelStyle) === null || _c === void 0 ? void 0 : _c.customize)) {
+            if (!style || !((_d = style === null || style === void 0 ? void 0 : style.modelStyle) === null || _d === void 0 ? void 0 : _d.customize)) {
                 return null;
             }
-            return style.Settings;
+            return style;
         };
-        CadStyler.prototype.getTilesetFeatureNeedsFullData = function (entityId, entityTypeId) {
+        Styler.prototype.getTilesetFeatureNeedsFullData = function (entityId, entityTypeId) {
             var _a;
             var style = this.getTilesetFeatureStyle(entityId, entityTypeId);
             if (!style) {
@@ -4932,9 +4991,9 @@ var TilesetRenderEngine;
             }
             return fill[0].type != 0;
         };
-        return CadStyler;
+        return Styler;
     }());
-    TilesetRenderEngine.CadStyler = CadStyler;
+    TilesetRenderEngine.Styler = Styler;
 })(TilesetRenderEngine || (TilesetRenderEngine = {}));
 
 /**
@@ -5010,7 +5069,7 @@ var TilesetCadRenderManager;
                                         return;
                                     }
                                     _this.onCTilesetLoad();
-                                    _this.styler = new TilesetRenderEngine.CadStyler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
+                                    _this.styler = new TilesetRenderEngine.Styler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
                                 }
                                 catch (e) {
                                     console.error(e);
@@ -5989,12 +6048,12 @@ var TilesetArbRenderManager;
             configurable: true
         });
         Manager.prototype.Init = function () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
             return __awaiter(this, void 0, void 0, function () {
-                var loadUrlOverride, itemUrl, url, urlParts, tilesetId_1, accountId, tilesetId, _e, tileset, type, _f, LEGACY_TYPES, legacyTileset, _g, _h;
+                var loadUrlOverride, itemUrl, url, urlParts, tilesetId_1, accountId, tilesetId, _g, tileset, type, _h, LEGACY_TYPES, legacyTileset, _j, accountId, _k;
                 var _this = this;
-                return __generator(this, function (_j) {
-                    switch (_j.label) {
+                return __generator(this, function (_l) {
+                    switch (_l.label) {
                         case 0:
                             loadUrlOverride = null;
                             if (this.item.tileset) {
@@ -6026,13 +6085,13 @@ var TilesetArbRenderManager;
                                     menuItem: this.item
                                 })];
                         case 1:
-                            _f = _j.sent();
+                            _h = _l.sent();
                             return [3 /*break*/, 3];
                         case 2:
-                            _f = { tileset: null, type: null };
-                            _j.label = 3;
+                            _h = { tileset: null, type: null };
+                            _l.label = 3;
                         case 3:
-                            _e = _f, tileset = _e.tileset, type = _e.type;
+                            _g = _h, tileset = _g.tileset, type = _g.type;
                             if (tileset && loadUrlOverride) {
                                 tileset.loadUrl = loadUrlOverride;
                             }
@@ -6049,24 +6108,29 @@ var TilesetArbRenderManager;
                                     tileset: tileset
                                 })];
                         case 4:
-                            _g = _j.sent();
+                            _j = _l.sent();
                             return [3 /*break*/, 6];
                         case 5:
-                            _g = null;
-                            _j.label = 6;
+                            _j = null;
+                            _l.label = 6;
                         case 6:
-                            legacyTileset = _g;
-                            _h = this;
+                            legacyTileset = _j;
+                            accountId = (_e = (_d = this.item) === null || _d === void 0 ? void 0 : _d.tileset) === null || _e === void 0 ? void 0 : _e.ClientAccountID;
+                            if (!accountId) {
+                                accountId = this.apiGetter.accountId;
+                            }
+                            _k = this;
                             return [4 /*yield*/, TilesetRenderEngine.RenderLegacy({
                                     apiGetter: this.apiGetter,
                                     tileset: legacyTileset,
                                     viewer: this.viewer,
-                                    ionId: (_d = this.item.IonResource) === null || _d === void 0 ? void 0 : _d.AssetID,
+                                    ionId: (_f = this.item.IonResource) === null || _f === void 0 ? void 0 : _f.AssetID,
                                     loadUrl: loadUrlOverride,
+                                    accountId: accountId,
                                     viaCdn: true
                                 })];
                         case 7:
-                            _h.cTileset = _j.sent();
+                            _k.cTileset = _l.sent();
                             return [3 /*break*/, 9];
                         case 8:
                             if (tileset) {
@@ -6077,14 +6141,14 @@ var TilesetArbRenderManager;
                                     coords: null
                                 });
                             }
-                            _j.label = 9;
+                            _l.label = 9;
                         case 9:
                             this.cTileset.readyPromise.then(function () {
                                 try {
                                     if (_this.item.ApplyStyles ||
                                         _this.item.Type == MenuItem.EType.IonTileset) {
                                         var api = _this.apiGetter.getApi();
-                                        _this.styler = new TilesetRenderEngine.CadStyler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
+                                        _this.styler = new TilesetRenderEngine.Styler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, _this.item.id, _this.visualsManager);
                                     }
                                     _this.onCTilesetLoad();
                                 }
@@ -8068,7 +8132,7 @@ function renderLegacyNavigator(params, bookmark, view) {
                     // TODO: Other scene settings.
                     // TODO: Rendered relationships.
                     VR.ClearHidden();
-                    if ((_a = bSettings.hiddenEntityIds) === null || _a === void 0 ? void 0 : _a.length) {
+                    if ((_a = bSettings === null || bSettings === void 0 ? void 0 : bSettings.hiddenEntityIds) === null || _a === void 0 ? void 0 : _a.length) {
                         VR.SetHidden({
                             entityIds: bSettings.hiddenEntityIds,
                             hidden: true
@@ -8091,17 +8155,19 @@ function renderLegacyNavigator(params, bookmark, view) {
                         params.skipTransition = true;
                     }
                     if (!params.skipCamera) {
-                        camera = bookmark.Camera;
-                        pos = Cartesian3.fromDegrees(+camera.position.longitude, +camera.position.latitude, +camera.position.height);
-                        manager.Viewer.scene.camera.flyTo({
-                            destination: pos,
-                            orientation: {
-                                heading: +camera.heading,
-                                pitch: +camera.pitch,
-                                roll: +camera.roll
-                            },
-                            duration: params.skipTransition ? 0 : 2
-                        });
+                        camera = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Camera;
+                        pos = camera ? Cartesian3.fromDegrees(+camera.position.longitude, +camera.position.latitude, +camera.position.height) : null;
+                        if (pos === null || pos === void 0 ? void 0 : pos.x) {
+                            manager.Viewer.scene.camera.flyTo({
+                                destination: pos,
+                                orientation: {
+                                    heading: +camera.heading,
+                                    pitch: +camera.pitch,
+                                    roll: +camera.roll
+                                },
+                                duration: params.skipTransition ? 0 : 2
+                            });
+                        }
                     }
                     go = (_b = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _b === void 0 ? void 0 : _b.groundOcclusion;
                     if (go == null) {
@@ -8149,7 +8215,7 @@ function renderLegacyNavigator(params, bookmark, view) {
                     _f.sent();
                     _f.label = 8;
                 case 8:
-                    if (!((_e = bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 10];
+                    if (!((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 10];
                     menuItem = {
                         id: RELATION_MENU_ITEM_ID,
                         Caption: "Entity relations",
@@ -8406,7 +8472,7 @@ function renderNavigator(params, bookmark, view) {
                             }
                         }
                     }
-                    imagery = bSettings.imagery != null ? bSettings.imagery : (_1 = defaults.settings) === null || _1 === void 0 ? void 0 : _1.imagery;
+                    imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_1 = defaults.settings) === null || _1 === void 0 ? void 0 : _1.imagery;
                     if (imagery == null) {
                         // TODO: Need global default.
                         imagery = [
@@ -8429,7 +8495,7 @@ function renderNavigator(params, bookmark, view) {
                         })];
                 case 3:
                     _3.sent();
-                    renderedRelationEntityIds = bSettings.renderedEntityRelations;
+                    renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
                     if (!renderedRelationEntityIds) {
                         renderedRelationEntityIds = [];
                     }