bruce-cesium 2.8.8 → 2.8.9

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, JulianDate, Color, HeightReference, Cartesian3, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Math as Math$1, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cartesian2, CallbackProperty, Rectangle, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, createOsmBuildings, SceneTransforms, KmlDataSource, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidTerrainProvider, CesiumInspector, defined, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, GeometryInstance, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1939,6 +1939,34 @@ function getSizeOfPolygonEntity(entity) {
     }
     return length;
 }
+var _billboardCache = new LRUCache(100);
+var POINT_BILLBOARD_PADDING = 1;
+var createCircleBillboard = function (size, colorCss) {
+    var key = size + "-" + colorCss;
+    var cacheData = _billboardCache.Get(key);
+    if ((cacheData === null || cacheData === void 0 ? void 0 : cacheData.canvas) instanceof HTMLCanvasElement) {
+        return cacheData;
+    }
+    // Slight padding to avoid corners clipping.
+    var canvasSize = size + (POINT_BILLBOARD_PADDING * 4);
+    var canvas = document.createElement("canvas");
+    canvas.width = canvasSize;
+    canvas.height = canvasSize;
+    var context = canvas.getContext("2d");
+    context.beginPath();
+    context.arc(canvasSize / 2, canvasSize / 2, size / 2, 0, 2 * Math.PI, false);
+    context.fillStyle = colorCss;
+    context.fill();
+    var data = {
+        canvas: canvas,
+        colorCss: colorCss,
+        size: size,
+        height: canvasSize,
+        width: canvasSize
+    };
+    _billboardCache.Set(key, data);
+    return data;
+};
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
@@ -2199,7 +2227,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_1, res, blob_1, e_4, e_5, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef;
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl_1, res, blob_1, e_4, e_5, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef, circleBillboard;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -2297,8 +2325,7 @@ var EntityRenderEngine;
                                             heightReference: getHeightRef(style),
                                             scale: iconScale,
                                             disableDepthTestDistance: disableDepthTest ? Number.POSITIVE_INFINITY : undefined,
-                                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
-                                            height: _fileHeightCache[iconUrl_1]
+                                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
                                             // Would be great once we have a setting for this.
                                             // translucencyByDistance: getTranslucencyByDistance(params.minDistance, params.maxDistance),
                                         },
@@ -2310,6 +2337,7 @@ var EntityRenderEngine;
                                         }),
                                         show: true
                                     });
+                                    cEntity.billboard._billboardSize = _fileHeightCache[iconUrl_1];
                                 }
                             }
                             _a.label = 12;
@@ -2389,11 +2417,22 @@ var EntityRenderEngine;
                                     return [2 /*return*/, null];
                                 }
                                 heightRef = getHeightRef(style);
+                                circleBillboard = createCircleBillboard(size, cColor.toCssColorString());
                                 cEntity = new Entity({
-                                    point: {
-                                        pixelSize: size,
-                                        color: cColor,
-                                        heightReference: getHeightRef(style),
+                                    // point: {
+                                    //     pixelSize: size,
+                                    //     color: cColor,
+                                    //     heightReference: getHeightRef(style),
+                                    //     distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                                    // },
+                                    // We are generating a billboard instead of using the point.
+                                    // This is because points were behaving strangely where they would appear oblong shapes.
+                                    // This occurred consistently when rendering many icons and points at the same time.
+                                    billboard: {
+                                        height: circleBillboard.height,
+                                        width: circleBillboard.width,
+                                        image: circleBillboard.canvas,
+                                        heightReference: heightRef,
                                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
                                     },
                                     position: EntityUtils.GetPos({
@@ -2404,6 +2443,7 @@ var EntityRenderEngine;
                                     }),
                                     show: true
                                 });
+                                cEntity.billboard._billboardSize = Math.ceil(circleBillboard.height / 2);
                             }
                             if (cEntity) {
                                 cEntity._siblingGraphics = siblings;
@@ -3900,7 +3940,7 @@ var EntityLabel;
                                 }
                                 else if (visual.billboard) {
                                     heightRef = getValue$1(this.viewer, visual.billboard.heightReference);
-                                    height = getValue$1(this.viewer, visual.billboard.height);
+                                    height = visual.billboard._billboardSize;
                                     if (height) {
                                         scale = EnsureNumber(getValue$1(this.viewer, visual.billboard.scale), 1);
                                         pixelOffset.y = -(height * scale);
@@ -9971,11 +10011,17 @@ var RelationsRenderManager;
          * @param relation
          */
         Manager.prototype.shouldRenderRelation = function (relation) {
-            var _a, _b, _c;
-            if (((_a = this.item.relationTypeIds) === null || _a === void 0 ? void 0 : _a.length) && !this.item.relationTypeIds.includes(relation["Relation.Type.ID"])) {
-                return false;
+            var _a, _b, _c, _d;
+            if ((_a = this.item.relations) === null || _a === void 0 ? void 0 : _a.length) {
+                // Find group for the same relationship type.
+                var typeRelations = this.item.relations.find(function (x) { return x.relationTypeId == relation["Relation.Type.ID"]; });
+                // See if group contains the parent entity ID.
+                if ((_b = typeRelations === null || typeRelations === void 0 ? void 0 : typeRelations.entityIds) === null || _b === void 0 ? void 0 : _b.find(function (x) { return x == relation["Principal.Entity.ID"]; })) {
+                    return true;
+                }
             }
-            var renderedIds = (_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.BruceEntity) === null || _c === void 0 ? void 0 : _c.EntityIds;
+            // Backwards compatability.
+            var renderedIds = (_d = (_c = this.item) === null || _c === void 0 ? void 0 : _c.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
             if (!renderedIds) {
                 return false;
             }
@@ -12760,6 +12806,7 @@ function assertIteration$1(viewer, iteration) {
 }
 /**
  * Renders DATA_VERSION = 1 navigator.
+ * param iteration
  * @param params
  * @param bookmark
  * @param view
@@ -12883,33 +12930,32 @@ function renderLegacyNavigator(iteration, params, bookmark, view) {
                     }
                     _f.label = 3;
                 case 3:
-                    if (!((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 5];
-                    menuItem = {
-                        id: RELATION_MENU_ITEM_ID,
-                        Caption: "Entity relations",
-                        BruceEntity: {
-                            EntityIds: bSettings.drawnRelationEntityIDs
-                        },
-                        Type: MenuItem.EType.Relations
-                    };
-                    return [4 /*yield*/, params.manager.RenderItem({
+                    if ((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length) {
+                        menuItem = {
+                            id: RELATION_MENU_ITEM_ID,
+                            Caption: "Entity relations",
+                            BruceEntity: {
+                                EntityIds: bSettings.drawnRelationEntityIDs
+                            },
+                            Type: MenuItem.EType.Relations
+                        };
+                        params.manager.RenderItem({
                             apiGetter: params.apiGetter,
                             getters: params.getters,
                             item: menuItem
-                        })];
-                case 4:
-                    _f.sent();
-                    if (!assertIteration$1(params.viewer, iteration)) {
-                        return [2 /*return*/];
+                        });
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
                     }
-                    _f.label = 5;
-                case 5: return [2 /*return*/];
+                    return [2 /*return*/];
             }
         });
     });
 }
 /**
  * Renders DATA_VERSION > 1 navigator.
+ * @param iteration
  * @param params
  * @param bookmark
  * @param view
@@ -12917,7 +12963,7 @@ function renderLegacyNavigator(iteration, params, bookmark, view) {
 function renderNavigator(iteration, params, bookmark, view) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, curLabelledIds, toUnLabel, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, curLabelledIds, toUnLabel, entityOpacityMap, entityId, opacity, imagery, legacyRelationIds, relations, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
         return __generator(this, function (_7) {
             switch (_7.label) {
                 case 0:
@@ -13203,16 +13249,20 @@ function renderNavigator(iteration, params, bookmark, view) {
                         tiles: imagery,
                         viewer: params.manager.Viewer,
                     });
-                    renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
-                    if (!renderedRelationEntityIds) {
-                        renderedRelationEntityIds = [];
+                    legacyRelationIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
+                    if (!legacyRelationIds) {
+                        legacyRelationIds = [];
+                    }
+                    relations = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedRelations;
+                    if (!relations) {
+                        relations = [];
                     }
                     curEnabled = params.manager.GetEnabledItemIds();
                     newItemIds = (_5 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _5 !== void 0 ? _5 : [];
                     for (_i = 0, curEnabled_1 = curEnabled; _i < curEnabled_1.length; _i++) {
                         id = curEnabled_1[_i];
-                        if (newItemIds.indexOf(id) === -1 ||
-                            (id == RELATION_MENU_ITEM_ID && !renderedRelationEntityIds.length)) {
+                        if ((newItemIds.indexOf(id) === -1 && id != RELATION_MENU_ITEM_ID) ||
+                            (id == RELATION_MENU_ITEM_ID && !legacyRelationIds.length && !relations.length)) {
                             params.manager.RemoveItemById({
                                 menuItemId: id
                             });
@@ -13232,26 +13282,24 @@ function renderNavigator(iteration, params, bookmark, view) {
                     }
                     _7.label = 4;
                 case 4:
-                    if (!renderedRelationEntityIds.length) return [3 /*break*/, 6];
-                    menuItem = {
-                        id: RELATION_MENU_ITEM_ID,
-                        Caption: "Entity relations",
-                        BruceEntity: {
-                            EntityIds: renderedRelationEntityIds
-                        },
-                        Type: MenuItem.EType.Relations
-                    };
-                    return [4 /*yield*/, params.manager.RenderItem({
+                    if (legacyRelationIds.length || relations.length) {
+                        menuItem = {
+                            id: RELATION_MENU_ITEM_ID,
+                            Caption: "Entity relations",
+                            BruceEntity: {
+                                EntityIds: legacyRelationIds
+                            },
+                            relations: relations,
+                            Type: MenuItem.EType.Relations
+                        };
+                        params.manager.RenderItem({
                             getters: params.getters,
                             item: menuItem
-                        })];
-                case 5:
-                    _7.sent();
-                    if (!assertIteration$1(params.viewer, iteration)) {
-                        return [2 /*return*/];
+                        });
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
                     }
-                    _7.label = 6;
-                case 6:
                     gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                     if (gOcclusion == null) {
                         gOcclusion = (_6 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _6 === void 0 ? void 0 : _6.groundOcclusion;
@@ -16005,9 +16053,13 @@ function backgroundRendering(viewer) {
         // 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();
+            // Check if window is active/in focus.
+            // TODO: Should render the moment it is in focus as well.
+            if (document.hasFocus()) {
+                viewer.scene.requestRender();
+            }
         }
-    }, 3500);
+    }, 1500);
 }
 var ViewerUtils;
 (function (ViewerUtils) {
@@ -16161,7 +16213,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.8.8";
+var VERSION$1 = "2.8.9";
 
 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, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map