Remove vector code from files

src/ol/source/imagewmssource.js

@@ -5,7 +5,6 @@ goog.require('goog.object');
 goog.require('ol.Image');
 goog.require('ol.ImageUrlFunction');
 goog.require('ol.extent');
-goog.require('ol.source.FeatureInfoSource');
 goog.require('ol.source.Image');
 goog.require('ol.source.wms');
 
@@ -14,7 +13,6 @@ goog.require('ol.source.wms');
 /**
  * @constructor
  * @extends {ol.source.Image}
- * @implements {ol.source.FeatureInfoSource}
  * @param {ol.source.ImageWMSOptions} options Options.
  * @todo stability experimental
  */
@@ -40,13 +38,6 @@ ol.source.ImageWMS = function(options) {
     imageUrlFunction: imageUrlFunction
   });
 
-  /**
-   * @private
-   * @type {ol.source.WMSGetFeatureInfoOptions}
-   */
-  this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
-      options.getFeatureInfoOptions : {};
-
   /**
    * @private
    * @type {ol.Image}
@@ -99,23 +90,6 @@ ol.source.ImageWMS.prototype.getImage =
 };
 
 
-/**
- * @inheritDoc
- */
-ol.source.ImageWMS.prototype.getFeatureInfoForPixel =
-    function(pixel, map, success, opt_error) {
-  var view = map.getView().getView2D();
-  var size = map.getSize();
-  goog.asserts.assert(goog.isDefAndNotNull(size));
-  var extent = view.calculateExtent(size);
-  var url = this.imageUrlFunction(extent, size, view.getProjection());
-  goog.asserts.assert(goog.isDef(url),
-      'ol.source.ImageWMS#imageUrlFunction does not return a URL');
-  ol.source.wms.getFeatureInfo(url, pixel, this.getFeatureInfoOptions_, success,
-      opt_error);
-};
-
-
 /**
  * Update the user-provided params.
  * @param {Object} params Params.

src/ol/source/tilewmssource.js

@@ -3,13 +3,11 @@
 goog.provide('ol.source.TileWMS');
 
 goog.require('goog.array');
-goog.require('goog.asserts');
 goog.require('goog.math');
 goog.require('goog.object');
 goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.extent');
-goog.require('ol.source.FeatureInfoSource');
 goog.require('ol.source.TileImage');
 goog.require('ol.source.wms');
 
@@ -18,7 +16,6 @@ goog.require('ol.source.wms');
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @implements {ol.source.FeatureInfoSource}
  * @param {ol.source.TileWMSOptions} options Tile WMS options.
  * @todo stability experimental
  */
@@ -105,13 +102,6 @@ ol.source.TileWMS = function(options) {
         tileCoordTransform, tileUrlFunction)
   });
 
-  /**
-   * @private
-   * @type {ol.source.WMSGetFeatureInfoOptions}
-   */
-  this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
-      options.getFeatureInfoOptions : {};
-
 };
 goog.inherits(ol.source.TileWMS, ol.source.TileImage);
 
@@ -135,29 +125,6 @@ ol.source.TileWMS.prototype.getParams = function() {
 };
 
 
-/**
- * @inheritDoc
- */
-ol.source.TileWMS.prototype.getFeatureInfoForPixel =
-    function(pixel, map, success, opt_error) {
-  var coord = map.getCoordinateFromPixel(pixel),
-      view2D = map.getView().getView2D(),
-      projection = view2D.getProjection(),
-      tileGrid = goog.isNull(this.tileGrid) ?
-          ol.tilegrid.getForProjection(projection) : this.tileGrid,
-      tileCoord = tileGrid.getTileCoordForCoordAndResolution(coord,
-          view2D.getResolution()),
-      tileExtent = tileGrid.getTileCoordExtent(tileCoord),
-      offset = map.getPixelFromCoordinate(ol.extent.getTopLeft(tileExtent)),
-      url = this.tileUrlFunction(tileCoord, projection);
-  goog.asserts.assert(goog.isDef(url),
-      'ol.source.TileWMS#tileUrlFunction does not return a URL');
-  ol.source.wms.getFeatureInfo(url,
-      [pixel[0] - offset[0], pixel[1] - offset[1]], this.getFeatureInfoOptions_,
-      success, opt_error);
-};
-
-
 /**
  * @private
  */

src/ol/source/wmssource.js

@@ -1,30 +1,9 @@
-goog.provide('ol.source.WMSGetFeatureInfoMethod');
 goog.provide('ol.source.wms');
 
-goog.require('goog.net.XhrIo');
 goog.require('goog.object');
 goog.require('goog.uri.utils');
 
 
-/**
- * Method to use to get WMS feature info.
- * @enum {string}
- * @todo stability experimental
- */
-ol.source.WMSGetFeatureInfoMethod = {
-  /**
-   * Load the info in an IFRAME. Only works with `text/html` and `text/plain` as
-   * `INFO_FORMAT`.
-   */
-  IFRAME: 'iframe',
-  /**
-   * Use an asynchronous GET request. Requires CORS headers or a server at the
-   * same origin as the application script.
-   */
-  XHR_GET: 'xhr_get'
-};
-
-
 /**
  * @param {string} baseUrl WMS base URL.
  * @param {Object.<string, string|number>} params Request parameters.
@@ -61,62 +40,3 @@ ol.source.wms.getUrl =
 
   return goog.uri.utils.appendParamsFromMap(baseUrl, baseParams);
 };
-
-
-/**
- * @param {string} url URL as provided by the url function.
- * @param {ol.Pixel} pixel Pixel.
- * @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.
- */
-ol.source.wms.getFeatureInfo =
-    function(url, pixel, options, success, opt_error) {
-  // TODO: This could be done in a smarter way if the url function was not a
-  // closure
-  url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo')
-      .replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1');
-  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]),
-      x = Math.round(pixel[0]),
-      y = Math.round(pixel[1]);
-  if (version >= 1.3) {
-    goog.object.extend(params, {'I': x, 'J': y});
-  } else {
-    goog.object.extend(params, {'X': x, 'Y': y});
-  }
-  goog.object.extend(params, localOptions.params);
-  url = goog.uri.utils.appendParamsFromMap(url, params);
-  if (localOptions.method == ol.source.WMSGetFeatureInfoMethod.IFRAME) {
-    goog.global.setTimeout(function() {
-      success('<iframe seamless src="' + url + '"></iframe>');
-    }, 0);
-  } else if (localOptions.method == ol.source.WMSGetFeatureInfoMethod.XHR_GET) {
-    goog.net.XhrIo.send(url, function(event) {
-      var xhr = event.target;
-      if (xhr.isSuccess()) {
-        success(xhr.getResponseText());
-      } else if (goog.isDef(opt_error)) {
-        opt_error();
-      }
-    });
-  }
-};
-
-
-/**
- * @enum {RegExp}
- */
-ol.source.wms.regExes = {
-  layers: (/LAYERS=([^&]+)/),
-  version: (/VERSION=([^&]+)/)
-};