@opengeoweb/webmap 2.1.2 → 2.2.0

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
      */
@@ -4027,7 +4155,6 @@
       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);
@@ -4152,10 +4279,6 @@
       this.init();
     }
 
-    WMJSMap.prototype.setXML2JSONURL = function (_xml2jsonrequest) {
-      this.xml2jsonrequest = _xml2jsonrequest;
-    };
-
     WMJSMap.prototype.setWMTileRendererTileSettings = function (_WMTileRendererTileSettings) {
       this.tileRenderSettings = _WMTileRendererTileSettings;
     };
@@ -4927,10 +5050,10 @@
           reject(new Error('layer has no constructor'));
           return;
         }
+        /* Set a reference in the layer to this map */
 
-        if (!layer.parentMaps.includes(_this)) {
-          layer.parentMaps.push(_this);
-        }
+
+        layer.parentMap = _this;
 
         _this.layers.push(layer);
 
@@ -4942,7 +5065,7 @@
           resolve(_this);
         };
 
-        layer.parseLayer(done, undefined);
+        layer.parseLayer(done, undefined, 'WMJSMap addLayer');
       });
     };
 
@@ -5453,9 +5576,7 @@
         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;
@@ -7327,7 +7448,7 @@
    * Global getcapabilities function
    */
 
-  var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, xml2jsonrequestURL, options, disableCache) {
+  var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, options, disableCache) {
     if (disableCache === void 0) {
       disableCache = false;
     }
@@ -7375,7 +7496,6 @@
       random: Math.random()
     } : {};
     var url = getWMSUrl(service, addParams);
-    var newXml2jsonrequestURL = xml2jsonrequestURL;
     WMXMLParser(url, headers).then(function (data) {
       try {
         succes(data);
@@ -7385,7 +7505,7 @@
     })["catch"](function () {
       loadGetCapabilitiesViaProxy(url, succes, function () {
         fail("Request failed for " + url);
-      }, newXml2jsonrequestURL);
+      }, WMServiceStoreXML2JSONRequest.proxy);
     });
   };
   var sortByKey = function sortByKey(array, key) {
@@ -7420,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: []
         };
       }
 
@@ -7434,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.
 
@@ -7446,7 +7568,6 @@
    *
    * options:
    *   service
-   *   xml2jsonrequestURL
    *   title (optional)
    */
 
@@ -7467,7 +7588,6 @@
       if (options) {
         this.service = options.service;
         this.title = options.title;
-        this.xml2jsonrequestURL = options.xml2jsonrequestURL;
       }
 
       this.checkVersion111 = this.checkVersion111.bind(this);
@@ -7584,7 +7704,7 @@
      */
 
 
-    WMJSService.prototype.getCapabilities = function (succescallback, failcallback, forceReload, xml2jsonrequestURL, options) {
+    WMJSService.prototype.getCapabilities = function (succescallback, failcallback, forceReload, options) {
       var _this = this;
 
       if (options) {
@@ -7669,7 +7789,7 @@
             return null;
           }, function () {
             return null;
-          }, false, xml2jsonrequestURL, options);
+          }, false, options);
 
           var current;
 
@@ -7678,14 +7798,9 @@
           }
         };
 
-        WMJSGetCapabilities(this.service, succes, fail_1, xml2jsonrequestURL, options);
+        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
 
@@ -7722,13 +7837,9 @@
      */
 
 
-    WMJSService.prototype.getNodes = function (succes, failure, forceReload, xml2jsonrequestURL, options) {
+    WMJSService.prototype.getNodes = function (succes, failure, forceReload, options) {
       var _this = this;
 
-      if (xml2jsonrequestURL === void 0) {
-        xml2jsonrequestURL = this.xml2jsonrequestURL;
-      }
-
       this.nodeCache = undefined;
 
       if (!failure) {
@@ -7765,7 +7876,7 @@
           nodeStructure.text = I18n.unnamed_service.text;
         }
 
-        recursivelyFindLayer(WMSLayers, nodeStructure.children, '');
+        recursivelyFindLayer(WMSLayers, nodeStructure.children, []);
         succes(nodeStructure);
       };
 
@@ -7777,29 +7888,20 @@
         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
      */
 
 
-    WMJSService.prototype.getLayerObjectsFlat = function (succes, failure, forceReload, xml2jsonrequestURL, options) {
+    WMJSService.prototype.getLayerObjectsFlat = function (succes, failure, forceReload, options) {
       var _this = this;
 
-      if (xml2jsonrequestURL === void 0) {
-        xml2jsonrequestURL = this.xml2jsonrequestURL;
-      }
-
       if (options === void 0) {
         options = this._options;
       }
 
-      if (!xml2jsonrequestURL) {
-        // eslint-disable-next-line no-param-reassign
-        xml2jsonrequestURL = this.xml2jsonrequestURL;
-      }
-
       if (isDefined(this._flatLayerObject) && forceReload !== true) {
         succes(this._flatLayerObject);
         return;
@@ -7824,7 +7926,7 @@
         succes(_this._flatLayerObject);
       };
 
-      this.getNodes(callback, failure, forceReload, xml2jsonrequestURL, options);
+      this.getNodes(callback, failure, forceReload, options);
     };
 
     return WMJSService;
@@ -7847,20 +7949,15 @@
    * 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;
@@ -7889,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.
@@ -7945,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);
@@ -8017,8 +8066,8 @@
         });
         /* 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);
@@ -8053,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 */
 
 
@@ -8125,8 +8178,8 @@
       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);
     }
   };
 
@@ -8226,8 +8279,8 @@
           this.type = options.type;
         }
 
-        if (options.parentMaps) {
-          this.parentMaps = options.parentMaps;
+        if (options.parentMap) {
+          this.parentMap = options.parentMap;
         }
 
         if (options.headers) {
@@ -8241,8 +8294,6 @@
       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;
@@ -8273,9 +8324,8 @@
       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;
     };
@@ -8292,7 +8342,7 @@
       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);
@@ -8309,7 +8359,7 @@
           clearInterval(this.timer);
         } else {
           this.timer = setInterval(function () {
-            _this.parseLayer(callback, true, undefined);
+            _this.parseLayer(callback, true, 'WMLayer setAutoUpdate');
           }, interval);
         }
       }
@@ -8317,10 +8367,7 @@
 
     WMLayer.prototype.setOpacity = function (opacityValue) {
       this.opacity = parseFloat(opacityValue);
-
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].redrawBuffer();
-      }
+      this.parentMap && this.parentMap.redrawBuffer();
     };
 
     WMLayer.prototype.getOpacity = function () {
@@ -8328,37 +8375,37 @@
     };
 
     WMLayer.prototype.remove = function () {
-      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);
     };
 
     WMLayer.prototype.moveUp = function () {
-      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');
       }
     };
 
     WMLayer.prototype.moveDown = function () {
-      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');
       }
     };
 
     WMLayer.prototype.zoomToLayer = function () {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].zoomToLayer(this);
+      if (this.parentMap) {
+        this.parentMap.zoomToLayer(this);
       }
     };
 
     WMLayer.prototype.draw = function (e) {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].draw("WMLayer::draw::" + e);
+      if (this.parentMap) {
+        this.parentMap.draw("WMLayer::draw::" + e);
       }
     };
 
@@ -8375,9 +8422,9 @@
           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');
               }
             }
           }
@@ -8405,42 +8452,40 @@
 
       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());
           }
         }
       }
     };
 
-    WMLayer.prototype.__parseGetCapForLayer = function (layer, getcapabilitiesjson, layerDoneCallback, fail) {
+    WMLayer.prototype.__parseGetCapForLayer = function (getcapabilitiesjson, layerDoneCallback, fail) {
       var _this = 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;
       }
 
@@ -8470,52 +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;
+
+      try {
+        this.getfeatureinfoURL = capabilityObject.Request.GetFeatureInfo.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
 
-        _this.getfeatureinfoURL = undefined;
+      if (!isDefined(this.getfeatureinfoURL)) {
+        this.getfeatureinfoURL = this.service;
+        debug(exports.DebugType.Error, 'GetFeatureInfo OnlineResource is not specified. Using default.');
+      }
 
-        try {
-          _this.getfeatureinfoURL = capabilityObject.Request.GetFeatureInfo.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
-        } catch (e) {
-          /* Do nothing */
-        }
+      this.getlegendgraphicURL = undefined;
 
-        if (!isDefined(_this.getfeatureinfoURL)) {
-          _this.getfeatureinfoURL = _this.service;
-          debug(exports.DebugType.Error, 'GetFeatureInfo OnlineResource is not specified. Using default.');
-        }
+      try {
+        this.getlegendgraphicURL = capabilityObject.Request.GetLegendGraphic.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
 
-        _this.getlegendgraphicURL = undefined;
+      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(layer.getmapURL);
-        _this.getfeatureinfoURL = WMJScheckURL(layer.getfeatureinfoURL);
-        _this.getlegendgraphicURL = WMJScheckURL(layer.getlegendgraphicURL);
-        _this.getCapabilitiesDoc = jsondata;
+      var foundLayerFunction = function foundLayerFunction(jsonlayer, path, nestedLayerPath) {
         _this.title = jsonlayer.Title.value;
 
         try {
@@ -8525,7 +8576,6 @@
         }
 
         _this.path = path;
-        _this.styles = [];
         /** ***************** Go through styles **************** */
 
         configureStyles(nestedLayerPath, _this);
@@ -8538,7 +8588,6 @@
           gp = toArray(jsonlayer.CRS);
         }
 
-        _this.projectionProperties = [];
         var tempSRS = [];
 
         var getgpbbox = function getgpbbox(data) {
@@ -8546,7 +8595,7 @@
             // 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;
 
@@ -8574,8 +8623,8 @@
                 geoProperty.srs = srs;
                 var swapBBOX = false;
 
-                if (layer.version === WMSVersion.version130) {
-                  if (geoProperty.srs === 'EPSG:4326' && layer.wms130bboxcompatibilitymode === false) {
+                if (_this.version === WMSVersion.version130) {
+                  if (geoProperty.srs === 'EPSG:4326' && _this.wms130bboxcompatibilitymode === false) {
                     swapBBOX = true;
                   }
                 }
@@ -8603,7 +8652,7 @@
         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(exports.DebugType.Error, "Warning: BoundingBOX missing for SRS " + gp[j].value);
@@ -8612,7 +8661,8 @@
             geoProperty.bbox.right = 180;
             geoProperty.bbox.top = 90;
             geoProperty.srs = gp[j].value;
-            layer.projectionProperties.push(geoProperty);
+
+            _this.projectionProperties.push(geoProperty);
           }
         }
 
@@ -8624,13 +8674,13 @@
         try {
           if (parseInt(jsonlayer.attr.queryable, 10) === 1) _this.queryable = true;else _this.queryable = false;
         } catch (e) {
-          debug(exports.DebugType.Error, "Unable to detect whether this layer is queryable (for layer " + layer.title + ")");
+          debug(exports.DebugType.Error, "Unable to detect whether this layer is queryable (for layer " + _this.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_1 = [];
 
@@ -8649,9 +8699,9 @@
               /* Do nothing */
             }
 
-            recursivelyFindLayer(toArray(JSONLayers[k].Layer), pathnew, nestedLayerPath_1);
+            recursivelyFindLayer(thisLayer, toArray(JSONLayers[k].Layer), pathnew, nestedLayerPath_1);
           } else if (JSONLayers[k].Name) {
-            if (JSONLayers[k].Name.value === layer.name) {
+            if (JSONLayers[k].Name.value === thisLayer.name) {
               foundLayerFunction(JSONLayers[k], path, nestedLayerPath_1);
               return;
             }
@@ -8663,13 +8713,13 @@
       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 '" + this.name + "' in service '" + this.service + "'";
         } else {
           message = "Unable to find layer '" + this.title + "' in service '" + this.service + "'";
@@ -8697,7 +8747,8 @@
      */
 
 
-    WMLayer.prototype.parseLayer = function (_layerDoneCallback, forceReload, xml2jsonrequest) {
+    WMLayer.prototype.parseLayer = function (_layerDoneCallback, forceReload, // eslint-disable-next-line no-unused-vars
+    origin) {
       var _this = this;
 
       this.hasError = false;
@@ -8705,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);
           }
@@ -8724,20 +8778,13 @@
       };
 
       var callback = function callback(data) {
-        _this.__parseGetCapForLayer(_this, data, layerDoneCallback, fail);
+        _this.__parseGetCapForLayer(data, layerDoneCallback, fail);
       };
 
       var requestfail = function requestfail() {
         fail(_this, 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: {}
       };
@@ -8746,10 +8793,12 @@
         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);
       }
     };
     /**
@@ -8774,7 +8823,7 @@
           } else {
             resolve(layer);
           }
-        }, forceReload);
+        }, forceReload, 'WMLayer parseLayerPromise');
       });
     };
 
@@ -8824,7 +8873,8 @@
         success(layerObjects[currentLayerIndex], currentLayerIndex, layerObjects.length);
       };
 
-      this.WMJSService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
+      var wmjsService = WMGetServiceFromStore(this.service);
+      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
     };
 
     WMLayer.prototype.autoSelectLayer = function (success, failure) {
@@ -8841,7 +8891,8 @@
         }
       };
 
-      this.WMJSService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
+      var wmjsService = WMGetServiceFromStore(this.service);
+      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
     };
 
     WMLayer.prototype.getNextLayer = function (success, failure) {
@@ -9005,8 +9056,8 @@
     WMLayer.prototype.display = function (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);
       }
     };