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

Remove state enum from tile constructor

Browse Source
This commit is contained in:
Tim Schaub
2016-12-27 09:49:21 -07:00
parent 3852c0da83
commit 895a506025
22 changed files with 134 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
goog.provide('ol.test.ImageTile');
goog.require('ol.ImageTile');
goog.require('ol.Tile');
goog.require('ol.TileState');
goog.require('ol.events');
goog.require('ol.events.EventType');
goog.require('ol.source.Image');
@@ -13,7 +13,7 @@ describe('ol.ImageTile', function() {
it('can load idle tile', function(done) {
var tileCoord = [0, 0, 0];
var state = ol.Tile.State.IDLE;
var state = ol.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);
@@ -22,10 +22,10 @@ describe('ol.ImageTile', function() {
ol.events.listen(tile, ol.events.EventType.CHANGE, function(event) {
var state = tile.getState();
if (previousState == ol.Tile.State.IDLE) {
expect(state).to.be(ol.Tile.State.LOADING);
} else if (previousState == ol.Tile.State.LOADING) {
expect(state).to.be(ol.Tile.State.LOADED);
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);
done();
} else {
expect().fail();
@@ -38,7 +38,7 @@ describe('ol.ImageTile', function() {
it('can load error tile', function(done) {
var tileCoord = [0, 0, 0];
var state = ol.Tile.State.ERROR;
var state = ol.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);
@@ -47,10 +47,10 @@ describe('ol.ImageTile', function() {
ol.events.listen(tile, ol.events.EventType.CHANGE, function(event) {
var state = tile.getState();
if (previousState == ol.Tile.State.ERROR) {
expect(state).to.be(ol.Tile.State.LOADING);
} else if (previousState == ol.Tile.State.LOADING) {
expect(state).to.be(ol.Tile.State.LOADED);
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);
done();
} else {
expect().fail();

2
test/spec/ol/source/tile.test.js
View File

@@ -248,7 +248,7 @@ describe('ol.source.Tile', function() {
*
* @constructor
* @extends {ol.source.Tile}
* @param {Object.<string, ol.Tile.State>} tileStates Lookup of tile key to
* @param {Object.<string, ol.TileState>} tileStates Lookup of tile key to
* tile state.
*/
ol.test.source.TileMock = function(tileStates) {

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

@@ -1,13 +1,13 @@
goog.provide('ol.test.Tile');
goog.require('ol.Tile');
goog.require('ol.TileState');
describe('ol.Tile', function() {
describe('interimChain', function() {
var head, renderTile;
beforeEach(function() {
var tileCoord = [0, 0, 0];
head = new ol.ImageTile(tileCoord, ol.Tile.State.IDLE);
head = new ol.ImageTile(tileCoord, ol.TileState.IDLE);
ol.getUid(head);
var addToChain = function(tile, state) {
@@ -16,15 +16,15 @@ describe('ol.Tile', function() {
tile.interimTile = next;
return next;
};
var tail = addToChain(head, ol.Tile.State.IDLE); //discard, deprecated by head
tail = addToChain(tail, ol.Tile.State.LOADING); //keep, request already going
tail = addToChain(tail, ol.Tile.State.IDLE); //discard, deprecated by head
tail = addToChain(tail, ol.Tile.State.LOADED); //keep, use for rendering
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
renderTile = tail; //store this tile for later tests
tail = addToChain(tail, ol.Tile.State.IDLE); //rest of list outdated by tile above
tail = addToChain(tail, ol.Tile.State.LOADED);
tail = addToChain(tail, ol.Tile.State.LOADING);
tail = addToChain(tail, ol.Tile.State.LOADED);
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);
});