Merge pull request #1308 from ahocevar/wms-getfeatureinfo-options

Add missing WMSGetFeatureInfo exports

src/objectliterals.jsdoc

@@ -630,8 +630,8 @@
  * @property {null|string|undefined} crossOrigin crossOrigin setting for image
  *     requests.
  * @property {ol.Extent|undefined} extent Extent.
- * @property {ol.source.WMSGetFeatureInfoOptions|undefined}
+ * @property {ol.source.WMSGetFeatureInfoOptions|undefined} getFeatureInfoOptions
- *     getFeatureInfoOptions Options for GetFeatureInfo.
+ *     Options for GetFeatureInfo.
  * @property {Object.<string,*>} params WMS request parameters. At least a
  *     `LAYERS` param is required. `STYLES` is `` by default. `VERSION` is
  *     `1.3.0` by default. `WIDTH`, `HEIGHT`, `BBOX` and `CRS` (`SRS` for WMS
@@ -692,8 +692,8 @@
  * @property {null|string|undefined} crossOrigin crossOrigin setting for image
  *     requests.
  * @property {ol.Extent|undefined} extent Extent.
- * @property {ol.source.WMSGetFeatureInfoOptions|undefined}
+ * @property {ol.source.WMSGetFeatureInfoOptions|undefined} getFeatureInfoOptions
- *     getFeatureInfoOptions Options for GetFeatureInfo.
+ *     Options for GetFeatureInfo.
  * @property {string|undefined} logo Logo.
  * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid.
  * @property {number|undefined} maxZoom Maximum zoom.
@@ -722,17 +722,6 @@
  * @todo stability experimental
  */
 
-
-/**
- * @typedef {Object} ol.source.WMSGetFeatureInfoOptions
- * @property {ol.source.WMSGetFeatureInfoMethod} method Method for requesting
- *     GetFeatureInfo. Default is `ol.source.WMSGetFeatureInfoMethod.IFRAME`.
- * @property {Object} params Params for the GetFeatureInfo request. Default is
- *     `{'INFO_FORMAT': 'text/html'}`.
- * @todo stability experimental
- */
-
-
 /**
  * @typedef {Object} ol.source.WMTSOptions
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.

src/ol/source/imagewmssource.js

@@ -45,7 +45,8 @@ ol.source.ImageWMS = function(options) {
    * @type {ol.source.WMSGetFeatureInfoOptions}
    */
   this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
-      options.getFeatureInfoOptions : {};
+      options.getFeatureInfoOptions :
+      /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({});
 
   /**
    * @private

src/ol/source/tilewmssource.js

@@ -110,7 +110,8 @@ ol.source.TileWMS = function(options) {
    * @type {ol.source.WMSGetFeatureInfoOptions}
    */
   this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
-      options.getFeatureInfoOptions : {};
+      options.getFeatureInfoOptions :
+      /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({});
 
 };
 goog.inherits(ol.source.TileWMS, ol.source.TileImage);

src/ol/source/wmssource.exports

@@ -1 +1,3 @@
 @exportSymbol ol.source.WMSGetFeatureInfoMethod
+@exportProperty ol.source.WMSGetFeatureInfoMethod.IFRAME
+@exportProperty ol.source.WMSGetFeatureInfoMethod.XHR_GET

src/ol/source/wmssource.js

@@ -6,6 +6,13 @@ goog.require('goog.object');
 goog.require('goog.uri.utils');
 
 
+/**
+ * @typedef {{method: (ol.source.WMSGetFeatureInfoMethod|undefined),
+ *            params: (Object.<string,string>|undefined)}}
+ */
+ol.source.WMSGetFeatureInfoOptions;
+
+
 /**
  * Method to use to get WMS feature info.
  * @enum {string}