bruce-cesium 2.8.8 → 2.9.0

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, JulianDate, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, KmlDataSource, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, CesiumInspector, defined, SceneTransforms, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, Matrix3, Matrix4, GeometryInstance, IonResource, Ion, 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,8 @@ 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 renderedIds = (_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.BruceEntity) === null || _c === void 0 ? void 0 : _c.EntityIds;
+            var _a, _b;
+            var renderedIds = (_b = (_a = this.item) === null || _a === void 0 ? void 0 : _a.BruceEntity) === null || _b === void 0 ? void 0 : _b.EntityIds;
             if (!renderedIds) {
                 return false;
             }
@@ -16005,9 +16042,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 +16202,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.8.8";
+var VERSION$1 = "2.9.0";
 
 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