bruce-cesium 1.0.6 → 1.0.8

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, EntityRelationType, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, Cartesian3, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileColorBlendMode, HeadingPitchRange, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, CallbackProperty, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, createOsmBuildings, KmlDataSource } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileStyle, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, CallbackProperty, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, createOsmBuildings, KmlDataSource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -234,14 +234,18 @@ var ViewerUtils;
      * @param viewer
      */
     function InitViewer(params) {
-        var viewer = params.viewer;
-        ViewerUtils.DestroyWidget(viewer.timeline);
-        ViewerUtils.DestroyWidget(viewer.vrButton);
-        ViewerUtils.DestroyWidget(viewer.sceneModePicker);
-        ViewerUtils.DestroyWidget(viewer.homeButton);
-        ViewerUtils.DestroyWidget(viewer.fullscreenButton);
-        ViewerUtils.DestroyWidget(viewer.baseLayerPicker);
-        ViewerUtils.StyleContainer({ viewer: viewer });
+        var viewer = params.viewer, destroyWidgets = params.destroyWidgets, styleContainer = params.styleContainer;
+        if (destroyWidgets != false) {
+            ViewerUtils.DestroyWidget(viewer.timeline);
+            ViewerUtils.DestroyWidget(viewer.vrButton);
+            ViewerUtils.DestroyWidget(viewer.sceneModePicker);
+            ViewerUtils.DestroyWidget(viewer.homeButton);
+            ViewerUtils.DestroyWidget(viewer.fullscreenButton);
+            ViewerUtils.DestroyWidget(viewer.baseLayerPicker);
+        }
+        if (styleContainer != false) {
+            ViewerUtils.StyleContainer({ viewer: viewer });
+        }
     }
     ViewerUtils.InitViewer = InitViewer;
     function DestroyWidget(widget) {
@@ -355,6 +359,74 @@ function __generator(thisArg, body) {
     }
 }
 
+var MeasureUtils;
+(function (MeasureUtils) {
+    /**
+     * Returns the total distance in meters between an array of points.
+     * This distance is NOT following the terrain.
+     * @param posses
+     * @returns
+     */
+    function MeasurePolyline(params) {
+        var posses = params.posses;
+        if (posses.length < 2) {
+            return {
+                totalLength: 0
+            };
+        }
+        var totalLength = 0;
+        var pos1 = null;
+        var pos2 = null;
+        for (var i = 0; i < posses.length; i++) {
+            if (pos1 == null) {
+                pos1 = posses[i];
+            }
+            else if (pos2 == null) {
+                pos2 = posses[i];
+                totalLength += Cartesian3.distance(pos1, pos2);
+                pos1 = pos2;
+                pos2 = null;
+            }
+        }
+        return {
+            totalLength: totalLength
+        };
+    }
+    MeasureUtils.MeasurePolyline = MeasurePolyline;
+    function MeasurePolygon(params) {
+        var posses = params.posses;
+        posses = [].concat(posses);
+        if (!Cartes.IsRing3Closed(posses)) {
+            posses.push(posses[0].clone());
+        }
+        if (posses.length < 3) {
+            return {
+                area: 0,
+                perimeter: 0
+            };
+        }
+        var area = 0;
+        var indices = PolygonPipeline.triangulate(posses, []);
+        for (var i = 0; i < indices.length; i += 3) {
+            var vector1 = posses[indices[i]];
+            var vector2 = posses[indices[i + 1]];
+            var vector3 = posses[indices[i + 2]];
+            var vectorC = Cartesian3.subtract(vector2, vector1, new Cartesian3());
+            var vectorD = Cartesian3.subtract(vector3, vector1, new Cartesian3());
+            var areaVector = Cartesian3.cross(vectorC, vectorD, new Cartesian3());
+            area += Cartesian3.magnitude(areaVector) / 2.0;
+        }
+        var perimeter = MeasurePolyline({
+            posses: posses
+        }).totalLength;
+        return {
+            area: area,
+            perimeter: perimeter
+        };
+    }
+    MeasureUtils.MeasurePolygon = MeasurePolygon;
+})(MeasureUtils || (MeasureUtils = {}));
+
 var DrawingUtils;
 (function (DrawingUtils) {
     /**
@@ -367,15 +439,29 @@ var DrawingUtils;
      */
     function PointAcrossPolyline(params) {
         var viewer = params.viewer, positions = params.posses, distance = params.distance;
-        if (positions.length > 1) {
+        if (distance <= 0 && positions.length > 0) {
+            return {
+                point: positions[0]
+            };
+        }
+        else if (positions.length > 1) {
             var currentDistance = 0;
+            var totalLength = MeasureUtils.MeasurePolyline({
+                posses: positions,
+            }).totalLength;
+            if (distance > totalLength) {
+                return {
+                    point: positions[positions.length - 1]
+                };
+            }
             for (var i = 0; i < positions.length - 1; i++) {
                 var length_1 = Cartesian3.distance(positions[i], positions[i + 1]);
                 if (length_1 + currentDistance >= distance) {
                     var carto1 = Cartographic.fromCartesian(positions[i]);
                     var carto2 = Cartographic.fromCartesian(positions[i + 1]);
                     var geodesic = new EllipsoidGeodesic(carto1, carto2, viewer.scene.globe.ellipsoid);
-                    var position = geodesic.interpolateUsingSurfaceDistance(distance - currentDistance);
+                    //const position = geodesic.interpolateUsingSurfaceDistance(distance - currentDistance);
+                    var position = geodesic.interpolateUsingFraction((distance - currentDistance) / length_1);
                     var height = (carto1.height + carto2.height) / 2;
                     return {
                         point: Cartesian3.fromRadians(position.longitude, position.latitude, height)
@@ -386,18 +472,8 @@ var DrawingUtils;
                 }
             }
         }
-        else if (positions.length > 0) {
-            return {
-                point: positions[0]
-            };
-        }
-        else {
-            return {
-                point: null
-            };
-        }
         return {
-            point: positions[positions.length - 1]
+            point: positions.length ? positions[positions.length - 1] : null
         };
     }
     DrawingUtils.PointAcrossPolyline = PointAcrossPolyline;
@@ -451,74 +527,6 @@ var DrawingUtils;
     DrawingUtils.GetTerrainHeight = GetTerrainHeight;
 })(DrawingUtils || (DrawingUtils = {}));
 
-var MeasureUtils;
-(function (MeasureUtils) {
-    /**
-     * Returns the total distance in meters between an array of points.
-     * This distance is NOT following the terrain.
-     * @param posses
-     * @returns
-     */
-    function MeasurePolyline(params) {
-        var posses = params.posses;
-        if (posses.length < 2) {
-            return {
-                totalLength: 0
-            };
-        }
-        var totalLength = 0;
-        var pos1 = null;
-        var pos2 = null;
-        for (var i = 0; i < posses.length; i++) {
-            if (pos1 == null) {
-                pos1 = posses[i];
-            }
-            else if (pos2 == null) {
-                pos2 = posses[i];
-                totalLength += Cartesian3.distance(pos1, pos2);
-                pos1 = pos2;
-                pos2 = null;
-            }
-        }
-        return {
-            totalLength: totalLength
-        };
-    }
-    MeasureUtils.MeasurePolyline = MeasurePolyline;
-    function MeasurePolygon(params) {
-        var posses = params.posses;
-        posses = [].concat(posses);
-        if (!Cartes.IsRing3Closed(posses)) {
-            posses.push(posses[0].clone());
-        }
-        if (posses.length < 3) {
-            return {
-                area: 0,
-                perimeter: 0
-            };
-        }
-        var area = 0;
-        var indices = PolygonPipeline.triangulate(posses, []);
-        for (var i = 0; i < indices.length; i += 3) {
-            var vector1 = posses[indices[i]];
-            var vector2 = posses[indices[i + 1]];
-            var vector3 = posses[indices[i + 2]];
-            var vectorC = Cartesian3.subtract(vector2, vector1, new Cartesian3());
-            var vectorD = Cartesian3.subtract(vector3, vector1, new Cartesian3());
-            var areaVector = Cartesian3.cross(vectorC, vectorD, new Cartesian3());
-            area += Cartesian3.magnitude(areaVector) / 2.0;
-        }
-        var perimeter = MeasurePolyline({
-            posses: posses
-        }).totalLength;
-        return {
-            area: area,
-            perimeter: perimeter
-        };
-    }
-    MeasureUtils.MeasurePolygon = MeasurePolygon;
-})(MeasureUtils || (MeasureUtils = {}));
-
 /**
  * Ensures a number is returned from a given value.
  * If given value cannot be parsed it will return defaultNum.
@@ -656,6 +664,13 @@ function applyOpacityToEntity(viewer, opacity, entity) {
 function findOpacity(entity) {
     return entity[NEW_OPACITY_KEY];
 }
+function GetValue(viewer, obj) {
+    var _a;
+    if ((_a = obj) === null || _a === void 0 ? void 0 : _a.getValue) {
+        return obj.getValue(viewer.scene.lastRenderTime);
+    }
+    return obj;
+}
 var EntityUtils;
 (function (EntityUtils) {
     /**
@@ -666,6 +681,8 @@ var EntityUtils;
      */
     function GetPos(params) {
         var viewer = params.viewer, entity = params.entity, visualRegister = params.visualRegister;
+        // TODO: Tidy this up, move to a separate function.
+        // We need a generic "get pos AS blah height reference" function.
         function evaluateRendered() {
             var rego = visualRegister ? visualRegister.GetRego({
                 entityId: entity.Bruce.ID,
@@ -673,10 +690,61 @@ var EntityUtils;
             if ((rego === null || rego === void 0 ? void 0 : rego.visual) instanceof Entity) {
                 var visual = rego.visual;
                 if (visual.position) {
-                    if (visual.position.getValue) {
-                        return visual.position.getValue(viewer.scene.lastRenderTime);
+                    var pos3d_1 = GetValue(viewer, visual.position);
+                    // Fix height reference.
+                    if (pos3d_1 === null || pos3d_1 === void 0 ? void 0 : pos3d_1.x) {
+                        var visualHeightRef = HeightReference.RELATIVE_TO_GROUND;
+                        if (visual.model) {
+                            visualHeightRef = GetValue(viewer, visual.model.heightReference);
+                        }
+                        else if (visual.polygon) {
+                            visualHeightRef = GetValue(viewer, visual.polygon.heightReference);
+                        }
+                        else if (visual.polyline) {
+                            visualHeightRef = GetValue(viewer, visual.polyline.clampToGround) ?
+                                HeightReference.RELATIVE_TO_GROUND : HeightReference.NONE;
+                        }
+                        else if (visual.billboard) {
+                            visualHeightRef = GetValue(viewer, visual.billboard.heightReference);
+                        }
+                        else if (visual.ellipse) {
+                            visualHeightRef = GetValue(viewer, visual.ellipse.heightReference);
+                        }
+                        else if (visual.point) {
+                            visualHeightRef = GetValue(viewer, visual.point.heightReference);
+                        }
+                        if (visualHeightRef == params.heightReference) {
+                            return pos3d_1;
+                        }
+                        var carto_1 = Cartographic.fromCartesian(pos3d_1);
+                        if (visualHeightRef == HeightReference.NONE) {
+                            // Turn absolute into clamped.
+                            if (params.heightReference == HeightReference.CLAMP_TO_GROUND) {
+                                return Cartesian3.fromRadians(carto_1.longitude, carto_1.latitude, 0);
+                            }
+                            // Turn absolute into relative (remove terrain height).
+                            else if (params.heightReference == HeightReference.RELATIVE_TO_GROUND) {
+                                var terrainHeight = EnsureNumber(viewer.scene.globe.getHeight(carto_1), 0);
+                                return Cartesian3.fromRadians(carto_1.longitude, carto_1.latitude, carto_1.height - terrainHeight);
+                            }
+                        }
+                        else if (visualHeightRef == HeightReference.CLAMP_TO_GROUND) {
+                            var terrainHeight = EnsureNumber(viewer.scene.globe.getHeight(carto_1), 0);
+                            return Cartesian3.fromRadians(carto_1.longitude, carto_1.latitude, terrainHeight);
+                        }
+                        else if (visualHeightRef == HeightReference.RELATIVE_TO_GROUND) {
+                            // Turn relative into absolute (add terrain height).
+                            if (params.heightReference == HeightReference.NONE) {
+                                var terrainHeight = EnsureNumber(viewer.scene.globe.getHeight(carto_1), 0);
+                                return Cartesian3.fromRadians(carto_1.longitude, carto_1.latitude, carto_1.height + terrainHeight);
+                            }
+                            // Turn relative into clamped.
+                            else if (params.heightReference == HeightReference.CLAMP_TO_GROUND) {
+                                return Cartesian3.fromRadians(carto_1.longitude, carto_1.latitude, 0);
+                            }
+                        }
+                        return pos3d_1;
                     }
-                    return visual.position;
                 }
             }
             return null;
@@ -746,7 +814,14 @@ var EntityUtils;
             return pos3d;
         }
         pos3d = evaluateRecord();
-        return Cartes.ValidateCartes3(pos3d) ? pos3d : null;
+        var carto = Cartes.ValidateCartes3(pos3d) ? Cartographic.fromCartesian(pos3d) : null;
+        if (carto) {
+            // Since we don't know height reference, we can't convert it.
+            // We will just clamp it to ground.
+            var terrainHeight = EnsureNumber(viewer.scene.globe.getHeight(carto), 0);
+            pos3d = Cartesian3.fromRadians(carto.longitude, carto.latitude, terrainHeight);
+        }
+        return pos3d;
     }
     EntityUtils.GetPos = GetPos;
     /**
@@ -2311,13 +2386,11 @@ var CesiumParabola = /** @class */ (function () {
     CesiumParabola.prototype.Animate = function () {
         var _this = this;
         this.Dispose();
-        var p1 = this.curPos1;
-        var p2 = this.curPos2;
         var retry = false;
-        if (!p1 || !p2 || !Cartes.ValidateCartes3(p1) || !Cartes.ValidateCartes3(p2)) {
+        if (!this.curPos1 || !this.curPos2 || !Cartes.ValidateCartes3(this.curPos1) || !Cartes.ValidateCartes3(this.curPos2)) {
             retry = true;
         }
-        var TOTAL_LENGTH = retry ? 0 : Cartesian3.distance(p1, p2);
+        var TOTAL_LENGTH = retry ? 0 : Cartesian3.distance(this.curPos1, this.curPos2);
         if (TOTAL_LENGTH <= 0) {
             retry = true;
         }
@@ -2330,11 +2403,11 @@ var CesiumParabola = /** @class */ (function () {
             };
             return;
         }
-        var TOTAL_POINTS = Math.max(50, Math.min(1000, TOTAL_LENGTH * 0.1));
-        var POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
         var RATE_PER_SECOND = 1000 / 40;
         var SEC_DURATION = this.duration;
         var HEIGHT_DISTANCE_RATIO = this.heightDistanceRatio;
+        var TOTAL_POINTS = Math.max(50, Math.min(1000, TOTAL_LENGTH * 0.1));
+        var POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
         var TICK_LENGTH_INC = SEC_DURATION == 0 ? TOTAL_LENGTH : TOTAL_POINTS / (RATE_PER_SECOND * SEC_DURATION);
         var curPoints = [];
         var curPoint = 0;
@@ -2366,7 +2439,7 @@ var CesiumParabola = /** @class */ (function () {
             }, false),
             point: {
                 heightReference: HeightReference.NONE,
-                pixelSize: this.width * 1.3,
+                pixelSize: this.width * 1.8,
                 color: Color.fromCssColorString(this.color),
                 outlineColor: Color.WHITE,
                 outlineWidth: 2
@@ -2376,107 +2449,125 @@ var CesiumParabola = /** @class */ (function () {
         this.viewer.entities.add(p2Entity);
         p1Entity.parent = parabola;
         p2Entity.parent = parabola;
+        var siblings = [p1Entity, p2Entity];
         var quadraticKey = null;
         var quadratic = null;
-        var prepareQuadratic = function () {
-            var p1 = _this.curPos1;
-            var p2 = _this.curPos2;
-            if (!p1 || !p2 || !Cartes.ValidateCartes3(p1) || !Cartes.ValidateCartes3(p2)) {
-                return;
-            }
-            var height1 = Cartographic.fromCartesian(p1).height;
-            var height2 = Cartographic.fromCartesian(p2).height;
-            if (isNaN(height1) || isNaN(height2)) {
-                return;
-            }
-            var totalHeight = height2 + height1;
-            var curQuadraticKey = height1 + "-" + height2;
-            if (quadraticKey == curQuadraticKey) {
-                return;
-            }
-            var points2d = [
-                new Cartesian2(0, height1),
-                new Cartesian2(TOTAL_LENGTH, height2)
-            ];
-            var vertexHeight = 0;
-            // Flat line.
-            if (HEIGHT_DISTANCE_RATIO == 0) {
-                vertexHeight = totalHeight * 0.5;
-            }
-            else {
-                var largestHeight = Math.max(height1, height2);
-                vertexHeight = largestHeight + (TOTAL_LENGTH * HEIGHT_DISTANCE_RATIO);
-            }
-            points2d.push(new Cartesian2(TOTAL_LENGTH * 0.5, vertexHeight));
-            var calcQuadratic = function (points) {
-                // Swaps position of two rows in matrix.
-                function swapRows(matrix, rowAIndex, rowBIndex) {
-                    var rowAVal = matrix[rowAIndex];
-                    matrix[rowAIndex] = matrix[rowBIndex];
-                    matrix[rowBIndex] = rowAVal;
-                    return matrix;
+        var quadraticPreparing = false;
+        var prepareQuadratic = function () { return __awaiter(_this, void 0, void 0, function () {
+            var p1, p2, height1, height2, totalHeight, curQuadraticKey, points2d, vertexHeight, largestHeight, calcQuadratic;
+            return __generator(this, function (_a) {
+                if (quadraticPreparing) {
+                    return [2 /*return*/];
                 }
-                // Zeros rowA at colIndex by subtracting a multiplied rowB from it.
-                function reduceMatrixRowByRow(matrix, zeroingIndex, parentIndex, colIndex) {
-                    var zeroRow = matrix[zeroingIndex];
-                    var parentRow = matrix[parentIndex];
-                    if (zeroRow[colIndex] == 0) {
-                        return matrix;
+                quadraticPreparing = true;
+                try {
+                    p1 = this.curPos1;
+                    p2 = this.curPos2;
+                    if (!p1 || !p2 || !Cartes.ValidateCartes3(p1) || !Cartes.ValidateCartes3(p2)) {
+                        return [2 /*return*/];
                     }
-                    else if (parentRow[colIndex] == 0) {
-                        matrix = swapRows(matrix, parentIndex, zeroingIndex);
-                        return divideMatrixRow(matrix, parentIndex, colIndex);
+                    height1 = Cartographic.fromCartesian(p1).height;
+                    height2 = Cartographic.fromCartesian(p2).height;
+                    if (isNaN(height1) || isNaN(height2)) {
+                        return [2 /*return*/];
                     }
-                    // rowAIndex colIndex / rowBIndex colIndex = factor;
-                    var factor = zeroRow[colIndex] / parentRow[colIndex];
-                    for (var i = 0; i < zeroRow.length; i++) {
-                        if (i >= colIndex) {
-                            zeroRow[i] -= parentRow[i] * factor;
-                        }
+                    totalHeight = height2 + height1;
+                    curQuadraticKey = height1 + "-" + height2 + "-" + TOTAL_LENGTH;
+                    if (quadraticKey == curQuadraticKey) {
+                        return [2 /*return*/];
                     }
-                    return matrix;
-                }
-                // Makes a given row column equal 1 by diving while row by that column.
-                function divideMatrixRow(matrix, rowIndex, colIndex) {
-                    var row = matrix[rowIndex];
-                    var colValue = row[colIndex];
-                    for (var i = 0; i < row.length; i++) {
-                        if (i >= colIndex) {
-                            row[i] /= colValue;
-                        }
+                    points2d = [
+                        new Cartesian2(0, height1),
+                        new Cartesian2(TOTAL_LENGTH, height2)
+                    ];
+                    vertexHeight = 0;
+                    // Flat line.
+                    if (HEIGHT_DISTANCE_RATIO == 0) {
+                        vertexHeight = totalHeight * 0.5;
                     }
-                    return matrix;
-                }
-                // Returns initial matrix for calculating a, b and c for quadratic formula from given points.
-                function matrixFromPoints(points) {
-                    var rows = [];
-                    var constructRow = function (point) {
-                        rows.push([
-                            -Math.pow(point.x, 2),
-                            point.x,
-                            1,
-                            point.y
-                        ]);
-                    };
-                    for (var i = 0; i < points.length; i++) {
-                        constructRow(points[i]);
+                    else {
+                        largestHeight = Math.max(height1, height2);
+                        vertexHeight = largestHeight + (TOTAL_LENGTH * HEIGHT_DISTANCE_RATIO);
                     }
-                    return rows;
+                    points2d.push(new Cartesian2(TOTAL_LENGTH * 0.5, vertexHeight));
+                    calcQuadratic = function (points) {
+                        // Swaps position of two rows in matrix.
+                        function swapRows(matrix, rowAIndex, rowBIndex) {
+                            var rowAVal = matrix[rowAIndex];
+                            matrix[rowAIndex] = matrix[rowBIndex];
+                            matrix[rowBIndex] = rowAVal;
+                            return matrix;
+                        }
+                        // Zeros rowA at colIndex by subtracting a multiplied rowB from it.
+                        function reduceMatrixRowByRow(matrix, zeroingIndex, parentIndex, colIndex) {
+                            var zeroRow = matrix[zeroingIndex];
+                            var parentRow = matrix[parentIndex];
+                            if (zeroRow[colIndex] == 0) {
+                                return matrix;
+                            }
+                            else if (parentRow[colIndex] == 0) {
+                                matrix = swapRows(matrix, parentIndex, zeroingIndex);
+                                return divideMatrixRow(matrix, parentIndex, colIndex);
+                            }
+                            // rowAIndex colIndex / rowBIndex colIndex = factor;
+                            var factor = zeroRow[colIndex] / parentRow[colIndex];
+                            for (var i = 0; i < zeroRow.length; i++) {
+                                if (i >= colIndex) {
+                                    zeroRow[i] -= parentRow[i] * factor;
+                                }
+                            }
+                            return matrix;
+                        }
+                        // Makes a given row column equal 1 by diving while row by that column.
+                        function divideMatrixRow(matrix, rowIndex, colIndex) {
+                            var row = matrix[rowIndex];
+                            var colValue = row[colIndex];
+                            for (var i = 0; i < row.length; i++) {
+                                if (i >= colIndex) {
+                                    row[i] /= colValue;
+                                }
+                            }
+                            return matrix;
+                        }
+                        // Returns initial matrix for calculating a, b and c for quadratic formula from given points.
+                        function matrixFromPoints(points) {
+                            var rows = [];
+                            var constructRow = function (point) {
+                                rows.push([
+                                    -Math.pow(point.x, 2),
+                                    point.x,
+                                    1,
+                                    point.y
+                                ]);
+                            };
+                            for (var i = 0; i < points.length; i++) {
+                                constructRow(points[i]);
+                            }
+                            return rows;
+                        }
+                        var initialMatrix = matrixFromPoints(points);
+                        var step1Matrix = reduceMatrixRowByRow(initialMatrix, 1, 0, 0);
+                        var step2Matrix = reduceMatrixRowByRow(step1Matrix, 2, 0, 0);
+                        var step3Matrix = reduceMatrixRowByRow(step2Matrix, 2, 1, 1);
+                        var step4Matrix = reduceMatrixRowByRow(step3Matrix, 0, 1, 1);
+                        var step5Matrix = reduceMatrixRowByRow(step4Matrix, 0, 2, 2);
+                        var step6Matrix = reduceMatrixRowByRow(step5Matrix, 1, 2, 2);
+                        var a = step6Matrix[0][3];
+                        var b = step6Matrix[1][3];
+                        var c = step6Matrix[2][3];
+                        return { a: a, b: b, c: c };
+                    };
+                    quadratic = calcQuadratic(points2d);
                 }
-                var initialMatrix = matrixFromPoints(points);
-                var step1Matrix = reduceMatrixRowByRow(initialMatrix, 1, 0, 0);
-                var step2Matrix = reduceMatrixRowByRow(step1Matrix, 2, 0, 0);
-                var step3Matrix = reduceMatrixRowByRow(step2Matrix, 2, 1, 1);
-                var step4Matrix = reduceMatrixRowByRow(step3Matrix, 0, 1, 1);
-                var step5Matrix = reduceMatrixRowByRow(step4Matrix, 0, 2, 2);
-                var step6Matrix = reduceMatrixRowByRow(step5Matrix, 1, 2, 2);
-                var a = step6Matrix[0][3];
-                var b = step6Matrix[1][3];
-                var c = step6Matrix[2][3];
-                return { a: a, b: b, c: c };
-            };
-            quadratic = calcQuadratic(points2d);
-        };
+                catch (e) {
+                    console.error(e);
+                }
+                finally {
+                    quadraticPreparing = false;
+                }
+                return [2 /*return*/];
+            });
+        }); };
         var getPosition = function (increment) {
             if (!quadratic) {
                 return null;
@@ -2494,13 +2585,16 @@ var CesiumParabola = /** @class */ (function () {
             var pos3d = DrawingUtils.PointAcrossPolyline({
                 viewer: _this.viewer,
                 distance: lengthAcross,
-                posses: [p1, p2]
+                posses: [_this.curPos1, _this.curPos2]
             }).point;
             var point = Cartographic.fromCartesian(pos3d);
             var posHeight = getParabolaYFromX(lengthAcross, quadratic);
             return Cartesian3.fromRadians(point.longitude, point.latitude, posHeight);
         };
         var updatePoints = function () {
+            if (!quadratic) {
+                return;
+            }
             var increment = Math.floor(curPoint);
             var chips = curPoint - Math.floor(curPoint);
             var posses = [];
@@ -2517,13 +2611,22 @@ var CesiumParabola = /** @class */ (function () {
             curPoints = posses;
         };
         var doTick = function () {
-            if (curPoint >= TOTAL_POINTS) {
-                clearInterval(animateInterval);
-                return;
+            var p1 = _this.curPos1;
+            var p2 = _this.curPos2;
+            var newLength = p1 && p2 ? Cartesian3.distance(p1, p2) : -1;
+            if (newLength > 0 && newLength != TOTAL_LENGTH) {
+                TOTAL_LENGTH = newLength;
+                TOTAL_POINTS = Math.max(50, Math.min(1000, TOTAL_LENGTH * 0.1));
+                POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
+                TICK_LENGTH_INC = SEC_DURATION == 0 ? TOTAL_LENGTH : TOTAL_POINTS / (RATE_PER_SECOND * SEC_DURATION);
             }
-            curPoint += TICK_LENGTH_INC;
             prepareQuadratic();
-            updatePoints();
+            if (quadratic) {
+                if (curPoint < TOTAL_POINTS) {
+                    curPoint += TICK_LENGTH_INC;
+                }
+                updatePoints();
+            }
         };
         var animateInterval = setInterval(doTick, RATE_PER_SECOND);
         this.dispose = function () {
@@ -2540,10 +2643,7 @@ var CesiumParabola = /** @class */ (function () {
         };
         return {
             parabola: parabola,
-            siblings: [
-                p1Entity,
-                p2Entity
-            ]
+            siblings: siblings
         };
     };
     CesiumParabola.prototype.Dispose = function () {
@@ -2565,7 +2665,7 @@ var RelationRenderEngine;
     RelationRenderEngine.GetRenderGroupId = GetRenderGroupId;
     function Render(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var apiGetter, viewer, visualRegister, menuItemId, relations, api, rendered, i, relation, fromEntity, toEntity, dataEntity, _a, relationType, style, _b, cEntity;
+            var apiGetter, viewer, visualRegister, menuItemId, relations, api, rendered, i, relation, fromEntity, toEntity, dataEntity, _a, relationType, styleId, entityType, style, _b, cEntity;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -2575,7 +2675,7 @@ var RelationRenderEngine;
                         i = 0;
                         _c.label = 1;
                     case 1:
-                        if (!(i < relations.length)) return [3 /*break*/, 12];
+                        if (!(i < relations.length)) return [3 /*break*/, 14];
                         relation = relations[i];
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
@@ -2608,18 +2708,29 @@ var RelationRenderEngine;
                             })];
                     case 7:
                         relationType = (_c.sent()).relationType;
-                        if (!relationType.EntityDisplaySettingID) return [3 /*break*/, 9];
-                        return [4 /*yield*/, Style.Get({
+                        styleId = Number(relationType === null || relationType === void 0 ? void 0 : relationType["Relation.EntityType.ID"]);
+                        if (!!styleId) return [3 /*break*/, 9];
+                        return [4 /*yield*/, EntityType.Get({
                                 api: api,
-                                styleId: Number(relationType.EntityDisplaySettingID)
+                                entityTypeId: relationType === null || relationType === void 0 ? void 0 : relationType["Relation.EntityType.ID"]
                             })];
                     case 8:
-                        _b = (_c.sent()).style;
-                        return [3 /*break*/, 10];
+                        entityType = (_c.sent()).entityType;
+                        styleId = entityType === null || entityType === void 0 ? void 0 : entityType["DisplaySetting.ID"];
+                        _c.label = 9;
                     case 9:
-                        _b = null;
-                        _c.label = 10;
+                        if (!styleId) return [3 /*break*/, 11];
+                        return [4 /*yield*/, Style.Get({
+                                api: api,
+                                styleId: styleId
+                            })];
                     case 10:
+                        _b = (_c.sent()).style;
+                        return [3 /*break*/, 12];
+                    case 11:
+                        _b = null;
+                        _c.label = 12;
+                    case 12:
                         style = _b;
                         cEntity = Parabola.Render({
                             dataEntity: dataEntity,
@@ -2632,11 +2743,11 @@ var RelationRenderEngine;
                         });
                         cEntity._renderGroup = GetRenderGroupId(relation);
                         rendered[GetRenderGroupId(relation)] = cEntity;
-                        _c.label = 11;
-                    case 11:
+                        _c.label = 13;
+                    case 13:
                         i++;
                         return [3 /*break*/, 1];
-                    case 12: return [2 /*return*/, rendered];
+                    case 14: return [2 /*return*/, rendered];
                 }
             });
         });
@@ -2658,29 +2769,37 @@ var RelationRenderEngine;
             var hDistanceRatio = EnsureNumber((style === null || style === void 0 ? void 0 : style.heightDistanceRatio) ? Calculator.GetValue(style === null || style === void 0 ? void 0 : style.heightDistanceRatio, entity, []) : 0.25, 0.25);
             var fromPos = null;
             var toPos = null;
+            var updatingPosses = false;
             var updatePosses = function () {
+                if (updatingPosses) {
+                    return;
+                }
+                updatingPosses = true;
                 try {
                     fromPos = EntityUtils.GetPos({
                         entity: params.fromEntity,
                         viewer: params.viewer,
-                        visualRegister: params.visualRegister
+                        visualRegister: params.visualRegister,
+                        heightReference: HeightReference.NONE
                     });
                     toPos = EntityUtils.GetPos({
                         entity: params.toEntity,
                         viewer: params.viewer,
-                        visualRegister: params.visualRegister
+                        visualRegister: params.visualRegister,
+                        heightReference: HeightReference.NONE
                     });
                 }
                 catch (e) {
                     console.error(e);
                 }
+                updatingPosses = false;
             };
             updatePosses();
             var parabola = new CesiumParabola({
                 viewer: params.viewer,
                 pos1: function () { return fromPos; },
                 pos2: function () { return toPos; },
-                color: cColor.toString(),
+                color: cColor.toCssColorString(),
                 width: width,
                 duration: duration,
                 heightDistanceRatio: hDistanceRatio
@@ -4677,7 +4796,8 @@ function createFilterGetterCacheKey(params) {
     cacheKey += params.api.GetBaseUrl();
     cacheKey += params.typeId;
     cacheKey += params.batchSize;
-    cacheKey += JSON.stringify(params.attrFilter);
+    // This could potentially crash, but if it crashes here then it would crash during API request anyways.
+    cacheKey += JSON.stringify(params.attrFilter ? params.attrFilter : {});
     return cacheKey;
 }
 var SharedGetters;
@@ -5729,9 +5849,10 @@ var RelationsRenderManager;
 var MenuItemManager;
 (function (MenuItemManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsRegister) {
+        function Manager(params) {
             this.items = [];
             this.onUpdate = null;
+            var viewer = params.viewer, visualsRegister = params.visualsRegister;
             this.viewer = viewer;
             if (!visualsRegister) {
                 visualsRegister = new VisualsRegister.Register(viewer);
@@ -5768,12 +5889,10 @@ var MenuItemManager;
          * Renders a given menu item and all ids children.
          * Will return the enabled item id.
          * @param params
-         * @param recursive
          * @returns
          */
-        Manager.prototype.RenderItem = function (params, recursive) {
+        Manager.prototype.RenderItem = function (params) {
             var _a, _b, _c;
-            if (recursive === void 0) { recursive = true; }
             return __awaiter(this, void 0, void 0, function () {
                 var rItem, isFolder, i, childId;
                 return __generator(this, function (_d) {
@@ -5901,7 +6020,7 @@ var MenuItemManager;
                             _d.label = 2;
                         case 2:
                             isFolder = !params.item.Type || params.item.Type == MenuItem.EType.None;
-                            if (!(params.item.Children && recursive && isFolder)) return [3 /*break*/, 6];
+                            if (!(params.item.Children && params.recursive != false && isFolder)) return [3 /*break*/, 6];
                             i = 0;
                             _d.label = 3;
                         case 3:
@@ -5929,17 +6048,20 @@ var MenuItemManager;
          * @param id
          * @param recursive
          */
-        Manager.prototype.RemoveItemById = function (id, recursive) {
+        Manager.prototype.RemoveItemById = function (params) {
             var _a, _b;
-            if (recursive === void 0) { recursive = true; }
             return __awaiter(this, void 0, void 0, function () {
-                var item, _loop_1, this_1, i;
+                var id, recursive, item, _loop_1, this_1, i;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
+                            id = params.menuItemId, recursive = params.recursive;
                             if (this.viewer.isDestroyed()) {
                                 return [2 /*return*/];
                             }
+                            if (recursive == null) {
+                                recursive = true;
+                            }
                             item = this.items.find(function (x) { return x.id === id; });
                             if (!item) return [3 /*break*/, 5];
                             if (!recursive) return [3 /*break*/, 4];
@@ -5950,7 +6072,9 @@ var MenuItemManager;
                                         case 0:
                                             child = this_1.items.find(function (x) { return x.id === item.childIds[i]; });
                                             if (!child) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this_1.RemoveItemById(child.id)];
+                                            return [4 /*yield*/, this_1.RemoveItemById({
+                                                    menuItemId: child.id
+                                                })];
                                         case 1:
                                             _a.sent();
                                             _a.label = 2;
@@ -5995,15 +6119,15 @@ var MenuItemManager;
          * Rerenders given entities.
          * If no menu items are specified then the rerender is called on all enabled menu items.
          * It is highly recommended to supply menu item ids.
-         * @param entityIds
-         * @param menuItemIds
+         * @param params
          */
-        Manager.prototype.ReRender = function (entityIds, menuItemIds) {
+        Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var items, i, item;
+                var entityIds, menuItemIds, items, i, item;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            entityIds = params.entityIds, menuItemIds = params.menuItemIds;
                             if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
                                 return [2 /*return*/];
                             }
@@ -6345,6 +6469,14 @@ var MenuItemCreator;
         });
     }
     MenuItemCreator.RenderBookmarkItems = RenderBookmarkItems;
+    function RenderRelations(params) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/];
+            });
+        });
+    }
+    MenuItemCreator.RenderRelations = RenderRelations;
 })(MenuItemCreator || (MenuItemCreator = {}));
 
 var DEFAULT_BING_KEY = "AqL0uYT5T84jiJeX55_b9zJeeP3MX2p1WLOHH4ljIEPZ7ZL2M81bYLzyYeSwuzzl";
@@ -7311,37 +7443,61 @@ var TileRenderEngine;
 // TODO: Move these to the data model.
 var MIN_SHADOW_SIZE = 2048;
 var MAX_SHADOW_SIZE = 32768;
+var RELATION_MENU_ITEM_ID = "BOOKMARK_ENTITY_RELATIONS";
+/**
+ * Renders DATA_VERSION = 1 navigator.
+ * @param params
+ * @param bookmark
+ * @param view
+ */
 function renderLegacyNavigator(params, bookmark, view) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     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) {
+        var vSettings, bSettings, manager, VR, scene, baseColor, frustum, curFrustum, camera, pos, go, fxaa, pointer, clock, timeStr, enabledItems, newItemIds, _i, enabledItems_1, id, menuItem;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     vSettings = view.Settings;
                     bSettings = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings;
+                    manager = params.manager;
+                    VR = manager.VisualsRegister;
+                    scene = manager.Viewer.scene;
                     return [4 /*yield*/, TileRenderEngine.Terrain.LegacyNavigator.RenderView({
                             apiGetter: params.apiGetter,
                             bookmarkId: params.bookmarkId,
-                            viewer: params.manager.Viewer,
+                            viewer: manager.Viewer,
                             viewId: params.viewId,
                         })];
                 case 1:
-                    _c.sent();
+                    _f.sent();
                     return [4 /*yield*/, TileRenderEngine.Map.LegacyNavigator.RenderView({
                             apiGetter: params.apiGetter,
                             bookmarkId: params.bookmarkId,
-                            viewer: params.manager.Viewer,
+                            viewer: manager.Viewer,
                             viewId: params.viewId,
                             ignoreIds: []
                         })];
                 case 2:
-                    _c.sent();
+                    _f.sent();
+                    baseColor = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeColor;
+                    if (baseColor == null) {
+                        // TODO: Need global default.
+                        baseColor = "#0326BE";
+                    }
+                    scene.globe.baseColor = Color.fromCssColorString(baseColor);
+                    // TODO: Other scene settings.
+                    // TODO: Rendered relationships.
+                    VR.ClearHidden();
+                    if ((_a = bSettings.hiddenEntityIds) === null || _a === void 0 ? void 0 : _a.length) {
+                        VR.SetHidden({
+                            entityIds: bSettings.hiddenEntityIds,
+                            hidden: true
+                        });
+                    }
                     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) {
@@ -7357,7 +7513,7 @@ function renderLegacyNavigator(params, bookmark, view) {
                     if (!params.skipCamera) {
                         camera = bookmark.Camera;
                         pos = Cartesian3.fromDegrees(+camera.position.longitude, +camera.position.latitude, +camera.position.height);
-                        params.manager.Viewer.scene.camera.flyTo({
+                        manager.Viewer.scene.camera.flyTo({
                             destination: pos,
                             orientation: {
                                 heading: +camera.heading,
@@ -7367,41 +7523,83 @@ function renderLegacyNavigator(params, bookmark, view) {
                             duration: params.skipTransition ? 0 : 2
                         });
                     }
-                    go = (_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _a === void 0 ? void 0 : _a.groundOcclusion;
+                    go = (_b = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _b === void 0 ? void 0 : _b.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);
-                        }
+                    manager.Viewer.scene.globe.depthTestAgainstTerrain = go;
+                    fxaa = manager.Viewer.scene.postProcessStages.fxaa;
+                    fxaa.enabled = true;
+                    pointer = (_c = bSettings === null || bSettings === void 0 ? void 0 : bSettings.timelineSettings) === null || _c === void 0 ? void 0 : _c.timelinePointer;
+                    if (pointer != null) {
+                        clock = manager.Viewer.clock;
+                        timeStr = JulianDate.toIso8601(pointer);
+                        clock.currentTime = JulianDate.fromIso8601(timeStr);
                     }
-                    if (!params.bookmarkId) return [3 /*break*/, 4];
+                    enabledItems = manager.GetEnabledItemIds();
+                    newItemIds = (_d = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedItemIds) !== null && _d !== void 0 ? _d : [];
+                    _i = 0, enabledItems_1 = enabledItems;
+                    _f.label = 3;
+                case 3:
+                    if (!(_i < enabledItems_1.length)) return [3 /*break*/, 6];
+                    id = enabledItems_1[_i];
+                    if (!(newItemIds.indexOf(id) === -1 ||
+                        id == RELATION_MENU_ITEM_ID)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, params.manager.RemoveItemById({
+                            menuItemId: id
+                        })];
+                case 4:
+                    _f.sent();
+                    _f.label = 5;
+                case 5:
+                    _i++;
+                    return [3 /*break*/, 3];
+                case 6:
+                    if (!params.bookmarkId) return [3 /*break*/, 8];
                     return [4 /*yield*/, MenuItemCreator.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
-                            manager: params.manager,
+                            manager: manager,
                             view: view,
                             bookmark: bookmark
                         })];
-                case 3:
-                    _c.sent();
-                    _c.label = 4;
-                case 4: return [2 /*return*/];
+                case 7:
+                    _f.sent();
+                    _f.label = 8;
+                case 8:
+                    if (!((_e = bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 10];
+                    menuItem = {
+                        id: RELATION_MENU_ITEM_ID,
+                        Caption: "Entity relations",
+                        BruceEntity: {
+                            EntityIds: bSettings.drawnRelationEntityIDs
+                        },
+                        Type: MenuItem.EType.Relations
+                    };
+                    return [4 /*yield*/, params.manager.RenderItem({
+                            apiGetter: params.apiGetter,
+                            item: menuItem
+                        })];
+                case 9:
+                    _f.sent();
+                    _f.label = 10;
+                case 10: return [2 /*return*/];
             }
         });
     });
 }
+/**
+ * Renders DATA_VERSION > 1 navigator.
+ * @param params
+ * @param bookmark
+ * @param view
+ */
 function renderNavigator(params, bookmark, view) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, hillShades, baseColor, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, terrain, selectedIds, i, id, imagery, RELATION_MENU_ITEM_ID, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, hillShades, baseColor, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, terrain, selectedIds, i, id, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
         return __generator(this, function (_2) {
             switch (_2.label) {
                 case 0:
@@ -7616,7 +7814,6 @@ function renderNavigator(params, bookmark, view) {
                         })];
                 case 3:
                     _2.sent();
-                    RELATION_MENU_ITEM_ID = "BOOKMARK_ENTITY_RELATIONS";
                     renderedRelationEntityIds = bSettings.renderedEntityRelations;
                     if (!renderedRelationEntityIds) {
                         renderedRelationEntityIds = [];
@@ -7630,7 +7827,9 @@ function renderNavigator(params, bookmark, view) {
                     id = curEnabled_1[_i];
                     if (!(newItemIds.indexOf(id) === -1 ||
                         id == RELATION_MENU_ITEM_ID)) return [3 /*break*/, 6];
-                    return [4 /*yield*/, params.manager.RemoveItemById(id)];
+                    return [4 /*yield*/, params.manager.RemoveItemById({
+                            menuItemId: id
+                        })];
                 case 5:
                     _2.sent();
                     _2.label = 6;
@@ -7713,9 +7912,6 @@ var ViewRenderEngine;
                         bookmark = _b;
                         _c.label = 7;
                     case 7:
-                        if (bookmark && view.DataVersion != bookmark.DataVersion) {
-                            throw new Error("View and bookmark settings version mismatch.");
-                        }
                         version = view.DataVersion;
                         if (!(version == 1)) return [3 /*break*/, 9];
                         return [4 /*yield*/, renderLegacyNavigator(params, bookmark, view)];
@@ -7736,7 +7932,8 @@ var ViewRenderEngine;
 
 var ViewUtils;
 (function (ViewUtils) {
-    function GatherLegacyMapTiles(viewer) {
+    function GatherLegacyMapTiles(params) {
+        var viewer = params.viewer;
         var collection = viewer.imageryLayers;
         var tiles = [];
         for (var i = 0; i < collection.length; i++) {
@@ -7753,15 +7950,22 @@ var ViewUtils;
                 });
             }
         }
-        return tiles.reverse();
+        return {
+            imagery: tiles.reverse()
+        };
     }
     ViewUtils.GatherLegacyMapTiles = GatherLegacyMapTiles;
-    function GatherLegacyTerrainTile(viewer) {
+    function GatherLegacyTerrainTile(params) {
+        var viewer = params.viewer;
         var enabled = viewer.terrainProvider;
         if (enabled === null || enabled === void 0 ? void 0 : enabled._bName) {
-            return enabled._bName;
+            return {
+                terrain: enabled._bName
+            };
         }
-        return "flatterrain";
+        return {
+            terrain: "flatterrain"
+        };
     }
     ViewUtils.GatherLegacyTerrainTile = GatherLegacyTerrainTile;
     function GatherMapTiles(params) {