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

Rename _ol_TileState_ to TileState

Browse Source
This commit is contained in:
Frederic Junod
2017-12-22 09:00:46 +01:00
parent 2130ce7481
commit fc00aecd2e
25 changed files with 159 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/spec/ol/imagetile.test.js
View File

@@ -1,5 +1,5 @@
import _ol_ImageTile_ from '../../../src/ol/ImageTile.js';
import _ol_TileState_ from '../../../src/ol/TileState.js';
import TileState from '../../../src/ol/TileState.js';
import _ol_events_ from '../../../src/ol/events.js';
import EventType from '../../../src/ol/events/EventType.js';
import _ol_source_Image_ from '../../../src/ol/source/Image.js';
@@ -11,7 +11,7 @@ describe('ol.ImageTile', function() {
it('can load idle tile', function(done) {
var tileCoord = [0, 0, 0];
var state = _ol_TileState_.IDLE;
var state = TileState.IDLE;
var src = 'spec/ol/data/osm-0-0-0.png';
var tileLoadFunction = _ol_source_Image_.defaultImageLoadFunction;
var tile = new _ol_ImageTile_(tileCoord, state, src, null, tileLoadFunction);
@@ -20,10 +20,10 @@ describe('ol.ImageTile', function() {
_ol_events_.listen(tile, EventType.CHANGE, function(event) {
var state = tile.getState();
if (previousState == _ol_TileState_.IDLE) {
expect(state).to.be(_ol_TileState_.LOADING);
} else if (previousState == _ol_TileState_.LOADING) {
expect(state).to.be(_ol_TileState_.LOADED);
if (previousState == TileState.IDLE) {
expect(state).to.be(TileState.LOADING);
} else if (previousState == TileState.LOADING) {
expect(state).to.be(TileState.LOADED);
done();
} else {
expect().fail();
@@ -36,7 +36,7 @@ describe('ol.ImageTile', function() {
it('can load error tile', function(done) {
var tileCoord = [0, 0, 0];
var state = _ol_TileState_.ERROR;
var state = TileState.ERROR;
var src = 'spec/ol/data/osm-0-0-0.png';
var tileLoadFunction = _ol_source_Image_.defaultImageLoadFunction;
var tile = new _ol_ImageTile_(tileCoord, state, src, null, tileLoadFunction);
@@ -45,10 +45,10 @@ describe('ol.ImageTile', function() {
_ol_events_.listen(tile, EventType.CHANGE, function(event) {
var state = tile.getState();
if (previousState == _ol_TileState_.ERROR) {
expect(state).to.be(_ol_TileState_.LOADING);
} else if (previousState == _ol_TileState_.LOADING) {
expect(state).to.be(_ol_TileState_.LOADED);
if (previousState == TileState.ERROR) {
expect(state).to.be(TileState.LOADING);
} else if (previousState == TileState.LOADING) {
expect(state).to.be(TileState.LOADED);
done();
} else {
expect().fail();
@@ -61,15 +61,15 @@ describe('ol.ImageTile', function() {
it('loads an empty image on error ', function(done) {
var tileCoord = [0, 0, 0];
var state = _ol_TileState_.IDLE;
var state = TileState.IDLE;
var src = 'spec/ol/data/osm-0-0-99.png';
var tileLoadFunction = _ol_source_Image_.defaultImageLoadFunction;
var tile = new _ol_ImageTile_(tileCoord, state, src, null, tileLoadFunction);
var key = _ol_events_.listen(tile, EventType.CHANGE, function(event) {
var state = tile.getState();
if (state == _ol_TileState_.ERROR) {
expect(state).to.be(_ol_TileState_.ERROR);
if (state == TileState.ERROR) {
expect(state).to.be(TileState.ERROR);
expect(tile.image_).to.be.a(HTMLCanvasElement);
_ol_events_.unlistenByKey(key);
tile.load();
@@ -87,14 +87,14 @@ describe('ol.ImageTile', function() {
it('sets image src to a blank image data uri', function() {
var tileCoord = [0, 0, 0];
var state = _ol_TileState_.IDLE;
var state = TileState.IDLE;
var src = 'spec/ol/data/osm-0-0-0.png';
var tileLoadFunction = _ol_source_Image_.defaultImageLoadFunction;
var tile = new _ol_ImageTile_(tileCoord, state, src, null, tileLoadFunction);
tile.load();
expect(tile.getState()).to.be(_ol_TileState_.LOADING);
expect(tile.getState()).to.be(TileState.LOADING);
tile.dispose();
expect(tile.getState()).to.be(_ol_TileState_.ABORT);
expect(tile.getState()).to.be(TileState.ABORT);
expect(tile.getImage().src).to.be(_ol_ImageTile_.blankImageUrl);
});

6
test/spec/ol/renderer/canvas/vectortilelayer.test.js
View File

@@ -2,7 +2,7 @@ import {getUid, inherits} from '../../../../../src/ol/index.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import Map from '../../../../../src/ol/Map.js';
import _ol_TileState_ from '../../../../../src/ol/TileState.js';
import TileState from '../../../../../src/ol/TileState.js';
import _ol_VectorImageTile_ from '../../../../../src/ol/VectorImageTile.js';
import _ol_VectorTile_ from '../../../../../src/ol/VectorTile.js';
import _ol_View_ from '../../../../../src/ol/View.js';
@@ -74,7 +74,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
source.getTile = function() {
var tile = _ol_source_VectorTile_.prototype.getTile.apply(source, arguments);
tile.setState(_ol_TileState_.LOADED);
tile.setState(TileState.LOADED);
return tile;
};
layer = new _ol_layer_VectorTile_({
@@ -254,7 +254,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
var tile = new _ol_VectorImageTile_([0, 0, 0]);
tile.transition_ = 0;
tile.wrappedTileCoord = [0, 0, 0];
tile.setState(_ol_TileState_.LOADED);
tile.setState(TileState.LOADED);
tile.getSourceTile = function() {
return sourceTile;
};

4
test/spec/ol/source/raster.test.js
View File

@@ -1,5 +1,5 @@
import Map from '../../../../src/ol/Map.js';
import _ol_TileState_ from '../../../../src/ol/TileState.js';
import TileState from '../../../../src/ol/TileState.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_layer_Image_ from '../../../../src/ol/layer/Image.js';
import _ol_proj_Projection_ from '../../../../src/ol/proj/Projection.js';
@@ -343,7 +343,7 @@ where('Uint8ClampedArray').describe('ol.source.Raster', function() {
map2.once('moveend', function() {
expect(tileCache.getCount()).to.equal(1);
var state = tileCache.peekLast().getState();
expect(state === _ol_TileState_.LOADED || state === _ol_TileState_.LOADED).to.be(true);
expect(state === TileState.LOADED || state === TileState.LOADED).to.be(true);
done();
});

10
test/spec/ol/source/tileimage.test.js
View File

@@ -1,5 +1,5 @@
import _ol_ImageTile_ from '../../../../src/ol/ImageTile.js';
import _ol_TileState_ from '../../../../src/ol/TileState.js';
import TileState from '../../../../src/ol/TileState.js';
import {createFromTemplate} from '../../../../src/ol/tileurlfunction.js';
import _ol_events_ from '../../../../src/ol/events.js';
import {addCommon, clearAllProjections, get as getProjection} from '../../../../src/ol/proj.js';
@@ -188,7 +188,7 @@ describe('ol.source.TileImage', function() {
it('dispatches tileloadstart and tileloadend events', function() {
source.setTileLoadFunction(function(tile) {
tile.setState(_ol_TileState_.LOADED);
tile.setState(TileState.LOADED);
});
var startSpy = sinon.spy();
source.on('tileloadstart', startSpy);
@@ -203,15 +203,15 @@ describe('ol.source.TileImage', function() {
it('works for loading-error-loading-loaded sequences', function(done) {
source.setTileLoadFunction(function(tile) {
tile.setState(
tile.state == _ol_TileState_.ERROR ? _ol_TileState_.LOADED : _ol_TileState_.ERROR);
tile.state == TileState.ERROR ? TileState.LOADED : TileState.ERROR);
});
var startSpy = sinon.spy();
source.on('tileloadstart', startSpy);
var errorSpy = sinon.spy();
source.on('tileloaderror', function(e) {
setTimeout(function() {
e.tile.setState(_ol_TileState_.LOADING);
e.tile.setState(_ol_TileState_.LOADED);
e.tile.setState(TileState.LOADING);
e.tile.setState(TileState.LOADED);
}, 0);
errorSpy();
});

28
test/spec/ol/tile.test.js
View File

@@ -1,21 +1,21 @@
import {getUid} from '../../../src/ol/index.js';
import _ol_ImageTile_ from '../../../src/ol/ImageTile.js';
import _ol_Tile_ from '../../../src/ol/Tile.js';
import _ol_TileState_ from '../../../src/ol/TileState.js';
import TileState from '../../../src/ol/TileState.js';
describe('ol.Tile', function() {
describe('constructor', function() {
it('sets a default transition', function() {
var coord = [0, 0, 0];
var tile = new _ol_Tile_(coord, _ol_TileState_.IDLE);
var tile = new _ol_Tile_(coord, TileState.IDLE);
expect(tile.transition_).to.equal(250);
});
it('allows the transition to be set', function() {
var coord = [0, 0, 0];
var transition = 500;
var tile = new _ol_Tile_(coord, _ol_TileState_.IDLE, {transition: transition});
var tile = new _ol_Tile_(coord, TileState.IDLE, {transition: transition});
expect(tile.transition_).to.equal(transition);
});
});
@@ -23,7 +23,7 @@ describe('ol.Tile', function() {
describe('#getAlpha()', function() {
it('returns the alpha value for a tile in transition', function() {
var coord = [0, 0, 0];
var tile = new _ol_Tile_(coord, _ol_TileState_.IDLE);
var tile = new _ol_Tile_(coord, TileState.IDLE);
var id = 'test';
var time = Date.now();
@@ -45,7 +45,7 @@ describe('ol.Tile', function() {
describe('#inTransition()', function() {
it('determines if the tile is in transition', function() {
var coord = [0, 0, 0];
var tile = new _ol_Tile_(coord, _ol_TileState_.IDLE);
var tile = new _ol_Tile_(coord, TileState.IDLE);
var id = 'test';
expect(tile.inTransition(id)).to.be(true);
@@ -58,7 +58,7 @@ describe('ol.Tile', function() {
var head, renderTile;
beforeEach(function() {
var tileCoord = [0, 0, 0];
head = new _ol_ImageTile_(tileCoord, _ol_TileState_.IDLE);
head = new _ol_ImageTile_(tileCoord, TileState.IDLE);
getUid(head);
var addToChain = function(tile, state) {
@@ -67,15 +67,15 @@ describe('ol.Tile', function() {
tile.interimTile = next;
return next;
};
var tail = addToChain(head, _ol_TileState_.IDLE); //discard, deprecated by head
tail = addToChain(tail, _ol_TileState_.LOADING); //keep, request already going
tail = addToChain(tail, _ol_TileState_.IDLE); //discard, deprecated by head
tail = addToChain(tail, _ol_TileState_.LOADED); //keep, use for rendering
var tail = addToChain(head, TileState.IDLE); //discard, deprecated by head
tail = addToChain(tail, TileState.LOADING); //keep, request already going
tail = addToChain(tail, TileState.IDLE); //discard, deprecated by head
tail = addToChain(tail, TileState.LOADED); //keep, use for rendering
renderTile = tail; //store this tile for later tests
tail = addToChain(tail, _ol_TileState_.IDLE); //rest of list outdated by tile above
tail = addToChain(tail, _ol_TileState_.LOADED);
tail = addToChain(tail, _ol_TileState_.LOADING);
tail = addToChain(tail, _ol_TileState_.LOADED);
tail = addToChain(tail, TileState.IDLE); //rest of list outdated by tile above
tail = addToChain(tail, TileState.LOADED);
tail = addToChain(tail, TileState.LOADING);
tail = addToChain(tail, TileState.LOADED);
});

4
test/spec/ol/tilequeue.test.js
View File

@@ -1,7 +1,7 @@
import _ol_ImageTile_ from '../../../src/ol/ImageTile.js';
import _ol_Tile_ from '../../../src/ol/Tile.js';
import TileQueue from '../../../src/ol/TileQueue.js';
import _ol_TileState_ from '../../../src/ol/TileState.js';
import TileState from '../../../src/ol/TileState.js';
import _ol_source_Image_ from '../../../src/ol/source/Image.js';
import PriorityQueue from '../../../src/ol/structs/PriorityQueue.js';
@@ -95,7 +95,7 @@ describe('ol.TileQueue', function() {
var numTiles = 20;
for (var i = 0; i < numTiles; ++i) {
var tile = createImageTile();
tile.state = _ol_TileState_.ABORT;
tile.state = TileState.ABORT;
queue.enqueue([tile]);
}
var maxLoading = numTiles / 2;

18
test/spec/ol/vectorimagetile.test.js
View File

@@ -1,4 +1,4 @@
import _ol_TileState_ from '../../../src/ol/TileState.js';
import TileState from '../../../src/ol/TileState.js';
import _ol_VectorImageTile_ from '../../../src/ol/VectorImageTile.js';
import _ol_VectorTile_ from '../../../src/ol/VectorTile.js';
import _ol_events_ from '../../../src/ol/events.js';
@@ -47,12 +47,12 @@ describe('ol.VectorImageTile', function() {
var calls = 0;
_ol_events_.listen(tile, 'change', function(e) {
++calls;
expect(tile.getState()).to.be(calls == 2 ? _ol_TileState_.LOADED : _ol_TileState_.ERROR);
expect(tile.getState()).to.be(calls == 2 ? TileState.LOADED : TileState.ERROR);
if (calls == 2) {
done();
} else {
setTimeout(function() {
sourceTile.setState(_ol_TileState_.LOADED);
sourceTile.setState(TileState.LOADED);
}, 0);
}
});
@@ -70,7 +70,7 @@ describe('ol.VectorImageTile', function() {
tile.load();
_ol_events_.listen(tile, 'change', function(e) {
expect(tile.getState()).to.be(_ol_TileState_.ERROR);
expect(tile.getState()).to.be(TileState.ERROR);
done();
});
});
@@ -86,7 +86,7 @@ describe('ol.VectorImageTile', function() {
tile.load();
_ol_events_.listen(tile, 'change', function() {
expect(tile.getState()).to.be(_ol_TileState_.EMPTY);
expect(tile.getState()).to.be(TileState.EMPTY);
done();
});
});
@@ -123,12 +123,12 @@ describe('ol.VectorImageTile', function() {
tile.load();
expect(tile.loadListenerKeys_.length).to.be(4);
expect(tile.tileKeys.length).to.be(4);
expect(tile.getState()).to.be(_ol_TileState_.LOADING);
expect(tile.getState()).to.be(TileState.LOADING);
tile.dispose();
expect(tile.loadListenerKeys_.length).to.be(0);
expect(tile.tileKeys.length).to.be(0);
expect(tile.sourceTiles_).to.be(null);
expect(tile.getState()).to.be(_ol_TileState_.ABORT);
expect(tile.getState()).to.be(TileState.ABORT);
});
it('#dispose() when loaded', function(done) {
@@ -142,13 +142,13 @@ describe('ol.VectorImageTile', function() {
tile.load();
_ol_events_.listenOnce(tile, 'change', function() {
expect(tile.getState()).to.be(_ol_TileState_.LOADED);
expect(tile.getState()).to.be(TileState.LOADED);
expect(tile.loadListenerKeys_.length).to.be(0);
expect(tile.tileKeys.length).to.be(4);
tile.dispose();
expect(tile.tileKeys.length).to.be(0);
expect(tile.sourceTiles_).to.be(null);
expect(tile.getState()).to.be(_ol_TileState_.ABORT);
expect(tile.getState()).to.be(TileState.ABORT);
done();
});
});