From c67e67ee12ab8689894220ce556ad6a454e74545 Mon Sep 17 00:00:00 2001 From: Bruno Binet Date: Mon, 11 Mar 2013 11:29:40 +0100 Subject: [PATCH] Single tileUrlFunction in createFromTileUrlFunctions In that case, simply return the single tileUrlFunction. --- src/ol/source/wmtssource.js | 2 -- src/ol/tileurlfunction.js | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 2f14199557..7cca31fd66 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -113,8 +113,6 @@ ol.source.WMTS = function(wmtsOptions) { }; } - // TODO: update createFromTileUrlFunctions so that if - // tileUrlFunctions.length == 1, it returns the only tileUrlFunction var tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions( goog.array.map(urls, function(url) { if (goog.isDef(kvpParams)) { diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js index 3c270b80c6..209febe19c 100644 --- a/src/ol/tileurlfunction.js +++ b/src/ol/tileurlfunction.js @@ -60,6 +60,9 @@ ol.TileUrlFunction.createFromTemplates = function(templates) { * @return {ol.TileUrlFunctionType} Tile URL function. */ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) { + if (tileUrlFunctions.length === 1) { + return tileUrlFunctions[0]; + } return function(tileCoord, tileGrid, projection) { if (goog.isNull(tileCoord)) { return undefined;