@opengeoweb/webmap 2.0.1 → 2.1.3

package/webmap.esm.js

@@ -3399,7 +3399,6 @@ var WMJSDimension = /*#__PURE__*/function () {
  * */
 var WMDrawMarker = function WMDrawMarker(context, coordx, coordy) {
   var fillColor = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '#FFF';
-  var outlineColor = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '#000';
   var ctx = context;
   var coord = {
     x: parseInt(coordx.toString(), 10),
@@ -3408,8 +3407,8 @@ var WMDrawMarker = function WMDrawMarker(context, coordx, coordy) {
   ctx.fillStyle = fillColor;
   ctx.globalAlpha = 1.0;
   ctx.beginPath();
-  var topRadius = 9;
-  var topHeight = 2.5 * topRadius;
+  var topRadius = 7;
+  var topHeight = 2 * topRadius;
   ctx.arc(coord.x, coord.y - topHeight, topRadius, Math.PI, Math.PI * 2);
   ctx.bezierCurveTo(coord.x + topRadius, coord.y - topHeight, coord.x + topRadius / 1.6, coord.y - topRadius, coord.x, coord.y);
   ctx.bezierCurveTo(coord.x, coord.y, coord.x - topRadius / 1.6, coord.y - topRadius, coord.x - topRadius, coord.y - topHeight);
@@ -3419,13 +3418,7 @@ var WMDrawMarker = function WMDrawMarker(context, coordx, coordy) {
 
   ctx.fillStyle = '#FFF';
   ctx.beginPath();
-  ctx.arc(coord.x, coord.y - topHeight, topRadius / 2, Math.PI * 2, 0);
-  ctx.fill();
-  /* Fill marker exact location */
-
-  ctx.fillStyle = outlineColor;
-  ctx.beginPath();
-  ctx.arc(coord.x, coord.y, 2, Math.PI * 2, 0);
+  ctx.arc(coord.x, coord.y - topHeight, topRadius / 2.5, Math.PI * 2, 0);
   ctx.fill();
 };
 
@@ -3506,7 +3499,7 @@ var MapPin = /*#__PURE__*/function () {
     key: "drawMarker",
     value: function drawMarker(ctx) {
       if (isDefined(this.x) && isDefined(this.y)) {
-        WMDrawMarker(ctx, this.x, this.y, '#9090FF', '#000');
+        WMDrawMarker(ctx, this.x, this.y, '#051039');
       }
     }
   }]);
@@ -3967,7 +3960,6 @@ var WMJSMap = /*#__PURE__*/function () {
     this.previousMouseButtonState = 'up';
     /* Binds */
 
-    this.setXML2JSONURL = this.setXML2JSONURL.bind(this);
     this.setWMTileRendererTileSettings = this.setWMTileRendererTileSettings.bind(this);
     this.makeComponentId = this.makeComponentId.bind(this);
     this.setMessage = this.setMessage.bind(this);
@@ -4093,11 +4085,6 @@ var WMJSMap = /*#__PURE__*/function () {
   }
 
   _createClass(WMJSMap, [{
-    key: "setXML2JSONURL",
-    value: function setXML2JSONURL(_xml2jsonrequest) {
-      this.xml2jsonrequest = _xml2jsonrequest;
-    }
-  }, {
     key: "setWMTileRendererTileSettings",
     value: function setWMTileRendererTileSettings(_WMTileRendererTileSettings) {
       this.tileRenderSettings = _WMTileRendererTileSettings;
@@ -4419,6 +4406,7 @@ var WMJSMap = /*#__PURE__*/function () {
 
       ctx.font = '10px Helvetica';
       ctx.textBaseline = 'middle';
+      ctx.textAlign = 'left';
 
       if (isDefined(this.mouseGeoCoordXY)) {
         var roundingFactor = 1.0 / Math.pow(10, parseInt(Math.log((this.bbox.right - this.bbox.left) / this.width) / Math.log(10), 10) - 2);
@@ -4453,6 +4441,30 @@ var WMJSMap = /*#__PURE__*/function () {
 
       ctx.fillStyle = '#000000';
       ctx.fillText("Map projection: ".concat(this.srs), 5, this.height - 26);
+      /* Show layer metadata */
+
+      if (this.showLayerInfo === true) {
+        var metadataX = 100;
+        var metadataY = 100;
+        var dimStartX = 150;
+        var rowHeight = 26;
+        var rowNumber = 0;
+        drawTextBG(ctx, 'Layer name', metadataX, metadataY + rowNumber * rowHeight, 10);
+        drawTextBG(ctx, 'Dimensions', metadataX + dimStartX, metadataY + rowNumber * rowHeight, 10);
+        rowNumber += 1;
+
+        for (var _j3 = 0; _j3 < this.layers.length; _j3 += 1) {
+          var layer = this.layers[_j3];
+          drawTextBG(ctx, "#".concat(_j3, ":").concat(layer.name), metadataX, metadataY + rowNumber * rowHeight, 10);
+
+          for (var d = 0; d < layer.dimensions.length; d += 1) {
+            var dimension = layer.dimensions[d];
+            drawTextBG(ctx, "".concat(dimension.name, " = ").concat(dimension.currentValue), metadataX + d * 200 + dimStartX, metadataY + rowNumber * rowHeight, 10);
+          }
+
+          rowNumber += 1;
+        }
+      }
     }
     /* Is called when the WebMapJS object is created */
 
@@ -4604,8 +4616,8 @@ var WMJSMap = /*#__PURE__*/function () {
       }
 
       for (var i = 0; i < this.layers.length; i += 1) {
-        for (var _j3 = 0; _j3 < this.layers[i].dimensions.length; _j3 += 1) {
-          var dim = this.layers[i].dimensions[_j3];
+        for (var _j4 = 0; _j4 < this.layers[i].dimensions.length; _j4 += 1) {
+          var dim = this.layers[i].dimensions[_j4];
           var mapdim = this.getDimension(dim.name);
 
           if (isDefined(mapdim)) {
@@ -4618,10 +4630,10 @@ var WMJSMap = /*#__PURE__*/function () {
         }
       }
 
-      for (var _j4 = 0; _j4 < this.mapdimensions.length; _j4 += 1) {
-        if (this.mapdimensions[_j4].used === false) {
-          this.mapdimensions.splice(_j4, 1);
-          _j4 -= 1;
+      for (var _j5 = 0; _j5 < this.mapdimensions.length; _j5 += 1) {
+        if (this.mapdimensions[_j5].used === false) {
+          this.mapdimensions.splice(_j5, 1);
+          _j5 -= 1;
         }
       }
 
@@ -4880,10 +4892,10 @@ var WMJSMap = /*#__PURE__*/function () {
           reject(new Error('layer has no constructor'));
           return;
         }
+        /* Set a reference in the layer to this map */
 
-        if (!layer.parentMaps.includes(_this5)) {
-          layer.parentMaps.push(_this5);
-        }
+
+        layer.parentMap = _this5;
 
         _this5.layers.push(layer);
 
@@ -4920,6 +4932,11 @@ var WMJSMap = /*#__PURE__*/function () {
       }
 
       if (!_srs) _srs = 'EPSG:4326';
+
+      if (this.srs !== _srs) {
+        this.defaultBBOX.setBBOX(_bbox);
+      }
+
       this.srs = _srs;
 
       if (this.proj4.srs !== this.srs || !isDefined(this.proj4.projection)) {
@@ -4933,7 +4950,6 @@ var WMJSMap = /*#__PURE__*/function () {
       }
 
       this.setBBOX(_bbox);
-      this.defaultBBOX.setBBOX(_bbox);
       this.updateMouseCursorCoordinates(undefined);
       this.callBack.triggerEvent('onsetprojection', [this.srs, this.bbox]);
     }
@@ -5239,12 +5255,19 @@ var WMJSMap = /*#__PURE__*/function () {
         if (animationList !== undefined) {
           if (_typeof(animationList) === 'object') {
             if (animationList.length > 0) {
+              // Ensure the time dimension has been loaded for the map before starting animation
+              var timeDim = this.getDimension('time');
+
+              if (!timeDim) {
+                return;
+              }
+
+              var selectedTime = timeDim.currentValue;
               this.isAnimating = true;
               this.callBack.triggerEvent('onstartanimation', this);
               this.currentAnimationStep = 0;
               this.animationList = [];
               this.mouseHoverAnimationBox = false;
-              var selectedTime = this.getDimension('time').currentValue;
 
               for (var j = 0; j < animationList.length; j += 1) {
                 if (selectedTime && animationList[j].value === selectedTime) {
@@ -5422,9 +5445,7 @@ var WMJSMap = /*#__PURE__*/function () {
         this.baseLayers = layer;
 
         for (var j = 0; j < this.baseLayers.length; j += 1) {
-          if (!this.baseLayers[j].parentMaps.includes(this)) {
-            this.baseLayers[j].parentMaps.push(this);
-          }
+          this.baseLayers[j].parentMap = this;
 
           if (this.baseLayers[j].keepOnTop !== true) {
             this.numBaseLayers += 1;
@@ -6648,17 +6669,17 @@ var WMJSMap = /*#__PURE__*/function () {
             this.WMProjectionTempUndo[j] = this.WMProjectionUndo[j];
           }
 
-          for (var _j5 = 0; _j5 <= this.UndoPointer; _j5 += 1) {
-            this.WMProjectionUndo[_j5] = this.WMProjectionTempUndo[this.UndoPointer - _j5];
+          for (var _j6 = 0; _j6 <= this.UndoPointer; _j6 += 1) {
+            this.WMProjectionUndo[_j6] = this.WMProjectionTempUndo[this.UndoPointer - _j6];
           }
 
           this.UndoPointer = 0;
         }
 
-        for (var _j6 = this.MaxUndos - 1; _j6 > 0; _j6 -= 1) {
-          this.WMProjectionUndo[_j6].bbox.setBBOX(this.WMProjectionUndo[_j6 - 1].bbox);
+        for (var _j7 = this.MaxUndos - 1; _j7 > 0; _j7 -= 1) {
+          this.WMProjectionUndo[_j7].bbox.setBBOX(this.WMProjectionUndo[_j7 - 1].bbox);
 
-          this.WMProjectionUndo[_j6].srs = this.WMProjectionUndo[_j6 - 1].srs;
+          this.WMProjectionUndo[_j7].srs = this.WMProjectionUndo[_j7 - 1].srs;
         }
 
         this.WMProjectionUndo[0].bbox.setBBOX(this.bbox);
@@ -7324,8 +7345,8 @@ var getWMSUrl = function getWMSUrl() {
  * Global getcapabilities function
  */
 
-var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, xml2jsonrequestURL, options) {
-  var disableCache = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, options) {
+  var disableCache = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
 
   /* Make the getCapabilitiesJSONrequest */
   var headers = [];
@@ -7369,7 +7390,6 @@ var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, xm
     random: Math.random()
   } : {};
   var url = getWMSUrl(service, addParams);
-  var newXml2jsonrequestURL = xml2jsonrequestURL;
   WMXMLParser(url, headers).then(function (data) {
     try {
       succes(data);
@@ -7379,7 +7399,7 @@ var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, xm
   })["catch"](function () {
     loadGetCapabilitiesViaProxy(url, succes, function () {
       fail("Request failed for ".concat(url));
-    }, newXml2jsonrequestURL);
+    }, WMServiceStoreXML2JSONRequest.proxy);
   });
 };
 var sortByKey = function sortByKey(array, key) {
@@ -7410,7 +7430,11 @@ rootNode, path) {
         name: layers[j].Name.value,
         text: layers[j].Title.value,
         leaf: isleaf,
-        path: path
+        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
       };
     } else {
       var nodeText = isNull(layers[j].Title) ? 'Layer' : layers[j].Title.value;
@@ -7436,7 +7460,6 @@ rootNode, path) {
  *
  * options:
  *   service
- *   xml2jsonrequestURL
  *   title (optional)
  */
 
@@ -7457,7 +7480,6 @@ var WMJSService = /*#__PURE__*/function () {
     if (options) {
       this.service = options.service;
       this.title = options.title;
-      this.xml2jsonrequestURL = options.xml2jsonrequestURL;
     }
 
     this.checkVersion111 = this.checkVersion111.bind(this);
@@ -7580,7 +7602,7 @@ var WMJSService = /*#__PURE__*/function () {
 
   }, {
     key: "getCapabilities",
-    value: function getCapabilities(succescallback, failcallback, forceReload, xml2jsonrequestURL, options) {
+    value: function getCapabilities(succescallback, failcallback, forceReload, options) {
       var _this = this;
 
       if (options) {
@@ -7665,7 +7687,7 @@ var WMJSService = /*#__PURE__*/function () {
             return null;
           }, function () {
             return null;
-          }, false, xml2jsonrequestURL, options);
+          }, false, options);
 
           var current;
 
@@ -7674,7 +7696,7 @@ var WMJSService = /*#__PURE__*/function () {
           }
         };
 
-        WMJSGetCapabilities(this.service, succes, fail, xml2jsonrequestURL, options);
+        WMJSGetCapabilities(this.service, succes, fail, options);
       } else {
         /* The callbacks are not allowed to be called in the scope of this object.
           By using window.setTimeOut they are externally called
@@ -7720,11 +7742,9 @@ var WMJSService = /*#__PURE__*/function () {
 
   }, {
     key: "getNodes",
-    value: function getNodes(succes, failure, forceReload) {
+    value: function getNodes(succes, failure, forceReload, options) {
       var _this2 = this;
 
-      var xml2jsonrequestURL = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : this.xml2jsonrequestURL;
-      var options = arguments.length > 4 ? arguments[4] : undefined;
       this.nodeCache = undefined;
 
       if (!failure) {
@@ -7739,7 +7759,9 @@ var WMJSService = /*#__PURE__*/function () {
           leaf: false,
           expanded: true,
           children: [],
-          text: ''
+          text: '',
+          keywords: [],
+          "abstract": ''
         };
 
         var rootLayer = _this2.getCapabilityElement(jsonData).Layer;
@@ -7771,7 +7793,7 @@ var WMJSService = /*#__PURE__*/function () {
         failure(data);
       };
 
-      this.getCapabilities(callback, fail, forceReload, xml2jsonrequestURL, options);
+      this.getCapabilities(callback, fail, forceReload, options);
     }
     /** Calls succes with an array of all layerobjects
      * Calls failure when something goes wrong
@@ -7782,13 +7804,7 @@ var WMJSService = /*#__PURE__*/function () {
     value: function getLayerObjectsFlat(succes, failure, forceReload) {
       var _this3 = this;
 
-      var xml2jsonrequestURL = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : this.xml2jsonrequestURL;
-      var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : this._options;
-
-      if (!xml2jsonrequestURL) {
-        // eslint-disable-next-line no-param-reassign
-        xml2jsonrequestURL = this.xml2jsonrequestURL;
-      }
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : this._options;
 
       if (isDefined(this._flatLayerObject) && forceReload !== true) {
         succes(this._flatLayerObject);
@@ -7814,7 +7830,7 @@ var WMJSService = /*#__PURE__*/function () {
         succes(_this3._flatLayerObject);
       };
 
-      this.getNodes(callback, failure, forceReload, xml2jsonrequestURL, options);
+      this.getNodes(callback, failure, forceReload, options);
     }
   }]);
 
@@ -7838,20 +7854,15 @@ var WMJSService = /*#__PURE__*/function () {
  * Copyright 2020 - Finnish Meteorological Institute (FMI)
  * */
 
-var WMGetServiceFromStore = function WMGetServiceFromStore(serviceName, xml2jsonrequestURL) {
+var WMGetServiceFromStore = function WMGetServiceFromStore(serviceName) {
   for (var j = 0; j < WMServiceStore.length; j += 1) {
     if (WMServiceStore[j].service === serviceName) {
       return WMServiceStore[j];
     }
   }
 
-  if (xml2jsonrequestURL) {
-    WMServiceStoreXML2JSONRequest.proxy = xml2jsonrequestURL;
-  }
-
   var service = new WMJSService({
-    service: serviceName,
-    xml2jsonrequestURL: WMServiceStoreXML2JSONRequest.proxy
+    service: serviceName
   });
   WMServiceStore.push(service);
   return service;
@@ -7993,8 +8004,8 @@ var addDimsForLayer = function addDimsForLayer(layerObjectFromWMS, layer, layerD
       });
       /* Check if the dimension should take the value from the map */
 
-      if (layer.parentMaps.length > 0) {
-        var mapDim = layer.parentMaps[0].getDimension(layerDim.name);
+      if (layer.parentMap) {
+        var mapDim = layer.parentMap.getDimension(layerDim.name);
 
         if (mapDim && mapDim.linked && isDefined(mapDim.currentValue)) {
           var dimensionCurrentValue = dimension.getClosestValue(mapDim.currentValue);
@@ -8099,8 +8110,8 @@ var configureDimensions = function configureDimensions(nestedLayerPath, wmLayer)
     wmLayer.handleReferenceTime('reference_time', refTimeDimension.getValue());
   }
 
-  if (wmLayer.parentMaps && wmLayer.parentMaps.length > 0) {
-    wmLayer.parentMaps[0].configureMapDimensions(wmLayer);
+  if (wmLayer.parentMap) {
+    wmLayer.parentMap.configureMapDimensions(wmLayer);
   }
 };
 
@@ -8200,8 +8211,8 @@ var WMLayer = /*#__PURE__*/function () {
         this.type = options.type;
       }
 
-      if (options.parentMaps) {
-        this.parentMaps = options.parentMaps;
+      if (options.parentMap) {
+        this.parentMap = options.parentMap;
       }
 
       if (options.headers) {
@@ -8217,8 +8228,6 @@ var WMLayer = /*#__PURE__*/function () {
       this.timer = undefined;
       this.service = undefined; // URL of the WMS Service
 
-      this.WMJSService = undefined; // Corresponding WMJSService
-
       this.getmapURL = undefined;
       this.getfeatureinfoURL = undefined;
       this.getlegendgraphicURL = undefined;
@@ -8249,9 +8258,8 @@ var WMLayer = /*#__PURE__*/function () {
       this.id = '-1';
       this.opacity = 1.0; // Ranges from 0.0-1.0
 
-      this.getCapabilitiesDoc = undefined;
       this.serviceTitle = 'not defined';
-      this.parentMaps = [];
+      this.parentMap = null;
       this.sldURL = null;
       this.isConfigured = false;
     }
@@ -8270,7 +8278,7 @@ var WMLayer = /*#__PURE__*/function () {
       if (this.autoupdate) {
         var numDeltaMS = 60000;
         this.timer = setInterval(function () {
-          _this.parseLayer(undefined, true, undefined);
+          _this.parseLayer(undefined, true);
         }, numDeltaMS);
       } else {
         clearInterval(this.timer);
@@ -8288,7 +8296,7 @@ var WMLayer = /*#__PURE__*/function () {
           clearInterval(this.timer);
         } else {
           this.timer = setInterval(function () {
-            _this2.parseLayer(callback, true, undefined);
+            _this2.parseLayer(callback, true);
           }, interval);
         }
       }
@@ -8297,10 +8305,7 @@ var WMLayer = /*#__PURE__*/function () {
     key: "setOpacity",
     value: function setOpacity(opacityValue) {
       this.opacity = parseFloat(opacityValue);
-
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].redrawBuffer();
-      }
+      this.parentMap && this.parentMap.redrawBuffer();
     }
   }, {
     key: "getOpacity",
@@ -8310,9 +8315,9 @@ var WMLayer = /*#__PURE__*/function () {
   }, {
     key: "remove",
     value: function remove() {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].deleteLayer(this);
-        this.parentMaps[j].draw('WMLayer::remove');
+      if (this.parentMap) {
+        this.parentMap.deleteLayer(this);
+        this.parentMap.draw('WMLayer::remove');
       }
 
       clearInterval(this.timer);
@@ -8320,31 +8325,31 @@ var WMLayer = /*#__PURE__*/function () {
   }, {
     key: "moveUp",
     value: function moveUp() {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].moveLayerUp(this);
-        this.parentMaps[j].draw('WMLayer::moveUp');
+      if (this.parentMap) {
+        this.parentMap.moveLayerUp(this);
+        this.parentMap.draw('WMLayer::moveUp');
       }
     }
   }, {
     key: "moveDown",
     value: function moveDown() {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].moveLayerDown(this);
-        this.parentMaps[j].draw('WMLayer::moveDown');
+      if (this.parentMap) {
+        this.parentMap.moveLayerDown(this);
+        this.parentMap.draw('WMLayer::moveDown');
       }
     }
   }, {
     key: "zoomToLayer",
     value: function zoomToLayer() {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].zoomToLayer(this);
+      if (this.parentMap) {
+        this.parentMap.zoomToLayer(this);
       }
     }
   }, {
     key: "draw",
     value: function draw(e) {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].draw("WMLayer::draw::".concat(e));
+      if (this.parentMap) {
+        this.parentMap.draw("WMLayer::draw::".concat(e));
       }
     }
   }, {
@@ -8360,9 +8365,9 @@ var WMLayer = /*#__PURE__*/function () {
           timeDim.setTimeValuesForReferenceTime(value, referenceTimeDim);
 
           if (updateMapDimensions) {
-            if (this.parentMaps && this.parentMaps.length > 0) {
+            if (this.parentMap) {
               if (this.enabled !== false) {
-                this.parentMaps[0].getListener().triggerEvent('ondimchange', 'time');
+                this.parentMap.getListener().triggerEvent('ondimchange', 'time');
               }
             }
           }
@@ -8389,43 +8394,41 @@ var WMLayer = /*#__PURE__*/function () {
 
       if (updateMapDimensions) {
         if (dim.linked === true) {
-          for (var j = 0; j < this.parentMaps.length; j += 1) {
-            this.parentMaps[j].setDimension(name, dim.getValue());
+          if (this.parentMap) {
+            this.parentMap.setDimension(name, dim.getValue());
           }
         }
       }
     }
   }, {
     key: "__parseGetCapForLayer",
-    value: function __parseGetCapForLayer(layer, getcapabilitiesjson, layerDoneCallback, fail) {
+    value: function __parseGetCapForLayer(getcapabilitiesjson, layerDoneCallback, fail) {
       var _this3 = this;
 
-      var jsondata = getcapabilitiesjson;
-
-      if (!jsondata) {
+      if (!getcapabilitiesjson) {
         this.title = I18n.service_has_error.text;
         this["abstract"] = I18n.not_available_message.text;
-        fail(layer, I18n.unable_to_connect_server.text);
+        fail(this, I18n.unable_to_connect_server.text);
         return;
       }
 
-      var j = 0; // Get the capability object
+      var wmjsService = WMGetServiceFromStore(this.service); // Get the capability object
 
       var capabilityObject;
 
       try {
-        capabilityObject = layer.WMJSService.getCapabilityElement(getcapabilitiesjson);
+        capabilityObject = wmjsService.getCapabilityElement(getcapabilitiesjson);
       } catch (_a) {
-        fail(layer, 'No capability element in service');
+        fail(this, 'No capability element in service');
         return;
       }
 
-      this.version = layer.WMJSService.version; // Get the rootLayer
+      this.version = wmjsService.version; // Get the rootLayer
 
       var rootLayer = capabilityObject.Layer;
 
       if (!isDefined(rootLayer)) {
-        fail(layer, 'No Layer element in service');
+        fail(this, 'No Layer element in service');
         return;
       }
 
@@ -8497,10 +8500,9 @@ var WMLayer = /*#__PURE__*/function () {
         } // TODO Should be arranged also for the other services:
 
 
-        _this3.getmapURL = WMJScheckURL(layer.getmapURL);
-        _this3.getfeatureinfoURL = WMJScheckURL(layer.getfeatureinfoURL);
-        _this3.getlegendgraphicURL = WMJScheckURL(layer.getlegendgraphicURL);
-        _this3.getCapabilitiesDoc = jsondata;
+        _this3.getmapURL = WMJScheckURL(_this3.getmapURL);
+        _this3.getfeatureinfoURL = WMJScheckURL(_this3.getfeatureinfoURL);
+        _this3.getlegendgraphicURL = WMJScheckURL(_this3.getlegendgraphicURL);
         _this3.title = jsonlayer.Title.value;
 
         try {
@@ -8531,7 +8533,7 @@ var WMLayer = /*#__PURE__*/function () {
             // Fill in SRS and BBOX on basis of BoundingBox attribute
             var gpbbox = toArray(data.BoundingBox);
 
-            for (j = 0; j < gpbbox.length; j += 1) {
+            for (var j = 0; j < gpbbox.length; j += 1) {
               var srs = void 0;
               srs = gpbbox[j].attr.SRS;
 
@@ -8559,8 +8561,8 @@ var WMLayer = /*#__PURE__*/function () {
                 geoProperty.srs = srs;
                 var swapBBOX = false;
 
-                if (layer.version === WMSVersion.version130) {
-                  if (geoProperty.srs === 'EPSG:4326' && layer.wms130bboxcompatibilitymode === false) {
+                if (_this3.version === WMSVersion.version130) {
+                  if (geoProperty.srs === 'EPSG:4326' && _this3.wms130bboxcompatibilitymode === false) {
                     swapBBOX = true;
                   }
                 }
@@ -8588,7 +8590,7 @@ var WMLayer = /*#__PURE__*/function () {
         getgpbbox(jsonlayer);
         getgpbbox(rootLayer); // Fill in SRS  on basis of SRS attribute
 
-        for (j = 0; j < gp.length; j += 1) {
+        for (var j = 0; j < gp.length; j += 1) {
           if (tempSRS.indexOf(gp[j].value) === -1) {
             var geoProperty = new WMProjection();
             debug(DebugType.Error, "Warning: BoundingBOX missing for SRS ".concat(gp[j].value));
@@ -8597,7 +8599,8 @@ var WMLayer = /*#__PURE__*/function () {
             geoProperty.bbox.right = 180;
             geoProperty.bbox.top = 90;
             geoProperty.srs = gp[j].value;
-            layer.projectionProperties.push(geoProperty);
+
+            _this3.projectionProperties.push(geoProperty);
           }
         }
 
@@ -8609,13 +8612,13 @@ var WMLayer = /*#__PURE__*/function () {
         try {
           if (parseInt(jsonlayer.attr.queryable, 10) === 1) _this3.queryable = true;else _this3.queryable = false;
         } catch (e) {
-          debug(DebugType.Error, "Unable to detect whether this layer is queryable (for layer ".concat(layer.title, ")"));
+          debug(DebugType.Error, "Unable to detect whether this layer is queryable (for layer ".concat(_this3.title, ")"));
         }
 
         foundLayer = 1;
       };
 
-      function recursivelyFindLayer(JSONLayers, path, _prevNestedLayerPath) {
+      function recursivelyFindLayer(thisLayer, JSONLayers, path, _prevNestedLayerPath) {
         for (var k = 0; k < JSONLayers.length; k += 1) {
           var _nestedLayerPath = [];
 
@@ -8634,9 +8637,9 @@ var WMLayer = /*#__PURE__*/function () {
               /* Do nothing */
             }
 
-            recursivelyFindLayer(toArray(JSONLayers[k].Layer), pathnew, _nestedLayerPath);
+            recursivelyFindLayer(thisLayer, toArray(JSONLayers[k].Layer), pathnew, _nestedLayerPath);
           } else if (JSONLayers[k].Name) {
-            if (JSONLayers[k].Name.value === layer.name) {
+            if (JSONLayers[k].Name.value === thisLayer.name) {
               foundLayerFunction(JSONLayers[k], path, _nestedLayerPath);
               return;
             }
@@ -8648,13 +8651,13 @@ var WMLayer = /*#__PURE__*/function () {
       var JSONLayers = toArray(rootLayer.Layer);
       var path = '';
       var nestedLayerPath = [rootLayer];
-      recursivelyFindLayer(JSONLayers, path, nestedLayerPath);
+      recursivelyFindLayer(this, JSONLayers, path, nestedLayerPath);
 
       if (foundLayer === 0) {
         // Layer was not found...
         var message = '';
 
-        if (layer.name) {
+        if (this.name) {
           message = "Unable to find layer '".concat(this.name, "' in service '").concat(this.service, "'");
         } else {
           message = "Unable to find layer '".concat(this.title, "' in service '").concat(this.service, "'");
@@ -8683,7 +8686,7 @@ var WMLayer = /*#__PURE__*/function () {
 
   }, {
     key: "parseLayer",
-    value: function parseLayer(_layerDoneCallback, forceReload, xml2jsonrequest) {
+    value: function parseLayer(_layerDoneCallback, forceReload) {
       var _this4 = this;
 
       this.hasError = false;
@@ -8710,20 +8713,14 @@ var WMLayer = /*#__PURE__*/function () {
       };
 
       var callback = function callback(data) {
-        _this4.__parseGetCapForLayer(_this4, data, layerDoneCallback, fail);
+        _this4.__parseGetCapForLayer(data, layerDoneCallback, fail);
       };
 
       var requestfail = function requestfail() {
         fail(_this4, I18n.no_capability_element_found.text);
       };
 
-      var newXml2jsonrequest = xml2jsonrequest;
-
-      if (!xml2jsonrequest) {
-        newXml2jsonrequest = this.parentMaps && this.parentMaps.length > 0 ? this.parentMaps[0].xml2jsonrequest : undefined;
-      }
-
-      this.WMJSService = WMGetServiceFromStore(this.service, newXml2jsonrequest);
+      var wmjsService = WMGetServiceFromStore(this.service);
       var options = {
         headers: {}
       };
@@ -8732,10 +8729,10 @@ var WMLayer = /*#__PURE__*/function () {
         options.headers = this.headers;
       }
 
-      if (this.WMJSService.service !== undefined) {
-        this.WMJSService.getCapabilities(function (data) {
+      if (wmjsService.service !== undefined) {
+        wmjsService.getCapabilities(function (data) {
           callback(data);
-        }, requestfail, forceReload, xml2jsonrequest, options);
+        }, requestfail, forceReload, options);
       }
     }
     /**
@@ -8811,7 +8808,8 @@ var WMLayer = /*#__PURE__*/function () {
         success(layerObjects[currentLayerIndex], currentLayerIndex, layerObjects.length);
       };
 
-      this.WMJSService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
+      var wmjsService = WMGetServiceFromStore(this.service);
+      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
     }
   }, {
     key: "autoSelectLayer",
@@ -8829,7 +8827,8 @@ var WMLayer = /*#__PURE__*/function () {
         }
       };
 
-      this.WMJSService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
+      var wmjsService = WMGetServiceFromStore(this.service);
+      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
     }
   }, {
     key: "getNextLayer",
@@ -9005,8 +9004,8 @@ var WMLayer = /*#__PURE__*/function () {
     value: function display(displayornot) {
       this.enabled = displayornot;
 
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].displayLayer(this, this.enabled);
+      if (this.parentMap) {
+        this.parentMap.displayLayer(this, this.enabled);
       }
     }
   }]);