@opengeoweb/webmap 13.1.1 → 14.0.0

package/index.esm.js

@@ -327,6 +327,104 @@ function _regeneratorRuntime() {
   })();
 }
 
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2025 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2025 - Finnish Meteorological Institute (FMI)
+ * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var WMImageStoreLoadType;
+(function (WMImageStoreLoadType) {
+  WMImageStoreLoadType["PREFETCH"] = "A";
+  WMImageStoreLoadType["GETMAP"] = "B";
+})(WMImageStoreLoadType || (WMImageStoreLoadType = {}));
+var LoadDurationCounter = /*#__PURE__*/function () {
+  function LoadDurationCounter() {
+    this._loadingListForIds = new Map();
+    this._loadingDurationForIds = new Map();
+    this.setLoadingStatusForId = this.setLoadingStatusForId.bind(this);
+    this.getTotalLoadingPercentageForIds = this.getTotalLoadingPercentageForIds.bind(this);
+    this.getLoadDurationForId = this.getLoadDurationForId.bind(this);
+    this.setLoadDurationForId = this.setLoadDurationForId.bind(this);
+  }
+  var _proto = LoadDurationCounter.prototype;
+  _proto.setLoadingStatusForId = function setLoadingStatusForId(type, identifier, doneLoading, totalLoading, resetDuration) {
+    if (resetDuration === void 0) {
+      resetDuration = false;
+    }
+    var typeAndIdentifier = "" + type + identifier;
+    this._loadingListForIds.set(typeAndIdentifier, {
+      doneLoading: doneLoading,
+      totalLoading: totalLoading,
+      found: true
+    });
+    if (resetDuration) {
+      this._loadingDurationForIds.set(identifier, undefined);
+    }
+  };
+  _proto.setLoadDurationForId = function setLoadDurationForId(identifier, duration) {
+    if (duration !== undefined) {
+      this._loadingDurationForIds.set(identifier, duration);
+    }
+  };
+  _proto.getLoadDurationForId = function getLoadDurationForId(identifier) {
+    return this._loadingDurationForIds.get(identifier);
+  };
+  _proto.getTotalLoadingPercentageForIds = function getTotalLoadingPercentageForIds(identifierList) {
+    var _this = this;
+    if (!(identifierList != null && identifierList.length)) {
+      return {
+        percentage: 100,
+        doneLoading: 0,
+        totalLoading: 0
+      };
+    }
+    // Make list of possible identifiers
+    var typeAndIdentifierList = identifierList.reduce(function (prev, cur) {
+      return [].concat(prev, ["" + WMImageStoreLoadType.GETMAP + cur, "" + WMImageStoreLoadType.PREFETCH + cur]);
+    }, []);
+    // Combine all loading images into one number
+    var numLoadingDoneTotal = typeAndIdentifierList.reduce(function (previousValue, identifier) {
+      var info = _this._loadingListForIds.get(identifier);
+      return info ? {
+        doneLoading: info.doneLoading + previousValue.doneLoading,
+        totalLoading: info.totalLoading + previousValue.totalLoading,
+        found: true
+      } : previousValue;
+    }, {
+      doneLoading: 0,
+      totalLoading: 0,
+      found: false
+    });
+    // If nothing loading, just return 100 %
+    if (numLoadingDoneTotal.totalLoading === 0) {
+      return {
+        percentage: numLoadingDoneTotal.found ? 0 : 100,
+        doneLoading: 0,
+        totalLoading: 0
+      };
+    }
+    // Round upwards to percentages
+    return {
+      percentage: Math.round(numLoadingDoneTotal.doneLoading / numLoadingDoneTotal.totalLoading * 100),
+      doneLoading: numLoadingDoneTotal.doneLoading,
+      totalLoading: numLoadingDoneTotal.totalLoading
+    };
+  };
+  return LoadDurationCounter;
+}();
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -357,7 +455,7 @@ var makeHashUrlForGeoReferencedImage = function makeHashUrlForGeoReferencedImage
     urlParams["delete"]('WIDTH');
     urlParams["delete"]('HEIGHT');
     return "" + urlAsURL.origin + urlAsURL.pathname + "?" + urlParams.toString();
-  } catch (e) {
+  } catch (_e) {
     return undefined;
   }
 };
@@ -688,22 +786,22 @@ var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS) {
     };
     try {
       style.title = layerStyle.Title.value;
-    } catch (e) {
+    } catch (_e) {
       /* Do nothing */
     }
     try {
       style.name = layerStyle.Name.value;
-    } catch (e) {
+    } catch (_e) {
       /* Do nothing */
     }
     try {
       style.legendURL = layerStyle.LegendURL.OnlineResource.attr['xlink:href'];
-    } catch (e) {
+    } catch (_e) {
       /* Do nothing */
     }
     try {
       style["abstract"] = layerStyle.Abstract.value;
-    } catch (e) {
+    } catch (_e) {
       /* Do nothing */
     }
     return style;
@@ -854,7 +952,7 @@ var makeNodeLayerFromWMSGetCapabilityLayer = function makeNodeLayerFromWMSGetCap
   };
 };
 var getFirstPartOfDimensionValueSet = function getFirstPartOfDimensionValueSet(inputValue) {
-  return (inputValue == null ? void 0 : inputValue.indexOf('/')) === -1 ? inputValue : inputValue.split('/')[0];
+  return !(inputValue != null && inputValue.indexOf) || (inputValue == null ? void 0 : inputValue.indexOf('/')) === -1 ? inputValue : inputValue.split('/')[0];
 };
 
 /**
@@ -972,7 +1070,7 @@ var WMImage = /*#__PURE__*/function () {
         } else {
           this._fakeMaxAge = null;
         }
-      } catch (e) {
+      } catch (_e) {
         // failed to form URL
         this._fakeMaxAge = null;
       }
@@ -1232,6 +1330,7 @@ var WMImageStore = /*#__PURE__*/function () {
    * @param {*} options
    */
   function WMImageStore(maxNumberOfImages, options) {
+    this.loadDuration = new LoadDurationCounter();
     this.imagesbysrc = new Map();
     this.imagesbyGeoRef = new Map();
     this.imageLife = 0;
@@ -1314,11 +1413,7 @@ var WMImageStore = /*#__PURE__*/function () {
    * @param _resolution Resolution of the request image
    * @returns A WMImage which is ready to display. Can have a different extent and resolution then what was asked in srcToLoad
    */;
-  _proto.getAltGeoReferencedImage = function getAltGeoReferencedImage(srcToLoad,
-  // eslint-disable-next-line no-unused-vars
-  _extent,
-  // eslint-disable-next-line no-unused-vars
-  _resolution) {
+  _proto.getAltGeoReferencedImage = function getAltGeoReferencedImage(srcToLoad, _extent, _resolution) {
     var hashUrl = makeHashUrlForGeoReferencedImage(srcToLoad);
     if (!hashUrl) {
       return false;
@@ -1868,7 +1963,7 @@ var ParseISOTimeRangeDuration = /*#__PURE__*/function () {
       times[2] = defaultInterval;
     }
     if (times[1] === undefined) {
-      // eslint-disable-next-line prefer-destructuring
+      // eslint-disable-next-line @typescript-eslint/prefer-destructuring
       times[1] = times[0];
       times[2] = defaultInterval;
     }
@@ -1924,7 +2019,7 @@ var ParseISOTimeRangeDuration = /*#__PURE__*/function () {
     var currentDate = null;
     try {
       currentDate = parseISO8601DateToDate(currentISODate);
-    } catch (e) {
+    } catch (_e) {
       throw new Error("The date " + currentISODate + " is not a valid date");
     }
     return this.getTimeStepFromDate(currentDate, throwIfOutsideRange);
@@ -2048,7 +2143,7 @@ var getLegendGraphicURLForLayer = function getLegendGraphicURLForLayer(layer, wi
       if (!legendURL.includes('&width=') && !legendURL.includes('&height=')) {
         legendURL += "&width=" + width + "&height=" + height;
       }
-    } catch (e) {
+    } catch (_e) {
       return undefined;
     }
     // Handle WMS extensions
@@ -2303,7 +2398,7 @@ var WMBBOX = /*#__PURE__*/function () {
           this.bottom = parseFloat(bboxArray[1]);
           this.right = parseFloat(bboxArray[2]);
           this.top = parseFloat(bboxArray[3]);
-        } catch (e) {
+        } catch (_e) {
           return;
         }
       }
@@ -2417,7 +2512,6 @@ var WMXMLStringToXMLDocument = function WMXMLStringToXMLDocument(xmlString) {
   return xmlData;
 };
 var WMXMLtoJSON = function WMXMLtoJSON(xmlDocument) {
-  // eslint-disable-next-line no-shadow
   var traverse = function traverse(data, path, json) {
     if (data.children && data.children.length) {
       for (var _iterator = _createForOfIteratorHelperLoose(data.children), _step; !(_step = _iterator()).done;) {
@@ -2743,7 +2837,7 @@ var WMJSDimension = /*#__PURE__*/function () {
               var dataAtTimeStep = partTimeRanges.getDateAtTimeStep(i);
               try {
                 _this._allValues.push(dataAtTimeStep.toISO8601());
-              } catch (e) {
+              } catch (_e) {
                 _this._allValues.push(dataAtTimeStep.toString());
               }
             }
@@ -3026,7 +3120,7 @@ var WMJSDimension = /*#__PURE__*/function () {
     if (this._type === 'timestartstopres') {
       try {
         return this._timeRangeDurationDate.getDateAtTimeStep(index).toISO8601();
-      } catch (e) {
+      } catch (_e) {
         // nothing
       }
       return this._timeRangeDurationDate.getDateAtTimeStep(index);
@@ -3433,7 +3527,7 @@ var privateWmsGetCapabilityElement = function privateWmsGetCapabilityElement(jso
   var capabilityObject;
   try {
     capabilityObject = jsonData.WMT_MS_Capabilities.Capability;
-  } catch (e) {
+  } catch (_e) {
     try {
       capabilityObject = jsonData.WMS_Capabilities.Capability;
     } catch (_unused) {
@@ -3453,7 +3547,7 @@ var privateCheckException = function privateCheckException(jsonData) {
           if (se.attr.code) {
             code = se.attr.code;
           }
-        } catch (e) {
+        } catch (_e) {
           // do nothing
         }
         if (se.value) {
@@ -3463,7 +3557,7 @@ var privateCheckException = function privateCheckException(jsonData) {
       }
       return consoleErrorMessages.wmsServiceExceptionCode + " " + code;
     }
-  } catch (e) {
+  } catch (_e) {
     // do nothing
   }
   return undefined;
@@ -3477,7 +3571,7 @@ var privateCheckVersion111 = function privateCheckVersion111(jsonData) {
     if (!rootLayer) {
       throw new Error('No 111 layer');
     }
-  } catch (e) {
+  } catch (_e) {
     var message = privateCheckException(jsonData);
     if (message !== undefined) {
       throw new Error(message);
@@ -3496,7 +3590,7 @@ var privateCheckVersion130 = function privateCheckVersion130(jsonData) {
     if (!rootLayer) {
       throw new Error('No 130 layer');
     }
-  } catch (e) {
+  } catch (_e) {
     var message = privateCheckException(jsonData);
     if (message !== undefined) {
       throw new Error(message);
@@ -3521,7 +3615,7 @@ var privateCheckVersion = function privateCheckVersion(jsonData) {
     if (WMSVersion.version130 === jsonData.WMT_MS_Capabilities.attr.version) {
       version = WMSVersion.version130;
     }
-  } catch (e) {
+  } catch (_e) {
     try {
       if (WMSVersion.version100 === jsonData.WMS_Capabilities.attr.version) {
         version = WMSVersion.version100;
@@ -4005,8 +4099,6 @@ var WMLayer = /*#__PURE__*/function () {
     this.setSLDURL = this.setSLDURL.bind(this);
     this.display = this.display.bind(this);
     this.getDimensions = this.getDimensions.bind(this);
-    this.getCurrentRequestedGetMapURL = this.getCurrentRequestedGetMapURL.bind(this);
-    this.setCurrentRequestedGetMapURL = this.setCurrentRequestedGetMapURL.bind(this);
     this.init();
     this._options = options;
     this.sldURL = null;
@@ -4423,12 +4515,6 @@ var WMLayer = /*#__PURE__*/function () {
   _proto.display = function display(displayornot) {
     this.enabled = displayornot;
   };
-  _proto.setCurrentRequestedGetMapURL = function setCurrentRequestedGetMapURL(url) {
-    this.currentRequestedGetMapURL = url;
-  };
-  _proto.getCurrentRequestedGetMapURL = function getCurrentRequestedGetMapURL() {
-    return this.currentRequestedGetMapURL;
-  };
   return WMLayer;
 }();
 
@@ -6815,4 +6901,4 @@ var privateWebMapUtils = {
   QUERYWMS_GETCAPABILITIES: QUERYWMS_GETCAPABILITIES
 };
 
-export { DateInterval, DebugType, EVENT_GETCAPABILITIES_READY, EVENT_GETCAPABILITIES_START, LayerType, ParseISOTimeRangeDuration, WEBMAP_NAMESPACE, WMBBOX, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMDateUnit, WMEmptyLayerName, WMEmptyLayerTitle, WMImage, WMImageEventType, WMImageStore, WMInvalidDateValues, WMJSDimension, WMJSMAP_LONLAT_EPSGCODE, WMLayer, WMListener, WMProj4Defs, WMProjection, WMSVersion, WMXMLStringToJson, bgImageStoreLength, debugLogger, generateLayerId, generateMapId, generateTimesliderId, getCorrectWMSDimName, getLegendGraphicURLForLayer, getMapDimURL, getUriWithParam, getWMJSDimensionForLayerAndDimension, getWMJSTimeDimensionForLayerId, getWMLayerById, getWMSServiceId, handleDateUtilsISOString, invalidateWMSGetCapabilities, isDefined, isProjectionSupported, legendImageStore, legendImageStoreLength, mapImageStoreLength, mockGetCapabilities, parseISO8601DateToDate, parseISO8601IntervalToDateInterval, privateWebMapUtils, queryWMSGetCapabilities, queryWMSLayer, queryWMSLayers, queryWMSLayersTree, queryWMSServiceInfo, registerWMLayer, roundWithTimeStep, setWMSGetCapabilitiesFetcher, tilesettings, toArray, unRegisterAllWMJSLayersAndMaps, unRegisterWMJSLayer, index as webmapTestSettings, webmapTranslations, utils as webmapUtils, wmServiceListener, wmsQueryClient };
+export { DateInterval, DebugType, EVENT_GETCAPABILITIES_READY, EVENT_GETCAPABILITIES_START, LayerType, ParseISOTimeRangeDuration, WEBMAP_NAMESPACE, WMBBOX, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMDateUnit, WMEmptyLayerName, WMEmptyLayerTitle, WMImage, WMImageEventType, WMImageStore, WMImageStoreLoadType, WMInvalidDateValues, WMJSDimension, WMJSMAP_LONLAT_EPSGCODE, WMLayer, WMListener, WMProj4Defs, WMProjection, WMSVersion, WMXMLStringToJson, bgImageStoreLength, debugLogger, generateLayerId, generateMapId, generateTimesliderId, getCorrectWMSDimName, getLegendGraphicURLForLayer, getMapDimURL, getUriWithParam, getWMJSDimensionForLayerAndDimension, getWMJSTimeDimensionForLayerId, getWMLayerById, getWMSServiceId, handleDateUtilsISOString, invalidateWMSGetCapabilities, isDefined, isProjectionSupported, legendImageStore, legendImageStoreLength, mapImageStoreLength, mockGetCapabilities, parseISO8601DateToDate, parseISO8601IntervalToDateInterval, privateWebMapUtils, queryWMSGetCapabilities, queryWMSLayer, queryWMSLayers, queryWMSLayersTree, queryWMSServiceInfo, registerWMLayer, roundWithTimeStep, setWMSGetCapabilitiesFetcher, tilesettings, toArray, unRegisterAllWMJSLayersAndMaps, unRegisterWMJSLayer, index as webmapTestSettings, webmapTranslations, utils as webmapUtils, wmServiceListener, wmsQueryClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "13.1.1",
+  "version": "14.0.0",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "13.1.1",
+    "@opengeoweb/shared": "14.0.0",
     "@tanstack/query-core": "^5.69.2",
     "lodash": "^4.17.21",
     "i18next": "^25.0.1",

package/src/lib/components/LoadDurationCounter.d.ts

@@ -0,0 +1,17 @@
+export declare enum WMImageStoreLoadType {
+    'PREFETCH' = "A",
+    'GETMAP' = "B"
+}
+export default class LoadDurationCounter {
+    constructor();
+    private _loadingListForIds;
+    private _loadingDurationForIds;
+    setLoadingStatusForId(type: WMImageStoreLoadType, identifier: string, doneLoading: number, totalLoading: number, resetDuration?: boolean): void;
+    setLoadDurationForId(identifier: string, duration: number | undefined): void;
+    getLoadDurationForId(identifier: string): number | undefined;
+    getTotalLoadingPercentageForIds(identifierList: string[]): {
+        percentage: number;
+        doneLoading: number;
+        totalLoading: number;
+    };
+}

package/src/lib/components/LoadDurationCounter.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/src/lib/components/WMImageStore.d.ts

@@ -1,3 +1,4 @@
+import LoadDurationCounter from './LoadDurationCounter';
 import WMImage, { WMGeoReference, WMImageOptions } from './WMImage';
 export declare enum WMImageEventType {
     Loaded = 0,
@@ -17,6 +18,7 @@ export default class WMImageStore {
     };
     emptyImage: WMImage;
     imagesbyGeoRef: Map<string, WMImage[]>;
+    loadDuration: LoadDurationCounter;
     /**
      * Constructs a new WMImageStore with given amount of image cache.
      * @param {*} maxNumberOfImages

package/src/lib/components/WMLayer.d.ts

@@ -111,6 +111,4 @@ export default class WMLayer {
     getProjection(srsName: string): WMProjection;
     setSLDURL(url: string): void;
     display(displayornot: boolean): void;
-    setCurrentRequestedGetMapURL(url: string): void;
-    getCurrentRequestedGetMapURL(): string | undefined;
 }

package/src/lib/components/index.d.ts

@@ -7,6 +7,7 @@ import WMListener from './WMListener';
 import WMProjection from './WMProjection';
 import { LayerType } from './WMLayerTypes';
 import { WMXMLStringToJson } from './WMXMLParser';
+import { WMImageStoreLoadType } from './LoadDurationCounter';
 export { default as WMJSDimension, handleDateUtilsISOString, } from './WMJSDimension';
 export { default as WMLayer } from './WMLayer';
 export type { LayerOptions, LayerFoundation, EDRFeatureLayerOptions, } from './WMLayerTypes';
@@ -15,7 +16,7 @@ export { default as WMBBOX } from './WMBBOX';
 export type { Bbox } from './WMBBOX';
 export type { WMProjectionWH } from './WMProjection';
 export { WMProjection };
-export { DateInterval, parseISO8601IntervalToDateInterval, ParseISOTimeRangeDuration, isDefined, parseISO8601DateToDate, toArray, getLegendGraphicURLForLayer, legendImageStore, WMImage, debugLogger, DebugType, WMImageEventType, getUriWithParam, getMapDimURL, WMListener, WMXMLStringToJson, };
+export { DateInterval, parseISO8601IntervalToDateInterval, ParseISOTimeRangeDuration, isDefined, parseISO8601DateToDate, toArray, getLegendGraphicURLForLayer, legendImageStore, WMImage, debugLogger, DebugType, WMImageEventType, getUriWithParam, getMapDimURL, WMListener, WMXMLStringToJson, WMImageStoreLoadType, };
 export * from './types';
 export * from './WMTimeTypes';
 export * from './WMConstants';