bruce-cesium 6.9.3 → 6.9.5

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, Entity, DistanceDisplayCondition, ColorMaterialProperty, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, HeightReference, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, ArcType, CornerType, JulianDate, Quaternion, Matrix4, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileset, Cesium3DTileColorBlendMode, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, PolygonPipeline, CesiumInspector, ClockRange, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, Intersect, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Carto, Geometry, Bounds, Color as Color$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, BruceApi, EntityRelation, AccountConcept, RecordChangeFeed, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, Camera, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, Intersect, CzmlDataSource } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Bounds, Color as Color$1, Geometry, Carto, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, Camera, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -1718,6 +1718,13 @@ function getStoreStateKey(key) {
     return STORE_KEY_STATE_PREFIX + key;
 }
 const LAST_APPLIED_OPACITY_KEY = "_lastAppliedOpacityKey";
+const STORE_TEXTURE_IMAGE_KEY = "_storeTextureImage_default";
+function storeDefaultTextureImage(graphic, image) {
+    graphic[STORE_TEXTURE_IMAGE_KEY] = image;
+}
+function getDefaultTextureImage(graphic) {
+    return graphic[STORE_TEXTURE_IMAGE_KEY];
+}
 /**
  * Returns a color property from a graphic.
  * This will turn materials properties into colors before returning them.
@@ -1809,6 +1816,9 @@ function getColor$1(viewer, key, graphic) {
             if (color) {
                 storeColor(key, color, graphic);
             }
+            if (graphic instanceof PolygonGraphics && graphic.material instanceof ImageMaterialProperty) {
+                storeDefaultTextureImage(graphic, graphic.material.image);
+            }
         }
         else if (key == "highlight") {
             color = _highlightColor;
@@ -1898,11 +1908,27 @@ function refreshColor(viewer, graphic, opacity) {
             }
         }
         else if (graphic instanceof PolygonGraphics) {
-            // See if it's changed before applying.
-            // Applying a new material to a polygon causes a flicker we want to avoid when possible.
-            const currentColor = calculateCurColor(viewer, graphic);
-            if (currentColor == null || !currentColor.equals(color)) {
-                graphic.material = new ColorMaterialProperty(color);
+            const storedTextureImage = key == "default" ? getDefaultTextureImage(graphic) : undefined;
+            if (storedTextureImage) {
+                const tintAlpha = opacity != null ? opacity : 1;
+                const currentMaterial = graphic.material;
+                const currentIsSameImage = currentMaterial instanceof ImageMaterialProperty;
+                const currentAlpha = currentIsSameImage ? getCesiumColorValue(viewer, currentMaterial).alpha : null;
+                if (!currentIsSameImage || currentAlpha == null || Math.abs(currentAlpha - tintAlpha) > 0.001) {
+                    graphic.material = new ImageMaterialProperty({
+                        image: storedTextureImage,
+                        color: Color.WHITE.withAlpha(tintAlpha),
+                        transparent: true
+                    });
+                }
+            }
+            else {
+                // See if it's changed before applying.
+                // Applying a new material to a polygon causes a flicker we want to avoid when possible.
+                const currentColor = calculateCurColor(viewer, graphic);
+                if (currentColor == null || !currentColor.equals(color)) {
+                    graphic.material = new ColorMaterialProperty(color);
+                }
             }
         }
         else if (graphic instanceof PolylineGraphics) {
@@ -37186,7 +37212,13 @@ function looksLikeTextureUrl(value) {
  */
 async function resolveTexturedFill(params) {
     const { api, style, entity, tags } = params;
-    const textureTrace = style.texture ? Calculator.TraceGetString(style.texture, entity, tags) : { value: null, effective: null };
+    let textureRows = style.texture == null ? [] : style.texture;
+    textureRows.forEach((row) => {
+        if (row.type == Calculator.EValueType.Color) {
+            row.type = Calculator.EValueType.Input;
+        }
+    });
+    const textureTrace = textureRows.length ? Calculator.TraceGetString(textureRows, entity, tags) : { value: null, effective: null };
     const raw = textureTrace.value;
     if (!raw || typeof raw != "string" || !api) {
         return { dataUri: null, effective: textureTrace.effective };
@@ -38559,7 +38591,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "6.9.3";
+const VERSION = "6.9.5";
 /**
  * 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.