diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index ec81d61301..3952497768 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -29,15 +29,15 @@ ol.DEFAULT_MAX_ZOOM = 42; /** * @constructor - * @param {ol.tilegrid.TileGridOptions} tileGridOptions Tile grid options. + * @param {ol.tilegrid.TileGridOptions} options Tile grid options. */ -ol.tilegrid.TileGrid = function(tileGridOptions) { +ol.tilegrid.TileGrid = function(options) { /** * @private * @type {!Array.} */ - this.resolutions_ = tileGridOptions.resolutions; + this.resolutions_ = options.resolutions; goog.asserts.assert(goog.array.isSorted(this.resolutions_, function(a, b) { return b - a; }, true)); @@ -52,16 +52,15 @@ ol.tilegrid.TileGrid = function(tileGridOptions) { * @private * @type {ol.Coordinate} */ - this.origin_ = goog.isDef(tileGridOptions.origin) ? - tileGridOptions.origin : null; + this.origin_ = goog.isDef(options.origin) ? options.origin : null; /** * @private * @type {Array.} */ this.origins_ = null; - if (goog.isDef(tileGridOptions.origins)) { - this.origins_ = tileGridOptions.origins; + if (goog.isDef(options.origins)) { + this.origins_ = options.origins; goog.asserts.assert(this.origins_.length == this.resolutions_.length); } goog.asserts.assert( @@ -73,8 +72,8 @@ ol.tilegrid.TileGrid = function(tileGridOptions) { * @type {Array.} */ this.tileSizes_ = null; - if (goog.isDef(tileGridOptions.tileSizes)) { - this.tileSizes_ = tileGridOptions.tileSizes; + if (goog.isDef(options.tileSizes)) { + this.tileSizes_ = options.tileSizes; goog.asserts.assert(this.tileSizes_.length == this.resolutions_.length); } @@ -82,8 +81,8 @@ ol.tilegrid.TileGrid = function(tileGridOptions) { * @private * @type {ol.Size} */ - this.tileSize_ = goog.isDef(tileGridOptions.tileSize) ? - tileGridOptions.tileSize : + this.tileSize_ = goog.isDef(options.tileSize) ? + options.tileSize : goog.isNull(this.tileSizes_) ? new ol.Size(ol.DEFAULT_TILE_SIZE, ol.DEFAULT_TILE_SIZE) : null; goog.asserts.assert( diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmtstilegrid.js index 755b65e063..22c16165aa 100644 --- a/src/ol/tilegrid/wmtstilegrid.js +++ b/src/ol/tilegrid/wmtstilegrid.js @@ -11,26 +11,26 @@ goog.require('ol.tilegrid.TileGrid'); /** * @constructor * @extends {ol.tilegrid.TileGrid} - * @param {ol.tilegrid.WMTSOptions} wmtsOptions WMTS options. + * @param {ol.tilegrid.WMTSOptions} options WMTS options. */ -ol.tilegrid.WMTS = function(wmtsOptions) { +ol.tilegrid.WMTS = function(options) { goog.asserts.assert( - wmtsOptions.resolutions.length == wmtsOptions.matrixIds.length); + options.resolutions.length == options.matrixIds.length); /** * @private * @type {!Array.} */ - this.matrixIds_ = wmtsOptions.matrixIds; + this.matrixIds_ = options.matrixIds; // FIXME: should the matrixIds become optionnal? goog.base(this, { - origin: wmtsOptions.origin, - origins: wmtsOptions.origins, - resolutions: wmtsOptions.resolutions, - tileSize: wmtsOptions.tileSize, - tileSizes: wmtsOptions.tileSizes + origin: options.origin, + origins: options.origins, + resolutions: options.resolutions, + tileSize: options.tileSize, + tileSizes: options.tileSizes }); }; diff --git a/src/ol/tilegrid/xyztilegrid.js b/src/ol/tilegrid/xyztilegrid.js index ee34785def..212c0a52fe 100644 --- a/src/ol/tilegrid/xyztilegrid.js +++ b/src/ol/tilegrid/xyztilegrid.js @@ -11,14 +11,14 @@ goog.require('ol.tilegrid.TileGrid'); /** * @constructor * @extends {ol.tilegrid.TileGrid} - * @param {ol.tilegrid.XYZOptions} xyzOptions XYZ options. + * @param {ol.tilegrid.XYZOptions} options XYZ options. */ -ol.tilegrid.XYZ = function(xyzOptions) { +ol.tilegrid.XYZ = function(options) { - var resolutions = new Array(xyzOptions.maxZoom + 1); + var resolutions = new Array(options.maxZoom + 1); var z; var size = 2 * ol.projection.EPSG3857.HALF_SIZE / ol.DEFAULT_TILE_SIZE; - for (z = 0; z <= xyzOptions.maxZoom; ++z) { + for (z = 0; z <= options.maxZoom; ++z) { resolutions[z] = size / Math.pow(2, z); }