bruce-cesium 7.1.7 → 7.1.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, DistanceDisplayCondition, HeightReference, ColorBlendMode, HeadingPitchRoll, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, JulianDate, Quaternion, ArcType, CornerType, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneTransforms, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, OrthographicFrustum, EasingFunction, Intersect, CustomDataSource, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, CesiumInspector, ClockRange, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Carto, Geometry as Geometry$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Bounds, Color as Color$1, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, ProgramKey, EntitySource, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, ProjectViewBookmarkGroup, EntityRelationType } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, JulianDate, Quaternion, HeadingPitchRoll, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, DistanceDisplayCondition, ArcType, CornerType, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneTransforms, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, Cesium3DTileset, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Intersect, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, CustomDataSource, CesiumInspector, ClockRange, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, Entity as Entity$1, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry as Geometry$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Api, BruceEvent, EntityCoords, Bounds, Color as Color$1, DataLab, DelayQueue, EntityHistoricData, BruceApi, EntityRelation, AccountConcept, RecordChangeFeed, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -2976,6 +2976,8 @@ const CESIUM_TIMELINE_INTERVAL_KEY = "_nextspace_timeline_interval";
 const CESIUM_MODEL_SPACE_KEY = "_nextspace_model_space";
 const DEFAULT_LIVE_PADDING_SECONDS = 30 * 60;
 const DEFAULT_BRIGHTNESS_SHIFT = 0.2;
+const DEFAULT_LIGHT_INTENSITY = 3;
+const LIGHTING_SETTINGS_VERSION = 2;
 var ViewUtils;
 (function (ViewUtils) {
     function GatherLegacyMapTiles(params) {
@@ -3327,23 +3329,50 @@ var ViewUtils;
      */
     function ApplyDefaultBrightness(viewer, shift = DEFAULT_BRIGHTNESS_SHIFT) {
         const scene = viewer === null || viewer === void 0 ? void 0 : viewer.scene;
-        if (!scene || !(shift > 0)) {
+        if (!scene) {
             return;
         }
         // Atmosphere settings moved from Globe onto Scene, and the sky keeps its own copy, so each is
         // probed rather than version checked: host apps bring their own CesiumJS.
         const SCENE = scene;
-        if (SCENE.atmosphere && typeof SCENE.atmosphere.brightnessShift === "number") {
-            SCENE.atmosphere.brightnessShift = shift;
-        }
-        if (SCENE.globe && typeof SCENE.globe.atmosphereBrightnessShift === "number") {
-            SCENE.globe.atmosphereBrightnessShift = shift;
-        }
-        if (SCENE.skyAtmosphere && typeof SCENE.skyAtmosphere.brightnessShift === "number") {
-            SCENE.skyAtmosphere.brightnessShift = shift;
+        if (shift > 0) {
+            if (SCENE.atmosphere && typeof SCENE.atmosphere.brightnessShift === "number") {
+                SCENE.atmosphere.brightnessShift = shift;
+            }
+            if (SCENE.globe && typeof SCENE.globe.atmosphereBrightnessShift === "number") {
+                SCENE.globe.atmosphereBrightnessShift = shift;
+            }
+            if (SCENE.skyAtmosphere && typeof SCENE.skyAtmosphere.brightnessShift === "number") {
+                SCENE.skyAtmosphere.brightnessShift = shift;
+            }
         }
     }
     ViewUtils.ApplyDefaultBrightness = ApplyDefaultBrightness;
+    /**
+     * Resolves the sun colour and intensity to apply for a bookmark's lighting settings.
+     * @param lighting the bookmark's lighting settings, or null when it carries none.
+     * @returns the colour and intensity to put on the scene light.
+     */
+    function ResolveLightSettings(lighting) {
+        const raw = lighting === null || lighting === void 0 ? void 0 : lighting.color;
+        // An unreadable or missing colour would otherwise leave the light undefined.
+        const parsed = raw ? Color.fromCssColorString(raw) : null;
+        const version = Number(lighting === null || lighting === void 0 ? void 0 : lighting.lightingVer);
+        const stale = !Number.isFinite(version) || version <= 1;
+        const intensity = Number(lighting === null || lighting === void 0 ? void 0 : lighting.intensity);
+        return {
+            color: parsed || Color.WHITE,
+            intensity: stale || !Number.isFinite(intensity) ? DEFAULT_LIGHT_INTENSITY : intensity
+        };
+    }
+    ViewUtils.ResolveLightSettings = ResolveLightSettings;
+    /**
+     * Options handed to every tileset and model this library creates.
+     */
+    function DefaultEnvironmentMapOptions() {
+        return { enabled: false };
+    }
+    ViewUtils.DefaultEnvironmentMapOptions = DefaultEnvironmentMapOptions;
     function SetGlobeDetails(params) {
         let { viewer, hidden, baseColor } = params;
         const scene = viewer === null || viewer === void 0 ? void 0 : viewer.scene;
@@ -14702,6 +14731,7 @@ async function createTileset(url, props, noMemoryLimit) {
     const defaultProps = {
         // "Optimization option. Reduce the screen space error for tiles that are further away from the camera.".
         dynamicScreenSpaceError: true,
+        environmentMapOptions: ViewUtils.DefaultEnvironmentMapOptions()
     };
     if (noMemoryLimit != true) {
         // "The maximum amount of memory in MB that can be used by the tileset.".
@@ -21438,7 +21468,8 @@ var TilesetGooglePhotosRenderManager;
                                 return;
                             }
                             this.cTileset = await CESIUM.Cesium3DTileset.fromUrl(proxyRootUrl, {
-                                showCreditsOnScreen: true
+                                showCreditsOnScreen: true,
+                                environmentMapOptions: ViewUtils.DefaultEnvironmentMapOptions()
                             });
                         }
                         else {
@@ -22982,6 +23013,7 @@ var AssemblyRenderManager;
                     const cEntity = this.viewer.entities.add({
                         model: {
                             uri: lod["ClientFile"].URL,
+                            environmentMapOptions: ViewUtils.DefaultEnvironmentMapOptions(),
                             heightReference: HeightReference.NONE
                         },
                         // point: {
@@ -29059,13 +29091,15 @@ async function renderNavigator(iteration, params, bookmark, view, getters) {
     if (lighting == null) {
         lighting = {
             color: Color.WHITE.toCssColorString(),
-            intensity: 2
+            intensity: DEFAULT_LIGHT_INTENSITY,
+            lightingVer: LIGHTING_SETTINGS_VERSION
         };
     }
     const light = viewer.scene.light;
     if (light) {
-        light.color = Color.fromCssColorString(lighting.color);
-        light.intensity = EnsureNumber(lighting.intensity);
+        const resolved = ViewUtils.ResolveLightSettings(lighting);
+        light.color = resolved.color;
+        light.intensity = resolved.intensity;
     }
     ViewUtils.ApplyDefaultBrightness(viewer, EnsureNumber(lighting.brightnessShift, DEFAULT_BRIGHTNESS_SHIFT));
     let quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
@@ -38734,6 +38768,7 @@ var EntityRenderEngineModel3d;
                 id: ObjectUtils.UId(15),
                 model: {
                     uri: params.lodUrl,
+                    environmentMapOptions: ViewUtils.DefaultEnvironmentMapOptions(),
                     heightReference: heightRef,
                     scale: new CallbackProperty(() => scale * styleScale, true),
                     shadows: ShadowMode.ENABLED,
@@ -39375,7 +39410,8 @@ async function getModelEntity(url, scale) {
         return await CESIUM.Model.fromGltfAsync({
             url: url,
             asynchronous: true,
-            scale: scale
+            scale: scale,
+            environmentMapOptions: ViewUtils.DefaultEnvironmentMapOptions()
         });
     }
     // Older versions of Cesium have a fromGltf method.
@@ -43537,7 +43573,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.1.7";
+const VERSION = "7.1.9";
 /**
  * Updates the environment instance used by bruce-cesium to one specified.
  * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.
@@ -43554,5 +43590,5 @@ const getENVIRONMENT = () => {
     return ENVIRONMENT;
 };
 
-export { VERSION, setENVIRONMENT, getENVIRONMENT, CesiumAnimatedInOut, DisplacedSurfacePrimitive, CesiumAnimatedProperty, isStyleChanged, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, EntityRenderEnginePolygon, EntityRenderEnginePolyline, MenuItemCreator, MenuItemManager, CesiumParabola, EntityLabel, LiveCursor, SharedGetters, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, createTileset, TilesetRenderEngine, ViewRenderEngine, VisualRegisterCuller, VisualsRegister, XGridsRenderEngine, CesiumEntityStyler, DrawingUtils, EntityUtils, MeasureUtils, StyleUtils, 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, DEFAULT_BRIGHTNESS_SHIFT, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, WidgetLeftPanelTabDashboard, EMenuItemState, WidgetLeftPanelTabMenuItems, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
+export { VERSION, setENVIRONMENT, getENVIRONMENT, CesiumAnimatedInOut, DisplacedSurfacePrimitive, CesiumAnimatedProperty, isStyleChanged, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, EntityRenderEnginePolygon, EntityRenderEnginePolyline, MenuItemCreator, MenuItemManager, CesiumParabola, EntityLabel, LiveCursor, SharedGetters, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, createTileset, TilesetRenderEngine, ViewRenderEngine, VisualRegisterCuller, VisualsRegister, XGridsRenderEngine, CesiumEntityStyler, DrawingUtils, EntityUtils, MeasureUtils, StyleUtils, 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, DEFAULT_BRIGHTNESS_SHIFT, DEFAULT_LIGHT_INTENSITY, LIGHTING_SETTINGS_VERSION, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, WidgetLeftPanelTabDashboard, EMenuItemState, WidgetLeftPanelTabMenuItems, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
 //# sourceMappingURL=bruce-cesium.es5.js.map