From 3bce782943595b6a2ff95fe344da5b77250fc3ac Mon Sep 17 00:00:00 2001 From: ahocevar Date: Tue, 3 Sep 2013 20:02:49 +0200 Subject: [PATCH] Making sure that options are not renamed --- src/ol/source/wmssource.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ol/source/wmssource.js b/src/ol/source/wmssource.js index 6bf7aee552..07fb1b0cc2 100644 --- a/src/ol/source/wmssource.js +++ b/src/ol/source/wmssource.js @@ -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]),