@opengeoweb/webmap-react 20.0.1-nightly-20261013 → 20.0.1-nightly-20261014

package/dist/index.esm.js

@@ -420,6 +420,15 @@ function _defineProperty(e, r, t) {
     writable: true
   }) : e[r] = t, e;
 }
+function _get() {
+  return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+    var p = _superPropBase(e, t);
+    if (p) {
+      var n = Object.getOwnPropertyDescriptor(p, t);
+      return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+    }
+  }, _get.apply(null, arguments);
+}
 function _getPrototypeOf(t) {
   return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
     return t.__proto__ || Object.getPrototypeOf(t);
@@ -643,6 +652,16 @@ function _setPrototypeOf(t, e) {
 function _slicedToArray(r, e) {
   return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
 }
+function _superPropBase(t, o) {
+  for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
+  return t;
+}
+function _superPropGet(t, o, e, r) {
+  var p = _get(_getPrototypeOf(t.prototype ), o, e);
+  return "function" == typeof p ? function (t) {
+    return p.apply(e, t);
+  } : p;
+}
 function _toConsumableArray(r) {
   return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
 }
@@ -699,6 +718,7 @@ var MAX_NUMBER_STEPS_IN_TIME_SLIDER_TO_PREFETCH = 10000;
 var NUMBER_PREFETCH_WORKERS = 4;
 var NUM_IMAGES_TO_CACHE = 10000;
 var WMS_EXTENT_RATIO_TO_VIEWPORT = 1.2;
+var FAILED_IMAGE_RETRY_CHECK_INTERVAL_MS = 10000;
 var TIMEAWAREIMAGEWRAPPER_IMAGEDIDNOTLOADSUCCESFULLY = 'Image did not load succesfully';
 // // To debug what dimensions are actually being used in the map, use:
 // export const ADD_SHOW_DIMS_OPTION = true;
@@ -1140,6 +1160,7 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
       visible = _ref.visible;
     _classCallCheck(this, TimeawareImageSource);
     _this = _callSuper(this, TimeawareImageSource, [{}]);
+    _this._failedImageRetryTimer = null;
     _this._wmsUrl = wmsUrl;
     _this._extraWMSParams = _objectSpread2({}, params);
     _this._layerName = layerName;
@@ -1296,8 +1317,13 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
       var requestedImageHasWantedExtent = (this._loadedExtent && containsExtent$1(this._loadedExtent, requestExtent) || containsExtent$1(this._imWrapperForOlSource.getExtent(), requestExtent)) && (this._loadedResolution && fromResolutionLike(this._loadedResolution) === requestResolution || fromResolutionLike(this._imWrapperForOlSource.getResolution()) === requestResolution);
       var hasExactImage = this._loadedExtent && this._imWrapperForOlSource.hasImage(this._loadedExtent, this._loadedResolution, pixelRatio, projection, this._wmsUrl, this._extraWMSParams, this._layerName, this._styleName, requestDimProperties);
       if (hasExactImage && hasExactImage.isLoaded && requestedImageHasWantedExtent) {
-        this._imWrapperForOlSource.setGeoReferencedImage(hasExactImage);
-        return this._imWrapperForOlSource;
+        if (!hasExactImage.hasError) {
+          this._imWrapperForOlSource.setGeoReferencedImage(hasExactImage);
+          return this._imWrapperForOlSource;
+        }
+        // The image failed to load. Do not display the broken image, but check again later: the image is reloaded once it becomes stale.
+        this._scheduleFailedImageRetry();
+        return this._getAltImageOrEmpty(requestExtent, requestResolution, pixelRatio, projection, requestDimProperties);
       }
       this._lastRequestedExtent = requestExtent;
       this._lastRequestedResolution = requestResolution;
@@ -1305,7 +1331,12 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
       this._lastRequestedProjection = projection;
       this.throttledImageLoad();
       // While we are loading, check if there is an alternative image available
-      var altImage = this._loadedExtent && this._imWrapperForOlSource.getAlternativeImage(this._lastRequestedExtent, this._lastRequestedResolution, this._lastRequestedPixelRatio, this._lastRequestedProjection, this._wmsUrl, this._extraWMSParams, this._layerName, this._styleName, requestDimProperties);
+      return this._getAltImageOrEmpty(this._lastRequestedExtent, this._lastRequestedResolution, this._lastRequestedPixelRatio, this._lastRequestedProjection, requestDimProperties);
+    }
+  }, {
+    key: "_getAltImageOrEmpty",
+    value: function _getAltImageOrEmpty(extent, resolution, pixelRatio, projection, dimProperties) {
+      var altImage = this._loadedExtent && this._imWrapperForOlSource.getAlternativeImage(extent, resolution, pixelRatio, projection, this._wmsUrl, this._extraWMSParams, this._layerName, this._styleName, dimProperties);
       if (altImage && altImage.isLoaded) {
         // A similar image is available for display, show it
         this._imWrapperForAltImage.setGeoReferencedImage(altImage);
@@ -1314,6 +1345,28 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
       // This thing is has nothing to show yet.
       return this._imWrapperEmptyButLoading;
     }
+  }, {
+    key: "_scheduleFailedImageRetry",
+    value: function _scheduleFailedImageRetry() {
+      var _this4 = this;
+      if (this._failedImageRetryTimer) {
+        return;
+      }
+      this._failedImageRetryTimer = setTimeout(function () {
+        _this4._failedImageRetryTimer = null;
+        _this4.changed();
+      }, FAILED_IMAGE_RETRY_CHECK_INTERVAL_MS);
+    }
+  }, {
+    key: "disposeInternal",
+    value: function disposeInternal() {
+      if (this._failedImageRetryTimer) {
+        clearTimeout(this._failedImageRetryTimer);
+        this._failedImageRetryTimer = null;
+      }
+      this.cancelPrefetch();
+      _superPropGet(TimeawareImageSource, "disposeInternal", this)([]);
+    }
   }, {
     key: "setDimProps",
     value: function setDimProps(params) {
@@ -6982,11 +7035,12 @@ var TimeawareImageSourceWMSLayer = function TimeawareImageSourceWMSLayer(_ref) {
     // Assign olSource in wmlayer for metronome
     wmLayer.olSource = olLayer === null || olLayer === void 0 ? void 0 : olLayer.getSource();
     return function () {
-      var _olLayer$getSource;
-      olLayer === null || olLayer === void 0 || (_olLayer$getSource = olLayer.getSource()) === null || _olLayer$getSource === void 0 || _olLayer$getSource.cancelPrefetch();
+      var olSource = olLayer.getSource();
+      olSource === null || olSource === void 0 || olSource.cancelPrefetch();
       wmLayer.olSource = null;
       map.removeLayer(olLayer);
       olLayer.dispose();
+      olSource === null || olSource === void 0 || olSource.dispose();
     };
     // The dependency list should only contain the map, wmLayer, visible and dimensionValues. Other prop changes are handled by other effects.
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/src/lib/components/OpenLayers/utils/TimeawareImageSource.d.ts

@@ -38,6 +38,7 @@ export declare class TimeawareImageSource extends ImageSource {
     private throttledPrefetch;
     private throttledImageLoad;
     private _layerId;
+    private _failedImageRetryTimer;
     constructor({ wmsUrl, timeStampsToPrefetch, layerName, layerId, styleName, dimProps, params, visible, }: TimeawareImageSourceOptions);
     private _conditionalPrefetch;
     private _loadImagery;
@@ -45,6 +46,9 @@ export declare class TimeawareImageSource extends ImageSource {
     triggerPrefetch(): void;
     cancelPrefetch(): void;
     getImage(extent: Extent, resolution: number, pixelRatio: number, projection: Projection): ImageWrapper;
+    private _getAltImageOrEmpty;
+    private _scheduleFailedImageRetry;
+    disposeInternal(): void;
     setDimProps(params: Record<string, string>): void;
     /**
      * Check if an image is available and loaded for requested date. Used for showlayerinfo to proceed.

package/dist/src/lib/components/OpenLayers/utils/constants.d.ts

@@ -5,4 +5,5 @@ export declare const ENABLE_PREFETCH = true;
 export declare const ADD_SHOW_DIMS_OPTION = false;
 export declare const NUM_IMAGES_TO_CACHE = 10000;
 export declare const WMS_EXTENT_RATIO_TO_VIEWPORT = 1.2;
+export declare const FAILED_IMAGE_RETRY_CHECK_INTERVAL_MS = 10000;
 export declare const TIMEAWAREIMAGEWRAPPER_IMAGEDIDNOTLOADSUCCESFULLY = "Image did not load succesfully";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opengeoweb/webmap-react",
-    "version": "20.0.1-nightly-20261013",
+    "version": "20.0.1-nightly-20261014",
     "description": "GeoWeb react wrapper for webmap",
     "license": "Apache-2.0",
     "repository": {
@@ -20,9 +20,9 @@
         }
     },
     "dependencies": {
-        "@opengeoweb/webmap": "20.0.1-nightly-20261013",
-        "@opengeoweb/theme": "20.0.1-nightly-20261013",
-        "@opengeoweb/shared": "20.0.1-nightly-20261013",
+        "@opengeoweb/webmap": "20.0.1-nightly-20261014",
+        "@opengeoweb/theme": "20.0.1-nightly-20261014",
+        "@opengeoweb/shared": "20.0.1-nightly-20261014",
         "lodash": "^4.18.1",
         "ol": "^10.4.0",
         "proj4": "^2.9.2",