Named export for ol/tileurlfunction

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

View File

@@ -1,4 +1,4 @@
import _ol_TileUrlFunction_ from '../../../src/ol/TileUrlFunction.js';
import {expandUrl, createFromTemplate, createFromTemplates, createFromTileUrlFunctions} from '../../../src/ol/tileurlfunction.js';
import _ol_tilecoord_ from '../../../src/ol/tilecoord.js';
import _ol_tilegrid_ from '../../../src/ol/tilegrid.js';
import _ol_tilegrid_TileGrid_ from '../../../src/ol/tilegrid/TileGrid.js';
@@ -9,7 +9,7 @@ describe('ol.TileUrlFunction', function() {
describe('with number range', function() {
it('creates expected URLs', function() {
var template = 'http://tile-{1-3}/{z}/{x}/{y}';
var urls = _ol_TileUrlFunction_.expandUrl(template);
var urls = expandUrl(template);
expect(urls).to.eql([
'http://tile-1/{z}/{x}/{y}',
'http://tile-2/{z}/{x}/{y}',
@@ -18,7 +18,7 @@ describe('ol.TileUrlFunction', function() {
});
it('creates expected URLs', function() {
var template = 'http://tile-{9-11}/{z}/{x}/{y}';
var urls = _ol_TileUrlFunction_.expandUrl(template);
var urls = expandUrl(template);
expect(urls).to.eql([
'http://tile-9/{z}/{x}/{y}',
'http://tile-10/{z}/{x}/{y}',
@@ -29,7 +29,7 @@ describe('ol.TileUrlFunction', function() {
describe('with character range', function() {
it('creates expected URLs', function() {
var template = 'http://tile-{c-e}/{z}/{x}/{y}';
var urls = _ol_TileUrlFunction_.expandUrl(template);
var urls = expandUrl(template);
expect(urls).to.eql([
'http://tile-c/{z}/{x}/{y}',
'http://tile-d/{z}/{x}/{y}',
@@ -40,7 +40,7 @@ describe('ol.TileUrlFunction', function() {
describe('without range', function() {
it('creates expected URLs', function() {
var template = 'http://tiles.example.com/{z}/{x}/{y}';
var urls = _ol_TileUrlFunction_.expandUrl(template);
var urls = expandUrl(template);
expect(urls).to.eql([
'http://tiles.example.com/{z}/{x}/{y}'
]);
@@ -51,14 +51,12 @@ describe('ol.TileUrlFunction', function() {
describe('createFromTemplate', function() {
var tileGrid = _ol_tilegrid_.createXYZ();
it('creates expected URL', function() {
var tileUrl = _ol_TileUrlFunction_.createFromTemplate(
'{z}/{x}/{y}', tileGrid);
var tileUrl = createFromTemplate('{z}/{x}/{y}', tileGrid);
expect(tileUrl([3, 2, -2])).to.eql('3/2/1');
expect(tileUrl(null)).to.be(undefined);
});
it('accepts {-y} placeholder', function() {
var tileUrl = _ol_TileUrlFunction_.createFromTemplate(
'{z}/{x}/{-y}', tileGrid);
var tileUrl = createFromTemplate('{z}/{x}/{-y}', tileGrid);
expect(tileUrl([3, 2, -3])).to.eql('3/2/5');
});
it('returns correct value for {-y} with custom tile grids', function() {
@@ -67,13 +65,11 @@ describe('ol.TileUrlFunction', function() {
origin: [-180, -90],
resolutions: [360 / 256, 360 / 512, 360 / 1024, 360 / 2048]
});
var tileUrl = _ol_TileUrlFunction_.createFromTemplate(
'{z}/{x}/{-y}', customTileGrid);
var tileUrl = createFromTemplate('{z}/{x}/{-y}', customTileGrid);
expect(tileUrl([3, 2, -3])).to.eql('3/2/1');
});
it('replaces multiple placeholder occurrences', function() {
var tileUrl = _ol_TileUrlFunction_.createFromTemplate(
'{z}/{z}{x}{y}', tileGrid);
var tileUrl = createFromTemplate('{z}/{z}{x}{y}', tileGrid);
expect(tileUrl([3, 2, -2])).to.eql('3/321');
});
});
@@ -86,8 +82,7 @@ describe('ol.TileUrlFunction', function() {
'http://tile-2/{z}/{x}/{y}',
'http://tile-3/{z}/{x}/{y}'
];
var tileUrlFunction = _ol_TileUrlFunction_.createFromTemplates(
templates, tileGrid);
var tileUrlFunction = createFromTemplates(templates, tileGrid);
var tileCoord = [3, 2, -2];
/* eslint-disable openlayers-internal/no-missing-requires */
@@ -115,9 +110,9 @@ describe('ol.TileUrlFunction', function() {
describe('createFromTileUrlFunctions', function() {
var tileGrid = _ol_tilegrid_.createXYZ();
it('creates expected URL', function() {
var tileUrl = _ol_TileUrlFunction_.createFromTileUrlFunctions([
_ol_TileUrlFunction_.createFromTemplate('a', tileGrid),
_ol_TileUrlFunction_.createFromTemplate('b', tileGrid)
var tileUrl = createFromTileUrlFunctions([
createFromTemplate('a', tileGrid),
createFromTemplate('b', tileGrid)
]);
var tileUrl1 = tileUrl([1, 0, 0]);
var tileUrl2 = tileUrl([1, 0, 1]);