@opengeoweb/webmap 2.1.3 → 2.2.1

package/{webmap.umd.js → index.umd.js}

@@ -109,6 +109,16 @@
           finally { if (e) throw e.error; }
       }
       return ar;
+  }
+
+  function __spreadArray(to, from, pack) {
+      if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+          if (ar || !(i in from)) {
+              if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+              ar[i] = from[i];
+          }
+      }
+      return to.concat(ar || Array.prototype.slice.call(from));
   }
 
   /* *
@@ -381,6 +391,53 @@
     var iso = prf(date.getUTCFullYear(), 4) + "-" + prf(date.getUTCMonth() + 1, 2) + "-" + prf(date.getUTCDate(), 2) + "T" + prf(date.getUTCHours(), 2) + ":" + prf(date.getUTCMinutes(), 2) + ":" + prf(date.getUTCSeconds(), 2) + "Z";
     return iso;
   };
+  /**
+   * Helper function to figure out the styles from the WMS layer object from the WMS GetCapabilties document
+   * @param layerObjectFromWMS The layer object from the WMS GetCapabilities JSON document
+   * @returns Style[] Array of style objects.
+   */
+
+  var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS) {
+    /* Get the Style object */
+    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 */
+
+    return layerStyles.map(function (layerStyle) {
+      var style = {
+        title: 'default',
+        name: 'default',
+        legendURL: '',
+        "abstract": 'No abstract available'
+      };
+
+      try {
+        style.title = layerStyle.Title.value;
+      } catch (e) {
+        /* Do nothing */
+      }
+
+      try {
+        style.name = layerStyle.Name.value;
+      } catch (e) {
+        /* Do nothing */
+      }
+
+      try {
+        style.legendURL = layerStyle.LegendURL.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
+
+      try {
+        style["abstract"] = layerStyle.Abstract.value;
+      } catch (e) {
+        /* Do nothing */
+      }
+
+      return style;
+    });
+  };
 
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
@@ -398,6 +455,14 @@
    * Copyright 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2020 - Finnish Meteorological Institute (FMI)
    * */
+  /**
+   * Returns the current time in ms
+   * @returns the current time in ms
+   */
+
+  var getCurrentImageTime = function getCurrentImageTime() {
+    return new Date().getTime();
+  };
   /**
    * WMImage provides an API to the HTML image element. It is used for caching and easier access to images.
    */
@@ -419,6 +484,8 @@
       this._isLoaded = undefined;
       this._isLoading = undefined;
       this._hasError = undefined;
+      this._imageTimeStampAtError = getCurrentImageTime();
+      this._numFailedAttempts = 0;
       this.srcToLoad = src;
       this.loadEventCallback = callback;
       this.el = new Image();
@@ -437,6 +504,9 @@
       this.hasError = this.hasError.bind(this);
       this._load = this._load.bind(this);
       this.load = this.load.bind(this);
+      this.forceReload = this.forceReload.bind(this);
+      this.getLastErrorMSecondsAgo = this.getLastErrorMSecondsAgo.bind(this);
+      this.getNumFailedAttempts = this.getNumFailedAttempts.bind(this);
       this._loadEvent = this._loadEvent.bind(this);
       this.getWidth = this.getWidth.bind(this);
       this.getHeight = this.getHeight.bind(this);
@@ -447,6 +517,9 @@
         _this._loadEvent(false);
       });
       this.el.addEventListener('error', function () {
+        _this._imageTimeStampAtError = getCurrentImageTime();
+        _this._numFailedAttempts += 1;
+
         _this._loadEvent(true);
       });
 
@@ -464,6 +537,8 @@
       this._isLoaded = false;
       this._isLoading = false;
       this._hasError = false;
+      this._numFailedAttempts = 0;
+      this._imageTimeStampAtError = getCurrentImageTime();
     };
     /**
      * Returns true if the image has been loaded
@@ -482,6 +557,23 @@
     WMImage.prototype.isLoading = function () {
       return this._isLoading;
     };
+    /**
+     * Get the amount of milliseconds since the image experienced an image load.
+     * @returns milliseconds since the image had an error
+     */
+
+
+    WMImage.prototype.getLastErrorMSecondsAgo = function () {
+      return getCurrentImageTime() - this._imageTimeStampAtError;
+    };
+    /**
+     * @returns The number of failed attempts for this image
+     */
+
+
+    WMImage.prototype.getNumFailedAttempts = function () {
+      return this._numFailedAttempts;
+    };
     /**
      * Set source of image, but it will not load the image yet.
      * @param src URL of the image to load
@@ -506,6 +598,8 @@
         return;
       }
 
+      this._numFailedAttempts = 0;
+      this._imageTimeStampAtError = getCurrentImageTime();
       this._isLoaded = false;
     };
     /**
@@ -541,6 +635,13 @@
       this._load();
     };
 
+    WMImage.prototype.forceReload = function () {
+      this._isLoaded = false;
+      this._srcLoaded = undefined;
+
+      this._load();
+    };
+
     WMImage.prototype._getImageWithHeaders = function (url, headers) {
       var _this = this;
 
@@ -609,8 +710,12 @@
         var hostName = splittedHREF[0] + "//" + splittedHREF[1] + "/";
         this.srcToLoad = hostName + this.srcToLoad;
       }
+      /*
+       * If the image has already loaded this source succesfully (without error), simply trigger the loadevent.
+       */
+
 
-      if (this.srcToLoad === this._srcLoaded) {
+      if (this.srcToLoad === this._srcLoaded && !this._hasError) {
         this._loadEvent(false);
 
         return;
@@ -1272,13 +1377,14 @@
     /* It is not in the list, so add it */
 
     if (imageIsAlreadyIndex === -1) {
-      sharedImagesList[sigImageUrl].push(newLayer);
-    }
-    /* Ensure that the oldest images are removed, keep a maximum of 10 images per signature url */
+      /* Ensure that the oldest images are removed, keep a maximum of 10 images per signature url */
+      while (sharedImagesList[sigImageUrl].length >= 10) {
+        sharedImagesList[sigImageUrl].pop();
+      }
+      /* Add it to the beginning of the array for efficieny in searching at a later stage */
 
 
-    while (sharedImagesList[sigImageUrl].length > 10) {
-      sharedImagesList[sigImageUrl].splice(0, 1);
+      sharedImagesList[sigImageUrl].unshift(newLayer);
     }
   };
   /**
@@ -1303,38 +1409,17 @@
     }
   };
   /**
-   * Algorithm two determine how much two bboxes are similar
-   * @param rect1
-   * @param rect2
-   * @returns
-   */
-
-  var geClosestBBox = function geClosestBBox(rect1, rect2) {
-    var diffTLX = rect1.left - rect2.left;
-    var diffTLY = rect1.top - rect2.top;
-    var diffBRX = rect1.right - rect2.right;
-    var diffBRY = rect1.bottom - rect2.bottom;
-    return Math.sqrt(diffTLX * diffTLX + diffTLY * diffTLY) + Math.sqrt(diffBRX * diffBRX + diffBRY * diffBRY);
-  };
-  /**
-   * Sort the imageslist by overlapping area, highest area first
+   * Sort the imageslist by imagedate, newewst image first.
    * @param imagesList
-   * @param bbox
    * @returns
    */
 
-  var sortByOverlappingArea = function sortByOverlappingArea(imagesList, bbox) {
-    var toSort = imagesList.map(function (im) {
-      return {
-        dist: geClosestBBox(im.bbox, bbox),
-        image: im
-      };
-    });
-    var sorted = toSort.sort(function (a, b) {
-      return a.dist > b.dist ? 1 : -1;
+  var sortByImageDate = function sortByImageDate(imagesList) {
+    var sorted = imagesList.sort(function (a, b) {
+      return a.imageAge < b.imageAge ? 1 : -1;
     });
     return sorted.map(function (i) {
-      return i.image;
+      return i;
     });
   };
   /**
@@ -1345,17 +1430,18 @@
    * @returns A canvasLayer, containing the new image source with its geo properties
    */
 
-  var getAlternativeImage = function getAlternativeImage(imageUrl, imageStore, bbox) {
+  var getAlternativeImage = function getAlternativeImage(imageUrl, imageStore, // eslint-disable-next-line no-unused-vars
+  _bbox) {
     var sigImageUrl = makeQueryStringWithoutGeoInfo(imageUrl);
     var imagesForUrl = sharedImagesList[sigImageUrl];
 
     if (imagesForUrl && imagesForUrl.length > 0) {
-      var sortedImagesForUrl = sortByOverlappingArea(imagesForUrl, bbox);
-      /* Find the first image in this list which is also loaded */
+      var sortedImagesForUrl = sortByImageDate(imagesForUrl);
+      /* Find the first image in this list which is also loaded and has no error */
 
       var index = sortedImagesForUrl.findIndex(function (altImage) {
         var cachedImage = imageStore.getImageForSrc(altImage.imageSource);
-        return cachedImage && cachedImage.isLoaded();
+        return cachedImage && cachedImage.isLoaded() && !cachedImage.isLoading() && !cachedImage.hasError();
       });
       if (index !== -1) return sortedImagesForUrl[index];
     }
@@ -1516,16 +1602,29 @@
       for (var j = 0; j < this.layers.length; j += 1) {
         var imageToDisplay = this._imageStore.getImageForSrc(this.layers[j].imageSource);
 
-        if (!imageToDisplay || imageToDisplay.isLoaded() === false) {
-          /* Find closest image */
+        if (imageToDisplay && imageToDisplay.isLoaded() && !imageToDisplay.isLoading() && !imageToDisplay.hasError()) {
+          // Draw this image, it is loaded and OK
+          this._drawImage(this.layers[j]);
+        } else {
+          /**
+           * Check if this image has an error.
+           * If the error has occured some time ago, and the amount of retries is low, just retry to load the image.
+           */
+          if (imageToDisplay.hasError()) {
+            if (imageToDisplay.isLoading() === false && imageToDisplay.getLastErrorMSecondsAgo() > 5000) {
+              if (imageToDisplay.getNumFailedAttempts() < 10) {
+                imageToDisplay.forceReload();
+              }
+            }
+          }
+          /* Find closest alternative and display instead image */
+
+
           var im = getAlternativeImage(this.layers[j].imageSource, this._imageStore, this._currentnewbbox);
 
           if (im) {
             this._drawImage(im);
           }
-        } else {
-          // Draw
-          this._drawImage(this.layers[j]);
         }
       }
 
@@ -1612,6 +1711,7 @@
 
       var newLayer = {
         imageSource: imageSource,
+        imageAge: getCurrentImageTime(),
         opacity: opacity,
         bbox: {
           left: bbox.left,
@@ -1840,8 +1940,9 @@
         for (var i = 0; i < this._map.animationList[nextStep].requests.length; i += 1) {
           var url = this._map.animationList[nextStep].requests[i].url;
           var image = getMapImageStore.getImageForSrc(url);
+          /* Get a loaded image which has no error */
 
-          if (image && image.isLoaded()) {
+          if (image && image.isLoaded() && !image.isLoading() && !image.hasError()) {
             numReady += 1;
           } else {
             /* Check if a similar image is available instead, then we can continue with the smoother animation */
@@ -1849,11 +1950,14 @@
 
             if (im) {
               numReady += 1;
+            } else if (!(image && image.isLoading())) {
+              /* No alternatives and current image is not loading, so lets continue the animation */
+              numReady += 1;
             }
           }
         }
 
-        if (numReady === this._map.animationList[nextStep].requests.length) {
+        if (numReady >= this._map.animationList[nextStep].requests.length) {
           continueAnimation = true;
         }
 
@@ -1906,9 +2010,11 @@
                 this._map.setDimension(animationStep.name, animationStep.value, false);
 
                 this._map.animationList[index].imagesInPrefetch = prefetch(this._map.animationList[index].requests);
-                getNumImagesLoading += this._map.animationList[index].imagesInPrefetch.length; // imageStore.getNumImagesLoading();
+                getNumImagesLoading = this._imageStore.getNumImagesLoading();
 
-                if (getNumImagesLoading > maxSimultaneousLoads - 1) break;
+                if (getNumImagesLoading > maxSimultaneousLoads - 1) {
+                  break;
+                }
               }
             }
           }
@@ -2846,6 +2952,7 @@
       this.initialize = this.initialize.bind(this);
       this.getValue = this.getValue.bind(this);
       this.setValue = this.setValue.bind(this);
+      this.getValues = this.setValue.bind(this);
       this.setClosestValue = this.setClosestValue.bind(this);
       this.addTimeRangeDurationToValue = this.addTimeRangeDurationToValue.bind(this);
       this.setTimeRangeDuration = this.setTimeRangeDuration.bind(this);
@@ -2854,6 +2961,7 @@
       this.get = this.get.bind(this);
       this.getFirstValue = this.getFirstValue.bind(this);
       this.getLastValue = this.getLastValue.bind(this);
+      this.getDimInterval = this.getDimInterval.bind(this);
       this.getIndexForValue = this.getIndexForValue.bind(this);
       this.size = this.size.bind(this);
       this.clone = this.clone.bind(this);
@@ -3132,6 +3240,16 @@
 
       this.currentValue = value;
     };
+    /**
+     * Returns values of the dimension, according to values defined in WMS specification, e.g. 2011-01-01T00:00:00Z/2012-01-01T00:00:00Z/P1M or list of values.
+     * @returns
+     */
+
+
+    WMJSDimension.prototype.getValues = function () {
+      this.initialize();
+      return this.values;
+    };
 
     WMJSDimension.prototype.setClosestValue = function (newValue, evenWhenOutsideRange) {
       if (newValue === void 0) {
@@ -3278,6 +3396,16 @@
       if (this._type === 'anyvalue') return this._allValues[index];
       return null;
     };
+    /**
+     * Hint about the timestep size / time resolution of this dimension.
+     * @returns The dimTimeInterval
+     */
+
+
+    WMJSDimension.prototype.getDimInterval = function () {
+      this.initialize();
+      return this.dimTimeInterval;
+    };
     /**
      * Shorthand functionf or getValueForIndex
      */
@@ -4937,7 +5065,7 @@
           resolve(_this);
         };
 
-        layer.parseLayer(done, undefined);
+        layer.parseLayer(done, undefined, 'WMJSMap addLayer');
       });
     };
 
@@ -7412,13 +7540,15 @@
           keywords: toArray(layers[j].KeywordList && layers[j].KeywordList.Keyword).map(function (keywords) {
             return keywords.value;
           }),
-          "abstract": layers[j].Abstract && layers[j].Abstract.value
+          "abstract": layers[j].Abstract && layers[j].Abstract.value,
+          styles: addStylesForLayer(layers[j])
         };
       } else {
         var nodeText = isNull(layers[j].Title) ? 'Layer' : layers[j].Title.value;
         nodeObject = {
           text: nodeText,
-          leaf: isleaf
+          leaf: isleaf,
+          styles: []
         };
       }
 
@@ -7426,7 +7556,7 @@
 
       if (layers[j].Layer) {
         nodeObject.children = [];
-        recursivelyFindLayer(toArray(layers[j].Layer), nodeObject.children, path + layers[j].Title.value);
+        recursivelyFindLayer(toArray(layers[j].Layer), nodeObject.children, __spreadArray(__spreadArray([], __read(path)), [layers[j].Title.value]));
       }
     } // Sort nodes alphabetically.
 
@@ -7670,12 +7800,7 @@
 
         WMJSGetCapabilities(this.service, succes, fail_1, options);
       } else {
-        /* The callbacks are not allowed to be called in the scope of this object.
-          By using window.setTimeOut they are externally called
-        */
-        window.setTimeout(function () {
-          succescallback(_this.getcapabilitiesDoc);
-        }, 1);
+        succescallback(this.getcapabilitiesDoc);
       }
     }; // eslint-disable-next-line class-methods-use-this
 
@@ -7751,7 +7876,7 @@
           nodeStructure.text = I18n.unnamed_service.text;
         }
 
-        recursivelyFindLayer(WMSLayers, nodeStructure.children, '');
+        recursivelyFindLayer(WMSLayers, nodeStructure.children, []);
         succes(nodeStructure);
       };
 
@@ -7861,55 +7986,6 @@
     LayerType["baseLayer"] = "baseLayer";
     LayerType["overLayer"] = "overLayer";
   })(exports.LayerType || (exports.LayerType = {}));
-  /**
-   * Helper function to figure out the styles from the WMS layer object from the WMS GetCapabilties document
-   * @param layerStyles The layer styles object from the WMS GetCapabilities
-   * @param layer The WMLayer to configure
-   */
-
-
-  var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS, layer) {
-    /* Get the Style object */
-    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 */
-
-    for (var k = 0; k < layerStyles.length; k += 1) {
-      var layerStyle = layerStyles[k];
-      var style = {
-        title: 'default',
-        name: 'default',
-        legendURL: '',
-        "abstract": 'No abstract available'
-      };
-
-      try {
-        style.title = layerStyle.Title.value;
-      } catch (e) {
-        /* Do nothing */
-      }
-
-      try {
-        style.name = layerStyle.Name.value;
-      } catch (e) {
-        /* Do nothing */
-      }
-
-      try {
-        style.legendURL = layerStyle.LegendURL.OnlineResource.attr['xlink:href'];
-      } catch (e) {
-        /* Do nothing */
-      }
-
-      try {
-        style["abstract"] = layerStyle.Abstract.value;
-      } catch (e) {
-        /* Do nothing */
-      }
-
-      layer.styles.push(style);
-    }
-  };
   /**
    * Helper function to figure out the dimensions from the WMS layer object (From WMS GetCapabilities). Parses both WMS 1.1.1 and WMS 1.3.0.
    * @param layerObjectFromWMS The corresponding layer object from the WMS GetCapabilities.
@@ -7917,6 +7993,7 @@
    * @param layerDimNamesToRemove A set of dimensions names which are flagged for removal, this function removes the dimension from the set if found in the layer.
    */
 
+
   var addDimsForLayer = function addDimsForLayer(layerObjectFromWMS, layer, layerDimNamesToRemove) {
     /* Information from the WMS GetCapabilities document */
     var layerDims = toArray(layerObjectFromWMS.Dimension);
@@ -8025,13 +8102,17 @@
    */
 
   var configureStyles = function configureStyles(nestedLayerPath, wmLayer) {
+    var _a;
     /* Now add the previous parent layer objects style info (inherit) and end with the Style info from this layer */
+
+
     try {
       for (var o = 0; o < nestedLayerPath.length; o += 1) {
-        addStylesForLayer(nestedLayerPath[o], wmLayer);
+        // eslint-disable-next-line no-param-reassign
+        (_a = wmLayer.styles).push.apply(_a, __spreadArray([], __read(addStylesForLayer(nestedLayerPath[o]))));
       } // eslint-disable-next-line no-empty
 
-    } catch (_a) {}
+    } catch (_b) {}
     /* Set the default style */
 
 
@@ -8261,7 +8342,7 @@
       if (this.autoupdate) {
         var numDeltaMS = 60000;
         this.timer = setInterval(function () {
-          _this.parseLayer(undefined, true);
+          _this.parseLayer(undefined, true, 'WMLayer toggleAutoUpdate');
         }, numDeltaMS);
       } else {
         clearInterval(this.timer);
@@ -8278,7 +8359,7 @@
           clearInterval(this.timer);
         } else {
           this.timer = setInterval(function () {
-            _this.parseLayer(callback, true);
+            _this.parseLayer(callback, true, 'WMLayer setAutoUpdate');
           }, interval);
         }
       }
@@ -8434,51 +8515,58 @@
         return;
       }
 
-      var foundLayer = 0; // Function will be called when the layer with the right name is found in the getcap doc
+      this.getmapURL = undefined;
 
-      var foundLayerFunction = function foundLayerFunction(jsonlayer, path, nestedLayerPath) {
-        _this.getmapURL = undefined;
+      try {
+        this.getmapURL = capabilityObject.Request.GetMap.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
 
-        try {
-          _this.getmapURL = capabilityObject.Request.GetMap.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
-        } catch (e) {
-          /* Do nothing */
-        }
+      if (!isDefined(this.getmapURL)) {
+        this.getmapURL = this.service;
+        debug(exports.DebugType.Error, 'GetMap OnlineResource is not specified. Using default.');
+      }
 
-        if (!isDefined(_this.getmapURL)) {
-          _this.getmapURL = _this.service;
-          debug(exports.DebugType.Error, 'GetMap OnlineResource is not specified. Using default.');
-        }
+      this.getfeatureinfoURL = undefined;
 
-        _this.getfeatureinfoURL = undefined;
+      try {
+        this.getfeatureinfoURL = capabilityObject.Request.GetFeatureInfo.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
 
-        try {
-          _this.getfeatureinfoURL = capabilityObject.Request.GetFeatureInfo.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
-        } catch (e) {
-          /* Do nothing */
-        }
+      if (!isDefined(this.getfeatureinfoURL)) {
+        this.getfeatureinfoURL = this.service;
+        debug(exports.DebugType.Error, 'GetFeatureInfo OnlineResource is not specified. Using default.');
+      }
 
-        if (!isDefined(_this.getfeatureinfoURL)) {
-          _this.getfeatureinfoURL = _this.service;
-          debug(exports.DebugType.Error, 'GetFeatureInfo OnlineResource is not specified. Using default.');
-        }
+      this.getlegendgraphicURL = undefined;
 
-        _this.getlegendgraphicURL = undefined;
+      try {
+        this.getlegendgraphicURL = capabilityObject.Request.GetLegendGraphic.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
+
+      if (!isDefined(this.getlegendgraphicURL)) {
+        this.getlegendgraphicURL = this.service;
+      } // TODO Should be arranged also for the other services:
 
-        try {
-          _this.getlegendgraphicURL = capabilityObject.Request.GetLegendGraphic.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
-        } catch (e) {
-          /* Do nothing */
-        }
 
-        if (!isDefined(_this.getlegendgraphicURL)) {
-          _this.getlegendgraphicURL = _this.service;
-        } // TODO Should be arranged also for the other services:
+      this.getmapURL = WMJScheckURL(this.getmapURL);
+      this.getfeatureinfoURL = WMJScheckURL(this.getfeatureinfoURL);
+      this.getlegendgraphicURL = WMJScheckURL(this.getlegendgraphicURL);
+      this.styles = [];
+      this.projectionProperties = [];
+      /* Set default to layer name, try to find details in next steps */
 
+      this.title = this.name;
+      this["abstract"] = '';
+      this.path = '';
+      var foundLayer = 0; // Function will be called when the layer with the right name is found in the getcap doc
 
-        _this.getmapURL = WMJScheckURL(_this.getmapURL);
-        _this.getfeatureinfoURL = WMJScheckURL(_this.getfeatureinfoURL);
-        _this.getlegendgraphicURL = WMJScheckURL(_this.getlegendgraphicURL);
+      var foundLayerFunction = function foundLayerFunction(jsonlayer, path, nestedLayerPath) {
         _this.title = jsonlayer.Title.value;
 
         try {
@@ -8488,7 +8576,6 @@
         }
 
         _this.path = path;
-        _this.styles = [];
         /** ***************** Go through styles **************** */
 
         configureStyles(nestedLayerPath, _this);
@@ -8501,7 +8588,6 @@
           gp = toArray(jsonlayer.CRS);
         }
 
-        _this.projectionProperties = [];
         var tempSRS = [];
 
         var getgpbbox = function getgpbbox(data) {
@@ -8661,7 +8747,8 @@
      */
 
 
-    WMLayer.prototype.parseLayer = function (_layerDoneCallback, forceReload) {
+    WMLayer.prototype.parseLayer = function (_layerDoneCallback, forceReload, // eslint-disable-next-line no-unused-vars
+    origin) {
       var _this = this;
 
       this.hasError = false;
@@ -8669,7 +8756,10 @@
       var layerDoneCallback = function layerDoneCallback(__layer) {
         if (isDefined(_layerDoneCallback)) {
           try {
-            _layerDoneCallback(__layer);
+            /* Enable these two console timings to do performance measurments of parseLayer */
+            // console.time(origin);
+            _layerDoneCallback(__layer); // console.timeEnd(origin);
+
           } catch (e) {
             debug(exports.DebugType.Error, e);
           }
@@ -8695,7 +8785,6 @@
         fail(_this, I18n.no_capability_element_found.text);
       };
 
-      var wmjsService = WMGetServiceFromStore(this.service);
       var options = {
         headers: {}
       };
@@ -8704,6 +8793,8 @@
         options.headers = this.headers;
       }
 
+      var wmjsService = WMGetServiceFromStore(this.service);
+
       if (wmjsService.service !== undefined) {
         wmjsService.getCapabilities(function (data) {
           callback(data);
@@ -8732,7 +8823,7 @@
           } else {
             resolve(layer);
           }
-        }, forceReload);
+        }, forceReload, 'WMLayer parseLayerPromise');
       });
     };