@opengeoweb/webmap 20.0.1 → 20.1.0-nightly-20261017

package/dist/index.esm.js

@@ -745,13 +745,13 @@ var makeNodeLayerFromWMSGetCapabilityLayer = function makeNodeLayerFromWMSGetCap
   if (nestedLayerPath === void 0) {
     nestedLayerPath = [];
   }
-  // geographicBoundingBox and styles resolve nearest-parent-first, so reduce over
+  // geographicBoundingBox, dimensions and styles resolve nearest-parent-first, so reduce over
   // a reversed copy of nestedLayerPath without mutating the original parameter
   var reversedLayerPath = nestedLayerPath.slice().reverse();
   var geographicBoundingBox = reversedLayerPath.reduce(function (npath, lprops) {
     return npath || lprops.geographicBoundingBox;
   }, addBoundingBoxForLayer(layer));
-  var dimensions = nestedLayerPath.reduce(function (dims, props) {
+  var dimensions = reversedLayerPath.reduce(function (dims, props) {
     var parentDims = (props.dimensions || []).filter(function (dim) {
       return !dims.some(function (dimit) {
         return dimit.name === dim.name;
@@ -810,6 +810,9 @@ var getFirstPartOfDimensionValueSet = function getFirstPartOfDimensionValueSet(i
 var getCurrentImageTime = function getCurrentImageTime() {
   return new Date().getTime();
 };
+// A failed image becomes stale after this delay, so it is retried. The delay doubles with every failed attempt, up to the max.
+var WMIMAGE_ERROR_RETRY_DELAY_MS = 10000;
+var WMIMAGE_ERROR_RETRY_MAX_DELAY_MS = 300000;
 /**
  * WMImage provides an API to the HTML image element. It is used for caching and easier access to images.
  */
@@ -864,8 +867,6 @@ var WMImage = /*#__PURE__*/function () {
       _this._loadEvent(false);
     });
     this.el.addEventListener('error', function () {
-      _this._imageTimeStampAtError = getCurrentImageTime();
-      _this._numFailedAttempts += 1;
       _this._loadEvent(true);
     });
     this.el.onselectstart = function () {
@@ -914,7 +915,14 @@ var WMImage = /*#__PURE__*/function () {
     return !this._isLoaded && !this._isLoading;
   };
   _proto.isStale = function isStale() {
-    if (!this._isLoaded || this._loadedAtTime === undefined) {
+    if (!this._isLoaded) {
+      return false;
+    }
+    if (this._hasError) {
+      // Retry failed images after a delay, otherwise a temporary server error would hide the image permanently
+      return this.getLastErrorMSecondsAgo() >= this.getErrorRetryDelay();
+    }
+    if (this._loadedAtTime === undefined) {
       return false;
     }
     if (this._maxAgeSeconds === null || this._maxAgeSeconds === undefined) {
@@ -943,6 +951,13 @@ var WMImage = /*#__PURE__*/function () {
   _proto.getNumFailedAttempts = function getNumFailedAttempts() {
     return this._numFailedAttempts;
   }
+  /**
+   * @returns The amount of milliseconds after which a failed image becomes stale and should be retried
+   */;
+  _proto.getErrorRetryDelay = function getErrorRetryDelay() {
+    var numRetries = Math.max(this._numFailedAttempts - 1, 0);
+    return Math.min(WMIMAGE_ERROR_RETRY_DELAY_MS * Math.pow(2, numRetries), WMIMAGE_ERROR_RETRY_MAX_DELAY_MS);
+  }
   /**
    * Set source of image, but it will not load the image yet.
    * @param src URL of the image to load
@@ -1065,6 +1080,12 @@ var WMImage = /*#__PURE__*/function () {
     };
     var request = new Request(url);
     authFetch(request, options).then(function (response) {
+      if (!response.ok) {
+        var _response$body;
+        void ((_response$body = response.body) == null ? void 0 : _response$body.cancel());
+        _this3._loadEvent(true);
+        return;
+      }
       _this3._setMaxAgeFromResponseHeaders(response);
       response.blob().then(function (imageBlob) {
         _this3.el.src = URL.createObjectURL(imageBlob);
@@ -1079,15 +1100,15 @@ var WMImage = /*#__PURE__*/function () {
   };
   _proto._load = function _load() {
     this._loadStartTime = getCurrentImageTime();
-    this._hasError = false;
     if (this._isLoaded) {
-      if (!this.isStale()) {
+      if (!this._hasError && !this.isStale()) {
         this._loadEvent(false);
         return;
       }
       this._isLoaded = false;
       this._srcLoaded = undefined;
     }
+    this._hasError = false;
     this._isLoading = true;
     if (!this.srcToLoad) {
       this._loadEvent(true);
@@ -1114,6 +1135,12 @@ var WMImage = /*#__PURE__*/function () {
   _proto._loadEvent = function _loadEvent(hasError) {
     var _this$loadEventCallba;
     this._loadDuration = hasError ? undefined : getCurrentImageTime() - this._loadStartTime;
+    if (hasError) {
+      this._imageTimeStampAtError = getCurrentImageTime();
+      this._numFailedAttempts += 1;
+    } else {
+      this._numFailedAttempts = 0;
+    }
     this._hasError = hasError;
     this._isLoading = false;
     this._isLoaded = true;
@@ -1122,7 +1149,9 @@ var WMImage = /*#__PURE__*/function () {
     this._resolveAll();
     (_this$loadEventCallba = this.loadEventCallback) == null || _this$loadEventCallba.call(this, this);
     // Free up memory
-    URL.revokeObjectURL(this._srcLoaded);
+    if (this.el.src.startsWith('blob:')) {
+      URL.revokeObjectURL(this.el.src);
+    }
   };
   _proto.getLoadDuration = function getLoadDuration() {
     return this._loadDuration;

package/dist/src/lib/components/WMImage.d.ts

@@ -16,6 +16,8 @@ export interface WMGeoReference {
  * @returns the current time in ms
  */
 export declare const getCurrentImageTime: () => number;
+export declare const WMIMAGE_ERROR_RETRY_DELAY_MS = 10000;
+export declare const WMIMAGE_ERROR_RETRY_MAX_DELAY_MS = 300000;
 /**
  * WMImage provides an API to the HTML image element. It is used for caching and easier access to images.
  */
@@ -68,6 +70,10 @@ export default class WMImage {
      * @returns The number of failed attempts for this image
      */
     getNumFailedAttempts(): number;
+    /**
+     * @returns The amount of milliseconds after which a failed image becomes stale and should be retried
+     */
+    getErrorRetryDelay(): number;
     /**
      * Set source of image, but it will not load the image yet.
      * @param src URL of the image to load

package/dist/src/lib/components/WMLayerTypes.d.ts

@@ -18,6 +18,20 @@ export interface TiledLayerFoundation {
 export interface EDRFeatureLayerOptions {
     collectionId: string;
     parameterNames: string[];
+    parameterMetadata?: {
+        id?: string;
+        label?: string;
+        description?: string;
+        observedProperty?: {
+            label?: string;
+        };
+        unit?: {
+            label?: string;
+            symbol?: {
+                value?: string;
+            };
+        };
+    };
 }
 export interface STACGeoTIFFLayerOptions {
     assetKey?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opengeoweb/webmap",
-    "version": "20.0.1",
+    "version": "20.1.0-nightly-20261017",
     "description": "GeoWeb webmap library for the opengeoweb project",
     "license": "Apache-2.0",
     "repository": {
@@ -20,8 +20,8 @@
         }
     },
     "dependencies": {
-        "@opengeoweb/shared": "20.0.1",
-        "@opengeoweb/authentication": "20.0.1",
+        "@opengeoweb/shared": "20.1.0-nightly-20261017",
+        "@opengeoweb/authentication": "20.1.0-nightly-20261017",
         "@tanstack/query-core": "^5.69.2",
         "lodash": "^4.18.1",
         "i18next": "^25.0.1",