bruce-cesium 6.9.5 → 6.9.7

package/dist/bruce-cesium.umd.js

@@ -1724,6 +1724,9 @@
     function getDefaultTextureImage(graphic) {
         return graphic[STORE_TEXTURE_IMAGE_KEY];
     }
+    function clearDefaultTextureImage(graphic) {
+        delete graphic[STORE_TEXTURE_IMAGE_KEY];
+    }
     /**
      * Returns a color property from a graphic.
      * This will turn materials properties into colors before returning them.
@@ -2256,6 +2259,39 @@
             }
         }
         CesiumEntityStyler.SetDefaultColor = SetDefaultColor;
+        /*
+         * Updates (or clears) the baked default texture image for a graphic's polygon parts.
+         */
+        function SetDefaultTextureImage(params) {
+            const { viewer, entity, image, requestRender } = params;
+            if (!entity) {
+                return;
+            }
+            const parts = exports.EntityUtils.GatherEntity({
+                entity: entity,
+                selectable: true
+            });
+            for (let i = 0; i < parts.length; i++) {
+                const part = parts[i];
+                if (!isAlive(viewer, part)) {
+                    continue;
+                }
+                // Texture fill only applies to polygons.
+                if (part instanceof Cesium.Entity && part.polygon) {
+                    if (image == null) {
+                        clearDefaultTextureImage(part.polygon);
+                    }
+                    else {
+                        storeDefaultTextureImage(part.polygon, image);
+                    }
+                    refreshColor(viewer, part.polygon, getAppliedOpacity(part.polygon));
+                }
+            }
+            if (requestRender != false) {
+                viewer.scene.requestRender();
+            }
+        }
+        CesiumEntityStyler.SetDefaultTextureImage = SetDefaultTextureImage;
         /**
          * Updates the opacity of the graphic.
          * This will multiply against the current colour's opacity before applying.
@@ -36754,9 +36790,23 @@
                 cEntity.polygon.classificationType = new Cesium.ConstantProperty(classification);
                 // TODO: animate the texture!
                 if (textureDataUri) {
+                    // Rebaking texture to ensure we don't revert to the wrong one later.
                     cEntity.polygon.material = fillMaterial;
+                    exports.CesiumEntityStyler.SetDefaultTextureImage({
+                        entity: cEntity,
+                        image: textureDataUri,
+                        viewer: params.viewer,
+                        requestRender: false
+                    });
                 }
                 else {
+                    // Clear any baked texture from a previous textured style so reverting to default uses the colour fill.
+                    exports.CesiumEntityStyler.SetDefaultTextureImage({
+                        entity: cEntity,
+                        image: null,
+                        viewer: params.viewer,
+                        requestRender: false
+                    });
                     // We'll use "SetDefaultColor" to updating the internal reference and to allow for an animation.
                     // WARNING: polygon does not support animation (yet?).
                     exports.CesiumEntityStyler.SetDefaultColor({
@@ -37397,11 +37447,19 @@
         return heightRef;
     }
 
-    /**
-     * Returns if the outline metadata is different.
-     * @param rego
-     * @param entity
+    /*
+     * Returns if the style applied to a rego differs from the one the zoom item now wants.
      */
+    function isStyleChanged(rego, zoomItem) {
+        var _a;
+        if (!rego) {
+            return false;
+        }
+        // Normalize the same way cEntity.styleId is set when rendering (see RenderGroup callers).
+        const newStyleId = (zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) == -1 ? -1 : (+(zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) || null);
+        const oldStyleId = (_a = rego.styleId) !== null && _a !== void 0 ? _a : null;
+        return newStyleId != oldStyleId;
+    }
     function isOutlineChanged$1(rego, entity) {
         var _a, _b, _c, _d, _e, _f;
         if (((_a = rego.outline) === null || _a === void 0 ? void 0 : _a.length) != ((_c = (_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.Outline) === null || _c === void 0 ? void 0 : _c.length)) {
@@ -37584,6 +37642,7 @@
                     if (!params.force &&
                         newRenderId == oldRenderId &&
                         !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale) &&
+                        !isStyleChanged(existingRego, zoomItem) &&
                         !isOutlineChanged$1(existingRego, entity)) {
                         // No sorting category needed. Already rendered the way we want.
                         cEntities.set(id, existingRego.visual);
@@ -38469,7 +38528,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "6.9.5";
+    const VERSION = "6.9.7";
     /**
      * 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.
@@ -38489,6 +38548,7 @@
     exports.VERSION = VERSION;
     exports.setENVIRONMENT = setENVIRONMENT;
     exports.getENVIRONMENT = getENVIRONMENT;
+    exports.isStyleChanged = isStyleChanged;
     exports.isOutlineChanged = isOutlineChanged$1;
     exports.CesiumParabola = CesiumParabola;
     exports.createTileset = createTileset;