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.layer.Heatmap');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol.events');
|
||||
goog.require('ol');
|
||||
goog.require('ol.Object');
|
||||
@@ -101,12 +100,12 @@ ol.layer.Heatmap = function(opt_options) {
|
||||
} else {
|
||||
weightFunction = weight;
|
||||
}
|
||||
goog.asserts.assert(typeof weightFunction === 'function',
|
||||
ol.DEBUG && console.assert(typeof weightFunction === 'function',
|
||||
'weightFunction should be a function');
|
||||
|
||||
this.setStyle(function(feature, resolution) {
|
||||
goog.asserts.assert(this.styleCache_, 'this.styleCache_ expected');
|
||||
goog.asserts.assert(this.circleImage_ !== undefined,
|
||||
ol.DEBUG && console.assert(this.styleCache_, 'this.styleCache_ expected');
|
||||
ol.DEBUG && console.assert(this.circleImage_ !== undefined,
|
||||
'this.circleImage_ should be defined');
|
||||
var weight = weightFunction(feature);
|
||||
var opacity = weight !== undefined ? ol.math.clamp(weight, 0, 1) : 1;
|
||||
@@ -174,7 +173,7 @@ ol.layer.Heatmap.createGradient_ = function(colors) {
|
||||
ol.layer.Heatmap.prototype.createCircle_ = function() {
|
||||
var radius = this.getRadius();
|
||||
var blur = this.getBlur();
|
||||
goog.asserts.assert(radius !== undefined && blur !== undefined,
|
||||
ol.DEBUG && console.assert(radius !== undefined && blur !== undefined,
|
||||
'radius and blur should be defined');
|
||||
var halfSize = radius + blur + 1;
|
||||
var size = 2 * halfSize;
|
||||
@@ -247,9 +246,9 @@ ol.layer.Heatmap.prototype.handleStyleChanged_ = function() {
|
||||
* @private
|
||||
*/
|
||||
ol.layer.Heatmap.prototype.handleRender_ = function(event) {
|
||||
goog.asserts.assert(event.type == ol.render.EventType.RENDER,
|
||||
ol.DEBUG && console.assert(event.type == ol.render.EventType.RENDER,
|
||||
'event.type should be RENDER');
|
||||
goog.asserts.assert(this.gradient_, 'this.gradient_ expected');
|
||||
ol.DEBUG && console.assert(this.gradient_, 'this.gradient_ expected');
|
||||
var context = event.context;
|
||||
var canvas = context.canvas;
|
||||
var image = context.getImageData(0, 0, canvas.width, canvas.height);
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
goog.provide('ol.layer.Group');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol.Collection');
|
||||
goog.require('ol.CollectionEvent');
|
||||
goog.require('ol.CollectionEventType');
|
||||
@@ -64,8 +63,8 @@ ol.layer.Group = function(opt_options) {
|
||||
if (Array.isArray(layers)) {
|
||||
layers = new ol.Collection(layers.slice());
|
||||
} else {
|
||||
goog.asserts.assertInstanceof(layers, ol.Collection,
|
||||
'layers should be an ol.Collection');
|
||||
ol.assert(layers instanceof ol.Collection,
|
||||
43); // Expected `layers` to be an array or an `ol.Collection`
|
||||
layers = layers;
|
||||
}
|
||||
} else {
|
||||
@@ -131,7 +130,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
|
||||
ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
|
||||
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
|
||||
var key = ol.getUid(layer).toString();
|
||||
goog.asserts.assert(!(key in this.listenerKeys_),
|
||||
ol.DEBUG && console.assert(!(key in this.listenerKeys_),
|
||||
'listeners already registered');
|
||||
this.listenerKeys_[key] = [
|
||||
ol.events.listen(layer, ol.ObjectEventType.PROPERTYCHANGE,
|
||||
@@ -150,7 +149,7 @@ ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
|
||||
ol.layer.Group.prototype.handleLayersRemove_ = function(collectionEvent) {
|
||||
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
|
||||
var key = ol.getUid(layer).toString();
|
||||
goog.asserts.assert(key in this.listenerKeys_, 'no listeners to unregister');
|
||||
ol.DEBUG && console.assert(key in this.listenerKeys_, 'no listeners to unregister');
|
||||
this.listenerKeys_[key].forEach(ol.events.unlistenByKey);
|
||||
delete this.listenerKeys_[key];
|
||||
this.changed();
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
goog.provide('ol.layer.Vector');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol');
|
||||
goog.require('ol.layer.Layer');
|
||||
goog.require('ol.object');
|
||||
@@ -33,7 +32,7 @@ ol.layer.Vector = function(opt_options) {
|
||||
var options = opt_options ?
|
||||
opt_options : /** @type {olx.layer.VectorOptions} */ ({});
|
||||
|
||||
goog.asserts.assert(
|
||||
ol.DEBUG && console.assert(
|
||||
options.renderOrder === undefined || !options.renderOrder ||
|
||||
typeof options.renderOrder === 'function',
|
||||
'renderOrder must be a comparator function');
|
||||
@@ -159,7 +158,7 @@ ol.layer.Vector.prototype.getUpdateWhileInteracting = function() {
|
||||
* Render order.
|
||||
*/
|
||||
ol.layer.Vector.prototype.setRenderOrder = function(renderOrder) {
|
||||
goog.asserts.assert(
|
||||
ol.DEBUG && console.assert(
|
||||
renderOrder === undefined || !renderOrder ||
|
||||
typeof renderOrder === 'function',
|
||||
'renderOrder must be a comparator function');
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
goog.provide('ol.layer.VectorTile');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol.layer.Vector');
|
||||
goog.require('ol.object');
|
||||
|
||||
@@ -59,11 +58,11 @@ ol.layer.VectorTile = function(opt_options) {
|
||||
this.setUseInterimTilesOnError(options.useInterimTilesOnError ?
|
||||
options.useInterimTilesOnError : true);
|
||||
|
||||
goog.asserts.assert(options.renderMode == undefined ||
|
||||
ol.assert(options.renderMode == undefined ||
|
||||
options.renderMode == ol.layer.VectorTileRenderType.IMAGE ||
|
||||
options.renderMode == ol.layer.VectorTileRenderType.HYBRID ||
|
||||
options.renderMode == ol.layer.VectorTileRenderType.VECTOR,
|
||||
'renderMode needs to be \'image\', \'hybrid\' or \'vector\'');
|
||||
28); // `renderMode` must be `'image'`, `'hybrid'` or `'vector'`
|
||||
|
||||
/**
|
||||
* @private
|
||||
|
||||
Reference in New Issue
Block a user