From d4ebfac74a4045297e67af29cd4a9ab298b0ae0d Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 19:48:45 +0100
Subject: [PATCH] Allow ol.source.{Image,Tile}WMS serverType option to be a
 string

---
 src/objectliterals.jsdoc        | 4 ++--
 src/ol/source/imagewmssource.js | 3 ++-
 src/ol/source/tilewmssource.js  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 9a7afa90bc..930aca200a 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -739,7 +739,7 @@
  * @property {ol.Extent|undefined} extent Extent.
  * @property {boolean|undefined} hidpi Use the `ol.Map#pixelRatio` value when
  *     requesting the image from the remote server. Default is `true`.
- * @property {ol.source.wms.ServerType|undefined} serverType The type of the remote WMS
+ * @property {ol.source.wms.ServerType|string|undefined} serverType The type of the remote WMS
  *     server: `mapserver`, `geoserver` or `qgis`. Only needed if `hidpi` is `true`.
  *     Default is `undefined`.
  * @property {string|undefined} logo Logo.
@@ -818,7 +818,7 @@
  * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid.
  * @property {number|undefined} maxZoom Maximum zoom.
  * @property {ol.proj.ProjectionLike} projection Projection.
- * @property {ol.source.wms.ServerType|undefined} serverType The type of the remote WMS
+ * @property {ol.source.wms.ServerType|string|undefined} serverType The type of the remote WMS
  *     server: `mapserver`, `geoserver` or `qgis`. Only needed if `hidpi` is `true`.
  *     Default is `undefined`.
  * @property {ol.TileLoadFunctionType|undefined} tileLoadFunction Optional
diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js
index 0e48cd1bcd..8b7445c7c1 100644
--- a/src/ol/source/imagewmssource.js
+++ b/src/ol/source/imagewmssource.js
@@ -63,7 +63,8 @@ ol.source.ImageWMS = function(opt_options) {
    * @private
    * @type {ol.source.wms.ServerType|undefined}
    */
-  this.serverType_ = options.serverType;
+  this.serverType_ =
+      /** @type {ol.source.wms.ServerType|undefined} */ (options.serverType);
 
   /**
    * @private
diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js
index 2cd5989cd4..f80ec49719 100644
--- a/src/ol/source/tilewmssource.js
+++ b/src/ol/source/tilewmssource.js
@@ -84,7 +84,8 @@ ol.source.TileWMS = function(opt_options) {
    * @private
    * @type {ol.source.wms.ServerType|undefined}
    */
-  this.serverType_ = options.serverType;
+  this.serverType_ =
+      /** @type {ol.source.wms.ServerType|undefined} */ (options.serverType);
 
   /**
    * @private