diff --git a/examples/data/wmsgetfeatureinfo/osm-restaurant-hotel.xml b/examples/data/wmsgetfeatureinfo/osm-restaurant-hotel.xml
new file mode 100644
index 0000000000..4e04180659
--- /dev/null
+++ b/examples/data/wmsgetfeatureinfo/osm-restaurant-hotel.xml
@@ -0,0 +1,283 @@
+
+
+
+
+ Restaurants
+
+
+
+ 537750.006175,150923.784252 537750.006175,150923.784252
+
+
+
+
+ 537750.006175,150923.784252
+
+
+ Château d'Ouchy
+ Château d'Ouchy
+ 1230808910
+
+
+ restaurant
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | All features: |
+ |
+
+
+ | Hotel features: |
+ |
+
+
+ | Restaurant features: |
+ |
+
+
diff --git a/examples/getfeatureinfo-layers.js b/examples/getfeatureinfo-layers.js
new file mode 100644
index 0000000000..d6e06664b6
--- /dev/null
+++ b/examples/getfeatureinfo-layers.js
@@ -0,0 +1,24 @@
+goog.require('ol.format.WMSGetFeatureInfo');
+
+$.ajax({
+ url: './data/wmsgetfeatureinfo/osm-restaurant-hotel.xml',
+ success: function(response) {
+
+ // this is the standard way to read the features
+ var allFeatures = new ol.format.WMSGetFeatureInfo().readFeatures(response);
+ $('#all').html(allFeatures.length.toString());
+
+ // when specifying the 'layers' options, only the features of those
+ // layers are returned by the format
+ var hotelFeatures = new ol.format.WMSGetFeatureInfo({
+ layers: ['hotel']
+ }).readFeatures(response);
+ $('#hotel').html(hotelFeatures.length.toString());
+
+ var restaurantFeatures = new ol.format.WMSGetFeatureInfo({
+ layers: ['restaurant']
+ }).readFeatures(response);
+ $('#restaurant').html(restaurantFeatures.length.toString());
+
+ }
+});
diff --git a/externs/olx.js b/externs/olx.js
index c90548e044..3eb5418644 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -2217,6 +2217,24 @@ olx.format.WKTOptions;
olx.format.WKTOptions.prototype.splitCollection;
+/**
+ * @typedef {{
+ * layers: (Array.|undefined)
+ * }}
+ * @api
+ */
+olx.format.WMSGetFeatureInfoOptions;
+
+
+/**
+ * If set, only features of the given layers will be returned by the format
+ * when read.
+ * @type {Array.|undefined}
+ * @api
+ */
+olx.format.WMSGetFeatureInfoOptions.prototype.layers;
+
+
/**
* Namespace.
* @type {Object}
diff --git a/src/ol/format/wmsgetfeatureinfoformat.js b/src/ol/format/wmsgetfeatureinfoformat.js
index ab5c577d01..0157b197fe 100644
--- a/src/ol/format/wmsgetfeatureinfoformat.js
+++ b/src/ol/format/wmsgetfeatureinfoformat.js
@@ -4,6 +4,7 @@ goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.dom.NodeType');
goog.require('goog.object');
+goog.require('ol.array');
goog.require('ol.format.GML2');
goog.require('ol.format.XMLFeature');
goog.require('ol.xml');
@@ -16,9 +17,12 @@ goog.require('ol.xml');
*
* @constructor
* @extends {ol.format.XMLFeature}
+ * @param {olx.format.WMSGetFeatureInfoOptions=} opt_options Options.
* @api
*/
-ol.format.WMSGetFeatureInfo = function() {
+ol.format.WMSGetFeatureInfo = function(opt_options) {
+
+ var options = opt_options ? opt_options : {};
/**
* @private
@@ -33,6 +37,13 @@ ol.format.WMSGetFeatureInfo = function() {
*/
this.gmlFormat_ = new ol.format.GML2();
+
+ /**
+ * @private
+ * @type {Array.}
+ */
+ this.layers_ = options.layers ? options.layers : null;
+
goog.base(this);
};
goog.inherits(ol.format.WMSGetFeatureInfo, ol.format.XMLFeature);
@@ -86,7 +97,13 @@ ol.format.WMSGetFeatureInfo.prototype.readFeatures_ = function(node, objectStack
'localName of layer node should match layerIdentifier');
var toRemove = ol.format.WMSGetFeatureInfo.layerIdentifier_;
- var featureType = layer.localName.replace(toRemove, '') +
+ var layerName = layer.localName.replace(toRemove, '');
+
+ if (this.layers_ && !ol.array.includes(this.layers_, layerName)) {
+ continue;
+ }
+
+ var featureType = layerName +
ol.format.WMSGetFeatureInfo.featureIdentifier_;
context['featureType'] = featureType;
diff --git a/test/spec/ol/format/wmsgetfeatureinfoformat.test.js b/test/spec/ol/format/wmsgetfeatureinfoformat.test.js
index f49f8e8129..395b052b5f 100644
--- a/test/spec/ol/format/wmsgetfeatureinfoformat.test.js
+++ b/test/spec/ol/format/wmsgetfeatureinfoformat.test.js
@@ -140,6 +140,18 @@ describe('ol.format.WMSGetFeatureInfo', function() {
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({
+ layers: ['AAA64']
+ }).readFeatures(text);
+ expect(aaa64Features.length).to.be(1);
+ var allFeatures = new ol.format.WMSGetFeatureInfo({
+ layers: ['AAA64', 'AAA62']
+ }).readFeatures(text);
+ expect(allFeatures.length).to.be(2);
+ var dummyFeatures = new ol.format.WMSGetFeatureInfo({
+ layers: ['foo', 'bar']
+ }).readFeatures(text);
+ expect(dummyFeatures.length).to.be(0);
});
it('read geoserver’s response', function() {