@opengeoweb/webmap 2.1.3 → 2.1.4

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,6 +444,53 @@ 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;
+  });
+};
 
 /**
  * WMImage provides an API to the HTML image element. It is used for caching and easier access to images.
@@ -4907,7 +4970,7 @@ var WMJSMap = /*#__PURE__*/function () {
           resolve(_this5);
         };
 
-        layer.parseLayer(done, undefined);
+        layer.parseLayer(done, undefined, 'WMJSMap addLayer');
       });
     }
   }, {
@@ -7434,13 +7497,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: []
       };
     }
 
@@ -7698,12 +7763,7 @@ var WMJSService = /*#__PURE__*/function () {
 
         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
 
@@ -7875,55 +7935,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.
@@ -7931,6 +7942,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);
@@ -8041,7 +8053,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) {}
@@ -8278,7 +8293,7 @@ var WMLayer = /*#__PURE__*/function () {
       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);
@@ -8296,7 +8311,7 @@ var WMLayer = /*#__PURE__*/function () {
           clearInterval(this.timer);
         } else {
           this.timer = setInterval(function () {
-            _this2.parseLayer(callback, true);
+            _this2.parseLayer(callback, true, 'WMLayer setAutoUpdate');
           }, interval);
         }
       }
@@ -8458,51 +8473,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;
 
-        _this3.getfeatureinfoURL = undefined;
+      try {
+        this.getfeatureinfoURL = capabilityObject.Request.GetFeatureInfo.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
+      } catch (e) {
+        /* Do nothing */
+      }
 
-        try {
-          _this3.getfeatureinfoURL = capabilityObject.Request.GetFeatureInfo.DCPType.HTTP.Get.OnlineResource.attr['xlink:href'];
-        } catch (e) {
-          /* Do nothing */
-        }
+      if (!isDefined(this.getfeatureinfoURL)) {
+        this.getfeatureinfoURL = this.service;
+        debug(DebugType.Error);
+      }
 
-        if (!isDefined(_this3.getfeatureinfoURL)) {
-          _this3.getfeatureinfoURL = _this3.service;
-          debug(DebugType.Error);
-        }
+      this.getlegendgraphicURL = undefined;
+
+      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(_this3.getmapURL);
-        _this3.getfeatureinfoURL = WMJScheckURL(_this3.getfeatureinfoURL);
-        _this3.getlegendgraphicURL = WMJScheckURL(_this3.getlegendgraphicURL);
+      var foundLayerFunction = function foundLayerFunction(jsonlayer, path, nestedLayerPath) {
         _this3.title = jsonlayer.Title.value;
 
         try {
@@ -8512,7 +8534,6 @@ var WMLayer = /*#__PURE__*/function () {
         }
 
         _this3.path = path;
-        _this3.styles = [];
         /** ***************** Go through styles **************** */
 
         configureStyles(nestedLayerPath, _this3);
@@ -8525,7 +8546,6 @@ var WMLayer = /*#__PURE__*/function () {
           gp = toArray(jsonlayer.CRS);
         }
 
-        _this3.projectionProperties = [];
         var tempSRS = [];
 
         var getgpbbox = function getgpbbox(data) {
@@ -8686,7 +8706,8 @@ var WMLayer = /*#__PURE__*/function () {
 
   }, {
     key: "parseLayer",
-    value: function parseLayer(_layerDoneCallback, forceReload) {
+    value: function parseLayer(_layerDoneCallback, forceReload, // eslint-disable-next-line no-unused-vars
+    origin) {
       var _this4 = this;
 
       this.hasError = false;
@@ -8694,7 +8715,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);
           }
@@ -8720,7 +8744,6 @@ var WMLayer = /*#__PURE__*/function () {
         fail(_this4, I18n.no_capability_element_found.text);
       };
 
-      var wmjsService = WMGetServiceFromStore(this.service);
       var options = {
         headers: {}
       };
@@ -8729,6 +8752,8 @@ var WMLayer = /*#__PURE__*/function () {
         options.headers = this.headers;
       }
 
+      var wmjsService = WMGetServiceFromStore(this.service);
+
       if (wmjsService.service !== undefined) {
         wmjsService.getCapabilities(function (data) {
           callback(data);
@@ -8755,7 +8780,7 @@ var WMLayer = /*#__PURE__*/function () {
           } else {
             resolve(layer);
           }
-        }, forceReload);
+        }, forceReload, 'WMLayer parseLayerPromise');
       });
     }
   }, {

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");
@@ -4937,7 +4994,7 @@
           resolve(_this);
         };
 
-        layer.parseLayer(done, undefined);
+        layer.parseLayer(done, undefined, 'WMJSMap addLayer');
       });
     };
 
@@ -7412,13 +7469,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: []
         };
       }
 
@@ -7670,12 +7729,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
 
@@ -7861,55 +7915,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 +7922,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 +8031,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 +8271,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 +8288,7 @@
           clearInterval(this.timer);
         } else {
           this.timer = setInterval(function () {
-            _this.parseLayer(callback, true);
+            _this.parseLayer(callback, true, 'WMLayer setAutoUpdate');
           }, interval);
         }
       }
@@ -8434,51 +8444,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 +8505,6 @@
         }
 
         _this.path = path;
-        _this.styles = [];
         /** ***************** Go through styles **************** */
 
         configureStyles(nestedLayerPath, _this);
@@ -8501,7 +8517,6 @@
           gp = toArray(jsonlayer.CRS);
         }
 
-        _this.projectionProperties = [];
         var tempSRS = [];
 
         var getgpbbox = function getgpbbox(data) {
@@ -8661,7 +8676,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 +8685,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 +8714,6 @@
         fail(_this, I18n.no_capability_element_found.text);
       };
 
-      var wmjsService = WMGetServiceFromStore(this.service);
       var options = {
         headers: {}
       };
@@ -8704,6 +8722,8 @@
         options.headers = this.headers;
       }
 
+      var wmjsService = WMGetServiceFromStore(this.service);
+
       if (wmjsService.service !== undefined) {
         wmjsService.getCapabilities(function (data) {
           callback(data);
@@ -8732,7 +8752,7 @@
           } else {
             resolve(layer);
           }
-        }, forceReload);
+        }, forceReload, 'WMLayer parseLayerPromise');
       });
     };
 

package/lib/components/WMJSService.d.ts

@@ -1,3 +1,4 @@
+import { Style } from './types';
 export interface GetCapabilitiesJson {
     WMS_Capabilities?: any;
     WMT_MS_Capabilities?: any;
@@ -24,6 +25,7 @@ interface NodeObject {
     children?: [];
     keywords?: string[];
     abstract?: string;
+    styles?: Style[];
 }
 export declare const sortByKey: (array: NodeObject[], key: string) => NodeObject[];
 export declare const recursivelyFindLayer: (layers: any[], rootNode: any[], path: string) => void;

package/lib/components/WMJSTools.d.ts

@@ -1,3 +1,4 @@
+import type { Style, WMSLayerFromGetCapabilities } from './types';
 import type WMLayer from './WMLayer';
 export declare const enableConsoleDebugging = false;
 export declare enum DebugType {
@@ -58,3 +59,9 @@ export declare const getUriAddParam: (baseUrl: string, params: Record<string, an
  * @returns ISO8601 string
  */
 export declare const dateToISO8601: (date: Date) => string;
+/**
+ * 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.
+ */
+export declare const addStylesForLayer: (layerObjectFromWMS: WMSLayerFromGetCapabilities) => Style[];

package/lib/components/WMLayer.d.ts

@@ -3,7 +3,7 @@ import type WMJSMap from './WMJSMap';
 import WMJSDimension from './WMJSDimension';
 import WMProjection from './WMProjection';
 import { GetCapabilitiesJson } from './WMJSService';
-import { Style, Dimension } from './types';
+import { Style, Dimension, WMSLayerFromGetCapabilities } from './types';
 export declare enum LayerType {
     mapLayer = "mapLayer",
     baseLayer = "baseLayer",
@@ -34,20 +34,6 @@ export interface LayerOptions {
     ReactWMJSLayerId?: string;
     onLayerError?: (layer: WMLayer, error: Error, webmapInstance: WMJSMap) => void;
 }
-/**
- * This interface is for reading from the WMS GetCapabilties document, which can have different structures for V1.1.1 and V1.3.0
- */
-interface WMSLayerFromGetCapabilities {
-    Dimension: unknown;
-    Style: unknown;
-    Extent: unknown;
-}
-/**
- * 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
- */
-export declare const addStylesForLayer: (layerObjectFromWMS: WMSLayerFromGetCapabilities, layer: WMLayer) => void;
 /**
  * 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.
@@ -137,7 +123,7 @@ export default class WMLayer {
      * Calls options.failure with error message.
      * Throws string exceptions when someting goes wrong
      */
-    parseLayer(_layerDoneCallback: (layer: WMLayer) => void, forceReload: boolean): void;
+    parseLayer(_layerDoneCallback: (layer: WMLayer) => void, forceReload: boolean, origin: string): void;
     /**
      * A Promise to parse the layer, it will fetch the WMS GetCapabilities document, configure the layer and resolve to a WMLayer object
      * @param forceReload Do not use the cache of the WMS GetCapabilties document, but instead fetch new data from the server
@@ -191,4 +177,3 @@ export default class WMLayer {
     setSLDURL(url: string): void;
     display(displayornot: boolean): void;
 }
-export {};

package/lib/components/types.d.ts

@@ -1,6 +1,6 @@
-import WMJSDimension from './WMJSDimension';
+import type WMJSDimension from './WMJSDimension';
 import type WMLayer from './WMLayer';
-import { DateInterval } from './WMTime';
+import type { DateInterval } from './WMTime';
 export declare type WMPosition = {
     x: number;
     y: number;
@@ -35,3 +35,11 @@ export declare type WMLayerType = {
     title?: string;
     headers?: Headers[];
 };
+/**
+ * This interface is for reading from the WMS GetCapabilties document, which can have different structures for V1.1.1 and V1.3.0
+ */
+export interface WMSLayerFromGetCapabilities {
+    Dimension: unknown;
+    Style: unknown;
+    Extent: unknown;
+}

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
-  "main": "./webmap.umd.js",
-  "module": "./webmap.esm.js",
+  "main": "./index.umd.js",
+  "module": "./index.esm.js",
   "typings": "./index.d.ts",
   "dependencies": {},
   "peerDependencies": {
     "moment": "^2.29.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "react": "16.14.0",
-    "@material-ui/core": "^4.11.0"
+    "react": "^17.0.2",
+    "@mui/styles": "^5.2.3"
   }
 }