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

Merge pull request #969 from ahocevar/master

Browse Source 
WMS getFeatureInfoOptions ignored in minified build
This commit is contained in:
ahocevar
2013-09-03 12:57:09 -07:00
parent e83e0e1374 3bce782943
commit 94942e636c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/wmssource.js
+6 -4
View File
@@ -65,7 +65,8 @@ ol.source.wms.getUrl =
/** /**
* @param {string} url URL as provided by the url function. * @param {string} url URL as provided by the url function.
* @param {ol.Pixel} pixel Pixel. * @param {ol.Pixel} pixel Pixel.
* @param {Object} options Options as defined in the source. * @param {ol.source.WMSGetFeatureInfoOptions} options Options as defined in the
* source.
* @param {function(string)} success Callback function for successful queries. * @param {function(string)} success Callback function for successful queries.
* @param {function()=} opt_error Optional callback function for unsuccessful * @param {function()=} opt_error Optional callback function for unsuccessful
* queries. * queries.
@@ -76,11 +77,12 @@ ol.source.wms.getFeatureInfo =
// closure // closure
url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo') url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo')
.replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1'); .replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1');
options = goog.isDef(options) ? goog.object.clone(options) : {}; options = /** @type {ol.source.WMSGetFeatureInfoOptions} */
var localOptions = { (goog.isDef(options) ? goog.object.clone(options) : {});
var localOptions = /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({
method: ol.source.WMSGetFeatureInfoMethod.IFRAME, method: ol.source.WMSGetFeatureInfoMethod.IFRAME,
params: {} params: {}
}; });
goog.object.extend(localOptions, options); goog.object.extend(localOptions, options);
var params = {'INFO_FORMAT': 'text/html'}, var params = {'INFO_FORMAT': 'text/html'},
version = parseFloat(url.match(ol.source.wms.regExes.version)[1]), version = parseFloat(url.match(ol.source.wms.regExes.version)[1]),