@opengeoweb/webmap 2.0.1 → 2.1.3

package/webmap.umd.js

@@ -3433,15 +3433,11 @@
    * Copyright 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2020 - Finnish Meteorological Institute (FMI)
    * */
-  var WMDrawMarker = function WMDrawMarker(context, coordx, coordy, fillColor, outlineColor) {
+  var WMDrawMarker = function WMDrawMarker(context, coordx, coordy, fillColor) {
     if (fillColor === void 0) {
       fillColor = '#FFF';
     }
 
-    if (outlineColor === void 0) {
-      outlineColor = '#000';
-    }
-
     var ctx = context;
     var coord = {
       x: parseInt(coordx.toString(), 10),
@@ -3450,8 +3446,8 @@
     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);
@@ -3461,13 +3457,7 @@
 
     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();
   };
 
@@ -3563,7 +3553,7 @@
 
     MapPin.prototype.drawMarker = function (ctx) {
       if (isDefined(this.x) && isDefined(this.y)) {
-        WMDrawMarker(ctx, this.x, this.y, '#9090FF', '#000');
+        WMDrawMarker(ctx, this.x, this.y, '#051039');
       }
     };
 
@@ -4037,7 +4027,6 @@
       this.previousMouseButtonState = 'up';
       /* Binds */
 
-      this.setXML2JSONURL = this.setXML2JSONURL.bind(this);
       this.setWMTileRendererTileSettings = this.setWMTileRendererTileSettings.bind(this);
       this.makeComponentId = this.makeComponentId.bind(this);
       this.setMessage = this.setMessage.bind(this);
@@ -4162,10 +4151,6 @@
       this.init();
     }
 
-    WMJSMap.prototype.setXML2JSONURL = function (_xml2jsonrequest) {
-      this.xml2jsonrequest = _xml2jsonrequest;
-    };
-
     WMJSMap.prototype.setWMTileRendererTileSettings = function (_WMTileRendererTileSettings) {
       this.tileRenderSettings = _WMTileRendererTileSettings;
     };
@@ -4474,6 +4459,7 @@
 
       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);
@@ -4505,6 +4491,30 @@
 
       ctx.fillStyle = '#000000';
       ctx.fillText("Map projection: " + 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 j = 0; j < this.layers.length; j += 1) {
+          var layer = this.layers[j];
+          drawTextBG(ctx, "#" + j + ":" + layer.name, metadataX, metadataY + rowNumber * rowHeight, 10);
+
+          for (var d = 0; d < layer.dimensions.length; d += 1) {
+            var dimension = layer.dimensions[d];
+            drawTextBG(ctx, dimension.name + " = " + dimension.currentValue, metadataX + d * 200 + dimStartX, metadataY + rowNumber * rowHeight, 10);
+          }
+
+          rowNumber += 1;
+        }
+      }
     };
     /* Is called when the WebMapJS object is created */
 
@@ -4912,10 +4922,10 @@
           reject(new Error('layer has no constructor'));
           return;
         }
+        /* Set a reference in the layer to this map */
 
-        if (!layer.parentMaps.includes(_this)) {
-          layer.parentMaps.push(_this);
-        }
+
+        layer.parentMap = _this;
 
         _this.layers.push(layer);
 
@@ -4950,6 +4960,11 @@
       }
 
       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)) {
@@ -4963,7 +4978,6 @@
       }
 
       this.setBBOX(_bbox);
-      this.defaultBBOX.setBBOX(_bbox);
       this.updateMouseCursorCoordinates(undefined);
       this.callBack.triggerEvent('onsetprojection', [this.srs, this.bbox]);
     };
@@ -5250,12 +5264,19 @@
         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) {
@@ -5427,9 +5448,7 @@
         this.baseLayers = layer;
 
         for (var j = 0; j < this.baseLayers.length; j += 1) {
-          if (!this.baseLayers[j].parentMaps.includes(this)) {
-            this.baseLayers[j].parentMaps.push(this);
-          }
+          this.baseLayers[j].parentMap = this;
 
           if (this.baseLayers[j].keepOnTop !== true) {
             this.numBaseLayers += 1;
@@ -7301,7 +7320,7 @@
    * Global getcapabilities function
    */
 
-  var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, xml2jsonrequestURL, options, disableCache) {
+  var WMJSGetCapabilities = function WMJSGetCapabilities(service, succes, fail, options, disableCache) {
     if (disableCache === void 0) {
       disableCache = false;
     }
@@ -7349,7 +7368,6 @@
       random: Math.random()
     } : {};
     var url = getWMSUrl(service, addParams);
-    var newXml2jsonrequestURL = xml2jsonrequestURL;
     WMXMLParser(url, headers).then(function (data) {
       try {
         succes(data);
@@ -7359,7 +7377,7 @@
     })["catch"](function () {
       loadGetCapabilitiesViaProxy(url, succes, function () {
         fail("Request failed for " + url);
-      }, newXml2jsonrequestURL);
+      }, WMServiceStoreXML2JSONRequest.proxy);
     });
   };
   var sortByKey = function sortByKey(array, key) {
@@ -7390,7 +7408,11 @@
           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;
@@ -7416,7 +7438,6 @@
    *
    * options:
    *   service
-   *   xml2jsonrequestURL
    *   title (optional)
    */
 
@@ -7437,7 +7458,6 @@
       if (options) {
         this.service = options.service;
         this.title = options.title;
-        this.xml2jsonrequestURL = options.xml2jsonrequestURL;
       }
 
       this.checkVersion111 = this.checkVersion111.bind(this);
@@ -7554,7 +7574,7 @@
      */
 
 
-    WMJSService.prototype.getCapabilities = function (succescallback, failcallback, forceReload, xml2jsonrequestURL, options) {
+    WMJSService.prototype.getCapabilities = function (succescallback, failcallback, forceReload, options) {
       var _this = this;
 
       if (options) {
@@ -7639,7 +7659,7 @@
             return null;
           }, function () {
             return null;
-          }, false, xml2jsonrequestURL, options);
+          }, false, options);
 
           var current;
 
@@ -7648,7 +7668,7 @@
           }
         };
 
-        WMJSGetCapabilities(this.service, succes, fail_1, xml2jsonrequestURL, options);
+        WMJSGetCapabilities(this.service, succes, fail_1, options);
       } else {
         /* The callbacks are not allowed to be called in the scope of this object.
           By using window.setTimeOut they are externally called
@@ -7692,13 +7712,9 @@
      */
 
 
-    WMJSService.prototype.getNodes = function (succes, failure, forceReload, xml2jsonrequestURL, options) {
+    WMJSService.prototype.getNodes = function (succes, failure, forceReload, options) {
       var _this = this;
 
-      if (xml2jsonrequestURL === void 0) {
-        xml2jsonrequestURL = this.xml2jsonrequestURL;
-      }
-
       this.nodeCache = undefined;
 
       if (!failure) {
@@ -7713,7 +7729,9 @@
           leaf: false,
           expanded: true,
           children: [],
-          text: ''
+          text: '',
+          keywords: [],
+          "abstract": ''
         };
 
         var rootLayer = _this.getCapabilityElement(jsonData).Layer;
@@ -7745,29 +7763,20 @@
         failure(data);
       };
 
-      this.getCapabilities(callback, fail, forceReload, xml2jsonrequestURL, options);
+      this.getCapabilities(callback, fail, forceReload, options);
     };
     /** Calls succes with an array of all layerobjects
      * Calls failure when something goes wrong
      */
 
 
-    WMJSService.prototype.getLayerObjectsFlat = function (succes, failure, forceReload, xml2jsonrequestURL, options) {
+    WMJSService.prototype.getLayerObjectsFlat = function (succes, failure, forceReload, options) {
       var _this = this;
 
-      if (xml2jsonrequestURL === void 0) {
-        xml2jsonrequestURL = this.xml2jsonrequestURL;
-      }
-
       if (options === void 0) {
         options = this._options;
       }
 
-      if (!xml2jsonrequestURL) {
-        // eslint-disable-next-line no-param-reassign
-        xml2jsonrequestURL = this.xml2jsonrequestURL;
-      }
-
       if (isDefined(this._flatLayerObject) && forceReload !== true) {
         succes(this._flatLayerObject);
         return;
@@ -7792,7 +7801,7 @@
         succes(_this._flatLayerObject);
       };
 
-      this.getNodes(callback, failure, forceReload, xml2jsonrequestURL, options);
+      this.getNodes(callback, failure, forceReload, options);
     };
 
     return WMJSService;
@@ -7815,20 +7824,15 @@
    * Copyright 2020 - Finnish Meteorological Institute (FMI)
    * */
 
-  var WMGetServiceFromStore = function WMGetServiceFromStore(serviceName, xml2jsonrequestURL) {
+  var WMGetServiceFromStore = function WMGetServiceFromStore(serviceName) {
     for (var j = 0; j < WMServiceStore.length; j += 1) {
       if (WMServiceStore[j].service === serviceName) {
         return WMServiceStore[j];
       }
     }
 
-    if (xml2jsonrequestURL) {
-      WMServiceStoreXML2JSONRequest.proxy = xml2jsonrequestURL;
-    }
-
     var service = new WMJSService({
-      service: serviceName,
-      xml2jsonrequestURL: WMServiceStoreXML2JSONRequest.proxy
+      service: serviceName
     });
     WMServiceStore.push(service);
     return service;
@@ -7985,8 +7989,8 @@
         });
         /* Check if the dimension should take the value from the map */
 
-        if (layer.parentMaps.length > 0) {
-          var mapDim = layer.parentMaps[0].getDimension(layerDim.name);
+        if (layer.parentMap) {
+          var mapDim = layer.parentMap.getDimension(layerDim.name);
 
           if (mapDim && mapDim.linked && isDefined(mapDim.currentValue)) {
             var dimensionCurrentValue = dimension.getClosestValue(mapDim.currentValue);
@@ -8093,8 +8097,8 @@
       wmLayer.handleReferenceTime('reference_time', refTimeDimension.getValue());
     }
 
-    if (wmLayer.parentMaps && wmLayer.parentMaps.length > 0) {
-      wmLayer.parentMaps[0].configureMapDimensions(wmLayer);
+    if (wmLayer.parentMap) {
+      wmLayer.parentMap.configureMapDimensions(wmLayer);
     }
   };
 
@@ -8194,8 +8198,8 @@
           this.type = options.type;
         }
 
-        if (options.parentMaps) {
-          this.parentMaps = options.parentMaps;
+        if (options.parentMap) {
+          this.parentMap = options.parentMap;
         }
 
         if (options.headers) {
@@ -8209,8 +8213,6 @@
       this.timer = undefined;
       this.service = undefined; // URL of the WMS Service
 
-      this.WMJSService = undefined; // Corresponding WMJSService
-
       this.getmapURL = undefined;
       this.getfeatureinfoURL = undefined;
       this.getlegendgraphicURL = undefined;
@@ -8241,9 +8243,8 @@
       this.id = '-1';
       this.opacity = 1.0; // Ranges from 0.0-1.0
 
-      this.getCapabilitiesDoc = undefined;
       this.serviceTitle = 'not defined';
-      this.parentMaps = [];
+      this.parentMap = null;
       this.sldURL = null;
       this.isConfigured = false;
     };
@@ -8260,7 +8261,7 @@
       if (this.autoupdate) {
         var numDeltaMS = 60000;
         this.timer = setInterval(function () {
-          _this.parseLayer(undefined, true, undefined);
+          _this.parseLayer(undefined, true);
         }, numDeltaMS);
       } else {
         clearInterval(this.timer);
@@ -8277,7 +8278,7 @@
           clearInterval(this.timer);
         } else {
           this.timer = setInterval(function () {
-            _this.parseLayer(callback, true, undefined);
+            _this.parseLayer(callback, true);
           }, interval);
         }
       }
@@ -8285,10 +8286,7 @@
 
     WMLayer.prototype.setOpacity = function (opacityValue) {
       this.opacity = parseFloat(opacityValue);
-
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].redrawBuffer();
-      }
+      this.parentMap && this.parentMap.redrawBuffer();
     };
 
     WMLayer.prototype.getOpacity = function () {
@@ -8296,37 +8294,37 @@
     };
 
     WMLayer.prototype.remove = function () {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].deleteLayer(this);
-        this.parentMaps[j].draw('WMLayer::remove');
+      if (this.parentMap) {
+        this.parentMap.deleteLayer(this);
+        this.parentMap.draw('WMLayer::remove');
       }
 
       clearInterval(this.timer);
     };
 
     WMLayer.prototype.moveUp = function () {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].moveLayerUp(this);
-        this.parentMaps[j].draw('WMLayer::moveUp');
+      if (this.parentMap) {
+        this.parentMap.moveLayerUp(this);
+        this.parentMap.draw('WMLayer::moveUp');
       }
     };
 
     WMLayer.prototype.moveDown = function () {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].moveLayerDown(this);
-        this.parentMaps[j].draw('WMLayer::moveDown');
+      if (this.parentMap) {
+        this.parentMap.moveLayerDown(this);
+        this.parentMap.draw('WMLayer::moveDown');
       }
     };
 
     WMLayer.prototype.zoomToLayer = function () {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].zoomToLayer(this);
+      if (this.parentMap) {
+        this.parentMap.zoomToLayer(this);
       }
     };
 
     WMLayer.prototype.draw = function (e) {
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].draw("WMLayer::draw::" + e);
+      if (this.parentMap) {
+        this.parentMap.draw("WMLayer::draw::" + e);
       }
     };
 
@@ -8343,9 +8341,9 @@
           timeDim.setTimeValuesForReferenceTime(value, referenceTimeDim);
 
           if (updateMapDimensions) {
-            if (this.parentMaps && this.parentMaps.length > 0) {
+            if (this.parentMap) {
               if (this.enabled !== false) {
-                this.parentMaps[0].getListener().triggerEvent('ondimchange', 'time');
+                this.parentMap.getListener().triggerEvent('ondimchange', 'time');
               }
             }
           }
@@ -8373,42 +8371,40 @@
 
       if (updateMapDimensions) {
         if (dim.linked === true) {
-          for (var j = 0; j < this.parentMaps.length; j += 1) {
-            this.parentMaps[j].setDimension(name, dim.getValue());
+          if (this.parentMap) {
+            this.parentMap.setDimension(name, dim.getValue());
           }
         }
       }
     };
 
-    WMLayer.prototype.__parseGetCapForLayer = function (layer, getcapabilitiesjson, layerDoneCallback, fail) {
+    WMLayer.prototype.__parseGetCapForLayer = function (getcapabilitiesjson, layerDoneCallback, fail) {
       var _this = this;
 
-      var jsondata = getcapabilitiesjson;
-
-      if (!jsondata) {
+      if (!getcapabilitiesjson) {
         this.title = I18n.service_has_error.text;
         this["abstract"] = I18n.not_available_message.text;
-        fail(layer, I18n.unable_to_connect_server.text);
+        fail(this, I18n.unable_to_connect_server.text);
         return;
       }
 
-      var j = 0; // Get the capability object
+      var wmjsService = WMGetServiceFromStore(this.service); // Get the capability object
 
       var capabilityObject;
 
       try {
-        capabilityObject = layer.WMJSService.getCapabilityElement(getcapabilitiesjson);
+        capabilityObject = wmjsService.getCapabilityElement(getcapabilitiesjson);
       } catch (_a) {
-        fail(layer, 'No capability element in service');
+        fail(this, 'No capability element in service');
         return;
       }
 
-      this.version = layer.WMJSService.version; // Get the rootLayer
+      this.version = wmjsService.version; // Get the rootLayer
 
       var rootLayer = capabilityObject.Layer;
 
       if (!isDefined(rootLayer)) {
-        fail(layer, 'No Layer element in service');
+        fail(this, 'No Layer element in service');
         return;
       }
 
@@ -8480,10 +8476,9 @@
         } // TODO Should be arranged also for the other services:
 
 
-        _this.getmapURL = WMJScheckURL(layer.getmapURL);
-        _this.getfeatureinfoURL = WMJScheckURL(layer.getfeatureinfoURL);
-        _this.getlegendgraphicURL = WMJScheckURL(layer.getlegendgraphicURL);
-        _this.getCapabilitiesDoc = jsondata;
+        _this.getmapURL = WMJScheckURL(_this.getmapURL);
+        _this.getfeatureinfoURL = WMJScheckURL(_this.getfeatureinfoURL);
+        _this.getlegendgraphicURL = WMJScheckURL(_this.getlegendgraphicURL);
         _this.title = jsonlayer.Title.value;
 
         try {
@@ -8514,7 +8509,7 @@
             // Fill in SRS and BBOX on basis of BoundingBox attribute
             var gpbbox = toArray(data.BoundingBox);
 
-            for (j = 0; j < gpbbox.length; j += 1) {
+            for (var j = 0; j < gpbbox.length; j += 1) {
               var srs = void 0;
               srs = gpbbox[j].attr.SRS;
 
@@ -8542,8 +8537,8 @@
                 geoProperty.srs = srs;
                 var swapBBOX = false;
 
-                if (layer.version === WMSVersion.version130) {
-                  if (geoProperty.srs === 'EPSG:4326' && layer.wms130bboxcompatibilitymode === false) {
+                if (_this.version === WMSVersion.version130) {
+                  if (geoProperty.srs === 'EPSG:4326' && _this.wms130bboxcompatibilitymode === false) {
                     swapBBOX = true;
                   }
                 }
@@ -8571,7 +8566,7 @@
         getgpbbox(jsonlayer);
         getgpbbox(rootLayer); // Fill in SRS  on basis of SRS attribute
 
-        for (j = 0; j < gp.length; j += 1) {
+        for (var j = 0; j < gp.length; j += 1) {
           if (tempSRS.indexOf(gp[j].value) === -1) {
             var geoProperty = new WMProjection();
             debug(exports.DebugType.Error, "Warning: BoundingBOX missing for SRS " + gp[j].value);
@@ -8580,7 +8575,8 @@
             geoProperty.bbox.right = 180;
             geoProperty.bbox.top = 90;
             geoProperty.srs = gp[j].value;
-            layer.projectionProperties.push(geoProperty);
+
+            _this.projectionProperties.push(geoProperty);
           }
         }
 
@@ -8592,13 +8588,13 @@
         try {
           if (parseInt(jsonlayer.attr.queryable, 10) === 1) _this.queryable = true;else _this.queryable = false;
         } catch (e) {
-          debug(exports.DebugType.Error, "Unable to detect whether this layer is queryable (for layer " + layer.title + ")");
+          debug(exports.DebugType.Error, "Unable to detect whether this layer is queryable (for layer " + _this.title + ")");
         }
 
         foundLayer = 1;
       };
 
-      function recursivelyFindLayer(JSONLayers, path, _prevNestedLayerPath) {
+      function recursivelyFindLayer(thisLayer, JSONLayers, path, _prevNestedLayerPath) {
         for (var k = 0; k < JSONLayers.length; k += 1) {
           var nestedLayerPath_1 = [];
 
@@ -8617,9 +8613,9 @@
               /* Do nothing */
             }
 
-            recursivelyFindLayer(toArray(JSONLayers[k].Layer), pathnew, nestedLayerPath_1);
+            recursivelyFindLayer(thisLayer, toArray(JSONLayers[k].Layer), pathnew, nestedLayerPath_1);
           } else if (JSONLayers[k].Name) {
-            if (JSONLayers[k].Name.value === layer.name) {
+            if (JSONLayers[k].Name.value === thisLayer.name) {
               foundLayerFunction(JSONLayers[k], path, nestedLayerPath_1);
               return;
             }
@@ -8631,13 +8627,13 @@
       var JSONLayers = toArray(rootLayer.Layer);
       var path = '';
       var nestedLayerPath = [rootLayer];
-      recursivelyFindLayer(JSONLayers, path, nestedLayerPath);
+      recursivelyFindLayer(this, JSONLayers, path, nestedLayerPath);
 
       if (foundLayer === 0) {
         // Layer was not found...
         var message = '';
 
-        if (layer.name) {
+        if (this.name) {
           message = "Unable to find layer '" + this.name + "' in service '" + this.service + "'";
         } else {
           message = "Unable to find layer '" + this.title + "' in service '" + this.service + "'";
@@ -8665,7 +8661,7 @@
      */
 
 
-    WMLayer.prototype.parseLayer = function (_layerDoneCallback, forceReload, xml2jsonrequest) {
+    WMLayer.prototype.parseLayer = function (_layerDoneCallback, forceReload) {
       var _this = this;
 
       this.hasError = false;
@@ -8692,20 +8688,14 @@
       };
 
       var callback = function callback(data) {
-        _this.__parseGetCapForLayer(_this, data, layerDoneCallback, fail);
+        _this.__parseGetCapForLayer(data, layerDoneCallback, fail);
       };
 
       var requestfail = function requestfail() {
         fail(_this, I18n.no_capability_element_found.text);
       };
 
-      var newXml2jsonrequest = xml2jsonrequest;
-
-      if (!xml2jsonrequest) {
-        newXml2jsonrequest = this.parentMaps && this.parentMaps.length > 0 ? this.parentMaps[0].xml2jsonrequest : undefined;
-      }
-
-      this.WMJSService = WMGetServiceFromStore(this.service, newXml2jsonrequest);
+      var wmjsService = WMGetServiceFromStore(this.service);
       var options = {
         headers: {}
       };
@@ -8714,10 +8704,10 @@
         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);
       }
     };
     /**
@@ -8792,7 +8782,8 @@
         success(layerObjects[currentLayerIndex], currentLayerIndex, layerObjects.length);
       };
 
-      this.WMJSService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
+      var wmjsService = WMGetServiceFromStore(this.service);
+      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
     };
 
     WMLayer.prototype.autoSelectLayer = function (success, failure) {
@@ -8809,7 +8800,8 @@
         }
       };
 
-      this.WMJSService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
+      var wmjsService = WMGetServiceFromStore(this.service);
+      wmjsService.getLayerObjectsFlat(getLayerObjectsFinished, failure, undefined);
     };
 
     WMLayer.prototype.getNextLayer = function (success, failure) {
@@ -8973,8 +8965,8 @@
     WMLayer.prototype.display = function (displayornot) {
       this.enabled = displayornot;
 
-      for (var j = 0; j < this.parentMaps.length; j += 1) {
-        this.parentMaps[j].displayLayer(this, this.enabled);
+      if (this.parentMap) {
+        this.parentMap.displayLayer(this, this.enabled);
       }
     };