Try to expand single url for TiledWMS source

This commit is contained in:
Bruno Binet
2013-03-13 16:35:24 +01:00
parent 875ead58ab
commit 5eaf4baaa4
+7 -8
View File
@@ -22,20 +22,19 @@ ol.source.TiledWMS = function(tiledWMSOptions) {
tileGrid = tiledWMSOptions.tileGrid; tileGrid = tiledWMSOptions.tileGrid;
} }
var tileUrlFunction; var tileUrlFunction = ol.TileUrlFunction.nullTileUrlFunction;
if (tiledWMSOptions.urls) { var urls = tiledWMSOptions.urls;
if (!goog.isDef(urls) && goog.isDef(tiledWMSOptions.url)) {
urls = ol.TileUrlFunction.expandUrl(tiledWMSOptions.url);
}
if (goog.isDef(urls)) {
var tileUrlFunctions = goog.array.map( var tileUrlFunctions = goog.array.map(
tiledWMSOptions.urls, function(url) { urls, function(url) {
return ol.TileUrlFunction.createWMSParams( return ol.TileUrlFunction.createWMSParams(
url, tiledWMSOptions.params); url, tiledWMSOptions.params);
}); });
tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions( tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions(
tileUrlFunctions); tileUrlFunctions);
} else if (tiledWMSOptions.url) {
tileUrlFunction = ol.TileUrlFunction.createWMSParams(
tiledWMSOptions.url, tiledWMSOptions.params);
} else {
tileUrlFunction = ol.TileUrlFunction.nullTileUrlFunction;
} }
var transparent = goog.isDef(tiledWMSOptions.params['TRANSPARENT']) ? var transparent = goog.isDef(tiledWMSOptions.params['TRANSPARENT']) ?
tiledWMSOptions.params['TRANSPARENT'] : true; tiledWMSOptions.params['TRANSPARENT'] : true;