@opengeoweb/webmap 4.10.0 → 4.11.0

package/index.esm.js

@@ -1,4 +1,5 @@
 import { debounce, throttle } from 'throttle-debounce';
+import { compact } from 'lodash';
 import moment from 'moment';
 import proj4 from 'proj4';
 
@@ -200,6 +201,33 @@ var mapImageStoreLength = 1000;
 var bgImageStoreLength = 360;
 var legendImageStoreLength = 500;
 
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
 /* debug helper */
 
 var enableConsoleDebugging = false;
@@ -228,20 +256,6 @@ var isDefined = function isDefined(variable) {
 
   return true;
 };
-/**
- * Checks if a variable is null or not
- * @param variable The variable to check
- * @returns true if variable is indeed null, otherwise false.
- */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types,@typescript-eslint/no-explicit-any
-
-var isNull = function isNull(variable) {
-  if (variable === null) {
-    return true;
-  }
-
-  return false;
-};
 /**
  * Converts a variable to an array. If the variable is not an array it will be pushed as the first entry in a new array. If the variable is already an array, nothing will  be done.
  * @param array The variable to convert
@@ -493,14 +507,27 @@ var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS) {
 var addDimensionsForLayer = function addDimensionsForLayer(layerObjectFromWMS) {
   if (!layerObjectFromWMS.Dimension) return [];
   var layerDimensions = toArray(layerObjectFromWMS.Dimension);
-  var list = layerDimensions.map(function (layerDimension) {
+  var layerDimensionsExtents = toArray(layerObjectFromWMS.Extent);
+  var dimensionList = layerDimensions.map(function (layerDimension) {
+    var dimensionName = layerDimension.attr && layerDimension.attr.name.toLowerCase();
+    /* Find corresponding Dimension Extent if given */
+
+    var dimExtentIndex = layerDimensionsExtents.findIndex(function (layerDimensionsExtent) {
+      var extentName = layerDimensionsExtent.attr && layerDimensionsExtent.attr.name && layerDimensionsExtent.attr.name.toLowerCase();
+      return dimensionName === extentName;
+    });
+    var dimExtent = dimExtentIndex !== -1 ? layerDimensionsExtents[dimExtentIndex] : null;
+    var dimensionValues = dimExtent && dimExtent.value || layerDimension.value || '';
+    var dimensionCurrentValue = dimExtent && dimExtent.attr && dimExtent.attr["default"] || layerDimension.attr["default"] || '';
     return {
-      name: layerDimension.attr.name,
+      name: dimensionName,
       units: layerDimension.attr.units,
-      currentValue: layerDimension.value
+      currentValue: dimensionCurrentValue.trim(),
+      unitSymbol: layerDimension.attr.unitSymbol,
+      values: dimensionValues.trim()
     };
   });
-  return list;
+  return dimensionList;
 };
 var addBoundingBoxForLayer = function addBoundingBoxForLayer(layerObjectFromWMS) {
   var _a, _b, _c, _d;
@@ -508,10 +535,10 @@ var addBoundingBoxForLayer = function addBoundingBoxForLayer(layerObjectFromWMS)
   if (layerObjectFromWMS.EX_GeographicBoundingBox) {
     var layerBbox = layerObjectFromWMS.EX_GeographicBoundingBox;
     return {
-      east: ((_a = layerBbox.eastBoundLongitude) === null || _a === void 0 ? void 0 : _a.value) || null,
-      west: ((_b = layerBbox.westBoundLongitude) === null || _b === void 0 ? void 0 : _b.value) || null,
-      north: ((_c = layerBbox.northBoundLatitude) === null || _c === void 0 ? void 0 : _c.value) || null,
-      south: ((_d = layerBbox.southBoundLatitude) === null || _d === void 0 ? void 0 : _d.value) || null
+      east: (_a = layerBbox.eastBoundLongitude) === null || _a === void 0 ? void 0 : _a.value,
+      west: (_b = layerBbox.westBoundLongitude) === null || _b === void 0 ? void 0 : _b.value,
+      north: (_c = layerBbox.northBoundLatitude) === null || _c === void 0 ? void 0 : _c.value,
+      south: (_d = layerBbox.southBoundLatitude) === null || _d === void 0 ? void 0 : _d.value
     };
   }
 
@@ -527,6 +554,141 @@ var addBoundingBoxForLayer = function addBoundingBoxForLayer(layerObjectFromWMS)
 
   return undefined;
 };
+/**
+ * Sorts an array with objects by object key.
+ *
+ * @param array Array of objects
+ * @param key The key of the object to use for sorting
+ * @returns Sorted array.
+ */
+
+function sortArrayOfObjectsByKey(array, key) {
+  var spreadArray = _toConsumableArray(array);
+
+  return spreadArray.sort(function (a, b) {
+    var x = a[key];
+    var y = b[key];
+    if (x < y) return -1;
+    if (x > y) return 1;
+    return 0;
+  });
+}
+/**
+ * A LayerTree with deeply nested children will be flattened into a 1D array. Children properties are removed and result is sorted alphabetically by the layers title.
+ * @param layerTree a WMS LayerTree
+ * @returns Flat array of layers as LayerProps[]
+ */
+
+var flattenLayerTree = function flattenLayerTree(layerTree) {
+  var omit = function omit(prop, _a) {
+    var _b = prop;
+        _a[_b];
+        var rest = __rest(_a, [_typeof(_b) === "symbol" ? _b : _b + ""]);
+
+    return rest;
+  };
+
+  var recurseLayerTree = function recurseLayerTree(data) {
+    return data && Array.isArray(data) ? data.reduce(function (acc, item) {
+      item.name && acc.push(omit('children', item));
+      item.children && acc.push.apply(acc, _toConsumableArray(recurseLayerTree(item.children)));
+      return acc;
+    }, []) : [];
+  };
+
+  var flatLayerObject = recurseLayerTree(layerTree.children);
+  return sortArrayOfObjectsByKey(flatLayerObject, 'title');
+};
+/**
+ * Makes a LayerProps object from the WMSLayerFromGetCapabilities and nestedLayerPath
+ * @param layer WMSLayerFromGetCapabilities
+ * @param path The path of the layer in the WMS GetCapabilities tree (Array of strings)
+ * @param isleaf Is this a group layer or an actual layer
+ * @param nestedLayerPath The path of the layer in the WMS GetCapabilities, in this case array of LayerProps
+ * @returns
+ */
+
+var makeNodeLayerFromWMSGetCapabilityLayer = function makeNodeLayerFromWMSGetCapabilityLayer(layer) {
+  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var isleaf = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var nestedLayerPath = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var geographicBoundingBox = nestedLayerPath.reverse().reduce(function (p, c) {
+    return p || c.geographicBoundingBox;
+  }, addBoundingBoxForLayer(layer));
+  var dimensions = nestedLayerPath.reverse().reduce(function (p, c) {
+    if (p && Array.isArray(p) && p.length > 0) {
+      return p;
+    }
+
+    return c.dimensions || [];
+  }, addDimensionsForLayer(layer));
+  var styles = nestedLayerPath.reverse().reduce(function (p, c) {
+    if (c.styles && Array.isArray(c.styles) && c.styles.length) {
+      return c.styles.concat(p);
+    }
+
+    return p;
+  }, addStylesForLayer(layer));
+  var queryable = layer.attr ? parseInt(layer.attr.queryable, 10) === 1 : false;
+  var crs = layer.BoundingBox && Array.isArray(layer.BoundingBox) && layer.BoundingBox.length ? compact(layer.BoundingBox.map(function (wmsBBOX) {
+    if (wmsBBOX.attr) {
+      var crsName = wmsBBOX.attr.CRS || wmsBBOX.attr.SRS;
+      return {
+        name: crsName,
+        bbox: {
+          left: parseFloat(wmsBBOX.attr.minx),
+          right: parseFloat(wmsBBOX.attr.maxx),
+          bottom: parseFloat(wmsBBOX.attr.miny),
+          top: parseFloat(wmsBBOX.attr.maxy)
+        }
+      };
+    }
+
+    return undefined;
+  })) : [];
+  return {
+    name: layer.Name ? layer.Name.value : null,
+    title: layer.Title ? layer.Title.value : 'Layer',
+    leaf: isleaf,
+    path: path,
+    keywords: toArray(layer.KeywordList && layer.KeywordList.Keyword).map(function (keywords) {
+      return keywords.value;
+    }),
+    "abstract": layer.Abstract ? layer.Abstract.value : undefined,
+    styles: styles,
+    dimensions: dimensions,
+    geographicBoundingBox: geographicBoundingBox,
+    queryable: queryable,
+    crs: crs
+  };
+};
+/**
+ * Builds a standardized LayerTree object based on WMSLayerFromGetCapabilities object.
+ * @param wmsLayer The WMSLayerFromGetCapabilities object
+ * @param nestedPath - Optional, only to be used by buildLayerTreeFromNestedWMSLayer
+ * @param nestedLayerPath - Optional, only to be used by buildLayerTreeFromNestedWMSLayer
+ * @returns A LayerTree object.
+ */
+
+var buildLayerTreeFromNestedWMSLayer = function buildLayerTreeFromNestedWMSLayer(wmsLayer) {
+  var nestedPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var nestedLayerPath = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var isleaf = wmsLayer.Name && !wmsLayer.Layer;
+  var layerProps = makeNodeLayerFromWMSGetCapabilityLayer(wmsLayer, nestedPath, isleaf, nestedLayerPath);
+  var pathName = wmsLayer.Title && wmsLayer.Title.value || '';
+  var layerTree = Object.assign(Object.assign({}, layerProps), {
+    children: []
+  });
+
+  if (wmsLayer.Layer) {
+    var childLayers = wmsLayer.Layer['length'] ? wmsLayer.Layer : [wmsLayer.Layer];
+    layerTree.children = sortArrayOfObjectsByKey(childLayers.map(function (layerChild) {
+      return buildLayerTreeFromNestedWMSLayer(layerChild, [].concat(_toConsumableArray(nestedPath), [pathName]), [].concat(_toConsumableArray(nestedLayerPath), [layerProps]));
+    }), 'title');
+  }
+
+  return layerTree;
+};
 
 /**
  * Returns the current time in ms
@@ -1123,7 +1285,7 @@ var WMBBOX = /*#__PURE__*/function () {
     key: "setBBOX",
     value: function setBBOX(left, bottom, right, top) {
       /* Check if we recieve more than one parameter by checking the second bottom parameter. */
-      if (bottom) {
+      if (bottom !== undefined) {
         this.left = left; // -180; // 0
 
         this.bottom = bottom; // -90; // 1`
@@ -1135,7 +1297,7 @@ var WMBBOX = /*#__PURE__*/function () {
       /* Check if we recieve more than one parameter by checking the second bottom parameter. */
 
 
-      if (!bottom) {
+      if (bottom === undefined) {
         /* Otherwise it can be a bbox object or a string in the form "left,bottom,right,top" */
         if (_typeof(left) === 'object') {
           /* A bbox object is given, so it is not a string */
@@ -7673,63 +7835,6 @@ var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, op
     }, WMServiceStoreXML2JSONRequest.proxy);
   });
 };
-var sortByKey = function sortByKey(array, key) {
-  return array.sort(function (a, b) {
-    var x = a[key];
-    var y = b[key];
-    if (x < y) return -1;
-    if (x > y) return 1;
-    return 0;
-  });
-};
-var recursivelyFindLayer = function recursivelyFindLayer( // eslint-disable-next-line @typescript-eslint/no-explicit-any
-layers, // eslint-disable-next-line @typescript-eslint/no-explicit-any
-rootNode, path) {
-  for (var j = 0; j < layers.length; j += 1) {
-    var isleaf = false;
-    if (layers[j].Name) isleaf = true;
-
-    try {
-      if (layers[j].Layer) isleaf = false;
-    } catch (e) {// do nothing
-    }
-
-    var nodeObject = void 0;
-
-    if (layers[j].Name) {
-      nodeObject = {
-        name: layers[j].Name.value,
-        title: layers[j].Title.value,
-        leaf: isleaf,
-        path: path,
-        keywords: toArray(layers[j].KeywordList && layers[j].KeywordList.Keyword).map(function (keywords) {
-          return keywords.value;
-        }),
-        "abstract": layers[j].Abstract && layers[j].Abstract.value,
-        styles: addStylesForLayer(layers[j]),
-        dimensions: addDimensionsForLayer(layers[j]),
-        geographicBoundingBox: addBoundingBoxForLayer(layers[j])
-      };
-    } else {
-      var nodeText = isNull(layers[j].Title) ? 'Layer' : layers[j].Title.value;
-      nodeObject = {
-        title: nodeText,
-        leaf: isleaf,
-        styles: []
-      };
-    }
-
-    rootNode.push(nodeObject);
-
-    if (layers[j].Layer) {
-      nodeObject.children = [];
-      recursivelyFindLayer(toArray(layers[j].Layer), nodeObject.children, [].concat(_toConsumableArray(path), [layers[j].Title.value]));
-    }
-  } // Sort nodes alphabetically.
-
-
-  sortByKey(rootNode, 'title');
-};
 var generatedServiceIds = 0;
 
 var generateWMJSServiceId = function generateWMJSServiceId() {
@@ -7886,7 +7991,8 @@ var WMJSService = /*#__PURE__*/function () {
 
   }, {
     key: "getCapabilities",
-    value: function getCapabilities(succescallback, failcallback, forceReload, options) {
+    value: function getCapabilities(succescallback, failcallback, forceReload, // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
+    options) {
       var _this = this;
 
       if (options) {
@@ -8034,15 +8140,6 @@ var WMJSService = /*#__PURE__*/function () {
       }
 
       var parse = function parse(jsonData) {
-        var nodeStructure = {
-          leaf: false,
-          expanded: true,
-          children: [],
-          title: '',
-          keywords: [],
-          "abstract": ''
-        };
-
         var rootLayer = _this2.getCapabilityElement(jsonData).Layer;
 
         try {
@@ -8052,16 +8149,8 @@ var WMJSService = /*#__PURE__*/function () {
           return;
         }
 
-        var WMSLayers = toArray(rootLayer.Layer);
-
-        try {
-          nodeStructure.title = rootLayer.Title.value;
-        } catch (e) {
-          nodeStructure.title = I18n.unnamed_service.text;
-        }
-
-        recursivelyFindLayer(WMSLayers, nodeStructure.children, []);
-        succes(nodeStructure);
+        var layerTreeStructure = buildLayerTreeFromNestedWMSLayer(rootLayer);
+        succes(layerTreeStructure);
       };
 
       var callback = function callback(jsonData) {
@@ -8090,22 +8179,8 @@ var WMJSService = /*#__PURE__*/function () {
         return;
       }
 
-      var callback = function callback(data) {
-        _this3._flatLayerObject = [];
-
-        var getNames = function getNames(layers) {
-          for (var j = 0; j < layers.length; j += 1) {
-            if (layers[j].name) {
-              _this3._flatLayerObject.push(layers[j]);
-            }
-
-            if (layers[j].children) {
-              getNames(layers[j].children);
-            }
-          }
-        };
-
-        getNames(data.children);
+      var callback = function callback(layerTree) {
+        _this3._flatLayerObject = flattenLayerTree(layerTree);
         succes(_this3._flatLayerObject);
       };
 
@@ -8162,58 +8237,24 @@ var LayerType;
  */
 
 
-var addDimsForLayer = function addDimsForLayer(layerObjectFromWMS, layer, layerDimNamesToRemove) {
+var addDimsForLayer = function addDimsForLayer(layerProps, layer, layerDimNamesToRemove) {
   /* Information from the WMS GetCapabilities document */
-  var layerDims = toArray(layerObjectFromWMS.Dimension);
-  var layerDimExtents = toArray(layerObjectFromWMS.Extent);
+  var layerDims = layerProps.dimensions || [];
   /* Loop through all the dims from the WMS GetCapabilities document for this layer */
 
   var _loop = function _loop(d) {
     /* Obtain layerDim info from the GetCapabilities document and put into a WMSLayerDimInfo object  */
-    var dimAttributes = layerDims[d].attr;
+    var dimName = (layerDims[d].name || '').toLowerCase();
     var layerDim = {
-      name: dimAttributes.name.toLowerCase(),
-      units: dimAttributes.units,
-      unitSymbol: dimAttributes.unitSymbol,
-      value: layerDims[d].value,
-      "default": dimAttributes["default"],
-      isRefTimeDimension: dimAttributes.name.toLowerCase() === 'reference_time'
+      name: dimName,
+      units: layerDims[d].units || '',
+      unitSymbol: layerDims[d].unitSymbol || '',
+      value: layerDims[d].values || '',
+      "default": layerDims[d].currentValue,
+      isRefTimeDimension: dimName === 'reference_time'
     };
-    /* Add information to WMSLayerDimInfo from Extent elements: WMS 1.1.1 */
-
-    for (var i = 0; i < layerDimExtents.length; i += 1) {
-      if (layerDimExtents[i].attr.name.toLowerCase() === layerDim.name) {
-        /* Check if a value in the WMS Extent is given: */
-        if (layerDimExtents[i].value) {
-          layerDim.value = layerDimExtents[i].value.trim();
-        }
-        /* Check for default in the WMS Extent */
-
-
-        if (layerDimExtents[i].attr["default"]) {
-          layerDim["default"] = layerDimExtents[i].attr["default"].trim();
-        }
-      }
-    }
-    /* Graceful WMS check: Check if value is set, if not base it on the default */
-
-
-    if (!layerDim.value && layerDim["default"]) {
-      layerDim.value = layerDim["default"];
-    }
-    /* Graceful WMS check: Check if default is set, if not base it on the value */
-
-
-    if (!layerDim["default"] && layerDim.value) {
-      /* If it is not set, take either the last value in case start/stop/res is defined, otherwise the first */
-      var s = layerDim.value.split('/');
-      var defaultIndex = 0;
-      if (s.length > 1) defaultIndex = 1;else if (s.length > 0) defaultIndex = 0;
-      layerDim["default"] = s[defaultIndex];
-    }
     /* Flag that this dim should not be removed from the layer */
 
-
     layerDimNamesToRemove["delete"](layerDim.name);
     /* Now configure the dimensions in the Layer based on the obtained info */
 
@@ -8268,20 +8309,11 @@ var addDimsForLayer = function addDimsForLayer(layerObjectFromWMS, layer, layerD
  * @param wmLayer The WMLayer object to configure
  */
 
-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) {
-      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) {}
+var configureStyles = function configureStyles(layerProps, wmLayer) {
+  // eslint-disable-next-line no-param-reassign
+  wmLayer.styles = layerProps.styles || [];
   /* Set the default style */
 
-
   if (wmLayer.styles.length > 0) {
     /* Check if the current style is in the list */
     var styleIndex = wmLayer.styles.findIndex(function (style) {
@@ -8303,7 +8335,7 @@ var configureStyles = function configureStyles(nestedLayerPath, wmLayer) {
  * @param wmLayer The WMLayer object to configure
  */
 
-var configureDimensions = function configureDimensions(nestedLayerPath, wmLayer) {
+var configureDimensions = function configureDimensions(layerProps, wmLayer) {
   /*
   WMS 1.1.1:
     <Dimension name="time" units="ISO8601"/>
@@ -8321,12 +8353,9 @@ var configureDimensions = function configureDimensions(nestedLayerPath, wmLayer)
   /* Now start adding all dimensions starting with the parent layer. Layers more deeply nested will inherit Dimension info */
 
 
-  for (var o = 0; o < nestedLayerPath.length; o += 1) {
-    addDimsForLayer(nestedLayerPath[o], wmLayer, layerDimNamesToRemove);
-  }
+  addDimsForLayer(layerProps, wmLayer, layerDimNamesToRemove);
   /* The list with dimensions to remove is now complete, remove the unneeded dimensions from the layer */
 
-
   layerDimNamesToRemove.forEach(function (dimName) {
     var dimIndex = wmLayer.dimensions.findIndex(function (dim) {
       return dim.name === dimName;
@@ -8348,6 +8377,14 @@ var configureDimensions = function configureDimensions(nestedLayerPath, wmLayer)
     wmLayer.parentMap.configureMapDimensions(wmLayer);
   }
 };
+var configureGeographicBoundingBox = function configureGeographicBoundingBox(layerProps, wmLayer) {
+  var bbox = layerProps.geographicBoundingBox;
+
+  if (bbox) {
+    // eslint-disable-next-line no-param-reassign
+    wmLayer.geographicBoundingBox = bbox;
+  }
+};
 
 var WMLayer = /*#__PURE__*/function () {
   function WMLayer(options) {
@@ -8371,10 +8408,6 @@ var WMLayer = /*#__PURE__*/function () {
     this.parseLayerPromise = this.parseLayerPromise.bind(this);
     this.cloneLayer = this.cloneLayer.bind(this);
     this.setName = this.setName.bind(this);
-    this.getLayerRelative = this.getLayerRelative.bind(this);
-    this.autoSelectLayer = this.autoSelectLayer.bind(this);
-    this.getNextLayer = this.getNextLayer.bind(this);
-    this.getPreviousLayer = this.getPreviousLayer.bind(this);
     this.setStyle = this.setStyle.bind(this);
     this.getStyles = this.getStyles.bind(this);
     this.getStyleObject = this.getStyleObject.bind(this);
@@ -8740,162 +8773,67 @@ var WMLayer = /*#__PURE__*/function () {
 
       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
-
-      var foundLayerFunction = function foundLayerFunction(jsonlayer, path, nestedLayerPath) {
-        _this3.title = jsonlayer.Title.value;
-
-        try {
-          _this3["abstract"] = jsonlayer.Abstract.value;
-        } catch (e) {
-          _this3["abstract"] = I18n.not_available_message.text;
-        }
+      this.path = ''; // Function will be called when the layer with the right name is found in the getcap doc
 
-        _this3.path = path;
+      var populateLayerFromTreeElement = function populateLayerFromTreeElement(jsonlayer) {
+        _this3.title = jsonlayer.title || jsonlayer.name || '';
+        _this3["abstract"] = jsonlayer["abstract"] || I18n.not_available_message.text;
+        _this3.path = jsonlayer.path.join('/');
         /** ***************** Go through styles **************** */
 
-        configureStyles(nestedLayerPath, _this3);
+        configureStyles(jsonlayer, _this3);
         /** ***************** Go through Dimensions **************** */
 
-        configureDimensions(nestedLayerPath, _this3);
-        var gp = toArray(jsonlayer.SRS);
-
-        if (isDefined(jsonlayer.CRS)) {
-          gp = toArray(jsonlayer.CRS);
-        }
-
-        var tempSRS = [];
+        configureDimensions(jsonlayer, _this3);
+        /** ***************** Go through geographicBoundingBox **************** */
 
-        var getgpbbox = function getgpbbox(data) {
-          if (isDefined(data.BoundingBox)) {
-            // Fill in SRS and BBOX on basis of BoundingBox attribute
-            var gpbbox = toArray(data.BoundingBox);
+        configureGeographicBoundingBox(jsonlayer, _this3);
+        _this3.queryable = jsonlayer.queryable || false;
 
-            for (var j = 0; j < gpbbox.length; j += 1) {
-              var srs = void 0;
-              srs = gpbbox[j].attr.SRS;
+        if (jsonlayer.crs) {
+          jsonlayer.crs.forEach(function (p) {
+            var wmProjection = new WMProjection();
+            wmProjection.srs = p.name || '';
 
-              if (isDefined(gpbbox[j].attr.CRS)) {
-                srs = gpbbox[j].attr.CRS;
-              }
+            if (p.bbox) {
+              var swapBBOX = _this3.version === WMSVersion.version130 && wmProjection.srs === 'EPSG:4326' && _this3.wms130bboxcompatibilitymode === false;
 
-              if (srs) {
-                if (srs.length > 0) {
-                  srs = decodeURIComponent(srs);
-                }
-              }
-
-              var alreadyAdded = false;
-
-              for (var i = 0; i < _this3.projectionProperties.length; i += 1) {
-                if (srs === _this3.projectionProperties[i].srs) {
-                  alreadyAdded = true;
-                  break;
-                }
-              }
-
-              if (alreadyAdded === false) {
-                var geoProperty = new WMProjection();
-                geoProperty.srs = srs;
-                var swapBBOX = false;
-
-                if (_this3.version === WMSVersion.version130) {
-                  if (geoProperty.srs === 'EPSG:4326' && _this3.wms130bboxcompatibilitymode === false) {
-                    swapBBOX = true;
-                  }
-                }
-
-                if (swapBBOX === false) {
-                  geoProperty.bbox.left = parseFloat(gpbbox[j].attr.minx);
-                  geoProperty.bbox.bottom = parseFloat(gpbbox[j].attr.miny);
-                  geoProperty.bbox.right = parseFloat(gpbbox[j].attr.maxx);
-                  geoProperty.bbox.top = parseFloat(gpbbox[j].attr.maxy);
-                } else {
-                  geoProperty.bbox.left = parseFloat(gpbbox[j].attr.miny);
-                  geoProperty.bbox.bottom = parseFloat(gpbbox[j].attr.minx);
-                  geoProperty.bbox.right = parseFloat(gpbbox[j].attr.maxy);
-                  geoProperty.bbox.top = parseFloat(gpbbox[j].attr.maxx);
-                }
-
-                _this3.projectionProperties.push(geoProperty);
-
-                tempSRS.push(geoProperty.srs);
+              if (swapBBOX) {
+                wmProjection.bbox.setBBOX(p.bbox.bottom, p.bbox.left, p.bbox.top, p.bbox.right);
+              } else {
+                wmProjection.bbox.setBBOX(p.bbox.left, p.bbox.bottom, p.bbox.right, p.bbox.top);
               }
             }
-          }
-        };
-
-        getgpbbox(jsonlayer);
-        getgpbbox(rootLayer); // Fill in SRS  on basis of SRS attribute
-
-        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));
-            geoProperty.bbox.left = -180;
-            geoProperty.bbox.bottom = -90;
-            geoProperty.bbox.right = 180;
-            geoProperty.bbox.top = 90;
-            geoProperty.srs = gp[j].value;
 
-            _this3.projectionProperties.push(geoProperty);
-          }
-        }
-
-        tempSRS = [];
-        /* Check if layer is queryable */
-
-        _this3.queryable = false;
-
-        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(_this3.title, ")"));
+            _this3.projectionProperties.push(wmProjection);
+          });
         }
-
-        foundLayer = 1;
       };
 
-      function recursivelyFindLayer(thisLayer, JSONLayers, path, _prevNestedLayerPath) {
-        for (var k = 0; k < JSONLayers.length; k += 1) {
-          var _nestedLayerPath = [];
-
-          for (var i = 0; i < _prevNestedLayerPath.length; i += 1) {
-            _nestedLayerPath.push(_prevNestedLayerPath[i]);
-          }
-
-          _nestedLayerPath.push(JSONLayers[k]);
+      var layerTreeStructure = buildLayerTreeFromNestedWMSLayer(rootLayer);
+      /* Recursively walk the layertree until a child is found with the corresponding name */
 
-          if (JSONLayers[k].Layer) {
-            var pathnew = path;
-
-            try {
-              pathnew += "".concat(JSONLayers[k].Title.value, "/");
-            } catch (e) {
-              /* Do nothing */
-            }
+      var findTreeNode = function findTreeNode(tree) {
+        if (tree.name === _this3.name) {
+          return tree;
+        }
 
-            recursivelyFindLayer(thisLayer, toArray(JSONLayers[k].Layer), pathnew, _nestedLayerPath);
-          } else if (JSONLayers[k].Name) {
-            if (JSONLayers[k].Name.value === thisLayer.name) {
-              foundLayerFunction(JSONLayers[k], path, _nestedLayerPath);
-              return undefined;
-            }
-          }
+        if (tree.children) {
+          var foundChild;
+          tree.children.find(function (node) {
+            foundChild = findTreeNode(node);
+            return foundChild;
+          });
+          return foundChild;
         }
 
         return undefined;
-      } // Try to recursively find the name in the getcap doc
-
+      };
 
-      var JSONLayers = toArray(rootLayer.Layer);
-      var path = '';
-      var nestedLayerPath = [rootLayer];
-      recursivelyFindLayer(this, JSONLayers, path, nestedLayerPath);
+      var foundLayer = findTreeNode(layerTreeStructure);
 
-      if (foundLayer === 0) {
-        // Layer was not found...
+      if (!foundLayer) {
+        /* Layer was not found... */
         var message = '';
 
         if (this.name) {
@@ -8912,6 +8850,8 @@ var WMLayer = /*#__PURE__*/function () {
       /* Layer was found */
 
 
+      populateLayerFromTreeElement(foundLayer);
+
       if (this.onReady) {
         this.onReady(this);
       }
@@ -9021,71 +8961,6 @@ var WMLayer = /*#__PURE__*/function () {
       this.name = name;
       return this.parseLayerPromise(false);
     }
-  }, {
-    key: "getLayerRelative",
-    value: function getLayerRelative(success, failure, prevNext) {
-      var _this6 = this;
-
-      var localPrevNext = prevNext;
-
-      if (!isDefined(prevNext)) {
-        localPrevNext = 0;
-      }
-
-      var getLayerObjectsFinished = function getLayerObjectsFinished(layerObjects) {
-        var currentLayerIndex = -1;
-
-        for (var j = 0; j < layerObjects.length; j += 1) {
-          if (layerObjects[j].name === _this6.name) {
-            currentLayerIndex = j;
-            break;
-          }
-        }
-
-        if (currentLayerIndex === -1) {
-          failure("Current layer [".concat(_this6.name, "] not in this service"));
-          return;
-        }
-
-        if (localPrevNext === -1) currentLayerIndex -= 1;
-        if (localPrevNext === 1) currentLayerIndex += 1;
-        if (currentLayerIndex > layerObjects.length - 1) currentLayerIndex = 0;
-        if (currentLayerIndex < 0) currentLayerIndex = layerObjects.length - 1;
-        success(layerObjects[currentLayerIndex], currentLayerIndex, layerObjects.length);
-      };
-
-      var wmjsService = WMGetServiceFromStore(this.service);
-      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
-    }
-  }, {
-    key: "autoSelectLayer",
-    value: function autoSelectLayer(success, failure) {
-      var getLayerObjectsFinished = function getLayerObjectsFinished(layerObjects) {
-        for (var j = 0; j < layerObjects.length; j += 1) {
-          if (isDefined(layerObjects[j].name)) {
-            if (layerObjects[j].name.indexOf('baselayer') === -1) {
-              if (layerObjects[j].path.indexOf('baselayer') === -1) {
-                success(layerObjects[j]);
-                return;
-              }
-            }
-          }
-        }
-      };
-
-      var wmjsService = WMGetServiceFromStore(this.service);
-      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
-    }
-  }, {
-    key: "getNextLayer",
-    value: function getNextLayer(success, failure) {
-      this.getLayerRelative(success, failure, 1);
-    }
-  }, {
-    key: "getPreviousLayer",
-    value: function getPreviousLayer(success, failure) {
-      this.getLayerRelative(success, failure, -1);
-    }
     /**
      * Sets the style by its name
      * @param style: The name of the style (not the object)