diff --git a/src/ol/source/wmts.js b/src/ol/source/wmts.js index 7ec74c36a4..2f7b8cc4a2 100644 --- a/src/ol/source/wmts.js +++ b/src/ol/source/wmts.js @@ -105,8 +105,9 @@ ol.source.WMTS = function(options) { /** * @param {string} template Template. * @return {ol.TileUrlFunctionType} Tile URL function. + * @private */ - function createFromWMTSTemplate(template) { + this.createFromWMTSTemplate_ = function(template) { // TODO: we may want to create our own appendParams function so that params // order conforms to wmts spec guidance, and so that we can avoid to escape @@ -146,11 +147,11 @@ ol.source.WMTS = function(options) { return url; } }); - } + }; var tileUrlFunction = (urls && urls.length > 0) ? ol.TileUrlFunction.createFromTileUrlFunctions( - urls.map(createFromWMTSTemplate)) : + urls.map(this.createFromWMTSTemplate_)) : ol.TileUrlFunction.nullTileUrlFunction; ol.source.TileImage.call(this, { @@ -175,6 +176,18 @@ ol.source.WMTS = function(options) { }; ol.inherits(ol.source.WMTS, ol.source.TileImage); +/** + * Set the URLs to use for requests. + * URLs may contain OCG conform URL Template Variables: {TileMatrix}, {TileRow}, {TileCol}. + * @override + */ +ol.source.WMTS.prototype.setUrls = function(urls) { + this.urls = urls; + var key = urls.join('\n'); + this.setTileUrlFunction(this.fixedTileUrlFunction ? + this.fixedTileUrlFunction.bind(this) : + ol.TileUrlFunction.createFromTileUrlFunctions(urls.map(this.createFromWMTSTemplate_.bind(this))), key); +}; /** * Get the dimensions, i.e. those passed to the constructor through the diff --git a/test/spec/ol/source/wmts.test.js b/test/spec/ol/source/wmts.test.js index e5aeba8ef4..1778705a20 100644 --- a/test/spec/ol/source/wmts.test.js +++ b/test/spec/ol/source/wmts.test.js @@ -230,6 +230,70 @@ describe('ol.source.WMTS', function() { }); }); + describe('#setUrls()', function() { + it('sets the URL for the source', function() { + var source = new ol.source.WMTS({}); + + var urls = [ + 'https://a.example.com/', + 'https://b.example.com/', + 'https://c.example.com/' + ]; + source.setUrls(urls); + + expect(source.getUrls()).to.eql(urls); + }); + + it('updates the key for the source', function() { + var source = new ol.source.WMTS({}); + + var urls = [ + 'https://a.example.com/', + 'https://b.example.com/', + 'https://c.example.com/' + ]; + source.setUrls(urls); + + expect(source.getKey()).to.eql(urls.join('\n')); + }); + + it('generates the correct tileUrlFunction during application of setUrl()', function() { + var projection = ol.proj.get('EPSG:3857'); + var source = new ol.source.WMTS({ + projection: projection, + requestEncoding: 'REST', + urls: [ + 'http://1.example.com/{TileMatrix}/{TileRow}/{TileCol}.jpeg', + 'http://2.example.com/{TileMatrix}/{TileRow}/{TileCol}.jpeg' + ], + tileGrid: new ol.tilegrid.WMTS({ + matrixIds: [0, 1, 2, 3, 4, 5, 6, 7], + origin: [2690000, 1285000], + resolutions: [4000, 3750, 3500, 3250, 3000, 2750, 2500, 2250] + }) + }); + + var urls = [ + 'https://a.example.com/{TileMatrix}/{TileRow}/{TileCol}.jpg', + 'https://b.example.com/{TileMatrix}/{TileRow}/{TileCol}.jpg' + ]; + source.setUrls(urls); + var tileUrl1 = source.tileUrlFunction([2, 9, 4], 1, projection); + expect(tileUrl1).to.match(/https\:\/\/[ab]\.example\.com\/2\/-5\/9\.jpg/); + }); + }); + + describe('url option', function() { + it('expands url template', function() { + var tileSource = new ol.source.WMTS({ + url: '{1-3}' + }); + + var urls = tileSource.getUrls(); + expect(urls).to.eql(['1', '2', '3']); + }); + }); + describe('#getUrls', function() { var sourceOptions;