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

Remove goog.asserts.*

Browse Source 
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:
Andreas Hocevar
2016-07-19 16:39:58 +02:00
parent f50f1f401c
commit 6f5ed17fc5
158 changed files with 1488 additions and 1629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/tilegrid/tilegrid.js
+26 -28
View File
@@ -1,6 +1,5 @@
goog.provide('ol.tilegrid.TileGrid');
goog.require('goog.asserts');
goog.require('ol');
goog.require('ol.TileRange');
goog.require('ol.array');
@@ -39,9 +38,9 @@ ol.tilegrid.TileGrid = function(options) {
* @type {!Array.<number>}
*/
this.resolutions_ = options.resolutions;
goog.asserts.assert(ol.array.isSorted(this.resolutions_, function(a, b) {
ol.assert(ol.array.isSorted(this.resolutions_, function(a, b) {
return b - a;
}, true), 'resolutions must be sorted in descending order');
}, true), 17); // `resolutions` must be sorted in descending order
/**
* @protected
@@ -62,8 +61,8 @@ ol.tilegrid.TileGrid = function(options) {
this.origins_ = null;
if (options.origins !== undefined) {
this.origins_ = options.origins;
goog.asserts.assert(this.origins_.length == this.resolutions_.length,
'number of origins and resolutions must be equal');
ol.assert(this.origins_.length == this.resolutions_.length,
20); // Number of `origins` and `resolutions` must be equal
}
var extent = options.extent;
@@ -73,10 +72,9 @@ ol.tilegrid.TileGrid = function(options) {
this.origin_ = ol.extent.getTopLeft(extent);
}
goog.asserts.assert(
(!this.origin_ && this.origins_) ||
(this.origin_ && !this.origins_),
'either origin or origins must be configured, never both');
ol.assert(
(!this.origin_ && this.origins_) || (this.origin_ && !this.origins_),
18); // Either `origin` or `origins` must be configured, never both
/**
* @private
@@ -85,8 +83,8 @@ ol.tilegrid.TileGrid = function(options) {
this.tileSizes_ = null;
if (options.tileSizes !== undefined) {
this.tileSizes_ = options.tileSizes;
goog.asserts.assert(this.tileSizes_.length == this.resolutions_.length,
'number of tileSizes and resolutions must be equal');
ol.assert(this.tileSizes_.length == this.resolutions_.length,
19); // Number of `tileSizes` and `resolutions` must be equal
}
/**
@@ -96,10 +94,10 @@ ol.tilegrid.TileGrid = function(options) {
this.tileSize_ = options.tileSize !== undefined ?
options.tileSize :
!this.tileSizes_ ? ol.DEFAULT_TILE_SIZE : null;
goog.asserts.assert(
ol.assert(
(!this.tileSize_ && this.tileSizes_) ||
(this.tileSize_ && !this.tileSizes_),
'either tileSize or tileSizes must be configured, never both');
22); // Either `tileSize` or `tileSizes` must be configured, never both
/**
* @private
@@ -121,18 +119,18 @@ ol.tilegrid.TileGrid = function(options) {
this.tmpSize_ = [0, 0];
if (options.sizes !== undefined) {
goog.asserts.assert(options.sizes.length == this.resolutions_.length,
ol.DEBUG && console.assert(options.sizes.length == this.resolutions_.length,
'number of sizes and resolutions must be equal');
this.fullTileRanges_ = options.sizes.map(function(size, z) {
goog.asserts.assert(size[0] !== 0, 'width must not be 0');
goog.asserts.assert(size[1] !== 0, 'height must not be 0');
ol.DEBUG && console.assert(size[0] !== 0, 'width must not be 0');
ol.DEBUG && console.assert(size[1] !== 0, 'height must not be 0');
var tileRange = new ol.TileRange(
Math.min(0, size[0]), Math.max(size[0] - 1, -1),
Math.min(0, size[1]), Math.max(size[1] - 1, -1));
if (this.minZoom <= z && z <= this.maxZoom && extent !== undefined) {
goog.asserts.assert(tileRange.containsTileRange(
ol.assert(tileRange.containsTileRange(
this.getTileRangeForExtentAndZ(extent, z)),
'extent tile range must not exceed tilegrid width and height');
21); // Tile range for `extent` must not exceed tilegrid width and height
}
return tileRange;
}, this);
@@ -230,9 +228,9 @@ ol.tilegrid.TileGrid.prototype.getOrigin = function(z) {
if (this.origin_) {
return this.origin_;
} else {
goog.asserts.assert(this.origins_,
ol.DEBUG && console.assert(this.origins_,
'origins cannot be null if origin is null');
goog.asserts.assert(this.minZoom <= z && z <= this.maxZoom,
ol.DEBUG && console.assert(this.minZoom <= z && z <= this.maxZoom,
'given z is not in allowed range (%s <= %s <= %s)',
this.minZoom, z, this.maxZoom);
return this.origins_[z];
@@ -247,7 +245,7 @@ ol.tilegrid.TileGrid.prototype.getOrigin = function(z) {
* @api stable
*/
ol.tilegrid.TileGrid.prototype.getResolution = function(z) {
goog.asserts.assert(this.minZoom <= z && z <= this.maxZoom,
ol.DEBUG && console.assert(this.minZoom <= z && z <= this.maxZoom,
'given z is not in allowed range (%s <= %s <= %s)',
this.minZoom, z, this.maxZoom);
return this.resolutions_[z];
@@ -440,7 +438,7 @@ ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndZ = function(coordinate, z
* @return {number} Tile resolution.
*/
ol.tilegrid.TileGrid.prototype.getTileCoordResolution = function(tileCoord) {
goog.asserts.assert(
ol.DEBUG && console.assert(
this.minZoom <= tileCoord[0] && tileCoord[0] <= this.maxZoom,
'z of given tilecoord is not in allowed range (%s <= %s <= %s',
this.minZoom, tileCoord[0], this.maxZoom);
@@ -460,9 +458,9 @@ ol.tilegrid.TileGrid.prototype.getTileSize = function(z) {
if (this.tileSize_) {
return this.tileSize_;
} else {
goog.asserts.assert(this.tileSizes_,
ol.DEBUG && console.assert(this.tileSizes_,
'tileSizes cannot be null if tileSize is null');
goog.asserts.assert(this.minZoom <= z && z <= this.maxZoom,
ol.DEBUG && console.assert(this.minZoom <= z && z <= this.maxZoom,
'z is not in allowed range (%s <= %s <= %s',
this.minZoom, z, this.maxZoom);
return this.tileSizes_[z];
@@ -478,7 +476,7 @@ ol.tilegrid.TileGrid.prototype.getFullTileRange = function(z) {
if (!this.fullTileRanges_) {
return null;
} else {
goog.asserts.assert(this.minZoom <= z && z <= this.maxZoom,
ol.DEBUG && console.assert(this.minZoom <= z && z <= this.maxZoom,
'z is not in allowed range (%s <= %s <= %s',
this.minZoom, z, this.maxZoom);
return this.fullTileRanges_[z];
@@ -518,7 +516,7 @@ ol.tilegrid.TileGrid.prototype.calculateTileRanges_ = function(extent) {
/**
* @param {ol.proj.Projection} projection Projection.
* @return {ol.tilegrid.TileGrid} Default tile grid for the passed projection.
* @return {!ol.tilegrid.TileGrid} Default tile grid for the passed projection.
*/
ol.tilegrid.getForProjection = function(projection) {
var tileGrid = projection.getDefaultTileGrid();
@@ -538,7 +536,7 @@ ol.tilegrid.getForProjection = function(projection) {
* ol.DEFAULT_TILE_SIZE).
* @param {ol.extent.Corner=} opt_corner Extent corner (default is
* ol.extent.Corner.TOP_LEFT).
* @return {ol.tilegrid.TileGrid} TileGrid instance.
* @return {!ol.tilegrid.TileGrid} TileGrid instance.
*/
ol.tilegrid.createForExtent = function(extent, opt_maxZoom, opt_tileSize, opt_corner) {
var corner = opt_corner !== undefined ?
@@ -614,7 +612,7 @@ ol.tilegrid.resolutionsFromExtent = function(extent, opt_maxZoom, opt_tileSize)
* @param {ol.Size=} opt_tileSize Tile size (default uses ol.DEFAULT_TILE_SIZE).
* @param {ol.extent.Corner=} opt_corner Extent corner (default is
* ol.extent.Corner.BOTTOM_LEFT).
* @return {ol.tilegrid.TileGrid} TileGrid instance.
* @return {!ol.tilegrid.TileGrid} TileGrid instance.
*/
ol.tilegrid.createForProjection = function(projection, opt_maxZoom, opt_tileSize, opt_corner) {
var extent = ol.tilegrid.extentFromProjection(projection);
src/ol/tilegrid/wmtstilegrid.js
+2 -3
View File
@@ -1,6 +1,5 @@
goog.provide('ol.tilegrid.WMTS');
goog.require('goog.asserts');
goog.require('ol.proj');
goog.require('ol.tilegrid.TileGrid');
@@ -17,7 +16,7 @@ goog.require('ol.tilegrid.TileGrid');
*/
ol.tilegrid.WMTS = function(options) {
goog.asserts.assert(
ol.DEBUG && console.assert(
options.resolutions.length == options.matrixIds.length,
'options resolutions and matrixIds must have equal length (%s == %s)',
options.resolutions.length, options.matrixIds.length);
@@ -48,7 +47,7 @@ ol.inherits(ol.tilegrid.WMTS, ol.tilegrid.TileGrid);
* @return {string} MatrixId..
*/
ol.tilegrid.WMTS.prototype.getMatrixId = function(z) {
goog.asserts.assert(0 <= z && z < this.matrixIds_.length,
ol.DEBUG && console.assert(0 <= z && z < this.matrixIds_.length,
'attempted to retrive matrixId for illegal z (%s)', z);
return this.matrixIds_[z];
};