Assert that ol.layer.Tile#getUseInterimTilesOnError is always set

This commit is contained in:
Frederic Junod
2015-01-07 16:59:44 +01:00
parent df51e55781
commit 55dda99cfe
5 changed files with 10 additions and 13 deletions

View File

@@ -34,6 +34,9 @@ ol.layer.Tile = function(opt_options) {
if (!goog.isDef(this.getPreload())) {
this.setPreload(0);
}
if (!goog.isDef(this.getUseInterimTilesOnError())) {
this.setUseInterimTilesOnError(true);
}
};
goog.inherits(ol.layer.Tile, ol.layer.Layer);
@@ -75,12 +78,12 @@ goog.exportProperty(
/**
* @return {boolean|undefined} Use interim tiles on error.
* @return {boolean} Use interim tiles on error.
* @observable
* @api
*/
ol.layer.Tile.prototype.getUseInterimTilesOnError = function() {
return /** @type {boolean|undefined} */ (
return /** @type {boolean} */ (
this.get(ol.layer.TileProperty.USE_INTERIM_TILES_ON_ERROR));
};
goog.exportProperty(
@@ -90,7 +93,7 @@ goog.exportProperty(
/**
* @param {boolean|undefined} useInterimTilesOnError Use interim tiles on error.
* @param {boolean} useInterimTilesOnError Use interim tiles on error.
* @observable
* @api
*/

View File

@@ -281,9 +281,6 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
tilesToDrawByZ, getTileIfLoaded);
var useInterimTilesOnError = tileLayer.getUseInterimTilesOnError();
if (!goog.isDef(useInterimTilesOnError)) {
useInterimTilesOnError = true;
}
var tmpExtent = ol.extent.createEmpty();
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);

View File

@@ -136,9 +136,6 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
tilesToDrawByZ, getTileIfLoaded);
var useInterimTilesOnError = tileLayer.getUseInterimTilesOnError();
if (!goog.isDef(useInterimTilesOnError)) {
useInterimTilesOnError = true;
}
var tmpExtent = ol.extent.createEmpty();
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);

View File

@@ -198,10 +198,6 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
tilesToDrawByZ, getTileIfLoaded);
var useInterimTilesOnError = tileLayer.getUseInterimTilesOnError();
if (!goog.isDef(useInterimTilesOnError)) {
useInterimTilesOnError = true;
}
var allTilesLoaded = true;
var tmpExtent = ol.extent.createEmpty();
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);

View File

@@ -24,6 +24,10 @@ describe('ol.layer.Tile', function() {
expect(layer.getPreload()).to.be(0);
});
it('provides default useInterimTilesOnError', function() {
expect(layer.getUseInterimTilesOnError()).to.be(true);
});
});
});