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.renderer.webgl.ImageLayer');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol.transform');
|
||||
goog.require('ol.ImageBase');
|
||||
goog.require('ol.ViewHint');
|
||||
@@ -104,9 +103,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
|
||||
|
||||
var image = this.image_;
|
||||
var texture = this.texture;
|
||||
var imageLayer = this.getLayer();
|
||||
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image,
|
||||
'layer is an instance of ol.layer.Image');
|
||||
var imageLayer = /** @type {ol.layer.Image} */ (this.getLayer());
|
||||
var imageSource = imageLayer.getSource();
|
||||
|
||||
var hints = frameState.viewHints;
|
||||
@@ -122,7 +119,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
|
||||
if (!ol.ENABLE_RASTER_REPROJECTION) {
|
||||
var sourceProjection = imageSource.getProjection();
|
||||
if (sourceProjection) {
|
||||
goog.asserts.assert(ol.proj.equivalent(projection, sourceProjection),
|
||||
ol.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
|
||||
'projection and sourceProjection are equivalent');
|
||||
projection = sourceProjection;
|
||||
}
|
||||
@@ -153,7 +150,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
|
||||
}
|
||||
|
||||
if (image) {
|
||||
goog.asserts.assert(texture, 'texture is truthy');
|
||||
ol.DEBUG && console.assert(texture, 'texture is truthy');
|
||||
|
||||
var canvas = this.mapRenderer.getContext().getCanvas();
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
goog.provide('ol.renderer.webgl.Map');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol');
|
||||
goog.require('ol.RendererType');
|
||||
goog.require('ol.array');
|
||||
@@ -86,7 +85,7 @@ ol.renderer.webgl.Map = function(container, map) {
|
||||
preserveDrawingBuffer: false,
|
||||
stencil: true
|
||||
});
|
||||
goog.asserts.assert(this.gl_, 'got a WebGLRenderingContext');
|
||||
ol.DEBUG && console.assert(this.gl_, 'got a WebGLRenderingContext');
|
||||
|
||||
/**
|
||||
* @private
|
||||
@@ -183,7 +182,7 @@ ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileG
|
||||
var tileKey = tile.getKey();
|
||||
if (this.textureCache_.containsKey(tileKey)) {
|
||||
var textureCacheEntry = this.textureCache_.get(tileKey);
|
||||
goog.asserts.assert(textureCacheEntry,
|
||||
ol.DEBUG && console.assert(textureCacheEntry,
|
||||
'a texture cache entry exists for key %s', tileKey);
|
||||
gl.bindTexture(ol.webgl.TEXTURE_2D, textureCacheEntry.texture);
|
||||
if (textureCacheEntry.magFilter != magFilter) {
|
||||
@@ -249,7 +248,7 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
|
||||
} else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) {
|
||||
return new ol.renderer.webgl.VectorLayer(this, layer);
|
||||
} else {
|
||||
goog.asserts.fail('unexpected layer configuration');
|
||||
ol.DEBUG && console.assert(false, 'unexpected layer configuration');
|
||||
return null;
|
||||
}
|
||||
};
|
||||
@@ -451,9 +450,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
|
||||
layerState = layerStatesArray[i];
|
||||
if (ol.layer.Layer.visibleAtResolution(layerState, viewResolution) &&
|
||||
layerState.sourceState == ol.source.State.READY) {
|
||||
layerRenderer = this.getLayerRenderer(layerState.layer);
|
||||
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer,
|
||||
'renderer is an instance of ol.renderer.webgl.Layer');
|
||||
layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layerState.layer));
|
||||
if (layerRenderer.prepareFrame(frameState, layerState, context)) {
|
||||
layerStatesToDraw.push(layerState);
|
||||
}
|
||||
@@ -476,9 +473,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
|
||||
|
||||
for (i = 0, ii = layerStatesToDraw.length; i < ii; ++i) {
|
||||
layerState = layerStatesToDraw[i];
|
||||
layerRenderer = this.getLayerRenderer(layerState.layer);
|
||||
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer,
|
||||
'renderer is an instance of ol.renderer.webgl.Layer');
|
||||
layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layerState.layer));
|
||||
layerRenderer.composeFrame(frameState, layerState, context);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
goog.provide('ol.renderer.webgl.TileLayer');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol.transform');
|
||||
goog.require('ol.TileRange');
|
||||
goog.require('ol.TileState');
|
||||
@@ -154,9 +153,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
|
||||
var viewState = frameState.viewState;
|
||||
var projection = viewState.projection;
|
||||
|
||||
var tileLayer = this.getLayer();
|
||||
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile,
|
||||
'layer is an instance of ol.layer.Tile');
|
||||
var tileLayer = /** @type {ol.layer.Tile} */ (this.getLayer());
|
||||
var tileSource = tileLayer.getSource();
|
||||
var tileGrid = tileSource.getTileGridForProjection(projection);
|
||||
var z = tileGrid.getZForResolution(viewState.resolution);
|
||||
@@ -261,7 +258,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
|
||||
if (!drawable && tile.interimTile) {
|
||||
tile = tile.interimTile;
|
||||
}
|
||||
goog.asserts.assert(tile);
|
||||
ol.DEBUG && console.assert(tile);
|
||||
tileState = tile.getState();
|
||||
if (tileState == ol.TileState.LOADED) {
|
||||
if (mapRenderer.isTileTextureLoaded(tile)) {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
goog.provide('ol.renderer.webgl.VectorLayer');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.ViewHint');
|
||||
goog.require('ol.extent');
|
||||
@@ -121,7 +120,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(co
|
||||
* @return {?} Callback result.
|
||||
*/
|
||||
function(feature) {
|
||||
goog.asserts.assert(feature !== undefined, 'received a feature');
|
||||
ol.DEBUG && console.assert(feature !== undefined, 'received a feature');
|
||||
var key = ol.getUid(feature).toString();
|
||||
if (!(key in features)) {
|
||||
features[key] = true;
|
||||
@@ -182,8 +181,6 @@ ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = function(event
|
||||
ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, layerState, context) {
|
||||
|
||||
var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer());
|
||||
goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector,
|
||||
'layer is an instance of ol.layer.Vector');
|
||||
var vectorSource = vectorLayer.getSource();
|
||||
|
||||
this.updateAttributions(
|
||||
|
||||
Reference in New Issue
Block a user