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

Use blocked scoped variables

Browse Source 
In addition to using const and let, this also upgrades our linter config and removes lint (mostly whitespace).
This commit is contained in:
Tim Schaub
2018-01-11 23:32:36 -07:00
parent 0bf2b04dee
commit ad62739a6e
684 changed files with 18120 additions and 18184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/source/tileimage.test.js
+41 -41
View File
@@ -14,7 +14,7 @@ import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
describe('ol.source.TileImage', function() {
function createSource(opt_proj, opt_tileGrid, opt_cacheSize) {
var proj = opt_proj || 'EPSG:3857';
const proj = opt_proj || 'EPSG:3857';
return new TileImage({
cacheSize: opt_cacheSize,
projection: proj,
@@ -26,8 +26,8 @@ describe('ol.source.TileImage', function() {
describe('#getTileCacheForProjection', function() {
it('uses the cacheSize for reprojected tile caches', function() {
var source = createSource(undefined, undefined, 42);
var tileCache = source.getTileCacheForProjection(getProjection('EPSG:4326'));
const source = createSource(undefined, undefined, 42);
const tileCache = source.getTileCacheForProjection(getProjection('EPSG:4326'));
expect(tileCache.highWaterMark).to.be(42);
expect(tileCache).to.not.equal(source.getTileCacheForProjection(source.getProjection()));
});
@@ -35,16 +35,16 @@ describe('ol.source.TileImage', function() {
describe('#setTileGridForProjection', function() {
it('uses the tilegrid for given projection', function() {
var source = createSource();
var tileGrid = _ol_tilegrid_.createForProjection('EPSG:4326', 3, [10, 20]);
const source = createSource();
const tileGrid = _ol_tilegrid_.createForProjection('EPSG:4326', 3, [10, 20]);
source.setTileGridForProjection('EPSG:4326', tileGrid);
var retrieved = source.getTileGridForProjection(getProjection('EPSG:4326'));
const retrieved = source.getTileGridForProjection(getProjection('EPSG:4326'));
expect(retrieved).to.be(tileGrid);
});
});
describe('#getTileInternal', function() {
var source, tile;
let source, tile;
beforeEach(function() {
source = createSource();
@@ -55,8 +55,8 @@ describe('ol.source.TileImage', function() {
});
it('gets the tile from the cache', function() {
var returnedTile = source.getTileInternal(
0, 0, -1, 1, getProjection('EPSG:3857'));
const returnedTile = source.getTileInternal(
0, 0, -1, 1, getProjection('EPSG:3857'));
expect(returnedTile).to.be(tile);
});
@@ -67,8 +67,8 @@ describe('ol.source.TileImage', function() {
source.getKey = function() {
return 'key0';
};
var returnedTile = source.getTileInternal(
0, 0, -1, 1, getProjection('EPSG:3857'));
const returnedTile = source.getTileInternal(
0, 0, -1, 1, getProjection('EPSG:3857'));
expect(returnedTile).not.to.be(tile);
expect(returnedTile.key).to.be('key0');
expect(returnedTile.interimTile).to.be(null);
@@ -81,8 +81,8 @@ describe('ol.source.TileImage', function() {
return 'key0';
};
tile.state = 2; // LOADED
var returnedTile = source.getTileInternal(
0, 0, -1, 1, getProjection('EPSG:3857'));
const returnedTile = source.getTileInternal(
0, 0, -1, 1, getProjection('EPSG:3857'));
expect(returnedTile).not.to.be(tile);
expect(returnedTile.key).to.be('key0');
expect(returnedTile.interimTile).to.be(tile);
@@ -91,17 +91,17 @@ describe('ol.source.TileImage', function() {
describe('tile is not loaded but interim tile is', function() {
it('returns a tile with interim tile', function() {
var dynamicParamsKey, returnedTile;
let dynamicParamsKey, returnedTile;
source.getKey = function() {
return dynamicParamsKey;
};
dynamicParamsKey = 'key0';
tile.state = 2; // LOADED
returnedTile = source.getTileInternal(
0, 0, -1, 1, getProjection('EPSG:3857'));
0, 0, -1, 1, getProjection('EPSG:3857'));
dynamicParamsKey = 'key1';
returnedTile = source.getTileInternal(
0, 0, -1, 1, getProjection('EPSG:3857'));
0, 0, -1, 1, getProjection('EPSG:3857'));
expect(returnedTile).not.to.be(tile);
expect(returnedTile.key).to.be('key1');
expect(returnedTile.interimTile).to.be(tile);
@@ -114,17 +114,17 @@ describe('ol.source.TileImage', function() {
describe('#getTile', function() {
it('does not do reprojection for identity', function() {
var source3857 = createSource('EPSG:3857');
var tile3857 = source3857.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
const source3857 = createSource('EPSG:3857');
const tile3857 = source3857.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
expect(tile3857).to.be.a(ImageTile);
expect(tile3857).not.to.be.a(ReprojTile);
var projXXX = new Projection({
const projXXX = new Projection({
code: 'XXX',
units: 'degrees'
});
var sourceXXX = createSource(projXXX);
var tileXXX = sourceXXX.getTile(0, 0, -1, 1, projXXX);
const sourceXXX = createSource(projXXX);
const tileXXX = sourceXXX.getTile(0, 0, -1, 1, projXXX);
expect(tileXXX).to.be.a(ImageTile);
expect(tileXXX).not.to.be.a(ReprojTile);
});
@@ -141,11 +141,11 @@ describe('ol.source.TileImage', function() {
});
it('can handle source projection without extent and units', function(done) {
var source = createSource('4326_noextentnounits', _ol_tilegrid_.createXYZ({
const source = createSource('4326_noextentnounits', _ol_tilegrid_.createXYZ({
extent: [-180, -90, 180, 90],
tileSize: [2, 2]
}));
var tile = source.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
const tile = source.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
expect(tile).to.be.a(ReprojTile);
_ol_events_.listen(tile, 'change', function() {
@@ -157,14 +157,14 @@ describe('ol.source.TileImage', function() {
});
it('can handle target projection without extent and units', function(done) {
var proj = getProjection('4326_noextentnounits');
var source = createSource();
const proj = getProjection('4326_noextentnounits');
const source = createSource();
source.setTileGridForProjection(proj,
_ol_tilegrid_.createXYZ({
extent: _ol_proj_EPSG3857_.WORLD_EXTENT,
tileSize: [2, 2]
}));
var tile = source.getTile(0, 0, -1, 1, proj);
_ol_tilegrid_.createXYZ({
extent: _ol_proj_EPSG3857_.WORLD_EXTENT,
tileSize: [2, 2]
}));
const tile = source.getTile(0, 0, -1, 1, proj);
expect(tile).to.be.a(ReprojTile);
_ol_events_.listen(tile, 'change', function() {
@@ -178,7 +178,7 @@ describe('ol.source.TileImage', function() {
describe('tile load events', function() {
var source;
let source;
beforeEach(function() {
source = new TileImage({
@@ -190,11 +190,11 @@ describe('ol.source.TileImage', function() {
source.setTileLoadFunction(function(tile) {
tile.setState(TileState.LOADED);
});
var startSpy = sinon.spy();
const startSpy = sinon.spy();
source.on('tileloadstart', startSpy);
var endSpy = sinon.spy();
const endSpy = sinon.spy();
source.on('tileloadend', endSpy);
var tile = source.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
const tile = source.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
tile.load();
expect(startSpy.callCount).to.be(1);
expect(endSpy.callCount).to.be(1);
@@ -203,11 +203,11 @@ describe('ol.source.TileImage', function() {
it('works for loading-error-loading-loaded sequences', function(done) {
source.setTileLoadFunction(function(tile) {
tile.setState(
tile.state == TileState.ERROR ? TileState.LOADED : TileState.ERROR);
tile.state == TileState.ERROR ? TileState.LOADED : TileState.ERROR);
});
var startSpy = sinon.spy();
const startSpy = sinon.spy();
source.on('tileloadstart', startSpy);
var errorSpy = sinon.spy();
const errorSpy = sinon.spy();
source.on('tileloaderror', function(e) {
setTimeout(function() {
e.tile.setState(TileState.LOADING);
@@ -220,17 +220,17 @@ describe('ol.source.TileImage', function() {
expect(errorSpy.callCount).to.be(1);
done();
});
var tile = source.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
const tile = source.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
tile.load();
});
it('dispatches tileloadend events for aborted tiles', function() {
source.setTileLoadFunction(function() {});
var startSpy = sinon.spy();
const startSpy = sinon.spy();
source.on('tileloadstart', startSpy);
var endSpy = sinon.spy();
const endSpy = sinon.spy();
source.on('tileloadend', endSpy);
var tile = source.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
const tile = source.getTile(0, 0, -1, 1, getProjection('EPSG:3857'));
tile.load();
tile.dispose();
expect(startSpy.callCount).to.be(1);