Remove goog.asserts.*
This pull requests replaces type check hint assertions with type casts, library sanity check assertions with conditional console.assert statements in debug mode, and runtime sanity checks with assertions that throw an ol.AssertionError with an error code for lookup outside the library.
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
goog.provide('ol.reproj.Tile');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol.Tile');
|
||||
goog.require('ol.TileState');
|
||||
goog.require('ol.events');
|
||||
@@ -182,9 +181,8 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
|
||||
sourceExtent, this.sourceZ_);
|
||||
|
||||
var tilesRequired = sourceRange.getWidth() * sourceRange.getHeight();
|
||||
if (!goog.asserts.assert(
|
||||
tilesRequired < ol.RASTER_REPROJECTION_MAX_SOURCE_TILES,
|
||||
'reasonable number of tiles is required')) {
|
||||
if (ol.DEBUG && !(tilesRequired < ol.RASTER_REPROJECTION_MAX_SOURCE_TILES)) {
|
||||
console.assert(false, 'reasonable number of tiles is required');
|
||||
this.state = ol.TileState.ERROR;
|
||||
return;
|
||||
}
|
||||
@@ -286,7 +284,7 @@ ol.reproj.Tile.prototype.load = function() {
|
||||
|
||||
var leftToLoad = 0;
|
||||
|
||||
goog.asserts.assert(!this.sourcesListenerKeys_,
|
||||
ol.DEBUG && console.assert(!this.sourcesListenerKeys_,
|
||||
'this.sourcesListenerKeys_ should be null');
|
||||
|
||||
this.sourcesListenerKeys_ = [];
|
||||
@@ -304,7 +302,7 @@ ol.reproj.Tile.prototype.load = function() {
|
||||
state == ol.TileState.EMPTY) {
|
||||
ol.events.unlistenByKey(sourceListenKey);
|
||||
leftToLoad--;
|
||||
goog.asserts.assert(leftToLoad >= 0,
|
||||
ol.DEBUG && console.assert(leftToLoad >= 0,
|
||||
'leftToLoad should not be negative');
|
||||
if (leftToLoad === 0) {
|
||||
this.unlistenSources_();
|
||||
@@ -334,7 +332,7 @@ ol.reproj.Tile.prototype.load = function() {
|
||||
* @private
|
||||
*/
|
||||
ol.reproj.Tile.prototype.unlistenSources_ = function() {
|
||||
goog.asserts.assert(this.sourcesListenerKeys_,
|
||||
ol.DEBUG && console.assert(this.sourcesListenerKeys_,
|
||||
'this.sourcesListenerKeys_ should not be null');
|
||||
this.sourcesListenerKeys_.forEach(ol.events.unlistenByKey);
|
||||
this.sourcesListenerKeys_ = null;
|
||||
|
||||
Reference in New Issue
Block a user