bruce-cesium 3.9.4 → 3.9.6

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, SceneMode, Entity, Primitive, Cesium3DTileFeature, GeoJsonDataSource, ColorMaterialProperty, ConstantProperty, DistanceDisplayCondition, NearFarScalar, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, CzmlDataSource, Quaternion, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2904,7 +2904,10 @@ var EntityUtils;
      * @returns
      */
     function GetPos(params) {
-        var viewer = params.viewer, entity = params.entity, visualRegister = params.visualRegister;
+        var viewer = params.viewer, entity = params.entity, visualRegister = params.visualRegister, allowRendered = params.allowRendered;
+        if (allowRendered == null) {
+            allowRendered = true;
+        }
         function evaluateRendered() {
             var rego = visualRegister ? visualRegister.GetRego({
                 entityId: entity.Bruce.ID,
@@ -3017,7 +3020,7 @@ var EntityUtils;
                 }
             }
         }
-        var pos3d = evaluateRendered();
+        var pos3d = allowRendered ? evaluateRendered() : null;
         if (Cartes.ValidateCartes3(pos3d)) {
             return pos3d;
         }
@@ -4327,6 +4330,8 @@ function runCullChecker(register) {
             checkInterval = null;
             return;
         }
+        var toRemove = [];
+        var toAdd = [];
         var slice = entityIds.splice(0, CHECK_BATCH);
         for (var i = 0; i < slice.length; i++) {
             var entityId = slice[i];
@@ -4349,9 +4354,10 @@ function runCullChecker(register) {
                 var shouldCull = shouldCullEntity(viewer, part);
                 if (shouldCull) {
                     part[VisualRegisterCuller.VISUAL_CULL_KEY] = true;
-                    if (viewer.entities.contains(part)) {
-                        viewer.entities.remove(part);
-                    }
+                    // if (viewer.entities.contains(part)) {
+                    //     viewer.entities.remove(part);
+                    // }
+                    toRemove.push(part);
                 }
                 else {
                     delete part[VisualRegisterCuller.VISUAL_CULL_KEY];
@@ -4360,11 +4366,18 @@ function runCullChecker(register) {
                         !viewer.entities.contains(part) &&
                         !hiddenIds.includes(entityId) &&
                         (isolatedIds.length <= 0 || isolatedIds.includes(entityId))) {
-                        viewer.entities.add(part);
+                        // viewer.entities.add(part);
+                        toAdd.push(part);
                     }
                 }
             }
         }
+        if (toRemove.length > 0) {
+            removeEntities(viewer, toRemove);
+        }
+        if (toAdd.length > 0) {
+            addEntities(viewer, toAdd);
+        }
         if (entityIds.length <= 0) {
             clearInterval(checkInterval);
             checkInterval = null;
@@ -4375,6 +4388,53 @@ function runCullChecker(register) {
         }
     }, 200);
 }
+// The latest remove/add pending states of an Entity.
+var entityRemoveAddState = new Map();
+/**
+ * Removes Entities from the viewer.
+ * This performs the action next viewer update to avoid any internal Cesium issues that can cause crashes.
+ * @param viewer
+ * @param entities
+ */
+function removeEntities(viewer, entities) {
+    for (var i = 0; i < entities.length; i++) {
+        var entity = entities[i];
+        entityRemoveAddState.set(entity.id, false);
+    }
+    var removal = viewer.scene.postRender.addEventListener(function () {
+        removal();
+        for (var i = 0; i < entities.length; i++) {
+            var entity = entities[i];
+            if (entityRemoveAddState.get(entity.id) != false) {
+                continue;
+            }
+            entityRemoveAddState.delete(entity.id);
+            viewer.entities.remove(entity);
+        }
+    });
+}
+/**
+ * Adds Entities to the viewer.
+ * @param viewer
+ * @param entities
+ */
+function addEntities(viewer, entities) {
+    for (var i = 0; i < entities.length; i++) {
+        var entity = entities[i];
+        entityRemoveAddState.set(entity.id, true);
+    }
+    var removal = viewer.scene.postRender.addEventListener(function () {
+        removal();
+        for (var i = 0; i < entities.length; i++) {
+            var entity = entities[i];
+            if (entityRemoveAddState.get(entity.id) != true) {
+                continue;
+            }
+            entityRemoveAddState.delete(entity.id);
+            viewer.entities.add(entity);
+        }
+    });
+}
 var VisualRegisterCuller;
 (function (VisualRegisterCuller) {
     VisualRegisterCuller.VISUAL_CULL_KEY = Symbol("VISUAL_CULL_KEY");
@@ -4739,21 +4799,11 @@ function getStyle(api, entity, styleId) {
         });
     });
 }
-/**
- * Height fix means while flat terrain is active we don't clamp-to-ground and instead place at alt=0.
- * This is currently breaking as the curvature of the earth makes larger polygons/polylines clip.
- * @param terrain
- * @returns
- */
-function shouldApplyFlatFix(terrain) {
-    //return terrain instanceof Cesium.EllipsoidTerrainProvider;
-    return false;
-}
-function getRenderGroupId(zoomItem, terrain) {
+function getRenderGroupId(zoomItem) {
     if (!zoomItem) {
         return null;
     }
-    return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + shouldApplyFlatFix(terrain);
+    return zoomItem.MinZoom + "-" + zoomItem.MaxZoom;
 }
 // Key = url + scale.
 var _fileRadiusCache = new LRUCache(1000);
@@ -5026,7 +5076,8 @@ function getSeriesPossesForHistoricEntity(viewer, heightRef, historic) {
             entity: item.data,
             viewer: viewer,
             recordHeightRef: heightRef,
-            returnHeightRef: heightRef
+            returnHeightRef: heightRef,
+            allowRendered: false
         });
         var dateTime = new Date(item.dateTime);
         if (!dateTime || !pos3d || isNaN(pos3d.x) || isNaN(pos3d.y) || isNaN(pos3d.z)) {
@@ -5039,14 +5090,116 @@ function getSeriesPossesForHistoricEntity(viewer, heightRef, historic) {
     }
     return series;
 }
+/**
+ * Returns if the given positions are equal.
+ * @param a
+ * @param b
+ */
+function comparePositions(a, b) {
+    // Same reference.
+    if (a == b) {
+        return true;
+    }
+    // Different lengths or one is null.
+    if ((!a || !b) || (a.length != b.length)) {
+        return false;
+    }
+    for (var i = 0; i < a.length; i++) {
+        var posA = a[i];
+        var posB = b[i];
+        // Null detected.
+        if (!posA || !posB) {
+            return false;
+        }
+        // Position values don't match.
+        if (!Cartes.IsEqualCartes3(posA, posB)) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Returns if the given polygon hierarchies are equal.
+ * @param a
+ * @param b
+ */
+function comparePolygonHierarchies(a, b) {
+    // Same reference.
+    if (a == b) {
+        return true;
+    }
+    // Different lengths or one is null.
+    if ((!a || !b) || (a.positions.length != b.positions.length)) {
+        return false;
+    }
+    // Positions don't match.
+    if (!comparePositions(a.positions, b.positions)) {
+        return false;
+    }
+    var holes = a.holes;
+    var bHoles = b.holes;
+    // Number of holes don't match.
+    if (holes.length != bHoles.length) {
+        return false;
+    }
+    for (var i = 0; i < holes.length; i++) {
+        // Hole positions don't match.
+        if (!comparePositions(holes[i].positions, bHoles[i].positions)) {
+            return false;
+        }
+    }
+    return true;
+}
+function getColor$2(viewer, obj) {
+    var value = null;
+    if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
+        var date = viewer.scene.lastRenderTime;
+        if (!date) {
+            date = viewer.clock.currentTime;
+        }
+        value = obj.getValue(date);
+    }
+    else {
+        value = obj;
+    }
+    if (value && value instanceof ColorMaterialProperty) {
+        value = value.color;
+    }
+    return value;
+}
+/**
+ * Compares two color materials.
+ * Returns if they are equal.
+ * @param viewer
+ * @param a
+ * @param b
+ * @returns
+ */
+function compareColorMaterials(viewer, a, b) {
+    // Same reference.
+    if (a == b) {
+        return true;
+    }
+    var colorA = getColor$2(viewer, a.color);
+    var colorB = getColor$2(viewer, b.color);
+    // One is null.
+    if (!colorA || !colorB) {
+        return false;
+    }
+    // Colors don't match.
+    if (colorA.alpha != colorB.alpha || colorA.red != colorB.red || colorA.green != colorB.green || colorA.blue != colorB.blue) {
+        return false;
+    }
+    return true;
+}
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function () {
             var groupRenderParams, i, entity, geometry, updated, cEntities, models, multiGeometry, polygons, polylines, points, i, entity, id, zoomItem, displayType, existingRego, newRenderId, oldRenderId, mParams, mEntities, i, entity, id, cEntity, _loop_1, i, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
-            return __generator(this, function (_m) {
-                switch (_m.label) {
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
@@ -5093,13 +5246,13 @@ var EntityRenderEngine;
                                     entityId: id,
                                     menuItemId: params.menuItemId
                                 });
-                                newRenderId = getRenderGroupId(zoomItem, (_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider);
-                                oldRenderId = (_c = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _c === void 0 ? void 0 : _c._renderGroup;
+                                newRenderId = getRenderGroupId(zoomItem);
+                                oldRenderId = (_b = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _b === void 0 ? void 0 : _b._renderGroup;
                                 if (!params.force &&
                                     newRenderId == oldRenderId &&
                                     !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale) &&
                                     // If historic metadata is different then it's also stale.
-                                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.historicDateTime) == ((_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.historicDateTime))) {
+                                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.historicDateTime) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.historicDateTime))) {
                                     // No sorting category needed. Already rendered the way we want.
                                     cEntities.set(id, existingRego.visual);
                                 }
@@ -5110,8 +5263,8 @@ var EntityRenderEngine;
                                         // Flag as no longer stale as we're unlikely to recreate the rego if we're reusing the graphic.
                                         existingRego.stale = false;
                                         // Update metadata for the same reason.
-                                        existingRego.historicDateTime = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.historicDateTime;
-                                        existingRego.historicAttrKey = (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.historicAttrKey;
+                                        existingRego.historicDateTime = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.historicDateTime;
+                                        existingRego.historicAttrKey = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.historicAttrKey;
                                         existingRego.entityTypeId = entity.Bruce["EntityType.ID"];
                                         updated.set(id, true);
                                     }
@@ -5119,7 +5272,7 @@ var EntityRenderEngine;
                                         models.push(entity);
                                     }
                                     else if (displayType == ZoomControl.EDisplayType.Geometry) {
-                                        if ((_h = (_g = entity.geometry) === null || _g === void 0 ? void 0 : _g.MultiGeometry) === null || _h === void 0 ? void 0 : _h.length) {
+                                        if ((_g = (_f = entity.geometry) === null || _f === void 0 ? void 0 : _f.MultiGeometry) === null || _g === void 0 ? void 0 : _g.length) {
                                             multiGeometry.push(entity);
                                         }
                                         else {
@@ -5137,7 +5290,7 @@ var EntityRenderEngine;
                         mParams = __assign(__assign({}, groupRenderParams), { rendered: cEntities, entities: models, entitiesHistoric: params.entitiesHistoric });
                         return [4 /*yield*/, Model3d.RenderGroup(mParams)];
                     case 1:
-                        mEntities = _m.sent();
+                        mEntities = _k.sent();
                         for (i = 0; i < mParams.entities.length; i++) {
                             entity = mParams.entities[i];
                             id = entity.Bruce.ID;
@@ -5149,16 +5302,16 @@ var EntityRenderEngine;
                                 multiGeometry.push(entity);
                             }
                         }
-                        _m.label = 2;
+                        _k.label = 2;
                     case 2:
                         if (!(multiGeometry.length > 0)) return [3 /*break*/, 6];
                         _loop_1 = function (i) {
                             var entity, pParams, zoomItem, j, subEntity, cPoly, rendered, cLines, cPoints, rootEntity_1, firstEntity;
-                            return __generator(this, function (_o) {
-                                switch (_o.label) {
+                            return __generator(this, function (_l) {
+                                switch (_l.label) {
                                     case 0:
                                         entity = multiGeometry[i];
-                                        if (!((_k = (_j = entity.geometry) === null || _j === void 0 ? void 0 : _j.MultiGeometry) === null || _k === void 0 ? void 0 : _k.length)) {
+                                        if (!((_j = (_h = entity.geometry) === null || _h === void 0 ? void 0 : _h.MultiGeometry) === null || _j === void 0 ? void 0 : _j.length)) {
                                             polygons.push(entity);
                                             return [2 /*return*/, "continue"];
                                         }
@@ -5172,7 +5325,7 @@ var EntityRenderEngine;
                                         }
                                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
                                     case 1:
-                                        cPoly = _o.sent();
+                                        cPoly = _l.sent();
                                         Array.from(cPoly.keys()).forEach(function (key) {
                                             if (cPoly.get(key)) {
                                                 pParams.entities = pParams.entities.filter(function (e) { return e.Bruce.ID != key; });
@@ -5181,7 +5334,7 @@ var EntityRenderEngine;
                                         rendered = Array.from(cPoly.values());
                                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
                                     case 2:
-                                        cLines = _o.sent();
+                                        cLines = _l.sent();
                                         Array.from(cLines.keys()).forEach(function (key) {
                                             if (cLines.get(key)) {
                                                 pParams.entities = pParams.entities.filter(function (e) { return e.Bruce.ID != key; });
@@ -5191,9 +5344,9 @@ var EntityRenderEngine;
                                         if (!!rendered.length) return [3 /*break*/, 4];
                                         return [4 /*yield*/, Point.RenderGroup(pParams)];
                                     case 3:
-                                        cPoints = _o.sent();
+                                        cPoints = _l.sent();
                                         rendered = rendered.concat(Array.from(cPoints.values()));
-                                        _o.label = 4;
+                                        _l.label = 4;
                                     case 4:
                                         rendered = rendered.filter(function (x) { return x != null; });
                                         if (rendered.length) {
@@ -5201,7 +5354,7 @@ var EntityRenderEngine;
                                                 id: ObjectUtils.UId(10)
                                             });
                                             rootEntity_1._siblingGraphics = [];
-                                            rootEntity_1._renderGroup = getRenderGroupId(zoomItem, (_l = params.viewer) === null || _l === void 0 ? void 0 : _l.terrainProvider);
+                                            rootEntity_1._renderGroup = getRenderGroupId(zoomItem);
                                             rootEntity_1._siblingGraphics = rootEntity_1._siblingGraphics.concat(rendered);
                                             cEntities.set(entity.Bruce.ID, rootEntity_1);
                                             firstEntity = rendered[0];
@@ -5220,13 +5373,13 @@ var EntityRenderEngine;
                             });
                         };
                         i = 0;
-                        _m.label = 3;
+                        _k.label = 3;
                     case 3:
                         if (!(i < multiGeometry.length)) return [3 /*break*/, 6];
                         return [5 /*yield**/, _loop_1(i)];
                     case 4:
-                        _m.sent();
-                        _m.label = 5;
+                        _k.sent();
+                        _k.label = 5;
                     case 5:
                         i++;
                         return [3 /*break*/, 3];
@@ -5235,7 +5388,7 @@ var EntityRenderEngine;
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polygons, rendered: cEntities });
                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
                     case 7:
-                        pEntities = _m.sent();
+                        pEntities = _k.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5246,13 +5399,13 @@ var EntityRenderEngine;
                                 polylines.push(entity);
                             }
                         }
-                        _m.label = 8;
+                        _k.label = 8;
                     case 8:
                         if (!(polylines.length > 0)) return [3 /*break*/, 10];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polylines, rendered: cEntities });
                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
                     case 9:
-                        pEntities = _m.sent();
+                        pEntities = _k.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5263,13 +5416,13 @@ var EntityRenderEngine;
                                 points.push(entity);
                             }
                         }
-                        _m.label = 10;
+                        _k.label = 10;
                     case 10:
                         if (!(points.length > 0)) return [3 /*break*/, 12];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: points, rendered: cEntities, entitiesHistoric: params.entitiesHistoric });
                         return [4 /*yield*/, Point.RenderGroup(pParams)];
                     case 11:
-                        pEntities = _m.sent();
+                        pEntities = _k.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5277,7 +5430,7 @@ var EntityRenderEngine;
                                 cEntities.set(entity.Bruce.ID, cEntity);
                             }
                         }
-                        _m.label = 12;
+                        _k.label = 12;
                     case 12: return [2 /*return*/, {
                             entities: cEntities,
                             updated: updated
@@ -5461,7 +5614,8 @@ var EntityRenderEngine;
                                                 viewer: params.viewer,
                                                 entity: entity,
                                                 recordHeightRef: heightRef_1,
-                                                returnHeightRef: heightRef_1
+                                                returnHeightRef: heightRef_1,
+                                                allowRendered: false
                                             }); }, true);
                                         }
                                         cEntity = new Entity({
@@ -5520,7 +5674,8 @@ var EntityRenderEngine;
                                                 viewer: params.viewer,
                                                 entity: entity,
                                                 recordHeightRef: heightRef_1,
-                                                returnHeightRef: heightRef_1
+                                                returnHeightRef: heightRef_1,
+                                                allowRendered: false
                                             });
                                             prevPos3d = getValue$1(params.viewer, cEntity.position);
                                             if (!prevPos3d || !Cartesian3.equals(prevPos3d, pos3d)) {
@@ -5569,7 +5724,8 @@ var EntityRenderEngine;
                                     viewer: params.viewer,
                                     entity: entity,
                                     recordHeightRef: heightRef,
-                                    returnHeightRef: heightRef
+                                    returnHeightRef: heightRef,
+                                    allowRendered: false
                                 });
                                 extrusion = getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderFillExtrusion);
                                 hasOutline = outline && outlineWidth > 0;
@@ -5700,7 +5856,8 @@ var EntityRenderEngine;
                                             viewer: params.viewer,
                                             entity: entity,
                                             recordHeightRef: heightRef_2,
-                                            returnHeightRef: heightRef_2
+                                            returnHeightRef: heightRef_2,
+                                            allowRendered: false
                                         }); }, true);
                                     }
                                     cEntity = new Entity({
@@ -5767,7 +5924,8 @@ var EntityRenderEngine;
                                             viewer: params.viewer,
                                             entity: entity,
                                             recordHeightRef: heightRef_2,
-                                            returnHeightRef: heightRef_2
+                                            returnHeightRef: heightRef_2,
+                                            allowRendered: false
                                         });
                                         prevPos3d = getValue$1(params.viewer, cEntity.position);
                                         if (!prevPos3d || !Cartesian3.equals(prevPos3d, pos3d)) {
@@ -5803,16 +5961,16 @@ var EntityRenderEngine;
         }
         Point.Render = Render;
         function RenderGroup(params) {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, _f, tagIds, tags, pStyle, cEntity, name_2;
-                return __generator(this, function (_g) {
-                    switch (_g.label) {
+                var api, cEntities, i, entity, zoomItem, style, _e, tagIds, tags, pStyle, cEntity, name_2;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = new Map();
                             i = 0;
-                            _g.label = 1;
+                            _f.label = 1;
                         case 1:
                             if (!(i < params.entities.length)) return [3 /*break*/, 11];
                             entity = params.entities[i];
@@ -5820,13 +5978,13 @@ var EntityRenderEngine;
                             if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 3];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            _f = (_a = (_g.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                            _e = (_a = (_f.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
                             return [3 /*break*/, 4];
                         case 3:
-                            _f = zoomItem.Style;
-                            _g.label = 4;
+                            _e = zoomItem.Style;
+                            _f.label = 4;
                         case 4:
-                            style = _f;
+                            style = _e;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 6];
@@ -5835,8 +5993,8 @@ var EntityRenderEngine;
                                     tagIds: tagIds
                                 })];
                         case 5:
-                            tags = (_g.sent()).tags;
-                            _g.label = 6;
+                            tags = (_f.sent()).tags;
+                            _f.label = 6;
                         case 6:
                             pStyle = (_b = style === null || style === void 0 ? void 0 : style.pointStyle) !== null && _b !== void 0 ? _b : {};
                             return [4 /*yield*/, Render({
@@ -5852,17 +6010,17 @@ var EntityRenderEngine;
                                     entityHistoric: (_d = params.entitiesHistoric) === null || _d === void 0 ? void 0 : _d[entity.Bruce.ID]
                                 })];
                         case 7:
-                            cEntity = _g.sent();
+                            cEntity = _f.sent();
                             if (!cEntity) return [3 /*break*/, 9];
                             return [4 /*yield*/, getName(api, entity)];
                         case 8:
-                            name_2 = _g.sent();
+                            name_2 = _f.sent();
                             cEntity.name = name_2;
-                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_e = params.viewer) === null || _e === void 0 ? void 0 : _e.terrainProvider);
-                            _g.label = 9;
+                            cEntity._renderGroup = getRenderGroupId(zoomItem);
+                            _f.label = 9;
                         case 9:
                             cEntities.set(entity.Bruce.ID, cEntity);
-                            _g.label = 10;
+                            _f.label = 10;
                         case 10:
                             i++;
                             return [3 /*break*/, 1];
@@ -5876,7 +6034,7 @@ var EntityRenderEngine;
     var Polyline;
     (function (Polyline) {
         function Render(params) {
-            var _a, _b;
+            var _a;
             var entity = params.entity;
             var line = (_a = entity.geometry) === null || _a === void 0 ? void 0 : _a.LineString;
             var points = line && typeof line == "string" ? Geometry.ParsePoints(line) : [];
@@ -5895,14 +6053,7 @@ var EntityRenderEngine;
             }
             var style = params.style;
             var heightRef = getHeightRef(style);
-            var flattenPoints = false;
-            // We gain a lot of performance when not clamping.
-            // If there is no terrain we can safely not clamp.
-            if (heightRef == HeightReference.CLAMP_TO_GROUND && shouldApplyFlatFix((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider)) {
-                heightRef = HeightReference.NONE;
-                flattenPoints = true;
-            }
-            var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(flattenPoints ? 0 : x.altitude)); });
+            var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
             posses = cullDuplicatePoints(posses);
             // 5 points should be enough to tell most bad data.
             var CHECK_POINTS = 5;
@@ -5978,7 +6129,8 @@ var EntityRenderEngine;
                         viewer: params.viewer,
                         entity: entity,
                         recordHeightRef: heightRef,
-                        returnHeightRef: heightRef
+                        returnHeightRef: heightRef,
+                        allowRendered: false
                     }),
                     show: true
                 });
@@ -6003,20 +6155,51 @@ var EntityRenderEngine;
                 }
                 cEntity = params.rendered;
                 if (units == "px") {
-                    cEntity.polyline.positions = new ConstantProperty(posses);
-                    cEntity.polyline.width = new ConstantProperty(width);
-                    cEntity.polyline.classificationType = new ConstantProperty(classification);
-                    cEntity.polyline.zIndex = new ConstantProperty(getZIndex(style, entity, params.tags));
-                    cEntity.polyline.clampToGround = new ConstantProperty(heightRef == HeightReference.CLAMP_TO_GROUND);
+                    var oldPosses = getValue$1(params.viewer, cEntity.polyline.positions);
+                    if (!comparePositions(posses, oldPosses)) {
+                        cEntity.polyline.positions = new ConstantProperty(posses);
+                    }
+                    var oldWidth = getValue$1(params.viewer, cEntity.polyline.width);
+                    if (oldWidth != width) {
+                        cEntity.polyline.width = new ConstantProperty(width);
+                    }
+                    var oldClassification = getValue$1(params.viewer, cEntity.polyline.classificationType);
+                    if (oldClassification != classification) {
+                        cEntity.polyline.classificationType = new ConstantProperty(classification);
+                    }
+                    var oldZIndex = getValue$1(params.viewer, cEntity.polyline.zIndex);
+                    if (oldZIndex != getZIndex(style, entity, params.tags)) {
+                        cEntity.polyline.zIndex = new ConstantProperty(getZIndex(style, entity, params.tags));
+                    }
+                    var oldClampToGround = getValue$1(params.viewer, cEntity.polyline.clampToGround);
+                    var newClampToGround = heightRef == HeightReference.CLAMP_TO_GROUND;
+                    if (oldClampToGround != newClampToGround) {
+                        cEntity.polyline.clampToGround = new ConstantProperty(newClampToGround);
+                    }
                     cEntity.polyline.distanceDisplayCondition = new ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance));
                     cEntity.corridor = undefined;
                 }
                 else {
-                    cEntity.corridor.positions = new ConstantProperty(posses);
-                    cEntity.corridor.width = new ConstantProperty(width);
-                    cEntity.corridor.classificationType = new ConstantProperty(classification);
-                    cEntity.corridor.heightReference = new ConstantProperty(heightRef);
-                    cEntity.corridor.zIndex = new ConstantProperty(getZIndex(style, entity, params.tags));
+                    var oldPosses = getValue$1(params.viewer, cEntity.corridor.positions);
+                    if (!comparePositions(posses, oldPosses)) {
+                        cEntity.corridor.positions = new ConstantProperty(posses);
+                    }
+                    var oldWidth = getValue$1(params.viewer, cEntity.corridor.width);
+                    if (oldWidth != width) {
+                        cEntity.corridor.width = new ConstantProperty(width);
+                    }
+                    var oldClassification = getValue$1(params.viewer, cEntity.corridor.classificationType);
+                    if (oldClassification != classification) {
+                        cEntity.corridor.classificationType = new ConstantProperty(classification);
+                    }
+                    var oldHeightRef = getValue$1(params.viewer, cEntity.corridor.heightReference);
+                    if (oldHeightRef != heightRef) {
+                        cEntity.corridor.heightReference = new ConstantProperty(heightRef);
+                    }
+                    var oldZIndex = getValue$1(params.viewer, cEntity.corridor.zIndex);
+                    if (oldZIndex != getZIndex(style, entity, params.tags)) {
+                        cEntity.corridor.zIndex = new ConstantProperty(getZIndex(style, entity, params.tags));
+                    }
                     cEntity.corridor.distanceDisplayCondition = new ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance, width));
                     cEntity.polyline = undefined;
                 }
@@ -6029,28 +6212,33 @@ var EntityRenderEngine;
                     override: true,
                     requestRender: false
                 });
-                cEntity.position = new ConstantPositionProperty(EntityUtils.GetPos({
+                var oldPos = getValue$1(params.viewer, cEntity.position);
+                var newPos = EntityUtils.GetPos({
                     viewer: params.viewer,
                     entity: entity,
                     recordHeightRef: heightRef,
-                    returnHeightRef: heightRef
-                }));
+                    returnHeightRef: heightRef,
+                    allowRendered: false
+                });
+                if (newPos && (!oldPos || !Cartes.IsEqualCartes3(oldPos, newPos))) {
+                    cEntity.position = new ConstantPositionProperty(newPos);
+                }
                 cEntity.show = true;
             }
             return cEntity;
         }
         Polyline.Render = Render;
         function RenderGroup(params) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, _e, tagIds, tags, lStyle, cEntity, name_3;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                var api, cEntities, i, entity, zoomItem, style, _d, tagIds, tags, lStyle, cEntity, name_3;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = new Map();
                             i = 0;
-                            _f.label = 1;
+                            _e.label = 1;
                         case 1:
                             if (!(i < params.entities.length)) return [3 /*break*/, 9];
                             entity = params.entities[i];
@@ -6058,13 +6246,13 @@ var EntityRenderEngine;
                             if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 3];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            _e = (_a = (_f.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                            _d = (_a = (_e.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
                             return [3 /*break*/, 4];
                         case 3:
-                            _e = zoomItem.Style;
-                            _f.label = 4;
+                            _d = zoomItem.Style;
+                            _e.label = 4;
                         case 4:
-                            style = _e;
+                            style = _d;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 6];
@@ -6073,8 +6261,8 @@ var EntityRenderEngine;
                                     tagIds: tagIds
                                 })];
                         case 5:
-                            tags = (_f.sent()).tags;
-                            _f.label = 6;
+                            tags = (_e.sent()).tags;
+                            _e.label = 6;
                         case 6:
                             lStyle = (_b = style === null || style === void 0 ? void 0 : style.polylineStyle) !== null && _b !== void 0 ? _b : {};
                             cEntity = Render({
@@ -6089,11 +6277,11 @@ var EntityRenderEngine;
                             if (!cEntity) return [3 /*break*/, 8];
                             return [4 /*yield*/, getName(api, entity)];
                         case 7:
-                            name_3 = _f.sent();
+                            name_3 = _e.sent();
                             cEntity.name = name_3;
-                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_d = params.viewer) === null || _d === void 0 ? void 0 : _d.terrainProvider);
+                            cEntity._renderGroup = getRenderGroupId(zoomItem);
                             cEntities.set(entity.Bruce.ID, cEntity);
-                            _f.label = 8;
+                            _e.label = 8;
                         case 8:
                             i++;
                             return [3 /*break*/, 1];
@@ -6107,7 +6295,7 @@ var EntityRenderEngine;
     var Polygon;
     (function (Polygon) {
         function Render(params) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             var entity = params.entity;
             var pRings = (_a = entity.geometry) === null || _a === void 0 ? void 0 : _a.Polygon;
             if (pRings == null || pRings.length <= 0) {
@@ -6146,15 +6334,10 @@ var EntityRenderEngine;
             if (posses.length < 4) {
                 return null;
             }
-            var flattenPoints = false;
-            if (heightRef == HeightReference.CLAMP_TO_GROUND && shouldApplyFlatFix((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider)) {
-                heightRef = HeightReference.NONE;
-                flattenPoints = true;
-            }
             var holeRings = pRings.filter(function (x) { return x.Facing == Geometry.EPolygonRingType.Hole; });
             var holePosses = holeRings.map(function (x) {
                 var points = Geometry.ParsePoints(x.LinearRing);
-                var holePosses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(flattenPoints ? 0 : x.altitude)); });
+                var holePosses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
                 holePosses = cullDuplicatePoints(holePosses);
                 return holePosses;
             }).filter(function (x) { return x.length >= 4; });
@@ -6206,7 +6389,8 @@ var EntityRenderEngine;
                         viewer: params.viewer,
                         entity: entity,
                         recordHeightRef: heightRef,
-                        returnHeightRef: heightRef
+                        returnHeightRef: heightRef,
+                        allowRendered: false
                     }),
                     show: true
                 });
@@ -6216,21 +6400,46 @@ var EntityRenderEngine;
                 // So this is a "good enough" way rather than perfect as it only preserves the outline.
                 prepareExistingGraphic(params.rendered, hasOutline ? 1 : 0);
                 cEntity = params.rendered;
-                cEntity.polygon.hierarchy = new ConstantProperty(new PolygonHierarchy(posses, holePosses.map(function (x) { return new PolygonHierarchy(x); })));
-                cEntity.polygon.extrudedHeight = new ConstantProperty(extrusion.value);
-                cEntity.polygon.extrudedHeightReference = new ConstantProperty(extrusion.exHeightRef);
-                cEntity.polygon.shadows = new ConstantProperty(ShadowMode.ENABLED);
-                cEntity.polygon.heightReference = new ConstantProperty(heightRef);
-                cEntity.polygon.classificationType = new ConstantProperty(classification);
-                cEntity.polygon.perPositionHeight = new ConstantProperty(heightRef == HeightReference.CLAMP_TO_GROUND ? false : true);
-                cEntity.polygon.zIndex = new ConstantProperty(zIndex);
-                cEntity.polygon.distanceDisplayCondition = new ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true));
-                cEntity.position = new ConstantPositionProperty(EntityUtils.GetPos({
+                // We'll do a number of checks to avoid updating the entity if it's not needed.
+                var oldHierarchy = getValue$1(params.viewer, cEntity.polygon.hierarchy);
+                var newHierarchy = new PolygonHierarchy(posses, holePosses.map(function (x) { return new PolygonHierarchy(x); }));
+                if (!comparePolygonHierarchies(oldHierarchy, newHierarchy)) {
+                    cEntity.polygon.hierarchy = new ConstantProperty(newHierarchy);
+                }
+                var oldExtrusion = getValue$1(params.viewer, cEntity.polygon.extrudedHeight);
+                if (oldExtrusion != extrusion.value) {
+                    cEntity.polygon.extrudedHeight = new ConstantProperty(extrusion.value);
+                }
+                var oldExHeightRef = getValue$1(params.viewer, cEntity.polygon.extrudedHeightReference);
+                if (oldExHeightRef != extrusion.exHeightRef) {
+                    cEntity.polygon.extrudedHeightReference = new ConstantProperty(extrusion.exHeightRef);
+                }
+                var oldHeightRef = getValue$1(params.viewer, cEntity.polygon.heightReference);
+                if (oldHeightRef != heightRef) {
+                    cEntity.polygon.heightReference = new ConstantProperty(heightRef);
+                }
+                var oldPerPosHeight = getValue$1(params.viewer, cEntity.polygon.perPositionHeight);
+                if (oldPerPosHeight != (heightRef == HeightReference.CLAMP_TO_GROUND ? false : true)) {
+                    cEntity.polygon.perPositionHeight = new ConstantProperty(heightRef == HeightReference.CLAMP_TO_GROUND ? false : true);
+                }
+                var oldPosition = getValue$1(params.viewer, cEntity.position);
+                var newPosition = EntityUtils.GetPos({
                     viewer: params.viewer,
                     entity: entity,
                     recordHeightRef: heightRef,
-                    returnHeightRef: heightRef
-                }));
+                    returnHeightRef: heightRef,
+                    allowRendered: false
+                });
+                if (newPosition && (!oldPosition || !Cartes.IsEqualCartes3(oldPosition, newPosition))) {
+                    cEntity.position = new ConstantPositionProperty(newPosition);
+                }
+                var oldZIndex = getValue$1(params.viewer, cEntity.polygon.zIndex);
+                if (oldZIndex != zIndex) {
+                    cEntity.polygon.zIndex = new ConstantProperty(zIndex);
+                }
+                cEntity.polygon.distanceDisplayCondition = new ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true));
+                cEntity.polygon.shadows = new ConstantProperty(ShadowMode.ENABLED);
+                cEntity.polygon.classificationType = new ConstantProperty(classification);
                 // We'll use "SetDefaultColor" to updating the internal reference and to allow for an animation.
                 // WARNING: polygon does not support animation (yet?).
                 CesiumEntityStyler.SetDefaultColor({
@@ -6245,28 +6454,16 @@ var EntityRenderEngine;
             if (hasOutline) {
                 var borderHeight = undefined;
                 if (heightRef != HeightReference.CLAMP_TO_GROUND) {
-                    if (flattenPoints) {
-                        borderHeight = 0;
-                    }
                     // Set height to smallest height value from points.
-                    else {
-                        for (var i = 0; i < points.length; i++) {
-                            var point = points[i];
-                            if (!borderHeight || point.altitude < borderHeight) {
-                                borderHeight = point.altitude;
-                            }
+                    for (var i = 0; i < points.length; i++) {
+                        var point = points[i];
+                        if (!borderHeight || point.altitude < borderHeight) {
+                            borderHeight = point.altitude;
                         }
                     }
                 }
-                var borderPosses = [];
-                if (flattenPoints) {
-                    borderPosses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(0)); });
-                    Cartes.CloseRing3(borderPosses);
-                }
-                else {
-                    borderPosses = posses.map(function (x) { return x.clone ? x.clone() : __assign({}, x); });
-                }
-                var cEntityBorder = (_d = (_c = params.rendered) === null || _c === void 0 ? void 0 : _c._siblingGraphics) === null || _d === void 0 ? void 0 : _d[0];
+                var borderPosses = posses.map(function (x) { return x.clone ? x.clone() : __assign({}, x); });
+                var cEntityBorder = (_c = (_b = params.rendered) === null || _b === void 0 ? void 0 : _b._siblingGraphics) === null || _c === void 0 ? void 0 : _c[0];
                 cEntity._siblingGraphics = [];
                 if (!cEntityBorder || ((!cEntityBorder.polyline && units == "px") ||
                     (!cEntityBorder.corridor && units == "m"))) {
@@ -6300,24 +6497,60 @@ var EntityRenderEngine;
                 }
                 else {
                     if (units == "px") {
-                        cEntityBorder.polyline.positions = new ConstantProperty(borderPosses);
-                        cEntityBorder.polyline.width = new ConstantProperty(width);
-                        cEntityBorder.polyline.clampToGround = new ConstantProperty(heightRef == HeightReference.CLAMP_TO_GROUND);
+                        var oldPosses = getValue$1(params.viewer, cEntityBorder.polyline.positions);
+                        if (!comparePositions(oldPosses, borderPosses)) {
+                            cEntityBorder.polyline.positions = new ConstantProperty(borderPosses);
+                        }
+                        var oldWidth = getValue$1(params.viewer, cEntityBorder.polyline.width);
+                        if (oldWidth != width) {
+                            cEntityBorder.polyline.width = new ConstantProperty(width);
+                        }
+                        var oldClampToGround = getValue$1(params.viewer, cEntityBorder.polyline.clampToGround);
+                        var newClampToGround = heightRef == HeightReference.CLAMP_TO_GROUND;
+                        if (oldClampToGround != newClampToGround) {
+                            cEntityBorder.polyline.clampToGround = new ConstantProperty(newClampToGround);
+                        }
+                        var oldZIndex = getValue$1(params.viewer, cEntityBorder.polyline.zIndex);
+                        if (oldZIndex != zIndex) {
+                            cEntityBorder.polyline.zIndex = new ConstantProperty(zIndex);
+                        }
+                        var oldMaterial = getValue$1(params.viewer, cEntityBorder.polyline.material);
+                        var newMaterial = new ColorMaterialProperty(cLineColor);
+                        if (compareColorMaterials(params.viewer, oldMaterial, newMaterial)) {
+                            cEntityBorder.polyline.material = newMaterial;
+                        }
                         cEntityBorder.polyline.classificationType = new ConstantProperty(ClassificationType.TERRAIN);
-                        cEntityBorder.polyline.zIndex = new ConstantProperty(zIndex);
                         cEntityBorder.polyline.distanceDisplayCondition = new ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance));
-                        cEntityBorder.polyline.material = new ColorMaterialProperty(cLineColor);
                         cEntityBorder.corridor = undefined;
                     }
                     else {
-                        cEntityBorder.corridor.positions = new ConstantProperty(borderPosses);
-                        cEntityBorder.corridor.heightReference = new ConstantProperty(heightRef);
-                        cEntityBorder.corridor.height = new ConstantProperty(borderHeight);
-                        cEntityBorder.corridor.width = new ConstantProperty(width);
+                        var oldPosses = getValue$1(params.viewer, cEntityBorder.corridor.positions);
+                        if (!comparePositions(oldPosses, borderPosses)) {
+                            cEntityBorder.corridor.positions = new ConstantProperty(borderPosses);
+                        }
+                        var oldHeightRef = getValue$1(params.viewer, cEntityBorder.corridor.heightReference);
+                        if (oldHeightRef != heightRef) {
+                            cEntityBorder.corridor.heightReference = new ConstantProperty(heightRef);
+                        }
+                        var oldBorderHeight = getValue$1(params.viewer, cEntityBorder.corridor.height);
+                        if (oldBorderHeight != borderHeight) {
+                            cEntityBorder.corridor.height = new ConstantProperty(borderHeight);
+                        }
+                        var oldWidth = getValue$1(params.viewer, cEntityBorder.corridor.width);
+                        if (oldWidth != width) {
+                            cEntityBorder.corridor.width = new ConstantProperty(width);
+                        }
+                        var oldZIndex = getValue$1(params.viewer, cEntityBorder.corridor.zIndex);
+                        if (oldZIndex != zIndex + 1) {
+                            cEntityBorder.corridor.zIndex = new ConstantProperty(zIndex + 1);
+                        }
+                        var oldMaterial = getValue$1(params.viewer, cEntityBorder.corridor.material);
+                        var newMaterial = new ColorMaterialProperty(cLineColor);
+                        if (compareColorMaterials(params.viewer, oldMaterial, newMaterial)) {
+                            cEntityBorder.corridor.material = newMaterial;
+                        }
                         cEntityBorder.corridor.fill = new ConstantProperty(true);
-                        cEntityBorder.corridor.zIndex = new ConstantProperty(zIndex + 1);
                         cEntityBorder.corridor.distanceDisplayCondition = new ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance, width));
-                        cEntityBorder.corridor.material = new ColorMaterialProperty(cLineColor);
                         cEntityBorder.polyline = undefined;
                     }
                     cEntityBorder.show = true;
@@ -6365,16 +6598,16 @@ var EntityRenderEngine;
         }
         Polygon.Render = Render;
         function RenderGroup(params) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, _e, tagIds, tags, pStyle, cEntity, name_4;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                var api, cEntities, i, entity, zoomItem, style, _d, tagIds, tags, pStyle, cEntity, name_4;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = new Map();
                             i = 0;
-                            _f.label = 1;
+                            _e.label = 1;
                         case 1:
                             if (!(i < params.entities.length)) return [3 /*break*/, 9];
                             entity = params.entities[i];
@@ -6382,13 +6615,13 @@ var EntityRenderEngine;
                             if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 3];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            _e = (_a = (_f.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                            _d = (_a = (_e.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
                             return [3 /*break*/, 4];
                         case 3:
-                            _e = zoomItem.Style;
-                            _f.label = 4;
+                            _d = zoomItem.Style;
+                            _e.label = 4;
                         case 4:
-                            style = _e;
+                            style = _d;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 6];
@@ -6397,8 +6630,8 @@ var EntityRenderEngine;
                                     tagIds: tagIds
                                 })];
                         case 5:
-                            tags = (_f.sent()).tags;
-                            _f.label = 6;
+                            tags = (_e.sent()).tags;
+                            _e.label = 6;
                         case 6:
                             pStyle = (_b = style === null || style === void 0 ? void 0 : style.polygonStyle) !== null && _b !== void 0 ? _b : {};
                             cEntity = Render({
@@ -6408,16 +6641,19 @@ var EntityRenderEngine;
                                 viewer: params.viewer,
                                 maxDistance: zoomItem.MaxZoom,
                                 minDistance: zoomItem.MinZoom,
+                                // Temporarily disabling re-using graphics for polygons as they have some bugs, and
+                                // they don't support any animation yet.
+                                // rendered: null
                                 rendered: (_c = params.rendered) === null || _c === void 0 ? void 0 : _c.get(entity.Bruce.ID)
                             });
                             if (!cEntity) return [3 /*break*/, 8];
                             return [4 /*yield*/, getName(api, entity)];
                         case 7:
-                            name_4 = _f.sent();
+                            name_4 = _e.sent();
                             cEntity.name = name_4;
-                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_d = params.viewer) === null || _d === void 0 ? void 0 : _d.terrainProvider);
+                            cEntity._renderGroup = getRenderGroupId(zoomItem);
                             cEntities.set(entity.Bruce.ID, cEntity);
-                            _f.label = 8;
+                            _e.label = 8;
                         case 8:
                             i++;
                             return [3 /*break*/, 1];
@@ -6456,17 +6692,9 @@ var EntityRenderEngine;
                 viewer: params.viewer,
                 entity: entity,
                 recordHeightRef: heightRef,
-                returnHeightRef: heightRef
+                returnHeightRef: heightRef,
+                allowRendered: false
             });
-            /*
-            We used to avoid clamp-to-ground on 3D models as Cesium had bugs with it.
-
-            if (heightRef == Cesium.HeightReference.CLAMP_TO_GROUND) {
-                const carto = Cesium.Cartographic.fromCartesian(pos3d);
-                pos3d = Cesium.Cartesian3.fromRadians(EnsureNumber(carto.longitude), EnsureNumber(carto.latitude), 0);
-                heightRef = Cesium.HeightReference.RELATIVE_TO_GROUND;
-            }
-            */
             var blendMode = null;
             var blendAmount = null;
             var color = null;
@@ -6515,7 +6743,8 @@ var EntityRenderEngine;
                         viewer: params.viewer,
                         entity: entity,
                         recordHeightRef: heightRef,
-                        returnHeightRef: heightRef
+                        returnHeightRef: heightRef,
+                        allowRendered: false
                     }); }, true);
                 }
                 cEntity = new Entity({
@@ -6747,16 +6976,16 @@ var EntityRenderEngine;
         }
         Model3d.Render = Render;
         function RenderGroup(params) {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, reqBody, i, entity, zoomItem, style, _h, tagIds, tags, mStyle, group, level, catId, lodData, _loop_2, i;
-                return __generator(this, function (_j) {
-                    switch (_j.label) {
+                var api, cEntities, reqBody, i, entity, zoomItem, style, _g, tagIds, tags, mStyle, group, level, catId, lodData, _loop_2, i;
+                return __generator(this, function (_h) {
+                    switch (_h.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             return [4 /*yield*/, api.Loading];
                         case 1:
-                            _j.sent();
+                            _h.sent();
                             cEntities = new Map();
                             reqBody = {
                                 "strict": false,
@@ -6764,7 +6993,7 @@ var EntityRenderEngine;
                                 "Items": []
                             };
                             i = 0;
-                            _j.label = 2;
+                            _h.label = 2;
                         case 2:
                             if (!(i < params.entities.length)) return [3 /*break*/, 9];
                             entity = params.entities[i];
@@ -6772,13 +7001,13 @@ var EntityRenderEngine;
                             if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 4];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 3:
-                            _h = (_a = (_j.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                            _g = (_a = (_h.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
                             return [3 /*break*/, 5];
                         case 4:
-                            _h = zoomItem.Style;
-                            _j.label = 5;
+                            _g = zoomItem.Style;
+                            _h.label = 5;
                         case 5:
-                            style = _h;
+                            style = _g;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 7];
@@ -6787,8 +7016,8 @@ var EntityRenderEngine;
                                     tagIds: tagIds
                                 })];
                         case 6:
-                            tags = (_j.sent()).tags;
-                            _j.label = 7;
+                            tags = (_h.sent()).tags;
+                            _h.label = 7;
                         case 7:
                             mStyle = (_b = style === null || style === void 0 ? void 0 : style.modelStyle) !== null && _b !== void 0 ? _b : {};
                             group = mStyle.lodGroup ? Calculator.GetString(mStyle.lodGroup, entity, tags) : null;
@@ -6809,7 +7038,7 @@ var EntityRenderEngine;
                                 "group": group,
                                 "level": level
                             });
-                            _j.label = 8;
+                            _h.label = 8;
                         case 8:
                             i++;
                             return [3 /*break*/, 2];
@@ -6818,24 +7047,24 @@ var EntityRenderEngine;
                                 filter: reqBody
                             })];
                         case 10:
-                            lodData = (_j.sent()).lods;
+                            lodData = (_h.sent()).lods;
                             _loop_2 = function (i) {
-                                var entity, zoomItem, style, _k, tagIds, tags, lod, mStyle, cEntity, name_5;
-                                return __generator(this, function (_l) {
-                                    switch (_l.label) {
+                                var entity, zoomItem, style, _j, tagIds, tags, lod, mStyle, cEntity, name_5;
+                                return __generator(this, function (_k) {
+                                    switch (_k.label) {
                                         case 0:
                                             entity = params.entities[i];
                                             zoomItem = params.zoomItems[entity.Bruce.ID];
                                             if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 2];
                                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                                         case 1:
-                                            _k = (_c = (_l.sent())) === null || _c === void 0 ? void 0 : _c.Settings;
+                                            _j = (_c = (_k.sent())) === null || _c === void 0 ? void 0 : _c.Settings;
                                             return [3 /*break*/, 3];
                                         case 2:
-                                            _k = zoomItem.Style;
-                                            _l.label = 3;
+                                            _j = zoomItem.Style;
+                                            _k.label = 3;
                                         case 3:
-                                            style = _k;
+                                            style = _j;
                                             tagIds = entity.Bruce["Layer.ID"];
                                             tags = [];
                                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 5];
@@ -6844,8 +7073,8 @@ var EntityRenderEngine;
                                                     tagIds: tagIds
                                                 })];
                                         case 4:
-                                            tags = (_l.sent()).tags;
-                                            _l.label = 5;
+                                            tags = (_k.sent()).tags;
+                                            _k.label = 5;
                                         case 5:
                                             lod = lodData.find(function (x) { return x.entityId == entity.Bruce.ID; });
                                             if (!(lod === null || lod === void 0 ? void 0 : lod.clientFileId)) {
@@ -6871,23 +7100,23 @@ var EntityRenderEngine;
                                             if (!cEntity) return [3 /*break*/, 7];
                                             return [4 /*yield*/, getName(api, entity)];
                                         case 6:
-                                            name_5 = _l.sent();
+                                            name_5 = _k.sent();
                                             cEntity.name = name_5;
-                                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_g = params.viewer) === null || _g === void 0 ? void 0 : _g.terrainProvider);
+                                            cEntity._renderGroup = getRenderGroupId(zoomItem);
                                             cEntities.set(entity.Bruce.ID, cEntity);
-                                            _l.label = 7;
+                                            _k.label = 7;
                                         case 7: return [2 /*return*/];
                                     }
                                 });
                             };
                             i = 0;
-                            _j.label = 11;
+                            _h.label = 11;
                         case 11:
                             if (!(i < params.entities.length)) return [3 /*break*/, 14];
                             return [5 /*yield**/, _loop_2(i)];
                         case 12:
-                            _j.sent();
-                            _j.label = 13;
+                            _h.sent();
+                            _h.label = 13;
                         case 13:
                             i++;
                             return [3 /*break*/, 11];
@@ -8114,7 +8343,7 @@ var EntityLabel;
     EntityLabel.GetLabel = GetLabel;
 })(EntityLabel || (EntityLabel = {}));
 
-function getColor$2(viewer, obj) {
+function getColor$3(viewer, obj) {
     var value = null;
     if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
         var date = viewer.scene.lastRenderTime;
@@ -8166,7 +8395,7 @@ var CesiumAnimatedInOut;
                     var thing_1;
                     var colorPropKey_1;
                     if (piece.model) {
-                        var curColor = getColor$2(viewer, piece.model.color);
+                        var curColor = getColor$3(viewer, piece.model.color);
                         if (!curColor) {
                             curColor = Color.WHITE.clone();
                         }
@@ -8180,7 +8409,7 @@ var CesiumAnimatedInOut;
                         colorPropKey_1 = "color";
                     }
                     else if (piece.point) {
-                        var curColor = getColor$2(viewer, piece.point.color);
+                        var curColor = getColor$3(viewer, piece.point.color);
                         if (!curColor) {
                             curColor = Color.WHITE.clone();
                         }
@@ -8194,7 +8423,7 @@ var CesiumAnimatedInOut;
                         colorPropKey_1 = "color";
                     }
                     else if (piece.billboard) {
-                        var curColor = getColor$2(viewer, piece.billboard.color);
+                        var curColor = getColor$3(viewer, piece.billboard.color);
                         if (!curColor) {
                             curColor = Color.WHITE.clone();
                         }
@@ -10257,7 +10486,7 @@ var EntitiesRenderManager;
                 this.item.CameraZoomSettings = [
                     {
                         MinZoom: 0,
-                        MaxZoom: 100000,
+                        MaxZoom: 200000,
                         DisplayType: ZoomControl.EDisplayType.Model3D,
                         LODCategoryID: "glb",
                         LODLevel: 0,
@@ -11257,7 +11486,7 @@ var EntitiesLoadedRenderManager;
                 this.item.CameraZoomSettings = [
                     {
                         MinZoom: 0,
-                        MaxZoom: 100000,
+                        MaxZoom: 200000,
                         DisplayType: ZoomControl.EDisplayType.Model3D,
                         LODCategoryID: "glb",
                         LODLevel: 0,
@@ -11925,7 +12154,7 @@ var EntitiesIdsRenderManager;
                 this.item.CameraZoomSettings = [
                     {
                         MinZoom: 0,
-                        MaxZoom: 100000,
+                        MaxZoom: 200000,
                         DisplayType: ZoomControl.EDisplayType.Model3D,
                         LODCategoryID: "glb",
                         LODLevel: 0,
@@ -12516,7 +12745,7 @@ var EntityRenderManager;
                 this.item.CameraZoomSettings = [
                     {
                         MinZoom: 0,
-                        MaxZoom: 100000,
+                        MaxZoom: 200000,
                         DisplayType: ZoomControl.EDisplayType.Model3D,
                         LODCategoryID: "glb",
                         LODLevel: 0,
@@ -24162,7 +24391,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.9.4";
+var VERSION = "3.9.6";
 
-export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, Draw3dPolygon, Draw3dPolyline };
+export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map