bruce-cesium 6.0.8 → 6.0.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, ProjectViewTile, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, KmlDataSource, Quaternion, Matrix3, Matrix4, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, KmlDataSource, Quaternion, Matrix3, Matrix4, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, Cesium3DTileset, IonResource, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, CesiumInspector, ClockRange, PolygonPipeline, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -5556,56 +5556,67 @@ var EntityRenderEnginePoint;
             }
         };
         if (type == Style.EPointType.Icon) {
-            // Fixing poor data.
-            let iconUrlRows = style.iconUrl == null ? [] : style.iconUrl;
-            iconUrlRows.forEach((row) => {
-                if (row.type == Calculator.EValueType.Color) {
-                    row.type = Calculator.EValueType.Input;
+            let image = null;
+            let imageKey = null;
+            // Let's our apps/plugins generate images themselves.
+            // Need a better documented process than this in the future.
+            if (style["imageBillboard"]) {
+                image = style["imageBillboard"];
+                imageKey = image ? image.canvasDataUri : null;
+            }
+            // Typical process.
+            else {
+                // Fixing poor data.
+                let iconUrlRows = style.iconUrl == null ? [] : style.iconUrl;
+                iconUrlRows.forEach((row) => {
+                    if (row.type == Calculator.EValueType.Color) {
+                        row.type = Calculator.EValueType.Input;
+                    }
+                });
+                const icon = Calculator.GetString(iconUrlRows, entity, params.tags);
+                let iconUrl = null;
+                if (typeof icon == "string") {
+                    iconUrl = icon;
+                    const metadata = extractMetadataFromFileUrl(iconUrl);
+                    // If we're able to determine the Nextspace metadata from the url then we can use that to load the file.
+                    // Warning, if this is cross-env, eg: UAT -> DEV then it will RIGHTLY fail to load the file.
+                    if (metadata) {
+                        const api = params.apiGetter.getApi(metadata.accountId);
+                        await api.Loading;
+                        iconUrl = ClientFile.GetUrl({
+                            api: api,
+                            fileId: metadata.fileId,
+                            viaCdn: true
+                        });
+                    }
                 }
-            });
-            const icon = Calculator.GetString(iconUrlRows, entity, params.tags);
-            let iconUrl = null;
-            if (typeof icon == "string") {
-                iconUrl = icon;
-                const metadata = extractMetadataFromFileUrl(iconUrl);
-                // If we're able to determine the Nextspace metadata from the url then we can use that to load the file.
-                // Warning, if this is cross-env, eg: UAT -> DEV then it will RIGHTLY fail to load the file.
-                if (metadata) {
-                    const api = params.apiGetter.getApi(metadata.accountId);
-                    await api.Loading;
+                if (!iconUrl && style.iconId) {
+                    await params.api.Loading;
                     iconUrl = ClientFile.GetUrl({
-                        api: api,
-                        fileId: metadata.fileId,
+                        api: params.api,
+                        fileId: style.iconId,
                         viaCdn: true
                     });
                 }
-            }
-            if (!iconUrl && style.iconId) {
-                await params.api.Loading;
-                iconUrl = ClientFile.GetUrl({
-                    api: params.api,
-                    fileId: style.iconId,
-                    viaCdn: true
-                });
-            }
-            let image = null;
-            // ND-1640 - Tags not appearing.
-            // Validate file, else user will see nothing.
-            // Pray we aren't loading some giant file.
-            if (iconUrl) {
-                try {
-                    image = await createImageBillboard(iconUrl);
-                }
-                catch (e) {
-                    // Expanding the logging here so we can figure out why this is happening.
-                    // Most of the time the file is missing but we're getting some strange errors so I am including logging on the API settings as well.
-                    OneTimeError("ENTITY_RENDER_ENGINE_ICON_URL_ERROR_" + iconUrl, {
-                        error: e,
-                        iconUrl,
-                        apiUrl: (_a = params.api) === null || _a === void 0 ? void 0 : _a.GetBaseUrl(),
-                        apiAccountId: (_b = params.api) === null || _b === void 0 ? void 0 : _b.AccountId
-                    });
+                // ND-1640 - Tags not appearing.
+                // Validate file, else user will see nothing.
+                // Pray we aren't loading some giant file.
+                if (iconUrl) {
+                    try {
+                        image = await createImageBillboard(iconUrl);
+                    }
+                    catch (e) {
+                        // Expanding the logging here so we can figure out why this is happening.
+                        // Most of the time the file is missing but we're getting some strange errors so I am including logging on the API settings as well.
+                        OneTimeError("ENTITY_RENDER_ENGINE_ICON_URL_ERROR_" + iconUrl, {
+                            error: e,
+                            iconUrl,
+                            apiUrl: (_a = params.api) === null || _a === void 0 ? void 0 : _a.GetBaseUrl(),
+                            apiAccountId: (_b = params.api) === null || _b === void 0 ? void 0 : _b.AccountId
+                        });
+                    }
                 }
+                imageKey = image ? iconUrl : null;
             }
             if (image) {
                 let iconScale = EnsureNumber(Calculator.GetNumber(style.iconScale, entity, params.tags));
@@ -5681,7 +5692,7 @@ var EntityRenderEnginePoint;
                         prepareExistingGraphic(params.rendered, shouldShowTrack ? 1 : 0);
                         cEntity = params.rendered;
                         const currentImgKey = cEntity.billboard._billboardImgKey;
-                        if (currentImgKey != iconUrl) {
+                        if (currentImgKey != imageKey) {
                             cEntity.billboard.image = new ConstantProperty(image.canvasDataUri);
                         }
                         cEntity.billboard.scale = new ConstantProperty(iconScale);
@@ -5767,7 +5778,7 @@ var EntityRenderEnginePoint;
                         cEntity.show = true;
                     }
                     cEntity.billboard._billboardSize = image.height;
-                    cEntity.billboard._billboardImgKey = iconUrl;
+                    cEntity.billboard._billboardImgKey = imageKey;
                 }
             }
         }
@@ -33517,7 +33528,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.0.8";
+const VERSION = "6.0.9";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isOutlineChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, AssemblyRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map