@opengeoweb/webmap 14.1.0 → 14.2.2

package/index.esm.js

@@ -698,12 +698,10 @@ var toArray = function toArray(array) {
   if (array === null || typeof array === 'undefined') {
     return [];
   }
-  if (array instanceof Array) {
+  if (Array.isArray(array)) {
     return array;
   }
-  var newArray = [];
-  newArray[0] = array;
-  return newArray;
+  return [array];
 };
 /* Returns all dimensions with its current values as URL */
 var getMapDimURL = function getMapDimURL(layer, dimensionOverride) {
@@ -727,18 +725,18 @@ var getMapDimURL = function getMapDimURL(layer, dimensionOverride) {
  * @param params
  * @returns
  */
-var getUriWithParam = function getUriWithParam(baseUrl,
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-params) {
-  var Url = new URL(baseUrl);
-  var urlParams = new URLSearchParams(Url.search);
-  for (var key in params) {
-    if (params[key] !== undefined) {
-      urlParams.set(key, params[key]);
-    }
-  }
-  Url.search = urlParams.toString();
-  return Url.toString();
+var getUriWithParam = function getUriWithParam(baseUrl, params) {
+  var url = new URL(baseUrl);
+  var urlParams = new URLSearchParams(url.search);
+  if (params) {
+    for (var key in params) {
+      if (params[key] !== undefined) {
+        urlParams.set(key, String(params[key]));
+      }
+    }
+  }
+  url.search = urlParams.toString();
+  return url.toString();
 };
 /**
  * Parses url and then it it allows for setting additional key value pairs in that URL (From https://stackoverflow.com/questions/5999118/how-can-i-add-or-update-a-query-string-parameter)
@@ -746,11 +744,9 @@ params) {
  * @param params
  * @returns
  */
-var getUriAddParam = function getUriAddParam(baseUrl,
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-params) {
-  var Url = new URL(baseUrl);
-  var urlParams = new URLSearchParams(Url.search);
+var getUriAddParam = function getUriAddParam(baseUrl, params) {
+  var url = new URL(baseUrl);
+  var urlParams = new URLSearchParams(url.search);
   // Create search params all lowercase so we can compare to the params passed in
   var lowerCaseUrlParams = new URLSearchParams();
   for (var _iterator = _createForOfIteratorHelperLoose(urlParams.keys()), _step; !(_step = _iterator()).done;) {
@@ -759,11 +755,11 @@ params) {
   }
   Object.keys(params).forEach(function (key) {
     if (params[key] !== undefined && !lowerCaseUrlParams.has(key.toLowerCase())) {
-      urlParams.set(key, params[key]);
+      urlParams.set(key, String(params[key]));
     }
   });
-  Url.search = urlParams.toString();
-  return Url.toString();
+  url.search = urlParams.toString();
+  return url.toString();
 };
 /**
  * Helper function to figure out the styles from the WMS layer object from the WMS GetCapabilities document
@@ -772,11 +768,13 @@ params) {
  */
 var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS) {
   /* Get the Style object */
-  if (!(layerObjectFromWMS != null && layerObjectFromWMS.Style)) {
+  if (!(layerObjectFromWMS != null && layerObjectFromWMS.Style) || typeof layerObjectFromWMS.Style === 'object' && Object.keys(layerObjectFromWMS.Style).length === 0) {
     return [];
   }
   var layerStyles = toArray(layerObjectFromWMS.Style);
-  /* Loop through the list of styles from the document, create a default object and try to fill in the object with the props from the WMS GetCapabilities document */
+  if (!layerStyles) {
+    return [];
+  }
   return layerStyles.map(function (layerStyle) {
     var style = {
       title: 'default',
@@ -784,23 +782,33 @@ var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS) {
       legendURL: '',
       "abstract": 'No abstract available'
     };
+    var getValueOrDefault = function getValueOrDefault(obj, key, defaultValue) {
+      // Only return .value if obj[key] is an object with a 'value' property
+      var prop = obj && obj[key];
+      if (prop && typeof prop === 'object' && 'value' in prop && typeof prop.value === 'string') {
+        return prop.value;
+      }
+      return defaultValue;
+    };
     try {
-      style.title = layerStyle.Title.value;
+      style.title = getValueOrDefault(layerStyle, 'Title', style.title);
     } catch (_e) {
       /* Do nothing */
     }
     try {
-      style.name = layerStyle.Name.value;
+      style.name = layerStyle.Name && layerStyle.Name.value ? layerStyle.Name.value : style.name;
     } catch (_e) {
       /* Do nothing */
     }
     try {
-      style.legendURL = layerStyle.LegendURL.OnlineResource.attr['xlink:href'];
+      var _layerStyle$LegendURL, _layerStyle$LegendURL2;
+      style.legendURL = (_layerStyle$LegendURL = (_layerStyle$LegendURL2 = layerStyle.LegendURL) == null || (_layerStyle$LegendURL2 = _layerStyle$LegendURL2.OnlineResource) == null ? void 0 : _layerStyle$LegendURL2.attr['xlink:href']) != null ? _layerStyle$LegendURL : '';
     } catch (_e) {
       /* Do nothing */
     }
     try {
-      style["abstract"] = layerStyle.Abstract.value;
+      var _layerStyle$Abstract$, _layerStyle$Abstract;
+      style["abstract"] = (_layerStyle$Abstract$ = (_layerStyle$Abstract = layerStyle.Abstract) == null ? void 0 : _layerStyle$Abstract.value) != null ? _layerStyle$Abstract$ : style["abstract"];
     } catch (_e) {
       /* Do nothing */
     }
@@ -814,7 +822,10 @@ var addDimensionsForLayer = function addDimensionsForLayer(layerObjectFromWMS) {
   var layerDimensions = toArray(layerObjectFromWMS.Dimension);
   var layerDimensionsExtents = toArray(layerObjectFromWMS.Extent);
   var dimensionList = layerDimensions.map(function (layerDimension) {
-    var dimensionName = layerDimension.attr && layerDimension.attr.name.toLowerCase();
+    var dimensionName = '';
+    if (layerDimension.attr && layerDimension.attr.name) {
+      dimensionName = layerDimension.attr.name.toLowerCase();
+    }
     /* Find corresponding Dimension Extent if given */
     var dimExtentIndex = layerDimensionsExtents.findIndex(function (layerDimensionsExtent) {
       var extentName = layerDimensionsExtent.attr && layerDimensionsExtent.attr.name && layerDimensionsExtent.attr.name.toLowerCase();
@@ -868,9 +879,7 @@ var addBoundingBoxForLayer = function addBoundingBoxForLayer(layerObjectFromWMS)
 function sortArrayOfObjectsByKey(array, key) {
   var spreadArray = [].concat(array);
   return spreadArray.sort(function (arrayA, arrayB) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var x = arrayA[key];
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var y = arrayB[key];
     if (x < y) {
       return -1;
@@ -941,7 +950,7 @@ var makeNodeLayerFromWMSGetCapabilityLayer = function makeNodeLayerFromWMSGetCap
     leaf: isleaf,
     path: path,
     keywords: toArray((_layer$KeywordList$Ke = layer == null || (_layer$KeywordList = layer.KeywordList) == null ? void 0 : _layer$KeywordList.Keyword) != null ? _layer$KeywordList$Ke : []).map(function (keyword) {
-      return keyword.value;
+      return typeof keyword === 'object' && keyword !== null && 'value' in keyword ? keyword.value : String(keyword);
     }).filter(Boolean),
     "abstract": layer != null && layer.Abstract ? layer.Abstract.value : undefined,
     styles: styles,
@@ -1188,9 +1197,7 @@ var WMImage = /*#__PURE__*/function () {
       this.randomize = true;
     }
     this._load();
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  ;
+  };
   _proto._getImageWithHeaders = function _getImageWithHeaders(url, headers) {
     var _this3 = this;
     var fetchHeaders = new Headers();
@@ -1944,12 +1951,20 @@ function getNumberOfTimeSteps(starttime, stoptime, interval) {
     return steps;
   }
   // In case of equally distributed time steps
-  steps = parseInt(
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  (stoptime.getTime() - starttime.getTime()) / interval.getTime() + 0.5, 10) + 1;
+  steps = Math.round((stoptime.getTime() - starttime.getTime()) / interval.getTime()) + 1;
   return steps;
 }
+// Utility function to fill missing elements in ISO time range duration array
+var fillMissingISOTimeRangeElements = function fillMissingISOTimeRangeElements(times, defaultInterval) {
+  var result = [].concat(times);
+  if (result[2] === undefined) {
+    result[2] = defaultInterval;
+  }
+  if (result[1] === undefined) {
+    return [result[0], result[0], defaultInterval];
+  }
+  return result;
+};
 // Takes "1999-01-01T00:00:00Z/2009-12-01T00:00:00Z/PT60S" as input
 var ParseISOTimeRangeDuration = /*#__PURE__*/function () {
   function ParseISOTimeRangeDuration(isoTimeRangeDuration, defaultInterval) {
@@ -1957,16 +1972,7 @@ var ParseISOTimeRangeDuration = /*#__PURE__*/function () {
       defaultInterval = 'PT1M';
     }
     this.initialized = false;
-    var times = isoTimeRangeDuration.split('/');
-    // Add safety checks for undefined elements
-    if (times[2] === undefined) {
-      times[2] = defaultInterval;
-    }
-    if (times[1] === undefined) {
-      // eslint-disable-next-line @typescript-eslint/prefer-destructuring
-      times[1] = times[0];
-      times[2] = defaultInterval;
-    }
+    var times = fillMissingISOTimeRangeElements(isoTimeRangeDuration.split('/'), defaultInterval);
     // Convert the dates
     this.startTime = parseISO8601DateToDate(times[0]);
     this.stopTime = parseISO8601DateToDate(times[1]);
@@ -2523,7 +2529,7 @@ var WMXMLtoJSON = function WMXMLtoJSON(xmlDocument) {
           newJson = {
             attr: {}
           };
-          // eslint-disable-next-line no-empty
+          // Convert to array if needed
           if (json[nodeName] instanceof Array) ; else {
             var obj = Object.assign({}, json[nodeName]);
             // eslint-disable-next-line no-param-reassign
@@ -4337,8 +4343,7 @@ var WMLayer = /*#__PURE__*/function () {
               _context.next = 10;
               break;
             }
-            // eslint-disable-next-line no-console
-            console.log('invalidateWMSGetCapabilities');
+            debugLogger(DebugType.Log);
             _context.next = 10;
             return invalidateWMSGetCapabilities(this.service);
           case 10:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "14.1.0",
+  "version": "14.2.2",
   "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": "14.1.0",
+    "@opengeoweb/shared": "14.2.2",
     "@tanstack/query-core": "^5.69.2",
     "lodash": "^4.17.21",
     "i18next": "^25.0.1",

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

@@ -1,6 +1,10 @@
+export interface WMHeader {
+    name: string;
+    value: string;
+}
 export interface WMImageOptions {
     randomizer?: boolean;
-    headers: Headers[];
+    headers: WMHeader[];
     fakeMaxAge?: number;
 }
 export interface WMGeoReference {
@@ -25,7 +29,7 @@ export default class WMImage {
     srcToLoad: string;
     loadEventCallback?: (image: WMImage) => void;
     el: HTMLImageElement;
-    headers: Headers[];
+    headers: WMHeader[];
     _imageTimeStampAtError: number;
     _numFailedAttempts: number;
     _loadStartTime: number;

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

@@ -18,7 +18,7 @@ export declare const isDefined: <T>(variable?: T) => variable is T;
  * @param array The variable to convert
  * @returns Always an array
  */
-export declare const toArray: (array: unknown | unknown[]) => any[];
+export declare const toArray: <T>(array: T | T[] | null | undefined) => T[];
 export declare const getMapDimURL: (layer: WMLayer, dimensionOverride?: Dimension[]) => URLSearchParams;
 /**
  * Parses url and then it it allows for setting / changing key value pairs in that URL (From https://stackoverflow.com/questions/5999118/how-can-i-add-or-update-a-query-string-parameter)
@@ -26,14 +26,14 @@ export declare const getMapDimURL: (layer: WMLayer, dimensionOverride?: Dimensio
  * @param params
  * @returns
  */
-export declare const getUriWithParam: (baseUrl: string, params?: Record<string, any>) => string;
+export declare const getUriWithParam: (baseUrl: string, params?: Record<string, unknown>) => string;
 /**
  * Parses url and then it it allows for setting additional key value pairs in that URL (From https://stackoverflow.com/questions/5999118/how-can-i-add-or-update-a-query-string-parameter)
  * @param baseUrl
  * @param params
  * @returns
  */
-export declare const getUriAddParam: (baseUrl: string, params: Record<string, any>) => string;
+export declare const getUriAddParam: (baseUrl: string, params: Record<string, unknown>) => string;
 /**
  * Helper function to figure out the styles from the WMS layer object from the WMS GetCapabilities document
  * @param layerObjectFromWMS The layer object from the WMS GetCapabilities JSON document
@@ -49,7 +49,7 @@ export declare const addBoundingBoxForLayer: (layerObjectFromWMS: WMSLayerFromGe
  * @param key The key of the object to use for sorting
  * @returns Sorted array.
  */
-export declare function sortArrayOfObjectsByKey<ArrayOfObjects>(array: ArrayOfObjects[], key: string): ArrayOfObjects[];
+export declare function sortArrayOfObjectsByKey<T>(array: T[], key: keyof T): T[];
 /**
  * Makes a LayerProps object from the WMSLayerFromGetCapabilities and nestedLayerPath
  * @param layer WMSLayerFromGetCapabilities