bruce-cesium 2.5.3 → 2.5.5

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, Cesium3DTileset, Model, PolygonPipeline, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, IonResource, CesiumInspector, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1630,9 +1630,9 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
     }
     return data;
 }
-function getHeightRef(style) {
+function getHeightRef(style, defaultStyle) {
     var _a;
-    var heightRef = HeightReference.CLAMP_TO_GROUND;
+    var heightRef = defaultStyle == null ? HeightReference.CLAMP_TO_GROUND : defaultStyle;
     var altOptionId = (_a = style === null || style === void 0 ? void 0 : style.altitudeOption) === null || _a === void 0 ? void 0 : _a.id;
     if (altOptionId == 1) {
         heightRef = HeightReference.NONE;
@@ -1693,38 +1693,52 @@ function getName(api, entity) {
 }
 function getStyle(api, entity, styleId) {
     return __awaiter(this, void 0, void 0, function () {
-        var style, typeId, type;
+        var style, e_2, typeId, type, e_3;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     style = null;
-                    if (!styleId) return [3 /*break*/, 2];
+                    if (!styleId) return [3 /*break*/, 4];
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, Style.Get({
                             api: api,
                             styleId: styleId
                         })];
-                case 1:
-                    style = (_a.sent()).style;
-                    _a.label = 2;
                 case 2:
-                    if (!!style) return [3 /*break*/, 5];
+                    style = (_a.sent()).style;
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_2 = _a.sent();
+                    console.error(e_2);
+                    return [3 /*break*/, 4];
+                case 4:
+                    if (!!style) return [3 /*break*/, 9];
                     typeId = entity.Bruce["EntityType.ID"];
-                    if (!typeId) return [3 /*break*/, 5];
+                    if (!typeId) return [3 /*break*/, 9];
                     return [4 /*yield*/, EntityType.Get({
                             api: api,
                             entityTypeId: typeId
                         })];
-                case 3:
+                case 5:
                     type = (_a.sent()).entityType;
-                    if (!type["DisplaySetting.ID"]) return [3 /*break*/, 5];
+                    if (!type["DisplaySetting.ID"]) return [3 /*break*/, 9];
+                    _a.label = 6;
+                case 6:
+                    _a.trys.push([6, 8, , 9]);
                     return [4 /*yield*/, Style.Get({
                             api: api,
                             styleId: type["DisplaySetting.ID"]
                         })];
-                case 4:
+                case 7:
                     style = (_a.sent()).style;
-                    _a.label = 5;
-                case 5: return [2 /*return*/, style];
+                    return [3 /*break*/, 9];
+                case 8:
+                    e_3 = _a.sent();
+                    console.error(e_3);
+                    return [3 /*break*/, 9];
+                case 9: return [2 /*return*/, style];
             }
         });
     });
@@ -2100,7 +2114,7 @@ var EntityRenderEngine;
     (function (Point) {
         function Render(params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_2, iconScale, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -2153,7 +2167,7 @@ var EntityRenderEngine;
                             _a.label = 4;
                         case 4: return [3 /*break*/, 6];
                         case 5:
-                            e_2 = _a.sent();
+                            e_4 = _a.sent();
                             iconUrl = null;
                             return [3 /*break*/, 6];
                         case 6:
@@ -2254,10 +2268,10 @@ var EntityRenderEngine;
                             }
                             if (!cEntity) {
                                 bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
-                                cColor = bColor ? colorToCColor(bColor) : Color.RED;
+                                cColor = bColor ? colorToCColor(bColor) : Color.fromCssColorString("rgba(33, 150, 243, 0.8)");
                                 size = style.size ? Calculator.GetNumber(style.size, entity, params.tags) : null;
                                 if (size == null) {
-                                    size = 30;
+                                    size = 20;
                                 }
                                 size = EnsureNumber(size);
                                 if (size <= 0) {
@@ -2292,33 +2306,40 @@ var EntityRenderEngine;
         function RenderGroup(params) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, pStyle, cEntity, name_2;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var api, cEntities, i, entity, zoomItem, style, _d, tagIds, tags, pStyle, cEntity, name_2;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = {};
                             i = 0;
-                            _d.label = 1;
+                            _e.label = 1;
                         case 1:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 9];
+                            if (!(i < params.entities.length)) return [3 /*break*/, 11];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
+                            if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 3];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            style = _d.sent();
+                            _d = (_a = (_e.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                            return [3 /*break*/, 4];
+                        case 3:
+                            _d = zoomItem.Style;
+                            _e.label = 4;
+                        case 4:
+                            style = _d;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
-                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
+                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 6];
                             return [4 /*yield*/, EntityTag.GetListByIds({
                                     api: api,
                                     tagIds: tagIds
                                 })];
-                        case 3:
-                            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 : {};
+                        case 5:
+                            tags = (_e.sent()).tags;
+                            _e.label = 6;
+                        case 6:
+                            pStyle = (_b = style === null || style === void 0 ? void 0 : style.pointStyle) !== null && _b !== void 0 ? _b : {};
                             return [4 /*yield*/, Render({
                                     entity: entity,
                                     style: pStyle,
@@ -2328,22 +2349,22 @@ var EntityRenderEngine;
                                     maxDistance: zoomItem.MaxZoom,
                                     minDistance: zoomItem.MinZoom
                                 })];
-                        case 5:
-                            cEntity = _d.sent();
-                            if (!cEntity) return [3 /*break*/, 7];
+                        case 7:
+                            cEntity = _e.sent();
+                            if (!cEntity) return [3 /*break*/, 9];
                             return [4 /*yield*/, getName(api, entity)];
-                        case 6:
-                            name_2 = _d.sent();
+                        case 8:
+                            name_2 = _e.sent();
                             cEntity.name = name_2;
                             cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
-                            _d.label = 7;
-                        case 7:
+                            _e.label = 9;
+                        case 9:
                             cEntities[entity.Bruce.ID] = cEntity;
-                            _d.label = 8;
-                        case 8:
+                            _e.label = 10;
+                        case 10:
                             i++;
                             return [3 /*break*/, 1];
-                        case 9: return [2 /*return*/, cEntities];
+                        case 11: return [2 /*return*/, cEntities];
                     }
                 });
             });
@@ -2399,13 +2420,13 @@ var EntityRenderEngine;
                 return null;
             }
             var bColor = style.lineColor ? Calculator.GetColor(style.lineColor, entity, params.tags) : null;
-            var cColor = bColor ? colorToCColor(bColor) : Color.RED;
+            var cColor = bColor ? colorToCColor(bColor) : Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
             if (cColor.alpha <= 0) {
                 return null;
             }
             var width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
             if (width == null) {
-                width = 4;
+                width = 2;
             }
             width = EnsureNumber(width);
             if (width < 0.01) {
@@ -2456,33 +2477,40 @@ var EntityRenderEngine;
         function RenderGroup(params) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, lStyle, cEntity, name_3;
-                return __generator(this, function (_d) {
-                    switch (_d.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 = {};
                             i = 0;
-                            _d.label = 1;
+                            _e.label = 1;
                         case 1:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 7];
+                            if (!(i < params.entities.length)) return [3 /*break*/, 9];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
+                            if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 3];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            style = _d.sent();
+                            _d = (_a = (_e.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                            return [3 /*break*/, 4];
+                        case 3:
+                            _d = zoomItem.Style;
+                            _e.label = 4;
+                        case 4:
+                            style = _d;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
-                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
+                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 6];
                             return [4 /*yield*/, EntityTag.GetListByIds({
                                     api: api,
                                     tagIds: tagIds
                                 })];
-                        case 3:
-                            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 : {};
+                        case 5:
+                            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({
                                 entity: entity,
                                 style: lStyle,
@@ -2491,18 +2519,18 @@ var EntityRenderEngine;
                                 maxDistance: zoomItem.MaxZoom,
                                 minDistance: zoomItem.MinZoom
                             });
-                            if (!cEntity) return [3 /*break*/, 6];
+                            if (!cEntity) return [3 /*break*/, 8];
                             return [4 /*yield*/, getName(api, entity)];
-                        case 5:
-                            name_3 = _d.sent();
+                        case 7:
+                            name_3 = _e.sent();
                             cEntity.name = name_3;
                             cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
                             cEntities[entity.Bruce.ID] = cEntity;
-                            _d.label = 6;
-                        case 6:
+                            _e.label = 8;
+                        case 8:
                             i++;
                             return [3 /*break*/, 1];
-                        case 7: return [2 /*return*/, cEntities];
+                        case 9: return [2 /*return*/, cEntities];
                     }
                 });
             });
@@ -2520,12 +2548,12 @@ var EntityRenderEngine;
             }
             var style = params.style;
             var bFillColor = Calculator.GetColor(style.fillColor, entity, params.tags);
-            var cFillColor = bFillColor ? colorToCColor(bFillColor) : Color.RED;
+            var cFillColor = bFillColor ? colorToCColor(bFillColor) : Color.fromCssColorString("rgba(139, 195, 74, 0.8)");
             var bLineColor = Calculator.GetColor(style.lineColor, entity, params.tags);
-            var cLineColor = bLineColor ? colorToCColor(bLineColor) : Color.RED;
+            var cLineColor = bLineColor ? colorToCColor(bLineColor) : Color.fromCssColorString("rgba(80, 80, 80, 0.8)");
             var width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
             if (width == null) {
-                width = 4;
+                width = 1;
             }
             width = EnsureNumber(width);
             if (width < 0.01) {
@@ -2668,33 +2696,40 @@ var EntityRenderEngine;
         function RenderGroup(params) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, pStyle, cEntity, name_4;
-                return __generator(this, function (_d) {
-                    switch (_d.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 = {};
                             i = 0;
-                            _d.label = 1;
+                            _e.label = 1;
                         case 1:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 7];
+                            if (!(i < params.entities.length)) return [3 /*break*/, 9];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
+                            if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 3];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            style = _d.sent();
+                            _d = (_a = (_e.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                            return [3 /*break*/, 4];
+                        case 3:
+                            _d = zoomItem.Style;
+                            _e.label = 4;
+                        case 4:
+                            style = _d;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
-                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
+                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 6];
                             return [4 /*yield*/, EntityTag.GetListByIds({
                                     api: api,
                                     tagIds: tagIds
                                 })];
-                        case 3:
-                            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 : {};
+                        case 5:
+                            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({
                                 entity: entity,
                                 style: pStyle,
@@ -2703,18 +2738,18 @@ var EntityRenderEngine;
                                 maxDistance: zoomItem.MaxZoom,
                                 minDistance: zoomItem.MinZoom
                             });
-                            if (!cEntity) return [3 /*break*/, 6];
+                            if (!cEntity) return [3 /*break*/, 8];
                             return [4 /*yield*/, getName(api, entity)];
-                        case 5:
-                            name_4 = _d.sent();
+                        case 7:
+                            name_4 = _e.sent();
                             cEntity.name = name_4;
                             cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
                             cEntities[entity.Bruce.ID] = cEntity;
-                            _d.label = 6;
-                        case 6:
+                            _e.label = 8;
+                        case 8:
                             i++;
                             return [3 /*break*/, 1];
-                        case 7: return [2 /*return*/, cEntities];
+                        case 9: return [2 /*return*/, cEntities];
                     }
                 });
             });
@@ -2741,7 +2776,7 @@ var EntityRenderEngine;
                 styleScale = 1;
             }
             var hpr = new HeadingPitchRoll(Math$1.toRadians(heading), Math$1.toRadians(pitch), Math$1.toRadians(roll));
-            var heightRef = getHeightRef(style);
+            var heightRef = getHeightRef(style, HeightReference.RELATIVE_TO_GROUND);
             var pos = EntityUtils.GetPos({
                 viewer: params.viewer,
                 entity: entity,
@@ -2800,9 +2835,9 @@ var EntityRenderEngine;
         function RenderGroup(params) {
             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 (_f) {
-                    switch (_f.label) {
+                var api, cEntities, reqBody, i, entity, zoomItem, style, _f, tagIds, tags, mStyle, group, level, catId, lodData, _loop_2, i;
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             api = params.apiGetter.getApi();
                             cEntities = {};
@@ -2812,26 +2847,33 @@ var EntityRenderEngine;
                                 "Items": []
                             };
                             i = 0;
-                            _f.label = 1;
+                            _g.label = 1;
                         case 1:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 6];
+                            if (!(i < params.entities.length)) return [3 /*break*/, 8];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
+                            if (!(zoomItem.StyleID != -1)) return [3 /*break*/, 3];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
                         case 2:
-                            style = _f.sent();
+                            _f = (_a = (_g.sent())) === null || _a === void 0 ? void 0 : _a.Settings;
+                            return [3 /*break*/, 4];
+                        case 3:
+                            _f = zoomItem.Style;
+                            _g.label = 4;
+                        case 4:
+                            style = _f;
                             tagIds = entity.Bruce["Layer.ID"];
                             tags = [];
-                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 4];
+                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 6];
                             return [4 /*yield*/, EntityTag.GetListByIds({
                                     api: api,
                                     tagIds: tagIds
                                 })];
-                        case 3:
-                            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 : {};
+                        case 5:
+                            tags = (_g.sent()).tags;
+                            _g.label = 6;
+                        case 6:
+                            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;
                             if (!group) {
                                 group = "DEFAULT";
@@ -2850,42 +2892,49 @@ var EntityRenderEngine;
                                 "group": group,
                                 "level": level
                             });
-                            _f.label = 5;
-                        case 5:
+                            _g.label = 7;
+                        case 7:
                             i++;
                             return [3 /*break*/, 1];
-                        case 6: return [4 /*yield*/, EntityLod.GetLods({
+                        case 8: return [4 /*yield*/, EntityLod.GetLods({
                                 api: api,
                                 filter: reqBody
                             })];
-                        case 7:
-                            lodData = (_f.sent()).lods;
+                        case 9:
+                            lodData = (_g.sent()).lods;
                             _loop_2 = function (i) {
-                                var entity, zoomItem, style, tagIds, tags, lod, mStyle, cEntity, name_5;
-                                return __generator(this, function (_g) {
-                                    switch (_g.label) {
+                                var entity, zoomItem, style, _h, tagIds, tags, lod, mStyle, cEntity, name_5;
+                                return __generator(this, function (_j) {
+                                    switch (_j.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:
-                                            style = _g.sent();
+                                            _h = (_c = (_j.sent())) === null || _c === void 0 ? void 0 : _c.Settings;
+                                            return [3 /*break*/, 3];
+                                        case 2:
+                                            _h = zoomItem.Style;
+                                            _j.label = 3;
+                                        case 3:
+                                            style = _h;
                                             tagIds = entity.Bruce["Layer.ID"];
                                             tags = [];
-                                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 3];
+                                            if (!(tagIds && tagIds.length > 0)) return [3 /*break*/, 5];
                                             return [4 /*yield*/, EntityTag.GetListByIds({
                                                     api: api,
                                                     tagIds: tagIds
                                                 })];
-                                        case 2:
-                                            tags = (_g.sent()).tags;
-                                            _g.label = 3;
-                                        case 3:
+                                        case 4:
+                                            tags = (_j.sent()).tags;
+                                            _j.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)) {
                                                 return [2 /*return*/, "continue"];
                                             }
-                                            mStyle = (_d = (_c = style === null || style === void 0 ? void 0 : style.Settings) === null || _c === void 0 ? void 0 : _c.modelStyle) !== null && _d !== void 0 ? _d : {};
+                                            mStyle = (_d = style === null || style === void 0 ? void 0 : style.modelStyle) !== null && _d !== void 0 ? _d : {};
                                             cEntity = Render({
                                                 entity: entity,
                                                 style: mStyle,
@@ -2899,30 +2948,30 @@ var EntityRenderEngine;
                                                 maxDistance: zoomItem.MaxZoom,
                                                 minDistance: zoomItem.MinZoom
                                             });
-                                            if (!cEntity) return [3 /*break*/, 5];
+                                            if (!cEntity) return [3 /*break*/, 7];
                                             return [4 /*yield*/, getName(api, entity)];
-                                        case 4:
-                                            name_5 = _g.sent();
+                                        case 6:
+                                            name_5 = _j.sent();
                                             cEntity.name = name_5;
                                             cEntity._renderGroup = getRenderGroupId(zoomItem, (_e = params.viewer) === null || _e === void 0 ? void 0 : _e.terrainProvider);
                                             cEntities[entity.Bruce.ID] = cEntity;
-                                            _g.label = 5;
-                                        case 5: return [2 /*return*/];
+                                            _j.label = 7;
+                                        case 7: return [2 /*return*/];
                                     }
                                 });
                             };
                             i = 0;
-                            _f.label = 8;
-                        case 8:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 11];
-                            return [5 /*yield**/, _loop_2(i)];
-                        case 9:
-                            _f.sent();
-                            _f.label = 10;
+                            _g.label = 10;
                         case 10:
+                            if (!(i < params.entities.length)) return [3 /*break*/, 13];
+                            return [5 /*yield**/, _loop_2(i)];
+                        case 11:
+                            _g.sent();
+                            _g.label = 12;
+                        case 12:
                             i++;
-                            return [3 /*break*/, 8];
-                        case 11: return [2 /*return*/, cEntities];
+                            return [3 /*break*/, 10];
+                        case 13: return [2 /*return*/, cEntities];
                     }
                 });
             });
@@ -5260,7 +5309,7 @@ var EntitiesRenderManager;
         });
         Manager.prototype.Init = function (params) {
             var _this = this;
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f;
             if (this.disposed) {
                 throw (new Error("This item is disposed."));
             }
@@ -5286,13 +5335,10 @@ var EntitiesRenderManager;
             }
             tagsToRender = [].concat(tagsToRender);
             var shouldRender = !isTagItem || tagsToRender.length > 0;
-            (_b = this.getter) === null || _b === void 0 ? void 0 : _b.ExcludeMenuItem(this.item.id);
-            this.getter = null;
-            (_c = this.getterSub) === null || _c === void 0 ? void 0 : _c.call(this);
-            this.getterSub = null;
-            (_d = this.viewMonitorRemoval) === null || _d === void 0 ? void 0 : _d.call(this);
+            this.unsetGetter();
+            (_b = this.viewMonitorRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
             this.viewMonitorRemoval = null;
-            (_e = this.entityCheckQueue) === null || _e === void 0 ? void 0 : _e.Dispose();
+            (_c = this.entityCheckQueue) === null || _c === void 0 ? void 0 : _c.Dispose();
             this.entityCheckQueue = null;
             clearInterval(this.renderQueueInterval);
             this.renderQueueInterval = null;
@@ -5304,22 +5350,39 @@ var EntitiesRenderManager;
                     menuItemId: this.item.id,
                     retainTagIds: tagsToRender
                 });
-                (_f = this.clustering) === null || _f === void 0 ? void 0 : _f.Dispose();
+                (_d = this.clustering) === null || _d === void 0 ? void 0 : _d.Dispose();
             }
             else {
                 this.visualsManager.RemoveRegos({
                     menuItemId: this.item.id
                 });
-                (_g = this.clustering) === null || _g === void 0 ? void 0 : _g.Dispose();
+                (_e = this.clustering) === null || _e === void 0 ? void 0 : _e.Dispose();
                 return;
             }
             if (this.item.enableClustering) {
-                this.clustering = new PointClustering(this.visualsManager, this.item.id, (_h = this.item) === null || _h === void 0 ? void 0 : _h.clustering);
+                this.clustering = new PointClustering(this.visualsManager, this.item.id, (_f = this.item) === null || _f === void 0 ? void 0 : _f.clustering);
             }
-            var api = this.apiGetter.getApi();
+            this.setGetter();
+            this.viewMonitorRemoval = this.monitor.Updated().Subscribe(function () {
+                _this.entityCheckQueue.Call();
+            });
+            this.entityCheckQueue = new DelayQueue(function () {
+                var _a;
+                // Don't bother checking for zoom control changes if we only have 1 item.
+                // We'll let Cesium handle hide/show at max zoom range. 
+                var shouldCheck = ((_a = _this.item) === null || _a === void 0 ? void 0 : _a.CameraZoomSettings) && _this.item.CameraZoomSettings.length > 1;
+                if (shouldCheck) {
+                    _this.doEntityCheck(Object.keys(_this.renderedEntities));
+                }
+            }, 3000);
+        };
+        Manager.prototype.setGetter = function () {
+            var _this = this;
+            var _a;
+            this.unsetGetter();
             this.getter = this.sharedGetters.GetOrCreateFilterGetter({
-                api: api,
-                attrFilter: (_j = this.item.BruceEntity.Filter) !== null && _j !== void 0 ? _j : {},
+                api: this.apiGetter.getApi(),
+                attrFilter: (_a = this.item.BruceEntity.Filter) !== null && _a !== void 0 ? _a : {},
                 batchSize: BATCH_SIZE,
                 typeId: this.item.BruceEntity["EntityType.ID"],
                 monitor: this.monitor,
@@ -5331,6 +5394,12 @@ var EntitiesRenderManager;
                 zoomControl: this.item.CameraZoomSettings
             });
             this.getter.IncludeMenuItem(this.item.id, [], minMax[0], minMax[1]);
+            var isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
+            var tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
+            if (!tagsToRender) {
+                tagsToRender = [];
+            }
+            tagsToRender = [].concat(tagsToRender);
             this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                 if (isTagItem) {
                     _this.distributeForRender(entities.filter(function (entity) {
@@ -5347,18 +5416,13 @@ var EntitiesRenderManager;
                     _this.distributeForRender(entities);
                 }
             });
-            this.viewMonitorRemoval = this.monitor.Updated().Subscribe(function () {
-                _this.entityCheckQueue.Call();
-            });
-            this.entityCheckQueue = new DelayQueue(function () {
-                var _a;
-                // Don't bother checking for zoom control changes if we only have 1 item.
-                // We'll let Cesium handle hide/show at max zoom range. 
-                var shouldCheck = ((_a = _this.item) === null || _a === void 0 ? void 0 : _a.CameraZoomSettings) && _this.item.CameraZoomSettings.length > 1;
-                if (shouldCheck) {
-                    _this.doEntityCheck(Object.keys(_this.renderedEntities));
-                }
-            }, 3000);
+        };
+        Manager.prototype.unsetGetter = function () {
+            var _a, _b;
+            (_a = this.getter) === null || _a === void 0 ? void 0 : _a.ExcludeMenuItem(this.item.id);
+            this.getter = null;
+            (_b = this.getterSub) === null || _b === void 0 ? void 0 : _b.call(this);
+            this.getterSub = null;
         };
         Manager.prototype.Dispose = function () {
             if (this.disposed) {
@@ -5367,21 +5431,17 @@ var EntitiesRenderManager;
             this.doDispose();
         };
         Manager.prototype.doDispose = function () {
-            var _a, _b, _c, _d;
-            (_a = this.getterSub) === null || _a === void 0 ? void 0 : _a.call(this);
-            this.getterSub = null;
-            if (this.getter) {
-                this.getter.ExcludeMenuItem(this.item.id);
-            }
+            var _a, _b, _c;
+            this.unsetGetter();
             this.disposed = true;
             this.visualsManager.RemoveRegos({
                 menuItemId: this.item.id
             });
-            (_b = this.entityCheckRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
-            (_c = this.viewMonitorRemoval) === null || _c === void 0 ? void 0 : _c.call(this);
+            (_a = this.entityCheckRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
+            (_b = this.viewMonitorRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
             clearInterval(this.renderQueueInterval);
             this.renderQueue = [];
-            (_d = this.clustering) === null || _d === void 0 ? void 0 : _d.Dispose();
+            (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.Dispose();
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
@@ -5435,6 +5495,24 @@ var EntitiesRenderManager;
                 });
             });
         };
+        Manager.prototype.UpdateSettings = function (params) {
+            var CameraZoomSettings = params.zoomControl, queueRerender = params.queueRerender;
+            if (this.disposed) {
+                return;
+            }
+            if (CameraZoomSettings === null || CameraZoomSettings === void 0 ? void 0 : CameraZoomSettings.length) {
+                this.item.CameraZoomSettings = CameraZoomSettings;
+                this.setGetter();
+            }
+            if (queueRerender != false) {
+                var entityIds = Object.keys(this.renderedEntities);
+                this.visualsManager.MarkStale({
+                    entityIds: entityIds,
+                    menuItemIds: [this.item.id]
+                });
+                this.doEntityCheck(entityIds);
+            }
+        };
         Manager.prototype.doEntityCheck = function (ids) {
             return __awaiter(this, void 0, void 0, function () {
                 var api, checkBatch, e_2;
@@ -5717,6 +5795,23 @@ var EntitiesLoadedRenderManager;
                 });
             });
         };
+        Manager.prototype.UpdateSettings = function (params) {
+            var CameraZoomSettings = params.zoomControl, queueRerender = params.queueRerender;
+            if (this.disposed) {
+                return;
+            }
+            if (CameraZoomSettings === null || CameraZoomSettings === void 0 ? void 0 : CameraZoomSettings.length) {
+                this.item.CameraZoomSettings = CameraZoomSettings;
+            }
+            if (queueRerender != false) {
+                var entityIds = Object.keys(this.renderedEntities);
+                this.visualsManager.MarkStale({
+                    entityIds: entityIds,
+                    menuItemIds: [this.item.id]
+                });
+                this.doEntityCheck(entityIds);
+            }
+        };
         Manager.prototype.doEntityCheck = function (ids, force) {
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
@@ -5948,6 +6043,23 @@ var EntitiesIdsRenderManager;
                 });
             });
         };
+        Manager.prototype.UpdateSettings = function (params) {
+            var CameraZoomSettings = params.zoomControl, queueRerender = params.queueRerender;
+            if (this.disposed) {
+                return;
+            }
+            if (CameraZoomSettings === null || CameraZoomSettings === void 0 ? void 0 : CameraZoomSettings.length) {
+                this.item.CameraZoomSettings = CameraZoomSettings;
+            }
+            if (queueRerender != false) {
+                var entityIds = Object.keys(this.renderedEntities);
+                this.visualsManager.MarkStale({
+                    entityIds: entityIds,
+                    menuItemIds: [this.item.id]
+                });
+                this.onGetterUpdate(entityIds);
+            }
+        };
         Manager.prototype.onGetterUpdate = function (entityIds, force) {
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
@@ -6182,6 +6294,23 @@ var EntityRenderManager;
                 });
             });
         };
+        Manager.prototype.UpdateSettings = function (params) {
+            var CameraZoomSettings = params.zoomControl, queueRerender = params.queueRerender;
+            if (this.disposed) {
+                return;
+            }
+            if (CameraZoomSettings === null || CameraZoomSettings === void 0 ? void 0 : CameraZoomSettings.length) {
+                this.item.CameraZoomSettings = CameraZoomSettings;
+            }
+            if (queueRerender != false) {
+                var entityId = this.item.BruceEntity.EntityId;
+                this.visualsManager.MarkStale({
+                    entityIds: [entityId],
+                    menuItemIds: [this.item.id]
+                });
+                this.onGetterUpdate(entityId, true);
+            }
+        };
         Manager.prototype.renderEntity = function (entity, force) {
             var _a;
             if (force === void 0) { force = false; }
@@ -9135,7 +9264,7 @@ var MenuItemManager;
             if (rItem.renderManager && !((_c = rItem.renderManager) === null || _c === void 0 ? void 0 : _c.Disposed)) {
                 (_d = this.onUpdate) === null || _d === void 0 ? void 0 : _d.Trigger({ isEnabling: true, itemId: rItem.id });
             }
-            rItem.id;
+            return rItem.id;
         };
         /**
          * Disables a menu item by its id.
@@ -14714,6 +14843,30 @@ var WidgetInfoView = /** @class */ (function (_super) {
 }(Widget.AWidget));
 
 var CESIUM_VIEWER_MANAGER_KEY = "_cesiumViewerManager";
+/**
+ * Bug related to entities not being visible after they were added then a render was requested.
+ * It was 4 point entities in York. They would not appear until a request render was recalled.
+ * Adding this slow render loop as a band-aid fix.
+ */
+var BACKGROUND_RENDERING_KEY = "_backgroundRendering";
+function backgroundRendering(viewer) {
+    if (viewer[BACKGROUND_RENDERING_KEY]) {
+        return;
+    }
+    viewer[BACKGROUND_RENDERING_KEY] = true;
+    var interval = setInterval(function () {
+        if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene) || viewer.isDestroyed()) {
+            clearInterval(interval);
+            return;
+        }
+        // Check if last render time is greater than 3 seconds ago.
+        // We check in case something else is also requesting renders.
+        var lastRenderTime = viewer.scene.lastRenderTime;
+        if (!lastRenderTime || JulianDate.secondsDifference(JulianDate.now(), lastRenderTime) > 3) {
+            viewer.scene.requestRender();
+        }
+    }, 3500);
+}
 var ViewerUtils;
 (function (ViewerUtils) {
     /**
@@ -14739,6 +14892,7 @@ var ViewerUtils;
                 viewer: viewer
             });
         }
+        backgroundRendering(viewer);
         return data;
     }
     ViewerUtils.InitViewer = InitViewer;
@@ -14756,6 +14910,9 @@ var ViewerUtils;
         var _a;
         var viewer = params.viewer;
         var container = viewer.container;
+        if (!container.style.position) {
+            container.style.position = "relative";
+        }
         var genContainer = (_a = container.getElementsByClassName("cesium-viewer")) === null || _a === void 0 ? void 0 : _a[0];
         if (genContainer) {
             var children = genContainer.children;
@@ -14859,7 +15016,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.5.3";
+var VERSION$1 = "2.5.5";
 
 export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map