bruce-cesium 1.4.6 → 1.4.8

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, Tileset, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Color, HeightReference, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, KmlDataSource, createOsmBuildings, Cesium3DTileStyle, Rectangle, CallbackProperty, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileset, IonResource, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Color, HeightReference, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, KmlDataSource, createOsmBuildings, Cesium3DTileStyle, Rectangle, CallbackProperty, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileset, IonResource, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1164,20 +1164,21 @@ function getStyle(api, entity, styleId) {
         });
     });
 }
-function getRenderGroupId(zoomItem) {
+function getRenderGroupId(zoomItem, terrain) {
+    var isFlatTerrain = terrain instanceof EllipsoidTerrainProvider;
     if (!zoomItem) {
         return null;
     }
-    return zoomItem.MinZoom + "-" + zoomItem.MaxZoom;
+    return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + isFlatTerrain;
 }
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function () {
             var groupRenderParams, i, entity, geometry, cEntities, models, multiGeometry, polygons, polylines, points, i, entity, id, zoomItem, displayType, newRenderId, existingRego, 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 (_g) {
-                switch (_g.label) {
+            return __generator(this, function (_j) {
+                switch (_j.label) {
                     case 0:
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
@@ -1219,12 +1220,12 @@ var EntityRenderEngine;
                                 displayType = ZoomControl.EDisplayType.Geometry;
                             }
                             if (displayType != ZoomControl.EDisplayType.Hidden) {
-                                newRenderId = getRenderGroupId(zoomItem);
+                                newRenderId = getRenderGroupId(zoomItem, (_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider);
                                 existingRego = params.visualRegister.GetRego({
                                     entityId: id,
                                     menuItemId: params.menuItemId
                                 });
-                                oldRenderId = (_b = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _b === void 0 ? void 0 : _b._renderGroup;
+                                oldRenderId = (_c = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _c === void 0 ? void 0 : _c._renderGroup;
                                 if (newRenderId == oldRenderId && !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale)) {
                                     cEntities[id] = existingRego.visual;
                                 }
@@ -1233,7 +1234,7 @@ var EntityRenderEngine;
                                         models.push(entity);
                                     }
                                     else if (displayType == ZoomControl.EDisplayType.Geometry) {
-                                        if ((_d = (_c = entity.geometry) === null || _c === void 0 ? void 0 : _c.MultiGeometry) === null || _d === void 0 ? void 0 : _d.length) {
+                                        if ((_e = (_d = entity.geometry) === null || _d === void 0 ? void 0 : _d.MultiGeometry) === null || _e === void 0 ? void 0 : _e.length) {
                                             multiGeometry.push(entity);
                                         }
                                         else {
@@ -1251,7 +1252,7 @@ var EntityRenderEngine;
                         mParams = __assign(__assign({}, groupRenderParams), { entities: models });
                         return [4 /*yield*/, Model3d.RenderGroup(mParams)];
                     case 1:
-                        mEntities = _g.sent();
+                        mEntities = _j.sent();
                         for (i = 0; i < mParams.entities.length; i++) {
                             entity = mParams.entities[i];
                             id = entity.Bruce.ID;
@@ -1263,7 +1264,7 @@ var EntityRenderEngine;
                                 multiGeometry.push(entity);
                             }
                         }
-                        _g.label = 2;
+                        _j.label = 2;
                     case 2:
                         if (!(multiGeometry.length > 0)) return [3 /*break*/, 6];
                         _loop_1 = function (i) {
@@ -1272,7 +1273,7 @@ var EntityRenderEngine;
                                 switch (_a.label) {
                                     case 0:
                                         entity = multiGeometry[i];
-                                        if (!((_f = (_e = entity.geometry) === null || _e === void 0 ? void 0 : _e.MultiGeometry) === null || _f === void 0 ? void 0 : _f.length)) {
+                                        if (!((_g = (_f = entity.geometry) === null || _f === void 0 ? void 0 : _f.MultiGeometry) === null || _g === void 0 ? void 0 : _g.length)) {
                                             polygons.push(entity);
                                             return [2 /*return*/, "continue"];
                                         }
@@ -1310,12 +1311,12 @@ var EntityRenderEngine;
                                             rootEntity_1 = new Entity({});
                                             params.viewer.entities.add(rootEntity_1);
                                             rootEntity_1._siblingGraphics = [];
-                                            rootEntity_1._renderGroup = getRenderGroupId(zoomItem);
+                                            rootEntity_1._renderGroup = getRenderGroupId(zoomItem, (_h = params.viewer) === null || _h === void 0 ? void 0 : _h.terrainProvider);
                                             rootEntity_1._siblingGraphics = rootEntity_1._siblingGraphics.concat(rendered);
                                             cEntities[entity.Bruce.ID] = rootEntity_1;
                                             firstEntity = rendered[0];
                                             if (firstEntity) {
-                                                rootEntity_1.position = getValue(params.viewer, firstEntity.position.getValue);
+                                                rootEntity_1.position = getValue(params.viewer, firstEntity.position);
                                             }
                                             rendered.forEach(function (child) {
                                                 child._parentEntity = rootEntity_1;
@@ -1329,13 +1330,13 @@ var EntityRenderEngine;
                             });
                         };
                         i = 0;
-                        _g.label = 3;
+                        _j.label = 3;
                     case 3:
                         if (!(i < multiGeometry.length)) return [3 /*break*/, 6];
                         return [5 /*yield**/, _loop_1(i)];
                     case 4:
-                        _g.sent();
-                        _g.label = 5;
+                        _j.sent();
+                        _j.label = 5;
                     case 5:
                         i++;
                         return [3 /*break*/, 3];
@@ -1344,7 +1345,7 @@ var EntityRenderEngine;
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polygons });
                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
                     case 7:
-                        pEntities = _g.sent();
+                        pEntities = _j.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1355,13 +1356,13 @@ var EntityRenderEngine;
                                 polylines.push(entity);
                             }
                         }
-                        _g.label = 8;
+                        _j.label = 8;
                     case 8:
                         if (!(polylines.length > 0)) return [3 /*break*/, 10];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polylines });
                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
                     case 9:
-                        pEntities = _g.sent();
+                        pEntities = _j.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1372,13 +1373,13 @@ var EntityRenderEngine;
                                 points.push(entity);
                             }
                         }
-                        _g.label = 10;
+                        _j.label = 10;
                     case 10:
                         if (!(points.length > 0)) return [3 /*break*/, 12];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: points });
                         return [4 /*yield*/, Point.RenderGroup(pParams)];
                     case 11:
-                        pEntities = _g.sent();
+                        pEntities = _j.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1386,7 +1387,7 @@ var EntityRenderEngine;
                                 cEntities[entity.Bruce.ID] = cEntity;
                             }
                         }
-                        _g.label = 12;
+                        _j.label = 12;
                     case 12: return [2 /*return*/, cEntities];
                 }
             });
@@ -1581,23 +1582,23 @@ var EntityRenderEngine;
         }
         Point.Render = Render;
         function RenderGroup(params) {
-            var _a, _b;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var api, cEntities, i, entity, zoomItem, style, tagIds, tags, pStyle, cEntity;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = {};
                             i = 0;
-                            _c.label = 1;
+                            _d.label = 1;
                         case 1:
                             if (!(i < params.entities.length)) return [3 /*break*/, 6];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            style = _c.sent();
+                            style = _d.sent();
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
@@ -1606,8 +1607,8 @@ var EntityRenderEngine;
                                     tagIds: tagIds
                                 })];
                         case 3:
-                            tags = (_c.sent()).tags;
-                            _c.label = 4;
+                            tags = (_d.sent()).tags;
+                            _d.label = 4;
                         case 4:
                             pStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.pointStyle) !== null && _b !== void 0 ? _b : {};
                             cEntity = Render({
@@ -1617,9 +1618,9 @@ var EntityRenderEngine;
                                 viewer: params.viewer,
                                 api: api
                             });
-                            cEntity._renderGroup = getRenderGroupId(zoomItem);
+                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
                             cEntities[entity.Bruce.ID] = cEntity;
-                            _c.label = 5;
+                            _d.label = 5;
                         case 5:
                             i++;
                             return [3 /*break*/, 1];
@@ -1633,7 +1634,7 @@ var EntityRenderEngine;
     var Polyline;
     (function (Polyline) {
         function Render(params) {
-            var _a;
+            var _a, _b;
             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) : [];
@@ -1650,7 +1651,17 @@ var EntityRenderEngine;
             if (!isValid) {
                 return null;
             }
-            var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
+            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 &&
+                ((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider) instanceof EllipsoidTerrainProvider) {
+                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)); });
             // Making sure no 0 length lines coming through.
             // Ideally we would measure the full line but I fear that's too expensive.
             if (posses.length == 2 || posses.length == 3) {
@@ -1666,7 +1677,6 @@ var EntityRenderEngine;
                     return null;
                 }
             }
-            var style = params.style;
             var bColor = style.lineColor ? Calculator.GetColor(style.lineColor, entity, params.tags) : null;
             var cColor = bColor ? colorToCColor(bColor) : Color.RED;
             var width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
@@ -1677,7 +1687,6 @@ var EntityRenderEngine;
             if (width <= 0) {
                 return null;
             }
-            var heightRef = getHeightRef(style);
             var cEntity = new Entity({
                 polyline: {
                     positions: posses,
@@ -1699,23 +1708,23 @@ var EntityRenderEngine;
         }
         Polyline.Render = Render;
         function RenderGroup(params) {
-            var _a, _b;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var api, cEntities, i, entity, zoomItem, style, tagIds, tags, lStyle, cEntity;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = {};
                             i = 0;
-                            _c.label = 1;
+                            _d.label = 1;
                         case 1:
                             if (!(i < params.entities.length)) return [3 /*break*/, 6];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            style = _c.sent();
+                            style = _d.sent();
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
@@ -1724,8 +1733,8 @@ var EntityRenderEngine;
                                     tagIds: tagIds
                                 })];
                         case 3:
-                            tags = (_c.sent()).tags;
-                            _c.label = 4;
+                            tags = (_d.sent()).tags;
+                            _d.label = 4;
                         case 4:
                             lStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.polylineStyle) !== null && _b !== void 0 ? _b : {};
                             cEntity = Render({
@@ -1735,10 +1744,10 @@ var EntityRenderEngine;
                                 viewer: params.viewer
                             });
                             if (cEntity) {
-                                cEntity._renderGroup = getRenderGroupId(zoomItem);
+                                cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
                                 cEntities[entity.Bruce.ID] = cEntity;
                             }
-                            _c.label = 5;
+                            _d.label = 5;
                         case 5:
                             i++;
                             return [3 /*break*/, 1];
@@ -1752,7 +1761,7 @@ var EntityRenderEngine;
     var Polygon;
     (function (Polygon) {
         function Render(params) {
-            var _a;
+            var _a, _b;
             var entity = params.entity;
             var pRings = (_a = entity.geometry) === null || _a === void 0 ? void 0 : _a.Polygon;
             if (pRings == null || pRings.length <= 0) {
@@ -1778,10 +1787,16 @@ var EntityRenderEngine;
             Cartes.CloseRing3(posses);
             var extrusion = getPolygonExtrusion(entity, params.tags, outerRing, posses, heightRef, style);
             posses = extrusion.posses;
+            var flattenPoints = false;
+            if (heightRef == HeightReference.CLAMP_TO_GROUND &&
+                ((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider) instanceof EllipsoidTerrainProvider) {
+                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);
-                return points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
+                return points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(flattenPoints ? 0 : x.altitude)); });
             });
             var zIndex = getZIndex(style, entity, params.tags);
             var cEntity = new Entity({
@@ -1804,9 +1819,14 @@ var EntityRenderEngine;
             });
             cEntity._siblingGraphics = [];
             if (width > 0 && cLineColor) {
+                var borderPosses = posses;
+                if (flattenPoints) {
+                    borderPosses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(0)); });
+                    Cartes.CloseRing3(borderPosses);
+                }
                 var cEntityBorder = new Entity({
                     polyline: new PolylineGraphics({
-                        positions: posses,
+                        positions: borderPosses,
                         material: cLineColor,
                         width: width,
                         clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
@@ -1844,23 +1864,23 @@ var EntityRenderEngine;
         }
         Polygon.Render = Render;
         function RenderGroup(params) {
-            var _a, _b;
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
                 var api, cEntities, i, entity, zoomItem, style, tagIds, tags, pStyle, cEntity;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = {};
                             i = 0;
-                            _c.label = 1;
+                            _d.label = 1;
                         case 1:
                             if (!(i < params.entities.length)) return [3 /*break*/, 6];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            style = _c.sent();
+                            style = _d.sent();
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
@@ -1869,8 +1889,8 @@ var EntityRenderEngine;
                                     tagIds: tagIds
                                 })];
                         case 3:
-                            tags = (_c.sent()).tags;
-                            _c.label = 4;
+                            tags = (_d.sent()).tags;
+                            _d.label = 4;
                         case 4:
                             pStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.polygonStyle) !== null && _b !== void 0 ? _b : {};
                             cEntity = Render({
@@ -1880,10 +1900,10 @@ var EntityRenderEngine;
                                 viewer: params.viewer
                             });
                             if (cEntity) {
-                                cEntity._renderGroup = getRenderGroupId(zoomItem);
+                                cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
                                 cEntities[entity.Bruce.ID] = cEntity;
                             }
-                            _c.label = 5;
+                            _d.label = 5;
                         case 5:
                             i++;
                             return [3 /*break*/, 1];
@@ -1913,7 +1933,6 @@ var EntityRenderEngine;
             if (styleScale <= 0) {
                 styleScale = 1;
             }
-            scale *= styleScale;
             var hpr = new HeadingPitchRoll(Math$1.toRadians(heading), Math$1.toRadians(pitch), Math$1.toRadians(roll));
             var heightRef = getHeightRef(style);
             var pos = EntityUtils.GetPos({
@@ -1949,7 +1968,7 @@ var EntityRenderEngine;
                 model: {
                     uri: params.lodUrl,
                     heightReference: heightRef,
-                    scale: scale,
+                    scale: scale * styleScale,
                     shadows: ShadowMode.ENABLED,
                     colorBlendAmount: blendAmount,
                     colorBlendMode: blendMode,
@@ -1961,16 +1980,20 @@ var EntityRenderEngine;
             });
             var model = cEntity.model;
             model._clientFileId = params.lodClientFileId;
+            model._entityScale = {
+                record: scale,
+                style: styleScale
+            };
             params.viewer.entities.add(cEntity);
             return cEntity;
         }
         Model3d.Render = Render;
         function RenderGroup(params) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             return __awaiter(this, void 0, void 0, function () {
                 var api, cEntities, reqBody, i, entity, zoomItem, style, tagIds, tags, mStyle, group, level, catId, lodData, _loop_2, i;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = {};
@@ -1980,14 +2003,14 @@ var EntityRenderEngine;
                                 "Items": []
                             };
                             i = 0;
-                            _e.label = 1;
+                            _f.label = 1;
                         case 1:
                             if (!(i < params.entities.length)) return [3 /*break*/, 6];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            style = _e.sent();
+                            style = _f.sent();
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
                             if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
@@ -1996,8 +2019,8 @@ var EntityRenderEngine;
                                     tagIds: tagIds
                                 })];
                         case 3:
-                            tags = (_e.sent()).tags;
-                            _e.label = 4;
+                            tags = (_f.sent()).tags;
+                            _f.label = 4;
                         case 4:
                             mStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.modelStyle) !== null && _b !== void 0 ? _b : {};
                             group = mStyle.lodGroup ? Calculator.GetString(mStyle.lodGroup, entity, tags) : null;
@@ -2018,7 +2041,7 @@ var EntityRenderEngine;
                                 "group": group,
                                 "level": level
                             });
-                            _e.label = 5;
+                            _f.label = 5;
                         case 5:
                             i++;
                             return [3 /*break*/, 1];
@@ -2027,7 +2050,7 @@ var EntityRenderEngine;
                                 filter: reqBody
                             })];
                         case 7:
-                            lodData = (_e.sent()).lods;
+                            lodData = (_f.sent()).lods;
                             _loop_2 = function (i) {
                                 var entity, zoomItem, style, tagIds, tags, lod, mStyle, cEntity;
                                 return __generator(this, function (_a) {
@@ -2066,7 +2089,7 @@ var EntityRenderEngine;
                                                 lodClientFileId: lod.clientFileId
                                             });
                                             if (cEntity) {
-                                                cEntity._renderGroup = getRenderGroupId(zoomItem);
+                                                cEntity._renderGroup = getRenderGroupId(zoomItem, (_e = params.viewer) === null || _e === void 0 ? void 0 : _e.terrainProvider);
                                                 cEntities[entity.Bruce.ID] = cEntity;
                                             }
                                             return [2 /*return*/];
@@ -2074,13 +2097,13 @@ var EntityRenderEngine;
                                 });
                             };
                             i = 0;
-                            _e.label = 8;
+                            _f.label = 8;
                         case 8:
                             if (!(i < params.entities.length)) return [3 /*break*/, 11];
                             return [5 /*yield**/, _loop_2(i)];
                         case 9:
-                            _e.sent();
-                            _e.label = 10;
+                            _f.sent();
+                            _f.label = 10;
                         case 10:
                             i++;
                             return [3 /*break*/, 8];
@@ -3220,7 +3243,8 @@ function select(viewer, visual) {
             "polygon": "material",
             "polyline": "material",
             "model": "color",
-            "billboard": "color"
+            "billboard": "color",
+            "ellipse": "material"
         };
         var _loop_1 = function (i) {
             var entity = entities[i];
@@ -3275,7 +3299,8 @@ function deselect(viewer, visual) {
             "polygon": "material",
             "polyline": "material",
             "model": "color",
-            "billboard": "color"
+            "billboard": "color",
+            "ellipse": "material"
         };
         var _loop_2 = function (i) {
             var entity = entities[i];