diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index 268f949237..c060ee88e1 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -101,10 +101,11 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = /** * @this {ol.source.BingMaps} * @param {ol.TileCoord} tileCoord Tile coordinate. + * @param {number} pixelRatio Pixel ratio. * @param {ol.proj.Projection} projection Projection. * @return {string|undefined} Tile URL. */ - function(tileCoord, projection) { + function(tileCoord, pixelRatio, projection) { goog.asserts.assert(ol.proj.equivalent( projection, this.getProjection())); if (goog.isNull(tileCoord)) { diff --git a/src/ol/source/tileimagesource.js b/src/ol/source/tileimagesource.js index bf7d0982db..c022f117ec 100644 --- a/src/ol/source/tileimagesource.js +++ b/src/ol/source/tileimagesource.js @@ -126,7 +126,7 @@ ol.source.TileImage.prototype.getTile = function(z, x, y, projection) { } else { goog.asserts.assert(projection); var tileCoord = new ol.TileCoord(z, x, y); - var tileUrl = this.tileUrlFunction(tileCoord, projection); + var tileUrl = this.tileUrlFunction(tileCoord, 1, projection); var tile = new this.tileClass( tileCoord, goog.isDef(tileUrl) ? ol.TileState.IDLE : ol.TileState.EMPTY, diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index 027c711e3e..ba82f91753 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -132,11 +132,13 @@ ol.source.TileWMS.prototype.resetCoordKeyPrefix_ = function() { /** * @param {ol.TileCoord} tileCoord Tile coordinate. + * @param {number} pixelRatio Pixel ratio. * @param {ol.proj.Projection} projection Projection. * @private * @return {string|undefined} Tile URL. */ -ol.source.TileWMS.prototype.tileUrlFunction_ = function(tileCoord, projection) { +ol.source.TileWMS.prototype.tileUrlFunction_ = + function(tileCoord, pixelRatio, projection) { var urls = this.urls_; if (!goog.isDef(urls) || goog.array.isEmpty(urls)) { diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 15e2aae7bb..bd0d7c514b 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -96,10 +96,11 @@ ol.source.WMTS = function(options) { /** * @this {ol.source.WMTS} * @param {ol.TileCoord} tileCoord Tile coordinate. + * @param {number} pixelRatio Pixel ratio. * @param {ol.proj.Projection} projection Projection. * @return {string|undefined} Tile URL. */ - function(tileCoord, projection) { + function(tileCoord, pixelRatio, projection) { if (goog.isNull(tileCoord)) { return undefined; } else { diff --git a/src/ol/source/zoomifysource.js b/src/ol/source/zoomifysource.js index 7e1a372d47..011b8056ca 100644 --- a/src/ol/source/zoomifysource.js +++ b/src/ol/source/zoomifysource.js @@ -61,10 +61,11 @@ ol.source.Zoomify = function(opt_options) { /** * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile Coordinate. + * @param {number} pixelRatio Pixel ratio. * @param {ol.proj.Projection} projection Projection. * @return {string|undefined} Tile URL. */ - function(tileCoord, projection) { + function(tileCoord, pixelRatio, projection) { if (goog.isNull(tileCoord)) { return undefined; } else { diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js index 8b8e17620b..ed7a17d9c3 100644 --- a/src/ol/tileurlfunction.js +++ b/src/ol/tileurlfunction.js @@ -8,7 +8,7 @@ goog.require('ol.TileCoord'); /** * @typedef {function(this: ol.source.TileImage, ol.TileCoord, - * ol.proj.Projection): (string|undefined)} + * number, ol.proj.Projection): (string|undefined)} */ ol.TileUrlFunctionType; @@ -29,10 +29,11 @@ ol.TileUrlFunction.createFromTemplate = function(template) { /** * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile Coordinate. + * @param {number} pixelRatio Pixel ratio. * @param {ol.proj.Projection} projection Projection. * @return {string|undefined} Tile URL. */ - function(tileCoord, projection) { + function(tileCoord, pixelRatio, projection) { if (goog.isNull(tileCoord)) { return undefined; } else { @@ -66,16 +67,18 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) { /** * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile Coordinate. + * @param {number} pixelRatio Pixel ratio. * @param {ol.proj.Projection} projection Projection. * @return {string|undefined} Tile URL. */ - function(tileCoord, projection) { + function(tileCoord, pixelRatio, projection) { if (goog.isNull(tileCoord)) { return undefined; } else { var index = goog.math.modulo(tileCoord.hash(), tileUrlFunctions.length); - return tileUrlFunctions[index].call(this, tileCoord, projection); + return tileUrlFunctions[index].call( + this, tileCoord, pixelRatio, projection); } }); }; @@ -84,10 +87,12 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) { /** * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile coordinate. + * @param {number} pixelRatio Pixel ratio. * @param {ol.proj.Projection} projection Projection. * @return {string|undefined} Tile URL. */ -ol.TileUrlFunction.nullTileUrlFunction = function(tileCoord, projection) { +ol.TileUrlFunction.nullTileUrlFunction = + function(tileCoord, pixelRatio, projection) { return undefined; }; @@ -104,16 +109,18 @@ ol.TileUrlFunction.withTileCoordTransform = /** * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile Coordinate. + * @param {number} pixelRatio Pixel ratio. * @param {ol.proj.Projection} projection Projection. * @return {string|undefined} Tile URL. */ - function(tileCoord, projection) { + function(tileCoord, pixelRatio, projection) { if (goog.isNull(tileCoord)) { return undefined; } else { return tileUrlFunction.call( this, transformFn.call(this, tileCoord, projection, tmpTileCoord), + pixelRatio, projection); } });