ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Making GetFeatureInfo work with SLD defined layers.

Browse Source 
Closes http://trac.osgeo.org/openlayers/ticket/3609. p=h0nIg, r=me
This commit is contained in:
ahocevar
2012-01-21 13:45:11 +01:00
parent e936ce7f2a
commit 3b96046669
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/OpenLayers/Control/WMSGetFeatureInfo.js
View File

@@ -314,9 +314,11 @@ OpenLayers.Control.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
*/ */
buildWMSOptions: function(url, layers, clickPosition, format) { buildWMSOptions: function(url, layers, clickPosition, format) {
var layerNames = [], styleNames = []; var layerNames = [], styleNames = [];
for (var i = 0, len = layers.length; i < len; i++) { for (var i = 0, len = layers.length; i < len; i++) {
layerNames = layerNames.concat(layers[i].params.LAYERS); if (layers[i].params.LAYERS != null) {
styleNames = styleNames.concat(this.getStyleNames(layers[i])); layerNames = layerNames.concat(layers[i].params.LAYERS);
styleNames = styleNames.concat(this.getStyleNames(layers[i]));
}
} }
var firstLayer = layers[0]; var firstLayer = layers[0];
// use the firstLayer's projection if it matches the map projection - // use the firstLayer's projection if it matches the map projection -
@@ -330,9 +332,6 @@ OpenLayers.Control.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
service: "WMS", service: "WMS",
version: firstLayer.params.VERSION, version: firstLayer.params.VERSION,
request: "GetFeatureInfo", request: "GetFeatureInfo",
layers: layerNames,
query_layers: layerNames,
styles: styleNames,
bbox: this.map.getExtent().toBBOX(null, bbox: this.map.getExtent().toBBOX(null,
firstLayer.reverseAxisOrder()), firstLayer.reverseAxisOrder()),
feature_count: this.maxFeatures, feature_count: this.maxFeatures,
@@ -352,6 +351,13 @@ OpenLayers.Control.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
y: parseInt(clickPosition.y) y: parseInt(clickPosition.y)
} }
); );
if (layerNames.length != 0) {
params = OpenLayers.Util.extend({
layers: layerNames,
query_layers: layerNames,
styles: styleNames
}, params);
}
OpenLayers.Util.applyDefaults(params, this.vendorParams); OpenLayers.Util.applyDefaults(params, this.vendorParams);
return { return {
url: url, url: url,