Rename ol.source.TiledWMS to ol.source.TileWMS

This commit is contained in:
Tom Payne
2013-09-09 15:12:38 +02:00
parent 0235caa1e0
commit 8f6f5e42c6
9 changed files with 21 additions and 21 deletions

View File

@@ -529,7 +529,7 @@
*/
/**
* @typedef {Object} ol.source.TiledWMSOptions
* @typedef {Object} ol.source.TileWMSOptions
* @property {Array.<ol.Attribution>|undefined} attributions Attributions.
* @property {Object.<string,*>} params WMS request parameters. At least a
* `LAYERS` param is required. `STYLES` is '' by default. `VERSION` is

View File

@@ -1 +1 @@
@exportClass ol.source.TiledWMS ol.source.TiledWMSOptions
@exportClass ol.source.TileWMS ol.source.TileWMSOptions

View File

@@ -1,6 +1,6 @@
// FIXME add minZoom support
goog.provide('ol.source.TiledWMS');
goog.provide('ol.source.TileWMS');
goog.require('goog.array');
goog.require('goog.asserts');
@@ -18,9 +18,9 @@ goog.require('ol.source.wms');
* @constructor
* @extends {ol.source.TileImage}
* @implements {ol.source.FeatureInfoSource}
* @param {ol.source.TiledWMSOptions} options Tiled WMS options.
* @param {ol.source.TileWMSOptions} options Tiled WMS options.
*/
ol.source.TiledWMS = function(options) {
ol.source.TileWMS = function(options) {
var tileGrid;
if (goog.isDef(options.tileGrid)) {
@@ -94,13 +94,13 @@ ol.source.TiledWMS = function(options) {
options.getFeatureInfoOptions : {};
};
goog.inherits(ol.source.TiledWMS, ol.source.TileImage);
goog.inherits(ol.source.TileWMS, ol.source.TileImage);
/**
* @inheritDoc
*/
ol.source.TiledWMS.prototype.getFeatureInfoForPixel =
ol.source.TileWMS.prototype.getFeatureInfoForPixel =
function(pixel, map, success, opt_error) {
var coord = map.getCoordinateFromPixel(pixel),
view2D = map.getView().getView2D(),
@@ -113,7 +113,7 @@ ol.source.TiledWMS.prototype.getFeatureInfoForPixel =
offset = map.getPixelFromCoordinate(ol.extent.getTopLeft(tileExtent)),
url = this.tileUrlFunction(tileCoord, projection);
goog.asserts.assert(goog.isDef(url),
'ol.source.TiledWMS#tileUrlFunction does not return a 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);