@opengeoweb/webmap 2.1.2 → 2.1.3

package/lib/components/WMGetServiceFromStore.d.ts

@@ -1,3 +1,3 @@
 import { WMJSService } from './WMJSService';
-declare const WMGetServiceFromStore: (serviceName: string, xml2jsonrequestURL?: string) => WMJSService;
+declare const WMGetServiceFromStore: (serviceName: string) => WMJSService;
 export default WMGetServiceFromStore;

package/lib/components/WMJSMap.d.ts

@@ -109,13 +109,11 @@ export default class WMJSMap {
     private proj4;
     private previousMouseButtonState;
     private longlat;
-    xml2jsonrequest: string;
     private tileRenderSettings;
     private drawPending;
     private needsRedraw;
     private buildLayerDimsBusy;
     constructor(_element: HTMLElement);
-    setXML2JSONURL(_xml2jsonrequest: string): void;
     setWMTileRendererTileSettings(_WMTileRendererTileSettings: unknown): void;
     /**
      * Function which make a component ID which is unique over several WebMapJS instances

package/lib/components/WMJSService.d.ts

@@ -13,7 +13,7 @@ export declare const getWMSUrl: (service?: string, additionalParams?: {}) => str
 /**
  * Global getcapabilities function
  */
-export declare const WMJSGetCapabilities: (service: string, succes: (param: any) => void, fail: (param: string) => void, xml2jsonrequestURL: string, options: {
+export declare const WMJSGetCapabilities: (service: string, succes: (param: any) => void, fail: (param: string) => void, options: {
     headers?: any;
 }, disableCache?: boolean) => void;
 interface NodeObject {
@@ -32,7 +32,6 @@ export declare const recursivelyFindLayer: (layers: any[], rootNode: any[], path
  *
  * options:
  *   service
- *   xml2jsonrequestURL
  *   title (optional)
  */
 export declare class WMJSService {
@@ -44,13 +43,11 @@ export declare class WMJSService {
     getcapabilitiesDoc: GetCapabilitiesJson;
     busy: boolean;
     _flatLayerObject: any[];
-    xml2jsonrequestURL: string;
     functionCallbackList: any[];
     _options: any;
     nodeCache: any;
     constructor(options: {
         service: string;
-        xml2jsonrequestURL: string;
         title?: string;
     });
     checkVersion111(jsonData: GetCapabilitiesJson): void;
@@ -64,16 +61,16 @@ export declare class WMJSService {
      * @param succescallback Function called upon succes, cannot be left blank
      * @param failcallback Function called upon failure, cannot be left blank
      */
-    getCapabilities(succescallback: (param: GetCapabilitiesJson) => void, failcallback: (param: unknown) => void, forceReload: boolean, xml2jsonrequestURL: string, options: unknown): void;
+    getCapabilities(succescallback: (param: GetCapabilitiesJson) => void, failcallback: (param: unknown) => void, forceReload: boolean, options: unknown): void;
     checkException(jsonData: GetCapabilitiesJson): string | undefined;
     /**
      * Calls succes with a hierarchical node structure
      * Calls failure with a string when someting goes wrong
      */
-    getNodes(succes: (param: unknown) => void, failure: (param: unknown) => void, forceReload: boolean, xml2jsonrequestURL?: string, options?: unknown): void;
+    getNodes(succes: (param: unknown) => void, failure: (param: unknown) => void, forceReload: boolean, options?: unknown): void;
     /** Calls succes with an array of all layerobjects
      * Calls failure when something goes wrong
      */
-    getLayerObjectsFlat(succes: (param: unknown) => void, failure: (param: unknown) => void, forceReload: boolean, xml2jsonrequestURL?: string, options?: any): void;
+    getLayerObjectsFlat(succes: (param: unknown) => void, failure: (param: unknown) => void, forceReload: boolean, options?: any): void;
 }
 export {};

package/lib/components/WMLayer.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="react" />
 /// <reference types="node" />
 import type WMJSMap from './WMJSMap';
 import WMJSDimension from './WMJSDimension';
 import WMProjection from './WMProjection';
-import WMImage from './WMImage';
-import { GetCapabilitiesJson, WMJSService } from './WMJSService';
+import { GetCapabilitiesJson } from './WMJSService';
 import { Style, Dimension } from './types';
 export declare enum LayerType {
     mapLayer = "mapLayer",
@@ -29,7 +27,7 @@ export interface LayerOptions {
     transparent?: boolean;
     onReady?: (param: any) => void;
     type?: string;
-    parentMaps?: WMJSMap[];
+    parentMap?: WMJSMap;
     dimensions?: Dimension[];
     headers?: Headers[];
     failure?: (layer: WMLayer, message: string) => void;
@@ -73,7 +71,6 @@ export default class WMLayer {
     id: string;
     name?: string;
     ReactWMJSLayerId?: string;
-    reactWebMapJSLayer?: React.ReactElement;
     hasError?: boolean;
     enabled?: boolean;
     lastError?: string;
@@ -83,7 +80,6 @@ export default class WMLayer {
     service: string;
     layerType: LayerType;
     currentStyle?: string;
-    image?: WMImage;
     linkedInfo: {
         layer: string;
         message: string;
@@ -91,7 +87,6 @@ export default class WMLayer {
     headers: Headers[];
     autoupdate: boolean;
     timer: NodeJS.Timeout;
-    WMJSService: WMJSService;
     getmapURL: string;
     getfeatureinfoURL: string;
     getlegendgraphicURL: string;
@@ -107,9 +102,8 @@ export default class WMLayer {
     projectionProperties: WMProjection[];
     queryable: boolean;
     styles: Style[];
-    getCapabilitiesDoc: GetCapabilitiesJson;
     serviceTitle: string;
-    parentMaps: WMJSMap[];
+    parentMap: WMJSMap;
     sldURL: string;
     active: boolean;
     getgraphinfoURL: string;
@@ -121,7 +115,6 @@ export default class WMLayer {
         url: string;
         colorscalerange: Record<string, unknown>[];
     };
-    jsonlayer: this;
     isConfigured: boolean;
     init(): void;
     constructor(options?: LayerOptions);
@@ -138,13 +131,13 @@ export default class WMLayer {
     handleReferenceTime(name: string, value: string, updateMapDimensions?: boolean): void;
     getDimensions(): WMJSDimension[];
     setDimension(name: string, value: string, updateMapDimensions?: boolean): void;
-    __parseGetCapForLayer(layer: WMLayer, getcapabilitiesjson: GetCapabilitiesJson, layerDoneCallback: (layer: WMLayer) => void, fail: (layer: WMLayer, message: string) => void): void;
+    __parseGetCapForLayer(getcapabilitiesjson: GetCapabilitiesJson, layerDoneCallback: (layer: WMLayer) => void, fail: (layer: WMLayer, message: string) => void): void;
     /**
      * Calls success with a configured layer object
      * Calls options.failure with error message.
      * Throws string exceptions when someting goes wrong
      */
-    parseLayer(_layerDoneCallback: (layer: WMLayer) => void, forceReload: boolean, xml2jsonrequest?: string): void;
+    parseLayer(_layerDoneCallback: (layer: WMLayer) => void, forceReload: boolean): void;
     /**
      * A Promise to parse the layer, it will fetch the WMS GetCapabilities document, configure the layer and resolve to a WMLayer object
      * @param forceReload Do not use the cache of the WMS GetCapabilties document, but instead fetch new data from the server

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/webmap.esm.js

@@ -3960,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);
@@ -4086,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;
@@ -4898,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);
 
@@ -5451,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;
@@ -7353,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 = [];
@@ -7398,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);
@@ -7408,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) {
@@ -7469,7 +7460,6 @@ rootNode, path) {
  *
  * options:
  *   service
- *   xml2jsonrequestURL
  *   title (optional)
  */
 
@@ -7490,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);
@@ -7613,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) {
@@ -7698,7 +7687,7 @@ var WMJSService = /*#__PURE__*/function () {
             return null;
           }, function () {
             return null;
-          }, false, xml2jsonrequestURL, options);
+          }, false, options);
 
           var current;
 
@@ -7707,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
@@ -7753,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) {
@@ -7806,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
@@ -7817,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);
@@ -7849,7 +7830,7 @@ var WMJSService = /*#__PURE__*/function () {
         succes(_this3._flatLayerObject);
       };
 
-      this.getNodes(callback, failure, forceReload, xml2jsonrequestURL, options);
+      this.getNodes(callback, failure, forceReload, options);
     }
   }]);
 
@@ -7873,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;
@@ -8028,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);
@@ -8134,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);
   }
 };
 
@@ -8235,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) {
@@ -8252,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;
@@ -8284,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;
     }
@@ -8305,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);
@@ -8323,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);
         }
       }
@@ -8332,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",
@@ -8345,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);
@@ -8355,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));
       }
     }
   }, {
@@ -8395,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');
               }
             }
           }
@@ -8424,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;
       }
 
@@ -8532,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 {
@@ -8566,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;
 
@@ -8594,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;
                   }
                 }
@@ -8623,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));
@@ -8632,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);
           }
         }
 
@@ -8644,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 = [];
 
@@ -8669,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;
             }
@@ -8683,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, "'");
@@ -8718,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;
@@ -8745,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: {}
       };
@@ -8767,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);
       }
     }
     /**
@@ -8846,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",
@@ -8864,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",
@@ -9040,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);
       }
     }
   }]);

package/webmap.umd.js

@@ -4027,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);
@@ -4152,10 +4151,6 @@
       this.init();
     }
 
-    WMJSMap.prototype.setXML2JSONURL = function (_xml2jsonrequest) {
-      this.xml2jsonrequest = _xml2jsonrequest;
-    };
-
     WMJSMap.prototype.setWMTileRendererTileSettings = function (_WMTileRendererTileSettings) {
       this.tileRenderSettings = _WMTileRendererTileSettings;
     };
@@ -4927,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);
 
@@ -5453,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;
@@ -7327,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;
     }
@@ -7375,7 +7368,6 @@
       random: Math.random()
     } : {};
     var url = getWMSUrl(service, addParams);
-    var newXml2jsonrequestURL = xml2jsonrequestURL;
     WMXMLParser(url, headers).then(function (data) {
       try {
         succes(data);
@@ -7385,7 +7377,7 @@
     })["catch"](function () {
       loadGetCapabilitiesViaProxy(url, succes, function () {
         fail("Request failed for " + url);
-      }, newXml2jsonrequestURL);
+      }, WMServiceStoreXML2JSONRequest.proxy);
     });
   };
   var sortByKey = function sortByKey(array, key) {
@@ -7446,7 +7438,6 @@
    *
    * options:
    *   service
-   *   xml2jsonrequestURL
    *   title (optional)
    */
 
@@ -7467,7 +7458,6 @@
       if (options) {
         this.service = options.service;
         this.title = options.title;
-        this.xml2jsonrequestURL = options.xml2jsonrequestURL;
       }
 
       this.checkVersion111 = this.checkVersion111.bind(this);
@@ -7584,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) {
@@ -7669,7 +7659,7 @@
             return null;
           }, function () {
             return null;
-          }, false, xml2jsonrequestURL, options);
+          }, false, options);
 
           var current;
 
@@ -7678,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
@@ -7722,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) {
@@ -7777,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;
@@ -7824,7 +7801,7 @@
         succes(_this._flatLayerObject);
       };
 
-      this.getNodes(callback, failure, forceReload, xml2jsonrequestURL, options);
+      this.getNodes(callback, failure, forceReload, options);
     };
 
     return WMJSService;
@@ -7847,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;
@@ -8017,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);
@@ -8125,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);
     }
   };
 
@@ -8226,8 +8198,8 @@
           this.type = options.type;
         }
 
-        if (options.parentMaps) {
-          this.parentMaps = options.parentMaps;
+        if (options.parentMap) {
+          this.parentMap = options.parentMap;
         }
 
         if (options.headers) {
@@ -8241,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;
@@ -8273,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;
     };
@@ -8292,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);
@@ -8309,7 +8278,7 @@
           clearInterval(this.timer);
         } else {
           this.timer = setInterval(function () {
-            _this.parseLayer(callback, true, undefined);
+            _this.parseLayer(callback, true);
           }, interval);
         }
       }
@@ -8317,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 () {
@@ -8328,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);
       }
     };
 
@@ -8375,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');
               }
             }
           }
@@ -8405,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;
       }
 
@@ -8512,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 {
@@ -8546,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;
 
@@ -8574,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;
                   }
                 }
@@ -8603,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);
@@ -8612,7 +8575,8 @@
             geoProperty.bbox.right = 180;
             geoProperty.bbox.top = 90;
             geoProperty.srs = gp[j].value;
-            layer.projectionProperties.push(geoProperty);
+
+            _this.projectionProperties.push(geoProperty);
           }
         }
 
@@ -8624,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 = [];
 
@@ -8649,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;
             }
@@ -8663,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 + "'";
@@ -8697,7 +8661,7 @@
      */
 
 
-    WMLayer.prototype.parseLayer = function (_layerDoneCallback, forceReload, xml2jsonrequest) {
+    WMLayer.prototype.parseLayer = function (_layerDoneCallback, forceReload) {
       var _this = this;
 
       this.hasError = false;
@@ -8724,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: {}
       };
@@ -8746,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);
       }
     };
     /**
@@ -8824,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) {
@@ -8841,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) {
@@ -9005,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);
       }
     };