ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4777 from gberaudo/expanded-urls

Browse Source 
Fix source.UrlTile URL expansion
This commit is contained in:
Andreas Hocevar
2016-02-03 13:03:37 +01:00
parent d87482e415 42df157a04
commit a848321842
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/source/urltilesource.js
View File

@@ -183,8 +183,7 @@ ol.source.UrlTile.prototype.setTileUrlFunction = function(tileUrlFunction) {
* @api stable * @api stable
*/ */
ol.source.UrlTile.prototype.setUrl = function(url) { ol.source.UrlTile.prototype.setUrl = function(url) {
this.urls = [url]; var urls = this.urls = ol.TileUrlFunction.expandUrl(url);
var urls = ol.TileUrlFunction.expandUrl(url);
this.setTileUrlFunction(this.fixedTileUrlFunction ? this.setTileUrlFunction(this.fixedTileUrlFunction ?
this.fixedTileUrlFunction.bind(this) : this.fixedTileUrlFunction.bind(this) :
ol.TileUrlFunction.createFromTemplates(urls, this.tileGrid)); ol.TileUrlFunction.createFromTemplates(urls, this.tileGrid));

11
test/spec/ol/source/urltilesource.test.js
View File

@@ -3,6 +3,17 @@ goog.provide('ol.test.source.UrlTile');
describe('ol.source.UrlTile', function() { describe('ol.source.UrlTile', function() {
describe('url option', function() {
it('expands url template', function() {
var tileSource = new ol.source.UrlTile({
url: '{1-3}'
});
var urls = tileSource.getUrls();
expect(urls).to.eql(['1', '2', '3']);
});
});
describe('tileUrlFunction', function() { describe('tileUrlFunction', function() {
var tileSource, tileGrid; var tileSource, tileGrid;