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

Named export for ol/tileurlfunction

Browse Source 
And change module name from ol/TileUrlFunction to ol/tileurlfunction
This commit is contained in:
Frederic Junod
2017-12-17 18:15:19 +01:00
parent db3e885076
commit 3cc63c4767
9 changed files with 47 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/source/WMTS.js
View File

@@ -2,7 +2,7 @@
* @module ol/source/WMTS
*/
import {inherits} from '../index.js';
import _ol_TileUrlFunction_ from '../TileUrlFunction.js';
import {expandUrl, createFromTileUrlFunctions, nullTileUrlFunction} from '../tileurlfunction.js';
import _ol_array_ from '../array.js';
import {containsExtent} from '../extent.js';
import _ol_obj_ from '../obj.js';
@@ -63,7 +63,7 @@ var _ol_source_WMTS_ = function(options) {
var urls = options.urls;
if (urls === undefined && options.url !== undefined) {
urls = _ol_TileUrlFunction_.expandUrl(options.url);
urls = expandUrl(options.url);
}
// FIXME: should we guess this requestEncoding from options.url(s)
@@ -151,9 +151,7 @@ var _ol_source_WMTS_ = function(options) {
};
var tileUrlFunction = (urls && urls.length > 0) ?
_ol_TileUrlFunction_.createFromTileUrlFunctions(
urls.map(this.createFromWMTSTemplate_)) :
_ol_TileUrlFunction_.nullTileUrlFunction;
createFromTileUrlFunctions(urls.map(this.createFromWMTSTemplate_)) : nullTileUrlFunction;
_ol_source_TileImage_.call(this, {
attributions: options.attributions,
@@ -187,7 +185,7 @@ _ol_source_WMTS_.prototype.setUrls = function(urls) {
var key = urls.join('\n');
this.setTileUrlFunction(this.fixedTileUrlFunction ?
this.fixedTileUrlFunction.bind(this) :
_ol_TileUrlFunction_.createFromTileUrlFunctions(urls.map(this.createFromWMTSTemplate_.bind(this))), key);
createFromTileUrlFunctions(urls.map(this.createFromWMTSTemplate_.bind(this))), key);
};
/**