@opengeoweb/webmap 4.10.0 → 4.11.0

package/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('throttle-debounce'), require('moment'), require('proj4')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'throttle-debounce', 'moment', 'proj4'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Webmap = {}, global.throttleDebounce, global.moment, global.proj4));
-})(this, (function (exports, throttleDebounce, moment, proj4) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('throttle-debounce'), require('lodash'), require('moment'), require('proj4')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'throttle-debounce', 'lodash', 'moment', 'proj4'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Webmap = {}, global.throttleDebounce, global.lodash, global.moment, global.proj4));
+})(this, (function (exports, throttleDebounce, lodash, moment, proj4) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -82,6 +82,18 @@
       return __assign.apply(this, arguments);
   };
 
+  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;
+  }
+
   function __values(o) {
       var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
       if (m) return m.call(o);
@@ -121,22 +133,6 @@
       return to.concat(ar || Array.prototype.slice.call(from));
   }
 
-  /* *
-   * Licensed under the Apache License, Version 2.0 (the "License");
-   * you may not use this file except in compliance with the License.
-   * You may obtain a copy of the License at
-   *
-   *     http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Unless required by applicable law or agreed to in writing, software
-   * distributed under the License is distributed on an "AS IS" BASIS,
-   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   * See the License for the specific language governing permissions and
-   * limitations under the License.
-   *
-   * Copyright 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-   * Copyright 2020 - Finnish Meteorological Institute (FMI)
-   * */
   /* debug helper */
 
   var enableConsoleDebugging = false;
@@ -170,20 +166,6 @@
 
     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
@@ -440,14 +422,27 @@
   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;
@@ -455,10 +450,10 @@
     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
       };
     }
 
@@ -474,6 +469,157 @@
 
     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 = __spreadArray([], __read(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, __spreadArray([], __read(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, path, isleaf, nestedLayerPath) {
+    if (path === void 0) {
+      path = [];
+    }
+
+    if (isleaf === void 0) {
+      isleaf = false;
+    }
+
+    if (nestedLayerPath === void 0) {
+      nestedLayerPath = [];
+    }
+
+    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 ? lodash.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, nestedPath, nestedLayerPath) {
+    if (nestedPath === void 0) {
+      nestedPath = [];
+    }
+
+    if (nestedLayerPath === void 0) {
+      nestedLayerPath = [];
+    }
+
+    var isleaf = wmsLayer.Name && !wmsLayer.Layer;
+    var layerProps = makeNodeLayerFromWMSGetCapabilityLayer(wmsLayer, nestedPath, isleaf, nestedLayerPath);
+    var pathName = wmsLayer.Title && wmsLayer.Title.value || '';
+
+    var layerTree = __assign(__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, __spreadArray(__spreadArray([], __read(nestedPath)), [pathName]), __spreadArray(__spreadArray([], __read(nestedLayerPath)), [layerProps]));
+      }), 'title');
+    }
+
+    return layerTree;
+  };
 
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1070,7 +1216,7 @@
 
     WMBBOX.prototype.setBBOX = function (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`
@@ -1082,7 +1228,7 @@
       /* 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 */
@@ -7638,63 +7784,6 @@
       }, 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, __spreadArray(__spreadArray([], __read(path)), [layers[j].Title.value]));
-      }
-    } // Sort nodes alphabetically.
-
-
-    sortByKey(rootNode, 'title');
-  };
   var generatedServiceIds = 0;
 
   var generateWMJSServiceId = function generateWMJSServiceId() {
@@ -7845,7 +7934,8 @@
      */
 
 
-    WMJSService.prototype.getCapabilities = function (succescallback, failcallback, forceReload, options) {
+    WMJSService.prototype.getCapabilities = function (succescallback, failcallback, forceReload, // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
+    options) {
       var _this = this;
 
       if (options) {
@@ -7991,15 +8081,6 @@
       }
 
       var parse = function parse(jsonData) {
-        var nodeStructure = {
-          leaf: false,
-          expanded: true,
-          children: [],
-          title: '',
-          keywords: [],
-          "abstract": ''
-        };
-
         var rootLayer = _this.getCapabilityElement(jsonData).Layer;
 
         try {
@@ -8009,16 +8090,8 @@
           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) {
@@ -8048,22 +8121,8 @@
         return;
       }
 
-      var callback = function callback(data) {
-        _this._flatLayerObject = [];
-
-        var getNames = function getNames(layers) {
-          for (var j = 0; j < layers.length; j += 1) {
-            if (layers[j].name) {
-              _this._flatLayerObject.push(layers[j]);
-            }
-
-            if (layers[j].children) {
-              getNames(layers[j].children);
-            }
-          }
-        };
-
-        getNames(data.children);
+      var callback = function callback(layerTree) {
+        _this._flatLayerObject = flattenLayerTree(layerTree);
         succes(_this._flatLayerObject);
       };
 
@@ -8135,57 +8194,23 @@
    */
 
 
-  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 || [];
 
     var _loop_1 = function _loop_1(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 */
 
@@ -8242,21 +8267,11 @@
    * @param wmLayer The WMLayer object to configure
    */
 
-  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) {
-        // 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 (_b) {}
+  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) {
@@ -8278,7 +8293,7 @@
    * @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"/>
@@ -8296,12 +8311,9 @@
     /* 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;
@@ -8323,6 +8335,14 @@
       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 =
   /** @class */
@@ -8346,10 +8366,6 @@
       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);
@@ -8704,162 +8720,67 @@
 
       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) {
-        _this.title = jsonlayer.Title.value;
+      this.path = ''; // Function will be called when the layer with the right name is found in the getcap doc
 
-        try {
-          _this["abstract"] = jsonlayer.Abstract.value;
-        } catch (e) {
-          _this["abstract"] = I18n.not_available_message.text;
-        }
-
-        _this.path = path;
+      var populateLayerFromTreeElement = function populateLayerFromTreeElement(jsonlayer) {
+        _this.title = jsonlayer.title || jsonlayer.name || '';
+        _this["abstract"] = jsonlayer["abstract"] || I18n.not_available_message.text;
+        _this.path = jsonlayer.path.join('/');
         /** ***************** Go through styles **************** */
 
-        configureStyles(nestedLayerPath, _this);
+        configureStyles(jsonlayer, _this);
         /** ***************** Go through Dimensions **************** */
 
-        configureDimensions(nestedLayerPath, _this);
-        var gp = toArray(jsonlayer.SRS);
-
-        if (isDefined(jsonlayer.CRS)) {
-          gp = toArray(jsonlayer.CRS);
-        }
+        configureDimensions(jsonlayer, _this);
+        /** ***************** Go through geographicBoundingBox **************** */
 
-        var tempSRS = [];
+        configureGeographicBoundingBox(jsonlayer, _this);
+        _this.queryable = jsonlayer.queryable || false;
 
-        var getgpbbox = function getgpbbox(data) {
-          if (isDefined(data.BoundingBox)) {
-            // Fill in SRS and BBOX on basis of BoundingBox attribute
-            var gpbbox = toArray(data.BoundingBox);
-
-            for (var j = 0; j < gpbbox.length; j += 1) {
-              var srs = void 0;
-              srs = gpbbox[j].attr.SRS;
-
-              if (isDefined(gpbbox[j].attr.CRS)) {
-                srs = gpbbox[j].attr.CRS;
-              }
-
-              if (srs) {
-                if (srs.length > 0) {
-                  srs = decodeURIComponent(srs);
-                }
-              }
-
-              var alreadyAdded = false;
-
-              for (var i = 0; i < _this.projectionProperties.length; i += 1) {
-                if (srs === _this.projectionProperties[i].srs) {
-                  alreadyAdded = true;
-                  break;
-                }
-              }
-
-              if (alreadyAdded === false) {
-                var geoProperty = new WMProjection();
-                geoProperty.srs = srs;
-                var swapBBOX = false;
-
-                if (_this.version === WMSVersion.version130) {
-                  if (geoProperty.srs === 'EPSG:4326' && _this.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);
-                }
+        if (jsonlayer.crs) {
+          jsonlayer.crs.forEach(function (p) {
+            var wmProjection = new WMProjection();
+            wmProjection.srs = p.name || '';
 
-                _this.projectionProperties.push(geoProperty);
+            if (p.bbox) {
+              var swapBBOX = _this.version === WMSVersion.version130 && wmProjection.srs === 'EPSG:4326' && _this.wms130bboxcompatibilitymode === false;
 
-                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(exports.DebugType.Error, "Warning: BoundingBOX missing for SRS " + gp[j].value);
-            geoProperty.bbox.left = -180;
-            geoProperty.bbox.bottom = -90;
-            geoProperty.bbox.right = 180;
-            geoProperty.bbox.top = 90;
-            geoProperty.srs = gp[j].value;
-
-            _this.projectionProperties.push(geoProperty);
-          }
-        }
-
-        tempSRS = [];
-        /* Check if layer is queryable */
 
-        _this.queryable = false;
-
-        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 " + _this.title + ")");
+            _this.projectionProperties.push(wmProjection);
+          });
         }
-
-        foundLayer = 1;
       };
 
-      function recursivelyFindLayer(thisLayer, JSONLayers, path, _prevNestedLayerPath) {
-        for (var k = 0; k < JSONLayers.length; k += 1) {
-          var nestedLayerPath_1 = [];
-
-          for (var i = 0; i < _prevNestedLayerPath.length; i += 1) {
-            nestedLayerPath_1.push(_prevNestedLayerPath[i]);
-          }
+      var layerTreeStructure = buildLayerTreeFromNestedWMSLayer(rootLayer);
+      /* Recursively walk the layertree until a child is found with the corresponding name */
 
-          nestedLayerPath_1.push(JSONLayers[k]);
-
-          if (JSONLayers[k].Layer) {
-            var pathnew = path;
-
-            try {
-              pathnew += JSONLayers[k].Title.value + "/";
-            } catch (e) {
-              /* Do nothing */
-            }
+      var findTreeNode = function findTreeNode(tree) {
+        if (tree.name === _this.name) {
+          return tree;
+        }
 
-            recursivelyFindLayer(thisLayer, toArray(JSONLayers[k].Layer), pathnew, nestedLayerPath_1);
-          } else if (JSONLayers[k].Name) {
-            if (JSONLayers[k].Name.value === thisLayer.name) {
-              foundLayerFunction(JSONLayers[k], path, nestedLayerPath_1);
-              return undefined;
-            }
-          }
+        if (tree.children) {
+          var foundChild_1;
+          tree.children.find(function (node) {
+            foundChild_1 = findTreeNode(node);
+            return foundChild_1;
+          });
+          return foundChild_1;
         }
 
         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) {
@@ -8876,6 +8797,8 @@
       /* Layer was found */
 
 
+      populateLayerFromTreeElement(foundLayer);
+
       if (this.onReady) {
         this.onReady(this);
       }
@@ -8984,67 +8907,6 @@
       this.name = name;
       return this.parseLayerPromise(false);
     };
-
-    WMLayer.prototype.getLayerRelative = function (success, failure, prevNext) {
-      var _this = 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 === _this.name) {
-            currentLayerIndex = j;
-            break;
-          }
-        }
-
-        if (currentLayerIndex === -1) {
-          failure("Current layer [" + _this.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);
-    };
-
-    WMLayer.prototype.autoSelectLayer = function (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);
-    };
-
-    WMLayer.prototype.getNextLayer = function (success, failure) {
-      this.getLayerRelative(success, failure, 1);
-    };
-
-    WMLayer.prototype.getPreviousLayer = function (success, failure) {
-      this.getLayerRelative(success, failure, -1);
-    };
     /**
      * Sets the style by its name
      * @param style: The name of the style (not the object)