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

Making sure that options are not renamed

Browse Source
This commit is contained in:
ahocevar
2013-09-03 20:02:49 +02:00
parent 09d9f28fe1
commit 3bce782943
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/source/wmssource.js
View File

@@ -65,7 +65,8 @@ ol.source.wms.getUrl =
/**
* @param {string} url URL as provided by the url function.
* @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()=} opt_error Optional callback function for unsuccessful
* queries.
@@ -76,11 +77,12 @@ ol.source.wms.getFeatureInfo =
// closure
url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo')
.replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1');
options = goog.isDef(options) ? goog.object.clone(options) : {};
var localOptions = {
options = /** @type {ol.source.WMSGetFeatureInfoOptions} */
(goog.isDef(options) ? goog.object.clone(options) : {});
var localOptions = /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({
method: ol.source.WMSGetFeatureInfoMethod.IFRAME,
params: {}
};
});
goog.object.extend(localOptions, options);
var params = {'INFO_FORMAT': 'text/html'},
version = parseFloat(url.match(ol.source.wms.regExes.version)[1]),