Homogenize wmts tileUrlFunction relative to other sources

This commit is contained in:
Bruno Binet
2013-03-13 16:39:49 +01:00
parent 5eaf4baaa4
commit 317676a68f
+8 -7
View File
@@ -66,12 +66,6 @@ ol.source.WMTS = function(wmtsOptions) {
goog.object.extend(kvpParams, context); goog.object.extend(kvpParams, context);
} }
var urls = wmtsOptions.urls;
if (!goog.isDef(urls)) {
goog.asserts.assert(goog.isDef(wmtsOptions.url));
urls = ol.TileUrlFunction.expandUrl(wmtsOptions.url);
}
/** /**
* @param {string} template Template. * @param {string} template Template.
* @return {ol.TileUrlFunctionType} Tile URL function. * @return {ol.TileUrlFunctionType} Tile URL function.
@@ -100,7 +94,13 @@ ol.source.WMTS = function(wmtsOptions) {
}; };
} }
var tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions( var tileUrlFunction = ol.TileUrlFunction.nullTileUrlFunction;
var urls = wmtsOptions.urls;
if (!goog.isDef(urls) && goog.isDef(wmtsOptions.url)) {
urls = ol.TileUrlFunction.expandUrl(wmtsOptions.url);
}
if (goog.isDef(urls)) {
tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions(
goog.array.map(urls, function(url) { goog.array.map(urls, function(url) {
if (goog.isDef(kvpParams)) { if (goog.isDef(kvpParams)) {
// TODO: we may want to create our own appendParams function // TODO: we may want to create our own appendParams function
@@ -110,6 +110,7 @@ ol.source.WMTS = function(wmtsOptions) {
} }
return createFromWMTSTemplate(url); return createFromWMTSTemplate(url);
})); }));
}
tileUrlFunction = ol.TileUrlFunction.withTileCoordTransform( tileUrlFunction = ol.TileUrlFunction.withTileCoordTransform(
function(tileCoord, tileGrid, projection) { function(tileCoord, tileGrid, projection) {