Merge pull request #7411 from fredj/getset_layers

Add getLayers and setLayers functions to ol.format.WMSGetFeatureInfo

src/ol/format/wmsgetfeatureinfo.js

@@ -63,6 +63,22 @@ ol.format.WMSGetFeatureInfo.featureIdentifier_ = '_feature';
 ol.format.WMSGetFeatureInfo.layerIdentifier_ = '_layer';
 
 
+/**
+ * @return {Array.<string>} layers
+ */
+ol.format.WMSGetFeatureInfo.prototype.getLayers = function() {
+  return this.layers_;
+};
+
+
+/**
+ * @param {Array.<string>} layers Layers to parse.
+ */
+ol.format.WMSGetFeatureInfo.prototype.setLayers = function(layers) {
+  this.layers_ = layers;
+};
+
+
 /**
  * @param {Node} node Node.
  * @param {Array.<*>} objectStack Object stack.

test/spec/ol/format/wmsgetfeatureinfo.test.js

@@ -1,10 +1,24 @@
-
-
 goog.require('ol.format.WMSGetFeatureInfo');
 
 
 describe('ol.format.WMSGetFeatureInfo', function() {
 
+  describe('#getLayers', function() {
+
+    it('returns null if layers is undefined', function() {
+      var format = new ol.format.WMSGetFeatureInfo();
+      expect(format.getLayers()).to.be(null);
+    });
+
+    it('returns the value provided in the layers option', function() {
+      var format = new ol.format.WMSGetFeatureInfo({
+        layers: ['a', 'z']
+      });
+      expect(format.getLayers()).to.eql(['a', 'z']);
+    });
+
+  });
+
   describe('#readFormat', function() {
 
     describe('read Features', function() {
@@ -139,21 +153,19 @@ describe('ol.format.WMSGetFeatureInfo', function() {
             '   </AAA62_feature>' +
             '  </AAA62_layer>' +
             '</msGMLOutput>';
-        var features = new ol.format.WMSGetFeatureInfo().readFeatures(text);
+        var format = new ol.format.WMSGetFeatureInfo();
+        var features = format.readFeatures(text);
         expect(features.length).to.be(2);
         expect(features[0].get('OBJECTID')).to.be('287');
         expect(features[1].get('OBJECTID')).to.be('1251');
-        var aaa64Features = new ol.format.WMSGetFeatureInfo({
+        format.setLayers(['AAA64']);
-          layers: ['AAA64']
+        var aaa64Features = format.readFeatures(text);
-        }).readFeatures(text);
         expect(aaa64Features.length).to.be(1);
-        var allFeatures = new ol.format.WMSGetFeatureInfo({
+        format.setLayers(['AAA64', 'AAA62']);
-          layers: ['AAA64', 'AAA62']
+        var allFeatures = format.readFeatures(text);
-        }).readFeatures(text);
         expect(allFeatures.length).to.be(2);
-        var dummyFeatures = new ol.format.WMSGetFeatureInfo({
+        format.setLayers(['foo', 'bar']);
-          layers: ['foo', 'bar']
+        var dummyFeatures = format.readFeatures(text);
-        }).readFeatures(text);
         expect(dummyFeatures.length).to.be(0);
       });