@opengeoweb/webmap 2.1.2 → 2.2.0

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

@@ -44,10 +44,22 @@ function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
 
+function _toConsumableArray(arr) {
+  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+
 function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
 
+function _iterableToArray(iter) {
+  if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
+}
+
 function _iterableToArrayLimit(arr, i) {
   if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
   var _arr = [];
@@ -92,6 +104,10 @@ function _arrayLikeToArray(arr, len) {
   return arr2;
 }
 
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
@@ -428,7 +444,62 @@ var dateToISO8601 = function dateToISO8601(date) {
   var iso = "".concat(prf(date.getUTCFullYear(), 4), "-").concat(prf(date.getUTCMonth() + 1, 2), "-").concat(prf(date.getUTCDate(), 2), "T").concat(prf(date.getUTCHours(), 2), ":").concat(prf(date.getUTCMinutes(), 2), ":").concat(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;
+  });
+};
+
+/**
+ * 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.
  */
@@ -450,6 +521,8 @@ var WMImage = /*#__PURE__*/function () {
     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();
@@ -468,6 +541,9 @@ var WMImage = /*#__PURE__*/function () {
     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);
@@ -478,6 +554,9 @@ var WMImage = /*#__PURE__*/function () {
       _this._loadEvent(false);
     });
     this.el.addEventListener('error', function () {
+      _this._imageTimeStampAtError = getCurrentImageTime();
+      _this._numFailedAttempts += 1;
+
       _this._loadEvent(true);
     });
 
@@ -497,6 +576,8 @@ var WMImage = /*#__PURE__*/function () {
       this._isLoaded = false;
       this._isLoading = false;
       this._hasError = false;
+      this._numFailedAttempts = 0;
+      this._imageTimeStampAtError = getCurrentImageTime();
     }
     /**
      * Returns true if the image has been loaded
@@ -517,6 +598,25 @@ var WMImage = /*#__PURE__*/function () {
     value: function isLoading() {
       return this._isLoading;
     }
+    /**
+     * Get the amount of milliseconds since the image experienced an image load.
+     * @returns milliseconds since the image had an error
+     */
+
+  }, {
+    key: "getLastErrorMSecondsAgo",
+    value: function getLastErrorMSecondsAgo() {
+      return getCurrentImageTime() - this._imageTimeStampAtError;
+    }
+    /**
+     * @returns The number of failed attempts for this image
+     */
+
+  }, {
+    key: "getNumFailedAttempts",
+    value: function getNumFailedAttempts() {
+      return this._numFailedAttempts;
+    }
     /**
      * Set source of image, but it will not load the image yet.
      * @param src URL of the image to load
@@ -542,6 +642,8 @@ var WMImage = /*#__PURE__*/function () {
         return;
       }
 
+      this._numFailedAttempts = 0;
+      this._imageTimeStampAtError = getCurrentImageTime();
       this._isLoaded = false;
     }
     /**
@@ -581,6 +683,14 @@ var WMImage = /*#__PURE__*/function () {
       this._load();
     }
   }, {
+    key: "forceReload",
+    value: function forceReload() {
+      this._isLoaded = false;
+      this._srcLoaded = undefined;
+
+      this._load();
+    }
+  }, {
     key: "_getImageWithHeaders",
     value: function _getImageWithHeaders(url, headers) {
       var _this2 = this;
@@ -651,8 +761,12 @@ var WMImage = /*#__PURE__*/function () {
         var hostName = "".concat(splittedHREF[0], "//").concat(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;
@@ -1274,13 +1388,14 @@ var addAlternativeImage = function addAlternativeImage(newLayer) {
   /* 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);
   }
 };
 /**
@@ -1305,38 +1420,17 @@ var removeAlternativeImage = function removeAlternativeImage(imageUrl) {
   }
 };
 /**
- * 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;
   });
 };
 /**
@@ -1347,17 +1441,18 @@ var sortByOverlappingArea = function sortByOverlappingArea(imagesList, bbox) {
  * @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];
   }
@@ -1525,16 +1620,29 @@ var WMCanvasBuffer = /*#__PURE__*/function () {
       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]);
         }
       }
 
@@ -1624,6 +1732,7 @@ var WMCanvasBuffer = /*#__PURE__*/function () {
 
       var newLayer = {
         imageSource: imageSource,
+        imageAge: getCurrentImageTime(),
         opacity: opacity,
         bbox: {
           left: bbox.left,
@@ -1844,8 +1953,9 @@ var WMJSAnimate = /*#__PURE__*/function () {
         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 */
@@ -1853,11 +1963,14 @@ var WMJSAnimate = /*#__PURE__*/function () {
 
             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;
         }
 
@@ -1911,9 +2024,11 @@ var WMJSAnimate = /*#__PURE__*/function () {
                 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;
+                }
               }
             }
           }
@@ -2814,6 +2929,7 @@ var WMJSDimension = /*#__PURE__*/function () {
     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);
@@ -2822,6 +2938,7 @@ var WMJSDimension = /*#__PURE__*/function () {
     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);
@@ -3096,6 +3213,17 @@ var WMJSDimension = /*#__PURE__*/function () {
 
       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
+     */
+
+  }, {
+    key: "getValues",
+    value: function getValues() {
+      this.initialize();
+      return this.values;
+    }
   }, {
     key: "setClosestValue",
     value: function setClosestValue() {
@@ -3238,6 +3366,17 @@ var WMJSDimension = /*#__PURE__*/function () {
       if (this._type === 'anyvalue') return this._allValues[index];
       return null;
     }
+    /**
+     * Hint about the timestep size / time resolution of this dimension.
+     * @returns The dimTimeInterval
+     */
+
+  }, {
+    key: "getDimInterval",
+    value: function getDimInterval() {
+      this.initialize();
+      return this.dimTimeInterval;
+    }
     /**
      * Shorthand functionf or getValueForIndex
      */
@@ -3960,7 +4099,6 @@ var WMJSMap = /*#__PURE__*/function () {
     this.previousMouseButtonState = 'up';
     /* Binds */
 
-    this.setXML2JSONURL = this.setXML2JSONURL.bind(this);
     this.setWMTileRendererTileSettings = this.setWMTileRendererTileSettings.bind(this);
     this.makeComponentId = this.makeComponentId.bind(this);
     this.setMessage = this.setMessage.bind(this);
@@ -4086,11 +4224,6 @@ var WMJSMap = /*#__PURE__*/function () {
   }
 
   _createClass(WMJSMap, [{
-    key: "setXML2JSONURL",
-    value: function setXML2JSONURL(_xml2jsonrequest) {
-      this.xml2jsonrequest = _xml2jsonrequest;
-    }
-  }, {
     key: "setWMTileRendererTileSettings",
     value: function setWMTileRendererTileSettings(_WMTileRendererTileSettings) {
       this.tileRenderSettings = _WMTileRendererTileSettings;
@@ -4898,10 +5031,10 @@ var WMJSMap = /*#__PURE__*/function () {
           reject(new Error('layer has no constructor'));
           return;
         }
+        /* Set a reference in the layer to this map */
 
-        if (!layer.parentMaps.includes(_this5)) {
-          layer.parentMaps.push(_this5);
-        }
+
+        layer.parentMap = _this5;
 
         _this5.layers.push(layer);
 
@@ -4913,7 +5046,7 @@ var WMJSMap = /*#__PURE__*/function () {
           resolve(_this5);
         };
 
-        layer.parseLayer(done, undefined);
+        layer.parseLayer(done, undefined, 'WMJSMap addLayer');
       });
     }
   }, {
@@ -5451,9 +5584,7 @@ var WMJSMap = /*#__PURE__*/function () {
         this.baseLayers = layer;
 
         for (var j = 0; j < this.baseLayers.length; j += 1) {
-          if (!this.baseLayers[j].parentMaps.includes(this)) {
-            this.baseLayers[j].parentMaps.push(this);
-          }
+          this.baseLayers[j].parentMap = this;
 
           if (this.baseLayers[j].keepOnTop !== true) {
             this.numBaseLayers += 1;
@@ -7353,8 +7484,8 @@ var getWMSUrl = function getWMSUrl() {
  * Global getcapabilities function
  */
 
-var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, xml2jsonrequestURL, options) {
-  var disableCache = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, options) {
+  var disableCache = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
 
   /* Make the getCapabilitiesJSONrequest */
   var headers = [];
@@ -7398,7 +7529,6 @@ var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, xm
     random: Math.random()
   } : {};
   var url = getWMSUrl(service, addParams);
-  var newXml2jsonrequestURL = xml2jsonrequestURL;
   WMXMLParser(url, headers).then(function (data) {
     try {
       succes(data);
@@ -7408,7 +7538,7 @@ var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, xm
   })["catch"](function () {
     loadGetCapabilitiesViaProxy(url, succes, function () {
       fail("Request failed for ".concat(url));
-    }, newXml2jsonrequestURL);
+    }, WMServiceStoreXML2JSONRequest.proxy);
   });
 };
 var sortByKey = function sortByKey(array, key) {
@@ -7443,13 +7573,15 @@ rootNode, path) {
         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: []
       };
     }
 
@@ -7457,7 +7589,7 @@ rootNode, path) {
 
     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, [].concat(_toConsumableArray(path), [layers[j].Title.value]));
     }
   } // Sort nodes alphabetically.
 
@@ -7469,7 +7601,6 @@ rootNode, path) {
  *
  * options:
  *   service
- *   xml2jsonrequestURL
  *   title (optional)
  */
 
@@ -7490,7 +7621,6 @@ var WMJSService = /*#__PURE__*/function () {
     if (options) {
       this.service = options.service;
       this.title = options.title;
-      this.xml2jsonrequestURL = options.xml2jsonrequestURL;
     }
 
     this.checkVersion111 = this.checkVersion111.bind(this);
@@ -7613,7 +7743,7 @@ var WMJSService = /*#__PURE__*/function () {
 
   }, {
     key: "getCapabilities",
-    value: function getCapabilities(succescallback, failcallback, forceReload, xml2jsonrequestURL, options) {
+    value: function getCapabilities(succescallback, failcallback, forceReload, options) {
       var _this = this;
 
       if (options) {
@@ -7698,7 +7828,7 @@ var WMJSService = /*#__PURE__*/function () {
             return null;
           }, function () {
             return null;
-          }, false, xml2jsonrequestURL, options);
+          }, false, options);
 
           var current;
 
@@ -7707,14 +7837,9 @@ var WMJSService = /*#__PURE__*/function () {
           }
         };
 
-        WMJSGetCapabilities(this.service, succes, fail, xml2jsonrequestURL, options);
+        WMJSGetCapabilities(this.service, succes, fail, 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
 
@@ -7753,11 +7878,9 @@ var WMJSService = /*#__PURE__*/function () {
 
   }, {
     key: "getNodes",
-    value: function getNodes(succes, failure, forceReload) {
+    value: function getNodes(succes, failure, forceReload, options) {
       var _this2 = this;
 
-      var xml2jsonrequestURL = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : this.xml2jsonrequestURL;
-      var options = arguments.length > 4 ? arguments[4] : undefined;
       this.nodeCache = undefined;
 
       if (!failure) {
@@ -7794,7 +7917,7 @@ var WMJSService = /*#__PURE__*/function () {
           nodeStructure.text = I18n.unnamed_service.text;
         }
 
-        recursivelyFindLayer(WMSLayers, nodeStructure.children, '');
+        recursivelyFindLayer(WMSLayers, nodeStructure.children, []);
         succes(nodeStructure);
       };
 
@@ -7806,7 +7929,7 @@ var WMJSService = /*#__PURE__*/function () {
         failure(data);
       };
 
-      this.getCapabilities(callback, fail, forceReload, xml2jsonrequestURL, options);
+      this.getCapabilities(callback, fail, forceReload, options);
     }
     /** Calls succes with an array of all layerobjects
      * Calls failure when something goes wrong
@@ -7817,13 +7940,7 @@ var WMJSService = /*#__PURE__*/function () {
     value: function getLayerObjectsFlat(succes, failure, forceReload) {
       var _this3 = this;
 
-      var xml2jsonrequestURL = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : this.xml2jsonrequestURL;
-      var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : this._options;
-
-      if (!xml2jsonrequestURL) {
-        // eslint-disable-next-line no-param-reassign
-        xml2jsonrequestURL = this.xml2jsonrequestURL;
-      }
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : this._options;
 
       if (isDefined(this._flatLayerObject) && forceReload !== true) {
         succes(this._flatLayerObject);
@@ -7849,7 +7966,7 @@ var WMJSService = /*#__PURE__*/function () {
         succes(_this3._flatLayerObject);
       };
 
-      this.getNodes(callback, failure, forceReload, xml2jsonrequestURL, options);
+      this.getNodes(callback, failure, forceReload, options);
     }
   }]);
 
@@ -7873,20 +7990,15 @@ var WMJSService = /*#__PURE__*/function () {
  * Copyright 2020 - Finnish Meteorological Institute (FMI)
  * */
 
-var WMGetServiceFromStore = function WMGetServiceFromStore(serviceName, xml2jsonrequestURL) {
+var WMGetServiceFromStore = function WMGetServiceFromStore(serviceName) {
   for (var j = 0; j < WMServiceStore.length; j += 1) {
     if (WMServiceStore[j].service === serviceName) {
       return WMServiceStore[j];
     }
   }
 
-  if (xml2jsonrequestURL) {
-    WMServiceStoreXML2JSONRequest.proxy = xml2jsonrequestURL;
-  }
-
   var service = new WMJSService({
-    service: serviceName,
-    xml2jsonrequestURL: WMServiceStoreXML2JSONRequest.proxy
+    service: serviceName
   });
   WMServiceStore.push(service);
   return service;
@@ -7899,55 +8011,6 @@ var LayerType;
   LayerType["baseLayer"] = "baseLayer";
   LayerType["overLayer"] = "overLayer";
 })(LayerType || (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.
@@ -7955,6 +8018,7 @@ var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS, layer) {
  * @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);
@@ -8028,8 +8092,8 @@ var addDimsForLayer = function addDimsForLayer(layerObjectFromWMS, layer, layerD
       });
       /* Check if the dimension should take the value from the map */
 
-      if (layer.parentMaps.length > 0) {
-        var mapDim = layer.parentMaps[0].getDimension(layerDim.name);
+      if (layer.parentMap) {
+        var mapDim = layer.parentMap.getDimension(layerDim.name);
 
         if (mapDim && mapDim.linked && isDefined(mapDim.currentValue)) {
           var dimensionCurrentValue = dimension.getClosestValue(mapDim.currentValue);
@@ -8065,7 +8129,10 @@ var configureStyles = function configureStyles(nestedLayerPath, wmLayer) {
   /* 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);
+      var _wmLayer$styles;
+
+      // eslint-disable-next-line no-param-reassign
+      (_wmLayer$styles = wmLayer.styles).push.apply(_wmLayer$styles, _toConsumableArray(addStylesForLayer(nestedLayerPath[o])));
     } // eslint-disable-next-line no-empty
 
   } catch (_a) {}
@@ -8134,8 +8201,8 @@ var configureDimensions = function configureDimensions(nestedLayerPath, wmLayer)
     wmLayer.handleReferenceTime('reference_time', refTimeDimension.getValue());
   }
 
-  if (wmLayer.parentMaps && wmLayer.parentMaps.length > 0) {
-    wmLayer.parentMaps[0].configureMapDimensions(wmLayer);
+  if (wmLayer.parentMap) {
+    wmLayer.parentMap.configureMapDimensions(wmLayer);
   }
 };
 
@@ -8235,8 +8302,8 @@ var WMLayer = /*#__PURE__*/function () {
         this.type = options.type;
       }
 
-      if (options.parentMaps) {
-        this.parentMaps = options.parentMaps;
+      if (options.parentMap) {
+        this.parentMap = options.parentMap;
       }
 
       if (options.headers) {
@@ -8252,8 +8319,6 @@ var WMLayer = /*#__PURE__*/function () {
       this.timer = undefined;
       this.service = undefined; // URL of the WMS Service
 
-      this.WMJSService = undefined; // Corresponding WMJSService
-
       this.getmapURL = undefined;
       this.getfeatureinfoURL = undefined;
       this.getlegendgraphicURL = undefined;
@@ -8284,9 +8349,8 @@ var WMLayer = /*#__PURE__*/function () {
       this.id = '-1';
       this.opacity = 1.0; // Ranges from 0.0-1.0
 
-      this.getCapabilitiesDoc = undefined;
       this.serviceTitle = 'not defined';
-      this.parentMaps = [];
+      this.parentMap = null;
       this.sldURL = null;
       this.isConfigured = false;
     }
@@ -8305,7 +8369,7 @@ var WMLayer = /*#__PURE__*/function () {
       if (this.autoupdate) {
         var numDeltaMS = 60000;
         this.timer = setInterval(function () {
-          _this.parseLayer(undefined, true, undefined);
+          _this.parseLayer(undefined, true, 'WMLayer toggleAutoUpdate');
         }, numDeltaMS);
       } else {
         clearInterval(this.timer);
@@ -8323,7 +8387,7 @@ var WMLayer = /*#__PURE__*/function () {
           clearInterval(this.timer);
         } else {
           this.timer = setInterval(function () {
-            _this2.parseLayer(callback, true, undefined);
+            _this2.parseLayer(callback, true, 'WMLayer setAutoUpdate');
           }, interval);
         }
       }
@@ -8332,10 +8396,7 @@ var WMLayer = /*#__PURE__*/function () {
     key: "setOpacity",
     value: function setOpacity(opacityValue) {
       this.opacity = parseFloat(opacityValue);
-
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].redrawBuffer();
-      }
+      this.parentMap && this.parentMap.redrawBuffer();
     }
   }, {
     key: "getOpacity",
@@ -8345,9 +8406,9 @@ var WMLayer = /*#__PURE__*/function () {
   }, {
     key: "remove",
     value: function remove() {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].deleteLayer(this);
-        this.parentMaps[j].draw('WMLayer::remove');
+      if (this.parentMap) {
+        this.parentMap.deleteLayer(this);
+        this.parentMap.draw('WMLayer::remove');
       }
 
       clearInterval(this.timer);
@@ -8355,31 +8416,31 @@ var WMLayer = /*#__PURE__*/function () {
   }, {
     key: "moveUp",
     value: function moveUp() {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].moveLayerUp(this);
-        this.parentMaps[j].draw('WMLayer::moveUp');
+      if (this.parentMap) {
+        this.parentMap.moveLayerUp(this);
+        this.parentMap.draw('WMLayer::moveUp');
       }
     }
   }, {
     key: "moveDown",
     value: function moveDown() {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].moveLayerDown(this);
-        this.parentMaps[j].draw('WMLayer::moveDown');
+      if (this.parentMap) {
+        this.parentMap.moveLayerDown(this);
+        this.parentMap.draw('WMLayer::moveDown');
       }
     }
   }, {
     key: "zoomToLayer",
     value: function zoomToLayer() {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].zoomToLayer(this);
+      if (this.parentMap) {
+        this.parentMap.zoomToLayer(this);
       }
     }
   }, {
     key: "draw",
     value: function draw(e) {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].draw("WMLayer::draw::".concat(e));
+      if (this.parentMap) {
+        this.parentMap.draw("WMLayer::draw::".concat(e));
       }
     }
   }, {
@@ -8395,9 +8456,9 @@ var WMLayer = /*#__PURE__*/function () {
           timeDim.setTimeValuesForReferenceTime(value, referenceTimeDim);
 
           if (updateMapDimensions) {
-            if (this.parentMaps && this.parentMaps.length > 0) {
+            if (this.parentMap) {
               if (this.enabled !== false) {
-                this.parentMaps[0].getListener().triggerEvent('ondimchange', 'time');
+                this.parentMap.getListener().triggerEvent('ondimchange', 'time');
               }
             }
           }
@@ -8424,43 +8485,41 @@ var WMLayer = /*#__PURE__*/function () {
 
       if (updateMapDimensions) {
         if (dim.linked === true) {
-          for (var j = 0; j < this.parentMaps.length; j += 1) {
-            this.parentMaps[j].setDimension(name, dim.getValue());
+          if (this.parentMap) {
+            this.parentMap.setDimension(name, dim.getValue());
           }
         }
       }
     }
   }, {
     key: "__parseGetCapForLayer",
-    value: function __parseGetCapForLayer(layer, getcapabilitiesjson, layerDoneCallback, fail) {
+    value: function __parseGetCapForLayer(getcapabilitiesjson, layerDoneCallback, fail) {
       var _this3 = this;
 
-      var jsondata = getcapabilitiesjson;
-
-      if (!jsondata) {
+      if (!getcapabilitiesjson) {
         this.title = I18n.service_has_error.text;
         this["abstract"] = I18n.not_available_message.text;
-        fail(layer, I18n.unable_to_connect_server.text);
+        fail(this, I18n.unable_to_connect_server.text);
         return;
       }
 
-      var j = 0; // Get the capability object
+      var wmjsService = WMGetServiceFromStore(this.service); // Get the capability object
 
       var capabilityObject;
 
       try {
-        capabilityObject = layer.WMJSService.getCapabilityElement(getcapabilitiesjson);
+        capabilityObject = wmjsService.getCapabilityElement(getcapabilitiesjson);
       } catch (_a) {
-        fail(layer, 'No capability element in service');
+        fail(this, 'No capability element in service');
         return;
       }
 
-      this.version = layer.WMJSService.version; // Get the rootLayer
+      this.version = wmjsService.version; // Get the rootLayer
 
       var rootLayer = capabilityObject.Layer;
 
       if (!isDefined(rootLayer)) {
-        fail(layer, 'No Layer element in service');
+        fail(this, 'No Layer element in service');
         return;
       }
 
@@ -8490,52 +8549,58 @@ var WMLayer = /*#__PURE__*/function () {
         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) {
-        _this3.getmapURL = undefined;
+      try {
+        this.getmapURL = capabilityObject.Request.GetMap.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
 
-        try {
-          _this3.getmapURL = capabilityObject.Request.GetMap.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
-        } catch (e) {
-          /* Do nothing */
-        }
+      if (!isDefined(this.getmapURL)) {
+        this.getmapURL = this.service;
+        debug(DebugType.Error);
+      }
 
-        if (!isDefined(_this3.getmapURL)) {
-          _this3.getmapURL = _this3.service;
-          debug(DebugType.Error);
-        }
+      this.getfeatureinfoURL = undefined;
+
+      try {
+        this.getfeatureinfoURL = capabilityObject.Request.GetFeatureInfo.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
 
-        _this3.getfeatureinfoURL = undefined;
+      if (!isDefined(this.getfeatureinfoURL)) {
+        this.getfeatureinfoURL = this.service;
+        debug(DebugType.Error);
+      }
 
-        try {
-          _this3.getfeatureinfoURL = capabilityObject.Request.GetFeatureInfo.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
-        } catch (e) {
-          /* Do nothing */
-        }
+      this.getlegendgraphicURL = undefined;
 
-        if (!isDefined(_this3.getfeatureinfoURL)) {
-          _this3.getfeatureinfoURL = _this3.service;
-          debug(DebugType.Error);
-        }
+      try {
+        this.getlegendgraphicURL = capabilityObject.Request.GetLegendGraphic.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
 
-        _this3.getlegendgraphicURL = undefined;
+      if (!isDefined(this.getlegendgraphicURL)) {
+        this.getlegendgraphicURL = this.service;
+      } // TODO Should be arranged also for the other services:
 
-        try {
-          _this3.getlegendgraphicURL = capabilityObject.Request.GetLegendGraphic.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
-        } catch (e) {
-          /* Do nothing */
-        }
 
-        if (!isDefined(_this3.getlegendgraphicURL)) {
-          _this3.getlegendgraphicURL = _this3.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
 
-        _this3.getmapURL = WMJScheckURL(layer.getmapURL);
-        _this3.getfeatureinfoURL = WMJScheckURL(layer.getfeatureinfoURL);
-        _this3.getlegendgraphicURL = WMJScheckURL(layer.getlegendgraphicURL);
-        _this3.getCapabilitiesDoc = jsondata;
+      var foundLayerFunction = function foundLayerFunction(jsonlayer, path, nestedLayerPath) {
         _this3.title = jsonlayer.Title.value;
 
         try {
@@ -8545,7 +8610,6 @@ var WMLayer = /*#__PURE__*/function () {
         }
 
         _this3.path = path;
-        _this3.styles = [];
         /** ***************** Go through styles **************** */
 
         configureStyles(nestedLayerPath, _this3);
@@ -8558,7 +8622,6 @@ var WMLayer = /*#__PURE__*/function () {
           gp = toArray(jsonlayer.CRS);
         }
 
-        _this3.projectionProperties = [];
         var tempSRS = [];
 
         var getgpbbox = function getgpbbox(data) {
@@ -8566,7 +8629,7 @@ var WMLayer = /*#__PURE__*/function () {
             // Fill in SRS and BBOX on basis of BoundingBox attribute
             var gpbbox = toArray(data.BoundingBox);
 
-            for (j = 0; j < gpbbox.length; j += 1) {
+            for (var j = 0; j < gpbbox.length; j += 1) {
               var srs = void 0;
               srs = gpbbox[j].attr.SRS;
 
@@ -8594,8 +8657,8 @@ var WMLayer = /*#__PURE__*/function () {
                 geoProperty.srs = srs;
                 var swapBBOX = false;
 
-                if (layer.version === WMSVersion.version130) {
-                  if (geoProperty.srs === 'EPSG:4326' && layer.wms130bboxcompatibilitymode === false) {
+                if (_this3.version === WMSVersion.version130) {
+                  if (geoProperty.srs === 'EPSG:4326' && _this3.wms130bboxcompatibilitymode === false) {
                     swapBBOX = true;
                   }
                 }
@@ -8623,7 +8686,7 @@ var WMLayer = /*#__PURE__*/function () {
         getgpbbox(jsonlayer);
         getgpbbox(rootLayer); // Fill in SRS  on basis of SRS attribute
 
-        for (j = 0; j < gp.length; j += 1) {
+        for (var j = 0; j < gp.length; j += 1) {
           if (tempSRS.indexOf(gp[j].value) === -1) {
             var geoProperty = new WMProjection();
             debug(DebugType.Error, "Warning: BoundingBOX missing for SRS ".concat(gp[j].value));
@@ -8632,7 +8695,8 @@ var WMLayer = /*#__PURE__*/function () {
             geoProperty.bbox.right = 180;
             geoProperty.bbox.top = 90;
             geoProperty.srs = gp[j].value;
-            layer.projectionProperties.push(geoProperty);
+
+            _this3.projectionProperties.push(geoProperty);
           }
         }
 
@@ -8644,13 +8708,13 @@ var WMLayer = /*#__PURE__*/function () {
         try {
           if (parseInt(jsonlayer.attr.queryable, 10) === 1) _this3.queryable = true;else _this3.queryable = false;
         } catch (e) {
-          debug(DebugType.Error, "Unable to detect whether this layer is queryable (for layer ".concat(layer.title, ")"));
+          debug(DebugType.Error, "Unable to detect whether this layer is queryable (for layer ".concat(_this3.title, ")"));
         }
 
         foundLayer = 1;
       };
 
-      function recursivelyFindLayer(JSONLayers, path, _prevNestedLayerPath) {
+      function recursivelyFindLayer(thisLayer, JSONLayers, path, _prevNestedLayerPath) {
         for (var k = 0; k < JSONLayers.length; k += 1) {
           var _nestedLayerPath = [];
 
@@ -8669,9 +8733,9 @@ var WMLayer = /*#__PURE__*/function () {
               /* Do nothing */
             }
 
-            recursivelyFindLayer(toArray(JSONLayers[k].Layer), pathnew, _nestedLayerPath);
+            recursivelyFindLayer(thisLayer, toArray(JSONLayers[k].Layer), pathnew, _nestedLayerPath);
           } else if (JSONLayers[k].Name) {
-            if (JSONLayers[k].Name.value === layer.name) {
+            if (JSONLayers[k].Name.value === thisLayer.name) {
               foundLayerFunction(JSONLayers[k], path, _nestedLayerPath);
               return;
             }
@@ -8683,13 +8747,13 @@ var WMLayer = /*#__PURE__*/function () {
       var JSONLayers = toArray(rootLayer.Layer);
       var path = '';
       var nestedLayerPath = [rootLayer];
-      recursivelyFindLayer(JSONLayers, path, nestedLayerPath);
+      recursivelyFindLayer(this, JSONLayers, path, nestedLayerPath);
 
       if (foundLayer === 0) {
         // Layer was not found...
         var message = '';
 
-        if (layer.name) {
+        if (this.name) {
           message = "Unable to find layer '".concat(this.name, "' in service '").concat(this.service, "'");
         } else {
           message = "Unable to find layer '".concat(this.title, "' in service '").concat(this.service, "'");
@@ -8718,7 +8782,8 @@ var WMLayer = /*#__PURE__*/function () {
 
   }, {
     key: "parseLayer",
-    value: function parseLayer(_layerDoneCallback, forceReload, xml2jsonrequest) {
+    value: function parseLayer(_layerDoneCallback, forceReload, // eslint-disable-next-line no-unused-vars
+    origin) {
       var _this4 = this;
 
       this.hasError = false;
@@ -8726,7 +8791,10 @@ var WMLayer = /*#__PURE__*/function () {
       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(DebugType.Error);
           }
@@ -8745,20 +8813,13 @@ var WMLayer = /*#__PURE__*/function () {
       };
 
       var callback = function callback(data) {
-        _this4.__parseGetCapForLayer(_this4, data, layerDoneCallback, fail);
+        _this4.__parseGetCapForLayer(data, layerDoneCallback, fail);
       };
 
       var requestfail = function requestfail() {
         fail(_this4, I18n.no_capability_element_found.text);
       };
 
-      var newXml2jsonrequest = xml2jsonrequest;
-
-      if (!xml2jsonrequest) {
-        newXml2jsonrequest = this.parentMaps && this.parentMaps.length > 0 ? this.parentMaps[0].xml2jsonrequest : undefined;
-      }
-
-      this.WMJSService = WMGetServiceFromStore(this.service, newXml2jsonrequest);
       var options = {
         headers: {}
       };
@@ -8767,10 +8828,12 @@ var WMLayer = /*#__PURE__*/function () {
         options.headers = this.headers;
       }
 
-      if (this.WMJSService.service !== undefined) {
-        this.WMJSService.getCapabilities(function (data) {
+      var wmjsService = WMGetServiceFromStore(this.service);
+
+      if (wmjsService.service !== undefined) {
+        wmjsService.getCapabilities(function (data) {
           callback(data);
-        }, requestfail, forceReload, xml2jsonrequest, options);
+        }, requestfail, forceReload, options);
       }
     }
     /**
@@ -8793,7 +8856,7 @@ var WMLayer = /*#__PURE__*/function () {
           } else {
             resolve(layer);
           }
-        }, forceReload);
+        }, forceReload, 'WMLayer parseLayerPromise');
       });
     }
   }, {
@@ -8846,7 +8909,8 @@ var WMLayer = /*#__PURE__*/function () {
         success(layerObjects[currentLayerIndex], currentLayerIndex, layerObjects.length);
       };
 
-      this.WMJSService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
+      var wmjsService = WMGetServiceFromStore(this.service);
+      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
     }
   }, {
     key: "autoSelectLayer",
@@ -8864,7 +8928,8 @@ var WMLayer = /*#__PURE__*/function () {
         }
       };
 
-      this.WMJSService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
+      var wmjsService = WMGetServiceFromStore(this.service);
+      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
     }
   }, {
     key: "getNextLayer",
@@ -9040,8 +9105,8 @@ var WMLayer = /*#__PURE__*/function () {
     value: function display(displayornot) {
       this.enabled = displayornot;
 
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].displayLayer(this, this.enabled);
+      if (this.parentMap) {
+        this.parentMap.displayLayer(this, this.enabled);
       }
     }
   }]);