@opengeoweb/webmap 4.17.0 → 4.19.0

package/index.esm.js

@@ -1,5 +1,6 @@
 import { debounce, throttle } from 'throttle-debounce';
 import { compact } from 'lodash';
+import { dateUtils } from '@opengeoweb/shared';
 import moment from 'moment';
 import proj4 from 'proj4';
 
@@ -248,7 +249,9 @@ var debug = function debug(type, message) {
  */
 
 var isDefined = function isDefined(variable) {
-  if (variable === null) return false;
+  if (variable === null) {
+    return false;
+  }
 
   if (typeof variable === 'undefined') {
     return false;
@@ -263,7 +266,9 @@ var isDefined = function isDefined(variable) {
  */
 
 var toArray = function toArray(array) {
-  if (array === null || typeof array === 'undefined') return [];
+  if (array === null || typeof array === 'undefined') {
+    return [];
+  }
 
   if (array instanceof Array) {
     return array;
@@ -281,7 +286,10 @@ var toArray = function toArray(array) {
  */
 
 var WMJScheckURL = function WMJScheckURL(url) {
-  if (!isDefined(url)) return '?';
+  if (!isDefined(url)) {
+    return '?';
+  }
+
   var trimmedUrl = url.trim();
 
   if (trimmedUrl.indexOf('?') === -1) {
@@ -308,14 +316,26 @@ var getMouseYCoordinate = function getMouseYCoordinate(event) {
   return event.clientY + document.documentElement.scrollTop + document.body.scrollTop;
 };
 var URLDecode = function URLDecode(encodedURL) {
-  if (!isDefined(encodedURL)) return '';
+  if (!isDefined(encodedURL)) {
+    return '';
+  }
+
   return encodedURL.replace('+', ' ').replace('%2B', '+').replace('%20', ' ').replace('%5E', '^').replace('%26', '&').replace('%3F', '?').replace('%3E', '>').replace('%3C', '<').replace('%5C', '\\').replace('%2F', '/').replace('%25', '%').replace('%3A', ':').replace('%27', "'").replace('%24', '$');
 }; // Encodes plain text to URL encoding
 
 var URLEncode = function URLEncode(plaintext) {
-  if (!plaintext) return plaintext;
-  if (plaintext === undefined) return plaintext;
-  if (plaintext === '') return plaintext;
+  if (!plaintext) {
+    return plaintext;
+  }
+
+  if (plaintext === undefined) {
+    return plaintext;
+  }
+
+  if (plaintext === '') {
+    return plaintext;
+  }
+
   var SAFECHARS = '0123456789' + // Numeric
   'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + // Alphabetic
   'abcdefghijklmnopqrstuvwxyz' + "%-_.!~*'()"; // RFC2396 Mark characters
@@ -354,8 +374,15 @@ var URLEncode = function URLEncode(plaintext) {
 var getCorrectWMSDimName = function getCorrectWMSDimName(origDimName) {
   /* Adds DIM_ for dimensions other than height or time */
   var upperCaseDimName = origDimName.toUpperCase();
-  if (upperCaseDimName === 'TIME') return upperCaseDimName;
-  if (upperCaseDimName === 'ELEVATION') return upperCaseDimName;
+
+  if (upperCaseDimName === 'TIME') {
+    return upperCaseDimName;
+  }
+
+  if (upperCaseDimName === 'ELEVATION') {
+    return upperCaseDimName;
+  }
+
   return "DIM_".concat(upperCaseDimName);
 };
 /* Returns all dimensions with its current values as URL */
@@ -465,7 +492,10 @@ var dateToISO8601 = function dateToISO8601(date) {
 
 var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS) {
   /* Get the Style object */
-  if (!layerObjectFromWMS.Style) return [];
+  if (!layerObjectFromWMS.Style) {
+    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 */
 
@@ -505,7 +535,10 @@ var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS) {
   });
 };
 var addDimensionsForLayer = function addDimensionsForLayer(layerObjectFromWMS) {
-  if (!layerObjectFromWMS.Dimension) return [];
+  if (!layerObjectFromWMS.Dimension) {
+    return [];
+  }
+
   var layerDimensions = toArray(layerObjectFromWMS.Dimension);
   var layerDimensionsExtents = toArray(layerObjectFromWMS.Extent);
   var dimensionList = layerDimensions.map(function (layerDimension) {
@@ -566,10 +599,19 @@ function sortArrayOfObjectsByKey(array, key) {
   var spreadArray = _toConsumableArray(array);
 
   return spreadArray.sort(function (a, b) {
-    var x = a[key];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    var x = a[key]; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
     var y = b[key];
-    if (x < y) return -1;
-    if (x > y) return 1;
+
+    if (x < y) {
+      return -1;
+    }
+
+    if (x > y) {
+      return 1;
+    }
+
     return 0;
   });
 }
@@ -784,7 +826,10 @@ var WMImage = /*#__PURE__*/function () {
   }, {
     key: "isLoaded",
     value: function isLoaded() {
-      if (this._isLoading) return false;
+      if (this._isLoading) {
+        return false;
+      }
+
       return this._isLoaded;
     }
     /**
@@ -887,7 +932,8 @@ var WMImage = /*#__PURE__*/function () {
       this._srcLoaded = undefined;
 
       this._load();
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   }, {
     key: "_getImageWithHeaders",
     value: function _getImageWithHeaders(url, headers) {
@@ -1314,7 +1360,10 @@ var WMBBOX = /*#__PURE__*/function () {
           try {
             var _a = left.split(',');
 
-            if (_a.length !== 4) return;
+            if (_a.length !== 4) {
+              return;
+            }
+
             this.left = parseFloat(_a[0]);
             this.bottom = parseFloat(_a[1]);
             this.right = parseFloat(_a[2]);
@@ -1327,10 +1376,21 @@ var WMBBOX = /*#__PURE__*/function () {
       /* Apply defaults to invalid values */
 
 
-      if (this.left == null) this.left = -180;
-      if (this.right == null) this.right = 180;
-      if (this.bottom == null) this.bottom = -90;
-      if (this.top == null) this.top = 90;
+      if (this.left == null) {
+        this.left = -180;
+      }
+
+      if (this.right == null) {
+        this.right = 180;
+      }
+
+      if (this.bottom == null) {
+        this.bottom = -90;
+      }
+
+      if (this.top == null) {
+        this.top = 90;
+      }
     }
     /*
      * Compares two boundingboxes and returns true if they are equal
@@ -1451,11 +1511,13 @@ var WMListener = /*#__PURE__*/function () {
   }, {
     key: "suspendEvent",
     value: function suspendEvent(name) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       this._suspendedEvents[name] = true;
     }
   }, {
     key: "resumeEvent",
     value: function resumeEvent(name) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       this._suspendedEvents[name] = false;
     }
   }, {
@@ -1472,7 +1534,8 @@ var WMListener = /*#__PURE__*/function () {
   }, {
     key: "triggerEvent",
     value: function triggerEvent(name, param) {
-      if (this._allEventsSuspended === true || this._suspendedEvents[name] === true) {
+      if (this._allEventsSuspended === true || // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      this._suspendedEvents[name] === true) {
         return [];
       }
 
@@ -1655,7 +1718,10 @@ _bbox) {
       var cachedImage = imageStore.getImageForSrc(altImage.imageSource);
       return cachedImage && cachedImage.isLoaded() && !cachedImage.isLoading() && !cachedImage.hasError();
     });
-    if (index !== -1) return sortedImagesForUrl[index];
+
+    if (index !== -1) {
+      return sortedImagesForUrl[index];
+    }
   }
 
   return null;
@@ -1875,7 +1941,10 @@ var WMCanvasBuffer = /*#__PURE__*/function () {
   }, {
     key: "finishedLoading",
     value: function finishedLoading() {
-      if (this.ready) return;
+      if (this.ready) {
+        return;
+      }
+
       this.ready = true;
 
       for (var j = 0; j < this.layers.length; j += 1) {
@@ -1899,7 +1968,11 @@ var WMCanvasBuffer = /*#__PURE__*/function () {
     value: function resize(w, h) {
       var width = parseInt(w, 10);
       var height = parseInt(h, 10);
-      if (this._width === width && this._height === height) return;
+
+      if (this._width === width && this._height === height) {
+        return;
+      }
+
       this._width = width;
       this._height = height;
       this.canvas.width = width;
@@ -2028,7 +2101,10 @@ var WMJSAnimate = /*#__PURE__*/function () {
     _map.isAnimating = false;
 
     _map.setAnimationDelay = function (delay) {
-      if (delay < 1) delay = 1;
+      if (delay < 1) {
+        delay = 1;
+      }
+
       _map.animationDelay = delay;
     };
 
@@ -2058,8 +2134,8 @@ var WMJSAnimate = /*#__PURE__*/function () {
   }
 
   _createClass(WMJSAnimate, [{
-    key: "_isCurrentAnimationTimeCloseToWallClockTime",
-    value: function _isCurrentAnimationTimeCloseToWallClockTime() {
+    key: "isCurrentAnimationTimeCloseToWallClockTime",
+    value: function isCurrentAnimationTimeCloseToWallClockTime() {
       if (this.isNextTimeCloseToWallClockTime) {
         this.isNextTimeCloseToWallClockTime = false;
         return true;
@@ -2067,13 +2143,13 @@ var WMJSAnimate = /*#__PURE__*/function () {
 
       var currentAnimationStep = this._map.animationList[this._map.currentAnimationStep];
       var nextAnimationStep = this._map.animationList[this._map.currentAnimationStep + 1 >= this._map.animationList.length ? 0 : this._map.currentAnimationStep + 1];
-      var wallClockTime = moment.utc();
-      var currentAnimationTime = moment.utc(currentAnimationStep.value);
-      var nextAnimationTime = moment.utc(nextAnimationStep.value);
+      var wallClockTime = new Date();
+      var currentAnimationTime = new Date(currentAnimationStep.value);
+      var nextAnimationTime = new Date(nextAnimationStep.value);
 
-      if (wallClockTime.isBetween(currentAnimationTime, nextAnimationTime, undefined, '[)')) {
-        var timeDiff1 = moment.duration(currentAnimationTime.clone().diff(wallClockTime)).asMinutes();
-        var timeDiff2 = moment.duration(nextAnimationTime.clone().diff(wallClockTime)).asMinutes();
+      if (dateUtils.isBetween(wallClockTime, currentAnimationTime, nextAnimationTime)) {
+        var timeDiff1 = dateUtils.differenceInMinutes(currentAnimationTime, wallClockTime);
+        var timeDiff2 = dateUtils.differenceInMinutes(nextAnimationTime, wallClockTime);
 
         if (Math.abs(timeDiff1) < Math.abs(timeDiff2)) {
           // Wall clock time is closer to current animation step time than to the next animation step time
@@ -2090,8 +2166,14 @@ var WMJSAnimate = /*#__PURE__*/function () {
   }, {
     key: "_animate",
     value: function _animate() {
-      if (this._map.isAnimating === false) return;
-      if (this._map.animateBusy === true) return;
+      if (this._map.isAnimating === false) {
+        return;
+      }
+
+      if (this._map.animateBusy === true) {
+        return;
+      }
+
       var animationStep = this._map.animationList[this._map.currentAnimationStep];
 
       if (!animationStep) {
@@ -2123,7 +2205,7 @@ var WMJSAnimate = /*#__PURE__*/function () {
         animationDelay *= 3;
       } else if (this._map.currentAnimationStep === this._map.animationList.length - 1) {
         animationDelay *= 5;
-      } else if (this._isCurrentAnimationTimeCloseToWallClockTime()) {
+      } else if (this.isCurrentAnimationTimeCloseToWallClockTime()) {
         animationDelay *= 5;
       }
 
@@ -2212,7 +2294,9 @@ var WMJSAnimate = /*#__PURE__*/function () {
                 index -= this._map.animationList.length;
               }
 
-              if (index < 0) index = 0;
+              if (index < 0) {
+                index = 0;
+              }
 
               if (index >= 0) {
                 var animationStep = this._map.animationList[index];
@@ -2245,7 +2329,10 @@ var WMJSAnimate = /*#__PURE__*/function () {
   }, {
     key: "stopAnimating",
     value: function stopAnimating() {
-      if (this._map.isAnimating === false) return;
+      if (this._map.isAnimating === false) {
+        return;
+      }
+
       this._map._animationList = undefined;
       this._divAnimationInfo.style.display = 'none';
       this._map.isAnimating = false;
@@ -2279,9 +2366,18 @@ var WMTileRenderer = /*#__PURE__*/function () {
       /* Temporal mappings from bgmaps.cgi service names to names defined here */
 
 
-      if (layerName === 'streetmap') layerName = 'OSM';
-      if (layerName === 'pdok') layerName = 'OSM';
-      if (layerName === 'naturalearth2') layerName = 'NaturalEarth2';
+      if (layerName === 'streetmap') {
+        layerName = 'OSM';
+      }
+
+      if (layerName === 'pdok') {
+        layerName = 'OSM';
+      }
+
+      if (layerName === 'naturalearth2') {
+        layerName = 'NaturalEarth2';
+      }
+
       var tileLayer = tileOptions[layerName];
 
       if (!tileLayer) {
@@ -2315,10 +2411,23 @@ var WMTileRenderer = /*#__PURE__*/function () {
       var initialResolution = 2 * pi * 6378137 / tileSize;
       var originShiftX = -2 * pi * 6378137 / 2.0;
       var originShiftY = 2 * pi * 6378137 / 2.0;
-      if (tileSettings.tileSize) tileSize = tileSettings.tileSize;
-      if (tileSettings.resolution) initialResolution = tileSettings.resolution;
-      if (tileSettings.origX) originShiftX = tileSettings.origX;
-      if (tileSettings.origY) originShiftY = tileSettings.origY;
+
+      if (tileSettings.tileSize) {
+        tileSize = tileSettings.tileSize;
+      }
+
+      if (tileSettings.resolution) {
+        initialResolution = tileSettings.resolution;
+      }
+
+      if (tileSettings.origX) {
+        originShiftX = tileSettings.origX;
+      }
+
+      if (tileSettings.origY) {
+        originShiftY = tileSettings.origY;
+      }
+
       var screenWidth = width;
       var bboxw = currentBBOX.right - currentBBOX.left;
       var originShiftX2 = initialResolution * tileSize + originShiftX;
@@ -2345,8 +2454,14 @@ var WMTileRenderer = /*#__PURE__*/function () {
         var tileServerFormat = tileSettings.tileServerFormat || 'png';
         var tmsEnabled = tileSettings.tms || false; // 'osm' or 'argisonline'
 
-        if (level < tileSettings.minLevel) level = tileSettings.minLevel;
-        if (level > tileSettings.maxLevel) level = tileSettings.maxLevel;
+        if (level < tileSettings.minLevel) {
+          level = tileSettings.minLevel;
+        }
+
+        if (level > tileSettings.maxLevel) {
+          level = tileSettings.maxLevel;
+        }
+
         var numTilesAtLevel = Math.pow(2, level);
         var numTilesAtLevelX = tileSetWidth / (initialResolution / numTilesAtLevel * tileSize);
         var numTilesAtLevelY = tileSetHeight / (initialResolution / numTilesAtLevel * tileSize);
@@ -2395,7 +2510,7 @@ var WMTileRenderer = /*#__PURE__*/function () {
             x: bounds.right,
             y: bounds.top
           }, newBBOX, width, height);
-          var imageURL;
+          var imageURL = '';
 
           if (tileServerType === 'osm') {
             if (tmsEnabled) {
@@ -2458,14 +2573,37 @@ var WMTileRenderer = /*#__PURE__*/function () {
           numTilesAtLevelX *= 2;
         }
 
-        if (tilenbottom < 1) tilenbottom = 1;
-        if (tilenbottom > numTilesAtLevelY) tilenbottom = numTilesAtLevelY;
-        if (tilenleft < 1) tilenleft = 1;
-        if (tilenleft > numTilesAtLevelX) tilenleft = numTilesAtLevelX;
-        if (tilentop < 1) tilentop = 1;
-        if (tilentop > numTilesAtLevelY) tilentop = numTilesAtLevelY;
-        if (tilenright < 1) tilenright = 1;
-        if (tilenright > numTilesAtLevelX) tilenright = numTilesAtLevelX;
+        if (tilenbottom < 1) {
+          tilenbottom = 1;
+        }
+
+        if (tilenbottom > numTilesAtLevelY) {
+          tilenbottom = numTilesAtLevelY;
+        }
+
+        if (tilenleft < 1) {
+          tilenleft = 1;
+        }
+
+        if (tilenleft > numTilesAtLevelX) {
+          tilenleft = numTilesAtLevelX;
+        }
+
+        if (tilentop < 1) {
+          tilentop = 1;
+        }
+
+        if (tilentop > numTilesAtLevelY) {
+          tilentop = numTilesAtLevelY;
+        }
+
+        if (tilenright < 1) {
+          tilenright = 1;
+        }
+
+        if (tilenright > numTilesAtLevelX) {
+          tilenright = numTilesAtLevelX;
+        }
 
         if (tilentop - tilenbottom > 20) {
           debug(DebugType.Error);
@@ -2486,8 +2624,14 @@ var WMTileRenderer = /*#__PURE__*/function () {
 
       drawBGTiles(level);
       imagesToRender.sort(function (imageA, imageB) {
-        if (imageA.level < imageB.level) return -1;
-        if (imageA.level > imageB.level) return 1;
+        if (imageA.level < imageB.level) {
+          return -1;
+        }
+
+        if (imageA.level > imageB.level) {
+          return 1;
+        }
+
         return 0;
       });
 
@@ -2537,7 +2681,11 @@ var getLegendGraphicURLForLayer = function getLegendGraphicURLForLayer(layer) {
 
   if (layer) {
     var legendURL = layer.legendGraphic;
-    if (!legendURL) return undefined; // For THREDDS WMS we need to add layers=
+
+    if (!legendURL) {
+      return undefined;
+    } // For THREDDS WMS we need to add layers=
+
 
     if (!legendURL.includes('&layers=')) {
       legendURL += "&layers=".concat(URLEncode(layer.name), "&");
@@ -2634,7 +2782,11 @@ var DateInterval = /*#__PURE__*/function () {
     this.minute = parseInt(minute, 10);
     this.second = parseInt(second, 10);
     this.isRegularInterval = false;
-    if (this.month === 0 && this.year === 0) this.isRegularInterval = true;
+
+    if (this.month === 0 && this.year === 0) {
+      this.isRegularInterval = true;
+    }
+
     this.getTime = this.getTime.bind(this);
     this.toISO8601 = this.toISO8601.bind(this);
   }
@@ -2646,8 +2798,14 @@ var DateInterval = /*#__PURE__*/function () {
       /* Months and years are unequally distributed in time
          So get time is not possible */
 
-      if (this.month !== 0) throw new Error('month !== 0');
-      if (this.year !== 0) throw new Error('year !== 0');
+      if (this.month !== 0) {
+        throw new Error('month !== 0');
+      }
+
+      if (this.year !== 0) {
+        throw new Error('year !== 0');
+      }
+
       timeres += this.day * 60 * 60 * 24;
       timeres += this.hour * 60 * 60;
       timeres += this.minute * 60;
@@ -2659,17 +2817,35 @@ var DateInterval = /*#__PURE__*/function () {
     key: "toISO8601",
     value: function toISO8601() {
       var isoTime = 'P';
-      if (this.year !== 0) isoTime += "".concat(this.year, "Y");
-      if (this.month !== 0) isoTime += "".concat(this.month, "M");
-      if (this.day !== 0) isoTime += "".concat(this.day, "D");
+
+      if (this.year !== 0) {
+        isoTime += "".concat(this.year, "Y");
+      }
+
+      if (this.month !== 0) {
+        isoTime += "".concat(this.month, "M");
+      }
+
+      if (this.day !== 0) {
+        isoTime += "".concat(this.day, "D");
+      }
 
       if (this.hour !== 0 && this.minute !== 0 && this.second !== 0) {
         isoTime += 'T';
       }
 
-      if (this.hour !== 0) isoTime += "".concat(this.hour, "H");
-      if (this.minute !== 0) isoTime += "".concat(this.minute, "M");
-      if (this.second !== 0) isoTime += "".concat(this.second, "S");
+      if (this.hour !== 0) {
+        isoTime += "".concat(this.hour, "H");
+      }
+
+      if (this.minute !== 0) {
+        isoTime += "".concat(this.minute, "M");
+      }
+
+      if (this.second !== 0) {
+        isoTime += "".concat(this.second, "S");
+      }
+
       return isoTime;
     }
   }]);
@@ -2721,16 +2897,29 @@ var parseISO8601DateToDate = function parseISO8601DateToDate(unvalidatedIsotime)
    */
   var makeISO8601StringFromFlexibleWMSDateString = function makeISO8601StringFromFlexibleWMSDateString(isoString) {
     // Datestring starting with a - token are not supported.
-    if (!isoString || isoString.startsWith('-')) return isoString;
-    if (isoString.length === 4) return "".concat(isoString, "-01-01T00:00:00Z"); // YYYY
+    if (!isoString || isoString.startsWith('-')) {
+      return isoString;
+    }
+
+    var trimmed = isoString.trim();
 
-    if (isoString.length === 7) return "".concat(isoString, "-01T00:00:00Z"); // YYYY-MM
+    if (trimmed.length === 4) {
+      return "".concat(trimmed, "-01-01T00:00:00Z"); // YYYY
+    }
+
+    if (trimmed.length === 7) {
+      return "".concat(trimmed, "-01T00:00:00Z"); // YYYY-MM
+    }
 
-    if (isoString.length === 10) return "".concat(isoString, "T00:00:00Z"); // YYYY-MM-DD
+    if (trimmed.length === 10) {
+      return "".concat(trimmed, "T00:00:00Z"); // YYYY-MM-DD
+    }
 
-    if (isoString.length === 14) return "".concat(isoString.slice(0, -1), ":00:00Z"); // YYYY-MM-DDTHHZ
+    if (trimmed.length === 14) {
+      return "".concat(trimmed.slice(0, -1), ":00:00Z"); // YYYY-MM-DDTHHZ
+    }
 
-    return isoString;
+    return trimmed;
   };
 
   var isotime = makeISO8601StringFromFlexibleWMSDateString(unvalidatedIsotime);
@@ -2752,7 +2941,9 @@ var parseISO8601DateToDate = function parseISO8601DateToDate(unvalidatedIsotime)
   var date = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
 
   date.add = function (dateInterval) {
-    if (!dateInterval) return;
+    if (!dateInterval) {
+      return;
+    }
 
     if (dateInterval.isRegularInterval === false) {
       if (dateInterval.year !== 0) {
@@ -2784,7 +2975,9 @@ var parseISO8601DateToDate = function parseISO8601DateToDate(unvalidatedIsotime)
   };
 
   date.substract = function (dateInterval) {
-    if (!dateInterval) return;
+    if (!dateInterval) {
+      return;
+    }
 
     if (dateInterval.isRegularInterval === false) {
       if (dateInterval.year !== 0) {
@@ -2816,7 +3009,9 @@ var parseISO8601DateToDate = function parseISO8601DateToDate(unvalidatedIsotime)
   };
 
   date.addMultipleTimes = function (dateInterval, numberOfSteps) {
-    if (!dateInterval) return;
+    if (!dateInterval) {
+      return;
+    }
 
     if (dateInterval.isRegularInterval === false) {
       if (dateInterval.year !== 0) {
@@ -2848,7 +3043,9 @@ var parseISO8601DateToDate = function parseISO8601DateToDate(unvalidatedIsotime)
   };
 
   date.substractMultipleTimes = function (dateInterval, numberOfSteps) {
-    if (!dateInterval) return;
+    if (!dateInterval) {
+      return;
+    }
 
     if (dateInterval.isRegularInterval === false) {
       if (dateInterval.year !== 0) {
@@ -2911,8 +3108,17 @@ var parseISO8601DateToDate = function parseISO8601DateToDate(unvalidatedIsotime)
 
 /** ****************************************************** */
 
-var parseISO8601IntervalToDateInterval = function parseISO8601IntervalToDateInterval(isotime) {
-  if (!isotime || isotime.charAt(0) !== 'P') return undefined;
+var parseISO8601IntervalToDateInterval = function parseISO8601IntervalToDateInterval(_isotime) {
+  if (!_isotime) {
+    return undefined;
+  }
+
+  var isotime = _isotime.trim();
+
+  if (isotime.charAt(0) !== 'P') {
+    return undefined;
+  }
+
   var splittedOnT = isotime.split('T');
   var years = '0';
   var months = '0';
@@ -2937,7 +3143,11 @@ var parseISO8601IntervalToDateInterval = function parseISO8601IntervalToDateInte
 
     if (dayIndex !== -1) {
       var start = yearIndex;
-      if (monthIndex !== -1) start = monthIndex;
+
+      if (monthIndex !== -1) {
+        start = monthIndex;
+      }
+
       days = YYYYMMDDPart.substring(start + 1, dayIndex);
     }
   } // parse the right part
@@ -2962,7 +3172,11 @@ var parseISO8601IntervalToDateInterval = function parseISO8601IntervalToDateInte
 
         if (secondIndex !== -1) {
           var _start = hourIndex;
-          if (minuteIndex !== -1) _start = minuteIndex;
+
+          if (minuteIndex !== -1) {
+            _start = minuteIndex;
+          }
+
           seconds = HHMMSSPart.substring(_start + 1, secondIndex);
         }
       }
@@ -2980,7 +3194,10 @@ var parseISO8601IntervalToDateInterval = function parseISO8601IntervalToDateInte
 /** ******************************************************* */
 
 function getNumberOfTimeSteps(starttime, stoptime, interval) {
-  if (!starttime || !stoptime || !interval) return undefined;
+  if (!starttime || !stoptime || !interval) {
+    return undefined;
+  }
+
   var steps = 0;
 
   if (interval.month !== 0 || interval.year !== 0) {
@@ -3011,7 +3228,9 @@ var ParseISOTimeRangeDuration = /*#__PURE__*/function () {
     this.initialized = false;
     var times = isoTimeRangeDuration.split('/'); // Some safety checks
 
-    if (times[2] === undefined) times[2] = 'PT1M';
+    if (times[2] === undefined) {
+      times[2] = 'PT1M';
+    }
 
     if (times[1] === undefined) {
       // eslint-disable-next-line prefer-destructuring
@@ -3122,7 +3341,10 @@ var ParseISOTimeRangeDuration = /*#__PURE__*/function () {
         return this.timeSteps - 1;
       }
 
-      if (currentDateTime > this.stopTime.getTime()) return this.timeSteps - 1;
+      if (currentDateTime > this.stopTime.getTime()) {
+        return this.timeSteps - 1;
+      }
+
       var timeStep = 0;
 
       if (this.timeInterval.isRegularInterval === false) {
@@ -3305,28 +3527,32 @@ var WMJSDimension = /*#__PURE__*/function () {
       /* 1. Get the last value in the list of the referencetime */
 
 
-      var lastRefTimeAsMoment = moment.utc(referenceTimeDim.getLastValue());
+      var lastRefTime = new Date(referenceTimeDim.getLastValue());
       /* 2. Get the original last value of the time dimension, we cannot use this.getLastValue(), as we are changing this. */
 
-      var timeLastValueAsMoment = moment.utc(this.values.split('/')[1]);
+      var orgLastDimTime = new Date(this.values.split('/')[1]);
       /* 3. Now calculate the run length */
 
-      var runLengthAsHour = moment.duration(timeLastValueAsMoment.clone().diff(lastRefTimeAsMoment)).asHours();
-      var newStartValueTimeAsMoment = moment.utc(referenceTimeValueToSet);
-      var newEndValueTimeAsMoment = newStartValueTimeAsMoment.clone().add(runLengthAsHour, 'h');
+      var runLengthAsHour = dateUtils.differenceInHours(orgLastDimTime, lastRefTime);
+      var newStartValueTime = new Date(referenceTimeValueToSet);
+      var newEndValueTime = dateUtils.add(new Date(newStartValueTime.getTime()), {
+        hours: runLengthAsHour
+      });
 
       if (this._type === 'timestartstopres') {
         /* Compose a new dataString interval and re-initialize the time dimension */
-        var dateStringItems = this.values.split('/');
+        var dateStringItems = this.values.split('/').map(function (value) {
+          return value.trim();
+        });
         var dateStringInterval = dateStringItems[2];
-        var newValue = "".concat(newStartValueTimeAsMoment.toISOString(), "/").concat(newEndValueTimeAsMoment.toISOString(), "/").concat(dateStringInterval);
-        this.defaultValue = newEndValueTimeAsMoment.toISOString();
+        var newValue = "".concat(newStartValueTime.toISOString(), "/").concat(newEndValueTime.toISOString(), "/").concat(dateStringInterval);
+        this.defaultValue = newEndValueTime.toISOString();
         this.reInitializeValues(newValue, true);
       } else if (this._type === 'timevalues') {
         /* Filter all dates from the array which are lower than given start value */
 
         /* TODO: Maarten Plieger 2020-06-10: Make this also work for WMS times advertised as a comma separated list */
-        var _newValue2 = parseISO8601DateToDate(newStartValueTimeAsMoment.toISOString());
+        var _newValue2 = parseISO8601DateToDate(newStartValueTime.toISOString());
 
         var newArray = this._allDates.filter(function (x) {
           return x >= _newValue2;
@@ -3335,7 +3561,10 @@ var WMJSDimension = /*#__PURE__*/function () {
         var newValues = '';
 
         for (var j = 0; j < newArray.length; j += 1) {
-          if (j > 0) newValues += ',';
+          if (j > 0) {
+            newValues += ',';
+          }
+
           newValues += newArray[j].toISO8601();
         }
 
@@ -3355,14 +3584,21 @@ var WMJSDimension = /*#__PURE__*/function () {
     value: function initialize() {
       var forceothervalues = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
       var forceReferenceTimeValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      if (this._initialized === true) return;
+
+      if (this._initialized === true) {
+        return;
+      }
+
       var ogcdimvalues = this.values;
 
       if (forceothervalues) {
         ogcdimvalues = forceothervalues;
       }
 
-      if (!isDefined(ogcdimvalues)) return;
+      if (!isDefined(ogcdimvalues)) {
+        return;
+      }
+
       this._allValues = [];
       this._initialized = true;
 
@@ -3383,10 +3619,14 @@ var WMJSDimension = /*#__PURE__*/function () {
         var values = ogcdimvalues.split(',');
 
         for (var j = 0; j < values.length; j += 1) {
-          var valuesRanged = values[j].split('/');
+          var valuesRangedNoTrim = values[j].split('/');
 
-          if (valuesRanged.length === 3) {
+          if (valuesRangedNoTrim.length === 3) {
+            var valuesRanged = valuesRangedNoTrim.map(function (value) {
+              return value.trim();
+            });
             /* Can be either time like '2021-03-17T06:00:00Z/2021-03-21T00:00:00Z/PT6H' or something else, like '0/24/2' */
+
             if (valuesRanged[2].charAt(0) === 'P') {
               var partTimeRanges = new ParseISOTimeRangeDuration(values[j]);
 
@@ -3404,8 +3644,14 @@ var WMJSDimension = /*#__PURE__*/function () {
               var stop = parseFloat(valuesRanged[1]);
               var res = parseFloat(valuesRanged[2]);
               stop += res;
-              if (start > stop) stop = start;
-              if (res <= 0) res = 1;
+
+              if (start > stop) {
+                stop = start;
+              }
+
+              if (res <= 0) {
+                res = 1;
+              }
 
               for (var j2 = start; j2 < stop; j2 += res) {
                 this._allValues.push(String(j2));
@@ -3424,26 +3670,39 @@ var WMJSDimension = /*#__PURE__*/function () {
           }
         }
       }
+      /* If no default value is given, take the last / most recent one */
+
 
-      if (!isDefined(this.defaultValue)) {
-        this.defaultValue = this.getValueForIndex(0);
+      if (!isDefined(this.defaultValue) || this.defaultValue === '') {
+        this.defaultValue = this.getLastValue();
+      }
+      /* Check if the string 'current' is given, and find the closest value inside the dimension */
+
+
+      if (this.defaultValue === 'current') {
+        this.defaultValue = this.getClosestValue(moment().utc().format('YYYY-MM-DDTHH:mm:ss[Z]'), true);
       }
       /* If no currentvalue is set, set the default */
 
 
-      if (!isDefined(this.currentValue)) {
-        this.currentValue = this.getFirstValue();
+      if (!this.currentValue || this.currentValue.length === 0) {
+        this.currentValue = this.defaultValue;
       }
       /* Check for out of range values and adjust accordingly to a valid range */
 
 
       var index = this.getIndexForValue(this.currentValue);
-      if (index === -2) this.currentValue = this.getLastValue(); // Date is past the latest (-2), so set it to the last value
 
-      if (index === -1) this.currentValue = this.getFirstValue(); // Date is past the first (-1), so set it to the first value
+      if (index === -2) {
+        this.currentValue = this.getLastValue(); // Date is past the latest (-2), so set it to the last value
+      }
 
+      if (index === -1) {
+        this.currentValue = this.getFirstValue(); // Date is past the first (-1), so set it to the first value
+      }
       /* In case of reference time, the time dimension range is changed, check if the current time still fits in that range */
 
+
       if (forceReferenceTimeValue) {
         if (this.getIndexForValue(this.currentValue, true) < 0) {
           this.currentValue = this.getClosestValue(this.currentValue);
@@ -3590,7 +3849,11 @@ var WMJSDimension = /*#__PURE__*/function () {
 
       if (newValue === 'middle') {
         var middleIndex = Math.ceil(this.size() / 2) - 1;
-        if (middleIndex < 0) middleIndex = 0;
+
+        if (middleIndex < 0) {
+          middleIndex = 0;
+        }
+
         return this.getValueForIndex(middleIndex);
       }
 
@@ -3610,7 +3873,11 @@ var WMJSDimension = /*#__PURE__*/function () {
         value = this.getValueForIndex(index);
       } catch (e) {
         if (typeof e.message === 'number') {
-          if (e.message === 0) value = WMDateTooEarlyString;else value = WMDateTooLateString;
+          if (e.message === 0) {
+            value = WMDateTooEarlyString;
+          } else {
+            value = WMDateTooLateString;
+          }
         }
       }
 
@@ -3652,8 +3919,14 @@ var WMJSDimension = /*#__PURE__*/function () {
         return this._timeRangeDurationDate.getDateAtTimeStep(index);
       }
 
-      if (this._type === 'timevalues') return this._allValues[index];
-      if (this._type === 'anyvalue') return this._allValues[index];
+      if (this._type === 'timevalues') {
+        return this._allValues[index];
+      }
+
+      if (this._type === 'anyvalue') {
+        return this._allValues[index];
+      }
+
       return null;
     }
     /**
@@ -3665,7 +3938,11 @@ var WMJSDimension = /*#__PURE__*/function () {
     key: "getDimInterval",
     value: function getDimInterval() {
       this.initialize();
-      if (!this.dimTimeInterval) return undefined;
+
+      if (!this.dimTimeInterval) {
+        return undefined;
+      }
+
       var _this$dimTimeInterval = this.dimTimeInterval,
           year = _this$dimTimeInterval.year,
           month = _this$dimTimeInterval.month,
@@ -3739,7 +4016,10 @@ var WMJSDimension = /*#__PURE__*/function () {
 
           return this._timeRangeDurationDate.getTimeStepFromDate(value, outSideOfRangeFlag);
         } catch (e) {
-          if (parseInt(e.message, 10) === 0) return -1;
+          if (parseInt(e.message, 10) === 0) {
+            return -1;
+          }
+
           return -2;
         }
       }
@@ -3747,7 +4027,7 @@ var WMJSDimension = /*#__PURE__*/function () {
       if (this._type === 'timevalues') {
         try {
           var dateToFind = parseISO8601DateToDate(value).getTime();
-          var minDistance;
+          var minDistance = null;
           var foundIndex = 0;
           var minTime = null;
           var maxTime = null;
@@ -3755,11 +4035,23 @@ var WMJSDimension = /*#__PURE__*/function () {
           for (var j = 0; j < this._allValues.length; j += 1) {
             var time = this._allDates[j].getTime();
 
-            if (time < minTime || minTime === null) minTime = time;
-            if (time > maxTime || maxTime === null) maxTime = time;
+            if (time < minTime || minTime === null) {
+              minTime = time;
+            }
+
+            if (time > maxTime || maxTime === null) {
+              maxTime = time;
+            }
+
             var distance = time - dateToFind;
-            if (distance < 0) distance = -distance;
-            if (j === 0) minDistance = distance;
+
+            if (distance < 0) {
+              distance = -distance;
+            }
+
+            if (j === 0) {
+              minDistance = distance;
+            }
 
             if (distance < minDistance) {
               minDistance = distance;
@@ -3768,8 +4060,13 @@ var WMJSDimension = /*#__PURE__*/function () {
           }
 
           if (outSideOfRangeFlag) {
-            if (minTime > dateToFind) return -1;
-            if (maxTime < dateToFind) return -2;
+            if (minTime > dateToFind) {
+              return -1;
+            }
+
+            if (maxTime < dateToFind) {
+              return -2;
+            }
           }
 
           return foundIndex;
@@ -3781,7 +4078,9 @@ var WMJSDimension = /*#__PURE__*/function () {
 
       if (this._type === 'anyvalue') {
         for (var _j2 = 0; _j2 < this._allValues.length; _j2 += 1) {
-          if (this._allValues[_j2] === value) return _j2;
+          if (this._allValues[_j2] === value) {
+            return _j2;
+          }
         }
       }
 
@@ -3892,7 +4191,9 @@ var MapPin = /*#__PURE__*/function () {
     };
 
     this.repositionMapPin = function (_bbox) {
-      if (!_bbox) return;
+      if (!_bbox) {
+        return;
+      }
 
       var newpos = _this._map.getPixelCoordFromGeoCoord({
         x: _this.geoPosX,
@@ -3905,8 +4206,14 @@ var MapPin = /*#__PURE__*/function () {
     this.setMapPin = function (_x, _y, _bbox) {
       var x = _x;
       var y = _y;
-      if (!x || !y) return;
-      if (_this.disableMapPin && !_bbox) return; // we still want to update the pin position when the bbox changes.
+
+      if (!x || !y) {
+        return;
+      }
+
+      if (_this.disableMapPin && !_bbox) {
+        return; // we still want to update the pin position when the bbox changes.
+      }
 
       _this.x = parseInt(x, 10);
       _this.y = parseInt(y, 10);
@@ -4021,10 +4328,12 @@ var getBBOXandProjString = function getBBOXandProjString(map, layer) {
 }; // Build a valid WMS request for a certain layer
 
 var buildWMSGetMapRequest = function buildWMSGetMapRequest(map, layer) {
-  if (!isDefined(layer.name)) return {
-    url: undefined,
-    headers: null
-  };
+  if (!isDefined(layer.name)) {
+    return {
+      url: undefined,
+      headers: null
+    };
+  }
 
   var _map$getProjection2 = map.getProjection(),
       srs = _map$getProjection2.srs;
@@ -4039,10 +4348,13 @@ var buildWMSGetMapRequest = function buildWMSGetMapRequest(map, layer) {
     layer.format = 'image/png';
   }
 
-  if (layer.name.length < 1) return {
-    url: undefined,
-    headers: null
-  }; // GetFeatureInfo timeseries in the mapview
+  if (layer.name.length < 1) {
+    return {
+      url: undefined,
+      headers: null
+    };
+  } // GetFeatureInfo timeseries in the mapview
+
 
   if (srs === 'GFI:TIME_ELEVATION') {
     var x = 707;
@@ -4136,8 +4448,10 @@ var buildWMSGetMapRequest = function buildWMSGetMapRequest(map, layer) {
 
 var SCALE_DELAY = 10;
 var ZOOMED_CALLBACK_DELAY = 500;
+var THROTTLE_OPTIONS = {
+  noTrailing: true
+};
 var THROTTLE_WAIT_TIME = 300;
-var THROTTLE_NO_TRAILING = true;
 
 var WMFlyToBBox = function WMFlyToBBox(wmMap) {
   var _this = this;
@@ -4146,7 +4460,6 @@ var WMFlyToBBox = function WMFlyToBBox(wmMap) {
 
   this.flyZoomToBBOXTimerStart = 1;
   this.flyZoomToBBOXTimerSteps = 5;
-  this.flyZoomToBBOXDebounced = debounce;
   this.flyZoomToBBOXScaler = 0;
   this.flyZoomToBBOXCurrent = new WMBBOX();
   this.flyZoomToBBOXFly = new WMBBOX();
@@ -4239,9 +4552,9 @@ var WMFlyToBBox = function WMFlyToBBox(wmMap) {
     }
   };
 
-  this.startZoomThrottled = throttle(THROTTLE_WAIT_TIME, THROTTLE_NO_TRAILING, function (currentbox, newbox) {
-    return _this.flyZoomToBBOXStartZoom(currentbox, newbox);
-  });
+  this.startZoomThrottled = throttle(THROTTLE_WAIT_TIME, function (currentbox, newbox) {
+    _this.flyZoomToBBOXStartZoom(currentbox, newbox);
+  }, THROTTLE_OPTIONS);
 
   this.flyZoomToBBOXStartZoomThrottled = function (currentbox, newbox) {
     _this.startZoomThrottled(currentbox, newbox);
@@ -4263,7 +4576,6 @@ var WebMapJSMapNo = 0;
 var bgMapImageStore = new WMImageStore(bgImageStoreLength, {
   id: 'bgMapImageStore'
 });
-
 var detectLeftButton = function detectLeftButton(evt) {
   if (evt.buttons) {
     return evt.buttons === 1;
@@ -4425,7 +4737,6 @@ var WMJSMap = /*#__PURE__*/function () {
     /* pan,zoom,zoomout,info */
 
     this.numGetFeatureInfoRequests = 0;
-    this.getFeatureInfoResult = [];
     this.oldMapMode = undefined;
     this.InValidMouseAction = 0;
     this.resizingBBOXCursor = '';
@@ -4441,7 +4752,11 @@ var WMJSMap = /*#__PURE__*/function () {
     this.proj4.srs = 'empty';
     this.proj4.projection = undefined;
     this.longlat = 'EPSG:4326';
-    if (proj4) proj4.defs(WMProj4Defs);
+
+    if (proj4) {
+      proj4.defs(WMProj4Defs);
+    }
+
     this.previousMouseButtonState = 'up';
     /* Binds */
 
@@ -4480,7 +4795,6 @@ var WMJSMap = /*#__PURE__*/function () {
     this.setSize = this.setSize.bind(this);
     this._setSize = this._setSize.bind(this);
     this.abort = this.abort.bind(this);
-    this.isBusy = this.isBusy.bind(this);
     this._makeInfoHTML = this._makeInfoHTML.bind(this);
     this.showScaleBar = this.showScaleBar.bind(this);
     this.hideScaleBar = this.hideScaleBar.bind(this);
@@ -4782,30 +5096,52 @@ var WMJSMap = /*#__PURE__*/function () {
           do {
             numMapUnits *= 10.0;
             divFactor = a / numMapUnits;
-            if (divFactor === 0) return undefined;
+
+            if (divFactor === 0) {
+              return undefined;
+            }
+
             realWidth = desiredWidth / divFactor;
           } while (realWidth < desiredWidth);
 
           do {
             numMapUnits /= 2.0;
             divFactor = a / numMapUnits;
-            if (divFactor === 0) return undefined;
+
+            if (divFactor === 0) {
+              return undefined;
+            }
+
             realWidth = desiredWidth / divFactor;
           } while (realWidth > desiredWidth);
 
           do {
             numMapUnits *= 1.2;
             divFactor = a / numMapUnits;
-            if (divFactor === 0) return undefined;
+
+            if (divFactor === 0) {
+              return undefined;
+            }
+
             realWidth = desiredWidth / divFactor;
           } while (realWidth < desiredWidth);
 
           var roundedMapUnits = numMapUnits;
           var d = Math.pow(10, Math.round(Math.log10(numMapUnits) + 0.5) - 1);
           roundedMapUnits = Math.round(roundedMapUnits / d);
-          if (roundedMapUnits < 2.5) roundedMapUnits = 2.5;
-          if (roundedMapUnits > 2.5 && roundedMapUnits < 7.5) roundedMapUnits = 5;
-          if (roundedMapUnits > 7.5) roundedMapUnits = 10;
+
+          if (roundedMapUnits < 2.5) {
+            roundedMapUnits = 2.5;
+          }
+
+          if (roundedMapUnits > 2.5 && roundedMapUnits < 7.5) {
+            roundedMapUnits = 5;
+          }
+
+          if (roundedMapUnits > 7.5) {
+            roundedMapUnits = 10;
+          }
+
           roundedMapUnits *= d;
           divFactor = desiredWidth / pixelsPerUnit / roundedMapUnits;
           realWidth = desiredWidth / divFactor;
@@ -4850,15 +5186,42 @@ var WMJSMap = /*#__PURE__*/function () {
           ctx.moveTo(offsetX + scaleBarProps.width * 2 + 1, scaleBarHeight - 2 + offsetY);
           ctx.lineTo(offsetX + scaleBarProps.width * 2 + 1, scaleBarHeight - 2 - 7 + offsetY);
           var units = '';
-          if (this.srs === 'EPSG:3411') units = 'meter';
-          if (this.srs === 'EPSG:3412') units = 'meter';
-          if (this.srs === 'EPSG:3575') units = 'meter';
-          if (this.srs === 'EPSG:4326') units = 'degrees';
-          if (this.srs === 'EPSG:28992') units = 'meter';
-          if (this.srs === 'EPSG:32661') units = 'meter';
-          if (this.srs === 'EPSG:3857') units = 'meter';
-          if (this.srs === 'EPSG:900913') units = 'meter';
-          if (this.srs === 'EPSG:102100') units = 'meter';
+
+          if (this.srs === 'EPSG:3411') {
+            units = 'meter';
+          }
+
+          if (this.srs === 'EPSG:3412') {
+            units = 'meter';
+          }
+
+          if (this.srs === 'EPSG:3575') {
+            units = 'meter';
+          }
+
+          if (this.srs === 'EPSG:4326') {
+            units = 'degrees';
+          }
+
+          if (this.srs === 'EPSG:28992') {
+            units = 'meter';
+          }
+
+          if (this.srs === 'EPSG:32661') {
+            units = 'meter';
+          }
+
+          if (this.srs === 'EPSG:3857') {
+            units = 'meter';
+          }
+
+          if (this.srs === 'EPSG:900913') {
+            units = 'meter';
+          }
+
+          if (this.srs === 'EPSG:102100') {
+            units = 'meter';
+          }
 
           if (units === 'meter') {
             if (scaleBarProps.mapunits > 1000) {
@@ -4884,7 +5247,11 @@ var WMJSMap = /*#__PURE__*/function () {
 
       if (isDefined(this.mouseGeoCoordXY)) {
         var roundingFactor = 1.0 / Math.pow(10, parseInt(Math.log((this.bbox.right - this.bbox.left) / this.width) / Math.log(10), 10) - 2);
-        if (roundingFactor < 1) roundingFactor = 1;
+
+        if (roundingFactor < 1) {
+          roundingFactor = 1;
+        }
+
         ctx.fillStyle = '#000000';
         var xText = Math.round(this.mouseGeoCoordXY.x * roundingFactor) / roundingFactor;
         var yText = Math.round(this.mouseGeoCoordXY.y * roundingFactor) / roundingFactor;
@@ -5084,32 +5451,18 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "rebuildMapDimensions",
     value: function rebuildMapDimensions() {
-      for (var j = 0; j < this.mapdimensions.length; j += 1) {
-        this.mapdimensions[j].used = false;
-      }
-
       for (var i = 0; i < this.layers.length; i += 1) {
-        for (var _j4 = 0; _j4 < this.layers[i].dimensions.length; _j4 += 1) {
-          var dim = this.layers[i].dimensions[_j4];
+        for (var j = 0; j < this.layers[i].dimensions.length; j += 1) {
+          var dim = this.layers[i].dimensions[j];
           var mapdim = this.getDimension(dim.name);
 
-          if (isDefined(mapdim)) {
-            mapdim.used = true;
-          } else {
+          if (!isDefined(mapdim)) {
             var newdim = dim.clone();
-            newdim.used = true;
             this.mapdimensions.push(newdim);
           }
         }
       }
 
-      for (var _j5 = 0; _j5 < this.mapdimensions.length; _j5 += 1) {
-        if (this.mapdimensions[_j5].used === false) {
-          this.mapdimensions.splice(_j5, 1);
-          _j5 -= 1;
-        }
-      }
-
       this.callBack.triggerEvent('onmapdimupdate');
     }
   }, {
@@ -5200,7 +5553,9 @@ var WMJSMap = /*#__PURE__*/function () {
     value: function toggleLayer(layer) {
       if (layer.enabled === true) {
         layer.enabled = false;
-      } else layer.enabled = true;
+      } else {
+        layer.enabled = true;
+      }
 
       this.calculateNumBaseLayers();
       this.rebuildMapDimensions();
@@ -5215,7 +5570,9 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "_getLayerIndex",
     value: function _getLayerIndex(layer) {
-      if (!layer) return undefined;
+      if (!layer) {
+        return undefined;
+      }
 
       for (var j = 0; j < this.layers.length; j += 1) {
         if (this.layers[j] === layer) {
@@ -5239,7 +5596,10 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "deleteLayer",
     value: function deleteLayer(layerToDelete) {
-      if (this.layers.length <= 0) return;
+      if (this.layers.length <= 0) {
+        return;
+      }
+
       layerToDelete.setAutoUpdate(false);
 
       var layerIndex = this._getLayerIndex(layerToDelete);
@@ -5397,14 +5757,18 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "setProjection",
     value: function setProjection(_srs, _bbox) {
-      if (!_srs) _srs = 'EPSG:4326';
+      if (!_srs) {
+        _srs = 'EPSG:4326';
+      }
 
       if (_typeof(_srs) === 'object') {
         _bbox = _srs.bbox;
         _srs = _srs.srs;
       }
 
-      if (!_srs) _srs = 'EPSG:4326';
+      if (!_srs) {
+        _srs = 'EPSG:4326';
+      }
 
       if (this.srs !== _srs) {
         this.defaultBBOX.setBBOX(_bbox);
@@ -5506,7 +5870,9 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "_setSize",
     value: function _setSize(w, h) {
-      if (!w || !h) return;
+      if (!w || !h) {
+        return;
+      }
 
       if (w < 4 || h < 4) {
         return;
@@ -5516,8 +5882,14 @@ var WMJSMap = /*#__PURE__*/function () {
       var projinfo = this.getProjection();
       this.width = w;
       this.height = h;
-      if (this.width < 4 || isNaN(this.width)) this.width = 4;
-      if (this.height < 4 || isNaN(this.height)) this.height = 4;
+
+      if (this.width < 4 || isNaN(this.width)) {
+        this.width = 4;
+      }
+
+      if (this.height < 4 || isNaN(this.height)) {
+        this.height = 4;
+      }
 
       if (!projinfo.srs || !projinfo.bbox) {
         debug(DebugType.Error);
@@ -5529,12 +5901,19 @@ var WMJSMap = /*#__PURE__*/function () {
         this.setProjection(projinfo.srs, projinfo.bbox);
       }
 
-      if (!this.baseDiv || !this.baseDiv.style) return;
+      if (!this.baseDiv || !this.baseDiv.style) {
+        return;
+      }
+
       Object.assign(this.baseDiv.style, {
         width: this.width,
         height: this.height
       });
-      if (!this.mainElement || !this.mainElement.style) return;
+
+      if (!this.mainElement || !this.mainElement.style) {
+        return;
+      }
+
       this.mainElement.style.width = "".concat(this.width, "px");
       this.mainElement.style.height = "".concat(this.height, "px");
       this.setBBOX(this.resizeBBOX);
@@ -5554,19 +5933,6 @@ var WMJSMap = /*#__PURE__*/function () {
       this.layersBusy = false;
       this.callBack.triggerEvent('onloadingcomplete');
     }
-  }, {
-    key: "isBusy",
-    value: function isBusy() {
-      if (this.suspendDrawing === true || this.mapBusy || this.layersBusy === 1) {
-        return true;
-      }
-
-      if (this.divBuffer[0].ready === false || this.divBuffer[1].ready === false) {
-        return true;
-      }
-
-      return false;
-    }
   }, {
     key: "_makeInfoHTML",
     value: function _makeInfoHTML() {
@@ -5618,7 +5984,9 @@ var WMJSMap = /*#__PURE__*/function () {
                   }
                 }
 
-                if (foundDim === false) infoHTML += '<td>-</td>';
+                if (foundDim === false) {
+                  infoHTML += '<td>-</td>';
+                }
               }
 
               infoHTML += '</tr>';
@@ -5661,7 +6029,10 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "display",
     value: function display() {
-      if (!this.divBuffer) return;
+      if (!this.divBuffer) {
+        return;
+      }
+
       this.divBuffer.display();
       this.drawnBBOX.setBBOX(this.bbox);
     }
@@ -5672,9 +6043,7 @@ var WMJSMap = /*#__PURE__*/function () {
     }
   }, {
     key: "draw",
-    value: function draw() {
-      var animationList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
+    value: function draw(animationList) {
       if (this.isDestroyed) {
         return;
       }
@@ -5695,7 +6064,6 @@ var WMJSMap = /*#__PURE__*/function () {
     /**
      * API Function called to draw the layers, fires getmap request and shows the layers on the screen
      */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
   }, {
     key: "_draw",
@@ -5714,8 +6082,7 @@ var WMJSMap = /*#__PURE__*/function () {
         this.needsRedraw = false;
         this.draw(this._animationList);
       }
-    } // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+    }
   }, {
     key: "_drawAndLoad",
     value: function _drawAndLoad(animationList) {
@@ -5876,9 +6243,17 @@ var WMJSMap = /*#__PURE__*/function () {
     key: "_updateBoundingBox",
     value: function _updateBoundingBox(_mapbbox) {
       var triggerEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      if (!this.divBuffer) return;
+
+      if (!this.divBuffer) {
+        return;
+      }
+
       var mapbbox = this.bbox;
-      if (isDefined(_mapbbox)) mapbbox = _mapbbox;
+
+      if (isDefined(_mapbbox)) {
+        mapbbox = _mapbbox;
+      }
+
       this.updateBBOX.setBBOX(mapbbox);
       this.divBuffer.setBBOX(this.updateBBOX, this.drawnBBOX);
       this.drawnBBOX.setBBOX(mapbbox);
@@ -5911,7 +6286,9 @@ var WMJSMap = /*#__PURE__*/function () {
         }
 
         this.callBack.triggerEvent('onlayeradd');
-      } else this.baseLayers = undefined;
+      } else {
+        this.baseLayers = undefined;
+      }
     }
   }, {
     key: "setBaseLayers",
@@ -5929,7 +6306,9 @@ var WMJSMap = /*#__PURE__*/function () {
         }
 
         this.callBack.triggerEvent('onlayerchange');
-      } else this.baseLayers = undefined;
+      } else {
+        this.baseLayers = undefined;
+      }
     }
   }, {
     key: "getBaseLayers",
@@ -5950,7 +6329,10 @@ var WMJSMap = /*#__PURE__*/function () {
     key: "mouseWheelEvent",
     value: function mouseWheelEvent(event) {
       preventdefaultEvent(event);
-      if (this.mouseWheelBusy === 1) return;
+
+      if (this.mouseWheelBusy === 1) {
+        return;
+      }
 
       var _this$getMouseCoordin = this.getMouseCoordinatesForDocument(event),
           x = _this$getMouseCoordin.x,
@@ -6009,7 +6391,10 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      if (!this.initialized) return;
+      if (!this.initialized) {
+        return;
+      }
+
       this.stopAnimating();
 
       for (var i = this.layers.length - 1; i >= 0; i -= 1) {
@@ -6099,7 +6484,10 @@ var WMJSMap = /*#__PURE__*/function () {
       var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'text/html';
 
       /* For invalid layers we cannot build an url */
-      if (!layer.name) return '';
+      if (!layer.name) {
+        return '';
+      }
+
       var request = WMJScheckURL(layer.service);
       request += "&SERVICE=WMS&REQUEST=GetFeatureInfo&VERSION=".concat(layer.version);
       request += "&LAYERS=".concat(URLEncode(layer.name));
@@ -6270,7 +6658,10 @@ var WMJSMap = /*#__PURE__*/function () {
           this.oldMapMode = undefined;
         }
       } else {
-        if (this.oldMapMode === undefined) this.oldMapMode = this.mapMode;
+        if (this.oldMapMode === undefined) {
+          this.oldMapMode = this.mapMode;
+        }
+
         this.mapMode = 'zoom';
       }
 
@@ -6464,10 +6855,21 @@ var WMJSMap = /*#__PURE__*/function () {
 
         if (foundBBOXRib === true || this.resizingBBOXEnabled !== '' && this.mouseDownPressed === 1) {
           if (this.mouseDownPressed === 1) {
-            if (this.resizingBBOXEnabled === 'left') tlpx.x = this.mouseX;
-            if (this.resizingBBOXEnabled === 'top') tlpx.y = this.mouseY;
-            if (this.resizingBBOXEnabled === 'right') brpx.x = this.mouseX;
-            if (this.resizingBBOXEnabled === 'bottom') brpx.y = this.mouseY;
+            if (this.resizingBBOXEnabled === 'left') {
+              tlpx.x = this.mouseX;
+            }
+
+            if (this.resizingBBOXEnabled === 'top') {
+              tlpx.y = this.mouseY;
+            }
+
+            if (this.resizingBBOXEnabled === 'right') {
+              brpx.x = this.mouseX;
+            }
+
+            if (this.resizingBBOXEnabled === 'bottom') {
+              brpx.y = this.mouseY;
+            }
 
             if (this.resizingBBOXEnabled === 'topleft') {
               tlpx.x = this.mouseX;
@@ -6520,10 +6922,15 @@ var WMJSMap = /*#__PURE__*/function () {
 
         this.mouseUpX = this.mouseX;
         this.mouseUpY = this.mouseY;
-        if (this.mapPanning === 0) return;
+
+        if (this.mapPanning === 0) {
+          return;
+        }
 
         if (this.mouseDownPressed === 1) {
-          if (this.mapMode === 'zoomout') this.zoomOut();
+          if (this.mapMode === 'zoomout') {
+            this.zoomOut();
+          }
         }
 
         this.mouseDownPressed = 0;
@@ -6615,8 +7022,13 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "_mouseDragStart",
     value: function _mouseDragStart(x, y) {
-      if (this.mapMode === 'pan') this._mapPanStart(x, y);
-      if (this.mapMode === 'zoom') this._mapZoomStart();
+      if (this.mapMode === 'pan') {
+        this._mapPanStart(x, y);
+      }
+
+      if (this.mapMode === 'zoom') {
+        this._mapZoomStart();
+      }
     }
   }, {
     key: "mouseDrag",
@@ -6627,16 +7039,31 @@ var WMJSMap = /*#__PURE__*/function () {
         this.mouseDragging = 1;
       }
 
-      if (this.mapMode === 'pan') this._mapPan(x, y);
-      if (this.mapMode === 'zoom') this._mapZoom();
+      if (this.mapMode === 'pan') {
+        this._mapPan(x, y);
+      }
+
+      if (this.mapMode === 'zoom') {
+        this._mapZoom();
+      }
     }
   }, {
     key: "mouseDragEnd",
     value: function mouseDragEnd(x, y) {
-      if (this.mouseDragging === 0) return;
+      if (this.mouseDragging === 0) {
+        return;
+      }
+
       this.mouseDragging = 0;
-      if (this.mapMode === 'pan') this._mapPanEnd(x, y);
-      if (this.mapMode === 'zoom') this._mapZoomEnd();
+
+      if (this.mapMode === 'pan') {
+        this._mapPanEnd(x, y);
+      }
+
+      if (this.mapMode === 'zoom') {
+        this._mapZoomEnd();
+      }
+
       this.callBack.triggerEvent('mapdragend', {
         map: this,
         x: this.mouseUpX,
@@ -6669,7 +7096,9 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "_mapPan",
     value: function _mapPan(x, y) {
-      if (this.mapPanning === 0) return;
+      if (this.mapPanning === 0) {
+        return;
+      }
 
       if (this.mouseX < 0 || this.mouseY < 0 || this.mouseX > this.mainElement.clientWidth || this.mouseY > this.mainElement.clientHeight) {
         this._mapPanEnd(x, y);
@@ -6698,7 +7127,11 @@ var WMJSMap = /*#__PURE__*/function () {
     key: "_mapPanEnd",
     value: function _mapPanEnd(x, y) {
       this.baseDiv.style.cursor = 'default';
-      if (this.mapPanning === 0) return;
+
+      if (this.mapPanning === 0) {
+        return;
+      }
+
       this.mapPanning = 0;
       var mapPanGeoCoords = this.getGeoCoordFromPixelCoord({
         x: x,
@@ -6756,7 +7189,10 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "_mapZoom",
     value: function _mapZoom() {
-      if (this.mapZooming === 0) return;
+      if (this.mapZooming === 0) {
+        return;
+      }
+
       var x = this.mouseX - this.mouseDownX;
       var y = this.mouseY - this.mouseDownY;
 
@@ -6773,12 +7209,16 @@ var WMJSMap = /*#__PURE__*/function () {
       if (w < 0) {
         w = -w;
         this.divZoomBox.style.left = "".concat(this.mouseX, "px");
-      } else this.divZoomBox.style.left = "".concat(this.mouseDownX, "px");
+      } else {
+        this.divZoomBox.style.left = "".concat(this.mouseDownX, "px");
+      }
 
       if (h < 0) {
         h = -h;
         this.divZoomBox.style.top = "".concat(this.mouseY, "px");
-      } else this.divZoomBox.style.top = "".concat(this.mouseDownY, "px");
+      } else {
+        this.divZoomBox.style.top = "".concat(this.mouseDownY, "px");
+      }
 
       this.divZoomBox.style.width = "".concat(w, "px");
       this.divZoomBox.style.height = "".concat(h, "px");
@@ -6789,10 +7229,18 @@ var WMJSMap = /*#__PURE__*/function () {
       var x = this.mouseUpX - this.mouseDownX;
       var y = this.mouseUpY - this.mouseDownY;
       this.baseDiv.style.cursor = 'default';
-      if (this.mapZooming === 0) return;
+
+      if (this.mapZooming === 0) {
+        return;
+      }
+
       this.mapZooming = 0;
       this.divZoomBox.style.display = 'none';
-      if (x < 0 && y < 0) return;
+
+      if (x < 0 && y < 0) {
+        return;
+      }
+
       var zoomBBOXPixels = new WMBBOX();
 
       if (x < 0) {
@@ -6869,7 +7317,10 @@ var WMJSMap = /*#__PURE__*/function () {
         ratio = 1;
       }
 
-      if (ratio < 0) ratio = -ratio;
+      if (ratio < 0) {
+        ratio = -ratio;
+      }
+
       var screenRatio = this.width / this.height; // Is W > H?
 
       if (ratio > screenRatio) {
@@ -6918,8 +7369,14 @@ var WMJSMap = /*#__PURE__*/function () {
     key: "getGeoCoordFromPixelCoord",
     value: function getGeoCoordFromPixelCoord(coordinates, _bbox) {
       var mybbox = this.bbox;
-      if (_bbox) mybbox = _bbox;
-      if (!isDefined(coordinates)) return undefined;
+
+      if (_bbox) {
+        mybbox = _bbox;
+      }
+
+      if (!isDefined(coordinates)) {
+        return undefined;
+      }
 
       try {
         var lon = coordinates.x / this.width * (mybbox.right - mybbox.left) + mybbox.left;
@@ -7046,9 +7503,19 @@ var WMJSMap = /*#__PURE__*/function () {
       var w = this.width;
       var h = this.height;
       var b = this.updateBBOX;
-      if (isDefined(_width)) w = _width;
-      if (isDefined(_height)) h = _height;
-      if (isDefined(_bbox)) b = _bbox;
+
+      if (isDefined(_width)) {
+        w = _width;
+      }
+
+      if (isDefined(_height)) {
+        h = _height;
+      }
+
+      if (isDefined(_bbox)) {
+        b = _bbox;
+      }
+
       var x = w * (coordinates.x - b.left) / (b.right - b.left);
       var y = h * (coordinates.y - b.top) / (b.bottom - b.top);
       return {
@@ -7066,7 +7533,10 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "removeListener",
     value: function removeListener(name, f) {
-      if (this.isDestroyed) return;
+      if (this.isDestroyed) {
+        return;
+      }
+
       this.callBack.removeEvents(name, f);
     }
   }, {
@@ -7207,23 +7677,26 @@ var WMJSMap = /*#__PURE__*/function () {
             this.WMProjectionTempUndo[j] = this.WMProjectionUndo[j];
           }
 
-          for (var _j6 = 0; _j6 <= this.UndoPointer; _j6 += 1) {
-            this.WMProjectionUndo[_j6] = this.WMProjectionTempUndo[this.UndoPointer - _j6];
+          for (var _j4 = 0; _j4 <= this.UndoPointer; _j4 += 1) {
+            this.WMProjectionUndo[_j4] = this.WMProjectionTempUndo[this.UndoPointer - _j4];
           }
 
           this.UndoPointer = 0;
         }
 
-        for (var _j7 = this.MaxUndos - 1; _j7 > 0; _j7 -= 1) {
-          this.WMProjectionUndo[_j7].bbox.setBBOX(this.WMProjectionUndo[_j7 - 1].bbox);
+        for (var _j5 = this.MaxUndos - 1; _j5 > 0; _j5 -= 1) {
+          this.WMProjectionUndo[_j5].bbox.setBBOX(this.WMProjectionUndo[_j5 - 1].bbox);
 
-          this.WMProjectionUndo[_j7].srs = this.WMProjectionUndo[_j7 - 1].srs;
+          this.WMProjectionUndo[_j5].srs = this.WMProjectionUndo[_j5 - 1].srs;
         }
 
         this.WMProjectionUndo[0].bbox.setBBOX(this.bbox);
         this.WMProjectionUndo[0].srs = this.srs;
         this.NrOfUndos += 1;
-        if (this.NrOfUndos > this.MaxUndos) this.NrOfUndos = this.MaxUndos;
+
+        if (this.NrOfUndos > this.MaxUndos) {
+          this.NrOfUndos = this.MaxUndos;
+        }
       }
 
       this.DoRedo = 0;
@@ -7250,7 +7723,9 @@ var WMJSMap = /*#__PURE__*/function () {
 
       if (isDefined(ratio) === false) {
         ratio = 1;
-      } else if (ratio === 0) return;
+      } else if (ratio === 0) {
+        return;
+      }
 
       a *= ratio;
       this.zoomTo(new WMBBOX(this.resizeBBOX.left - a, this.resizeBBOX.bottom - a, this.resizeBBOX.right + a, this.resizeBBOX.top + a));
@@ -7271,9 +7746,16 @@ var WMJSMap = /*#__PURE__*/function () {
         this.divBoundingBox.displayed = true;
       }
 
-      if (this.divBoundingBox.displayed !== true) return;
+      if (this.divBoundingBox.displayed !== true) {
+        return;
+      }
+
       var b = this.bbox;
-      if (isDefined(_mapbbox)) b = _mapbbox;
+
+      if (isDefined(_mapbbox)) {
+        b = _mapbbox;
+      }
+
       var coord1 = this.getPixelCoordFromGeoCoord({
         x: this.divBoundingBox.bbox.left,
         y: this.divBoundingBox.bbox.top
@@ -7889,7 +8371,10 @@ var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, op
 
   /* Make the getCapabilitiesJSONrequest */
   var headers = [];
-  if (options && options.headers) headers = options.headers;
+
+  if (options && options.headers) {
+    headers = options.headers;
+  }
 
   if (!isDefined(service)) {
     fail(I18n.no_service_defined.text);
@@ -7993,7 +8478,10 @@ var WMJSService = /*#__PURE__*/function () {
     value: function checkVersion111(jsonData) {
       try {
         var rootLayer = jsonData.WMT_MS_Capabilities.Capability.Layer;
-        if (!rootLayer) throw new Error('No 111 layer');
+
+        if (!rootLayer) {
+          throw new Error('No 111 layer');
+        }
       } catch (e) {
         var message = this.checkException(jsonData);
 
@@ -8015,7 +8503,10 @@ var WMJSService = /*#__PURE__*/function () {
     value: function checkVersion130(jsonData) {
       try {
         var rootLayer = jsonData.WMS_Capabilities.Capability.Layer;
-        if (!rootLayer) throw new Error('No 130 layer');
+
+        if (!rootLayer) {
+          throw new Error('No 130 layer');
+        }
       } catch (e) {
         var message = this.checkException(jsonData);
 
@@ -8188,7 +8679,8 @@ var WMJSService = /*#__PURE__*/function () {
             if (WMSCapabilities.Service.OnlineResource.value) {
               _this.onlineresource = WMSCapabilities.Service.OnlineResource.value;
             } else {
-              _this.onlineresource = WMSCapabilities.Service.OnlineResource.attr['xlink:href'];
+              _this.onlineresource = // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              WMSCapabilities.Service.OnlineResource.attr['xlink:href'];
             }
           } catch (e) {
             _this.onlineresource = I18n.not_available_message.text;
@@ -8225,7 +8717,9 @@ var WMJSService = /*#__PURE__*/function () {
 
           if (se) {
             try {
-              if (se.attr.code) code = se.attr.code;
+              if (se.attr.code) {
+                code = se.attr.code;
+              }
             } catch (e) {// do nothing
             }
 
@@ -8252,8 +8746,6 @@ var WMJSService = /*#__PURE__*/function () {
     value: function getNodes(succes, failure, forceReload, options) {
       var _this2 = this;
 
-      this.nodeCache = undefined;
-
       if (!failure) {
         // eslint-disable-next-line no-param-reassign
         failure = function failure(msg) {
@@ -8551,7 +9043,13 @@ var WMLayer = /*#__PURE__*/function () {
       this.getmapURL = options.service;
       this.getfeatureinfoURL = options.service;
       this.getlegendgraphicURL = options.service;
-      if (options.active === true) this.active = true;else this.active = false;
+
+      if (options.active === true) {
+        this.active = true;
+      } else {
+        this.active = false;
+      }
+
       this.name = options.name;
 
       if (options.getgraphinfoURL) {
@@ -8574,16 +9072,29 @@ var WMLayer = /*#__PURE__*/function () {
         this.id = options.id;
       }
 
-      if (options.format) this.format = options.format;else this.format = 'image/png';
+      if (options.format) {
+        this.format = options.format;
+      } else {
+        this.format = 'image/png';
+      }
 
       if (isDefined(options.opacity)) {
         this.opacity = options.opacity;
       }
 
-      if (options.title) this.title = options.title;
+      if (options.title) {
+        this.title = options.title;
+      }
+
       this["abstract"] = I18n.not_available_message.text;
-      if (options.enabled === false) this.enabled = false;
-      if (options.keepOnTop === true) this.keepOnTop = true;
+
+      if (options.enabled === false) {
+        this.enabled = false;
+      }
+
+      if (options.keepOnTop === true) {
+        this.keepOnTop = true;
+      }
 
       if (options.transparent === false) {
         this.transparent = false;
@@ -8775,11 +9286,19 @@ var WMLayer = /*#__PURE__*/function () {
     key: "setDimension",
     value: function setDimension(name, value) {
       var updateMapDimensions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-      if (!isDefined(value)) return;
+
+      if (!isDefined(value)) {
+        return;
+      }
+
       var dimIndex = this.dimensions.findIndex(function (dim) {
         return dim.name === name;
       });
-      if (dimIndex < 0) return;
+
+      if (dimIndex < 0) {
+        return;
+      }
+
       var dim = this.dimensions[dimIndex];
       dim.setValue(value);
       this.handleReferenceTime(name, value, updateMapDimensions);
@@ -9154,10 +9673,22 @@ var WMLayer = /*#__PURE__*/function () {
 
       for (var j = 0; j < this.styles.length; j += 1) {
         if (this.styles[j].name === styleName) {
-          if (nextPrev === -1) j -= 1;
-          if (nextPrev === 1) j += 1;
-          if (j < 0) j = this.styles.length - 1;
-          if (j > this.styles.length - 1) j = 0;
+          if (nextPrev === -1) {
+            j -= 1;
+          }
+
+          if (nextPrev === 1) {
+            j += 1;
+          }
+
+          if (j < 0) {
+            j = this.styles.length - 1;
+          }
+
+          if (j > this.styles.length - 1) {
+            j = 0;
+          }
+
           return this.styles[j];
         }
       }
@@ -9179,7 +9710,11 @@ var WMLayer = /*#__PURE__*/function () {
       var dimIndex = this.dimensions.findIndex(function (dim) {
         return dim.name === name;
       });
-      if (dimIndex < 0) return undefined;
+
+      if (dimIndex < 0) {
+        return undefined;
+      }
+
       return this.dimensions[dimIndex];
     }
     /**