diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js index 2e0c7a8d0b..8b8e17620b 100644 --- a/src/ol/tileurlfunction.js +++ b/src/ol/tileurlfunction.js @@ -4,7 +4,6 @@ goog.provide('ol.TileUrlFunctionType'); goog.require('goog.array'); goog.require('goog.math'); goog.require('ol.TileCoord'); -goog.require('ol.extent'); /** @@ -82,46 +81,6 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) { }; -/** - * @param {string} baseUrl Base URL (may have query data). - * @param {Object.} params Params to encode in the URL. - * @param {number} gutter Gutter value. - * @param {function(this: ol.source.TileImage, string, Object., - * ol.Extent, ol.Size, ol.proj.Projection)} paramsFunction params function. - * @return {ol.TileUrlFunctionType} Tile URL function. - */ -ol.TileUrlFunction.createFromParamsFunction = - function(baseUrl, params, gutter, paramsFunction) { - var tmpExtent = ol.extent.createEmpty(); - var tmpSize = [0, 0]; - return ( - /** - * @this {ol.source.TileImage} - * @param {ol.TileCoord} tileCoord Tile Coordinate. - * @param {ol.proj.Projection} projection Projection. - * @return {string|undefined} Tile URL. - */ - function(tileCoord, projection) { - if (goog.isNull(tileCoord)) { - return undefined; - } else { - var tileGrid = this.getTileGrid(); - if (goog.isNull(tileGrid)) { - tileGrid = ol.tilegrid.getForProjection(projection); - } - var tileResolution = tileGrid.getResolution(tileCoord.z); - var tileSize = tileGrid.getTileSize(tileCoord.z); - tmpSize[0] = tileSize[0] + (2 * gutter); - tmpSize[1] = tileSize[1] + (2 * gutter); - var extent = tileGrid.getTileCoordExtent(tileCoord, tmpExtent); - ol.extent.buffer(extent, tileResolution * gutter, extent); - return paramsFunction.call(this, baseUrl, params, - extent, tmpSize, projection); - } - }); -}; - - /** * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile coordinate. diff --git a/test/spec/ol/tileurlfunction.test.js b/test/spec/ol/tileurlfunction.test.js index 6c0e5bcbdd..23b32e9628 100644 --- a/test/spec/ol/tileurlfunction.test.js +++ b/test/spec/ol/tileurlfunction.test.js @@ -78,26 +78,7 @@ describe('ol.TileUrlFunction', function() { }); }); - describe('createFromParamsFunction', function() { - var paramsFunction = function(url, params) { return arguments; }; - var projection = ol.proj.get('EPSG:3857'); - var fakeTileSource = {getTileGrid: function() {return null;}}; - var params = {foo: 'bar'}; - var tileUrlFunction = ol.TileUrlFunction.createFromParamsFunction( - 'url', params, 0, paramsFunction); - it('calls the passed function with the correct arguments', function() { - var args = tileUrlFunction.call(fakeTileSource, - new ol.TileCoord(0, 0, 0), projection); - expect(args[0]).to.eql('url'); - expect(args[1]).to.be(params); - expect(args[2]).to.eql(projection.getExtent()); - expect(args[3]).to.eql([256, 256]); - expect(args[4]).to.eql(projection); - }); - }); - }); goog.require('ol.TileCoord'); goog.require('ol.TileUrlFunction'); -goog.require('ol.proj');