Named export for ol/asserts

This commit is contained in:
Frederic Junod
2017-12-17 18:10:59 +01:00
parent 7202573f82
commit 9349ba5403
33 changed files with 89 additions and 92 deletions

View File

@@ -3,7 +3,7 @@
*/
import {getUid, inherits} from '../index.js';
import _ol_asserts_ from '../asserts.js';
import {assert} from '../asserts.js';
import _ol_Feature_ from '../Feature.js';
import _ol_coordinate_ from '../coordinate.js';
import EventType from '../events/EventType.js';
@@ -55,7 +55,7 @@ var _ol_source_Cluster_ = function(options) {
*/
this.geometryFunction = options.geometryFunction || function(feature) {
var geometry = /** @type {ol.geom.Point} */ (feature.getGeometry());
_ol_asserts_.assert(geometry instanceof Point,
assert(geometry instanceof Point,
10); // The default `geometryFunction` can only handle `ol.geom.Point` geometries
return geometry;
};

View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import _ol_Image_ from '../Image.js';
import _ol_asserts_ from '../asserts.js';
import {assert} from '../asserts.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import {containsExtent, getHeight, getWidth} from '../extent.js';
@@ -216,7 +216,7 @@ _ol_source_ImageArcGISRest_.prototype.getRequestUrl_ = function(extent, size, pi
.replace(/MapServer\/?$/, 'MapServer/export')
.replace(/ImageServer\/?$/, 'ImageServer/exportImage');
if (modifiedUrl == url) {
_ol_asserts_.assert(false, 50); // `options.featureTypes` should be an Array
assert(false, 50); // `options.featureTypes` should be an Array
}
return _ol_uri_.appendParams(modifiedUrl, params);
};

View File

@@ -5,7 +5,7 @@
import {DEFAULT_WMS_VERSION} from './common.js';
import {inherits} from '../index.js';
import _ol_Image_ from '../Image.js';
import _ol_asserts_ from '../asserts.js';
import {assert} from '../asserts.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import {containsExtent, getCenter, getForViewAndSize, getHeight, getWidth} from '../extent.js';
@@ -265,7 +265,7 @@ _ol_source_ImageWMS_.prototype.getImageLoadFunction = function() {
*/
_ol_source_ImageWMS_.prototype.getRequestUrl_ = function(extent, size, pixelRatio, projection, params) {
_ol_asserts_.assert(this.url_ !== undefined, 9); // `url` must be configured or set using `#setUrl()`
assert(this.url_ !== undefined, 9); // `url` must be configured or set using `#setUrl()`
params[this.v13_ ? 'CRS' : 'SRS'] = projection.getCode();
@@ -291,7 +291,7 @@ _ol_source_ImageWMS_.prototype.getRequestUrl_ = function(extent, size, pixelRati
params['DPI'] = 90 * pixelRatio;
break;
default:
_ol_asserts_.assert(false, 8); // Unknown `serverType` configured
assert(false, 8); // Unknown `serverType` configured
break;
}
}

View File

@@ -9,7 +9,7 @@
import {inherits} from '../index.js';
import {createFromTemplates} from '../tileurlfunction.js';
import _ol_asserts_ from '../asserts.js';
import {assert} from '../asserts.js';
import {applyTransform, intersects} from '../extent.js';
import _ol_net_ from '../net.js';
import {get as getProjection, getTransformFromProjections} from '../proj.js';
@@ -60,7 +60,7 @@ var _ol_source_TileJSON_ = function(options) {
} else if (options.tileJSON) {
this.handleTileJSONResponse(options.tileJSON);
} else {
_ol_asserts_.assert(false, 51); // Either `url` or `tileJSON` options must be provided
assert(false, 51); // Either `url` or `tileJSON` options must be provided
}
};

View File

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_Tile_ from '../Tile.js';
import _ol_TileState_ from '../TileState.js';
import {createFromTemplates, nullTileUrlFunction} from '../tileurlfunction.js';
import _ol_asserts_ from '../asserts.js';
import {assert} from '../asserts.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import {applyTransform, intersects} from '../extent.js';
@@ -70,7 +70,7 @@ var _ol_source_TileUTFGrid_ = function(options) {
} else if (options.tileJSON) {
this.handleTileJSONResponse(options.tileJSON);
} else {
_ol_asserts_.assert(false, 51); // Either `url` or `tileJSON` options must be provided
assert(false, 51); // Either `url` or `tileJSON` options must be provided
}
};

View File

@@ -4,7 +4,7 @@
import {DEFAULT_WMS_VERSION} from './common.js';
import {inherits} from '../index.js';
import _ol_asserts_ from '../asserts.js';
import {assert} from '../asserts.js';
import {buffer, createEmpty} from '../extent.js';
import _ol_obj_ from '../obj.js';
import _ol_math_ from '../math.js';
@@ -225,7 +225,7 @@ _ol_source_TileWMS_.prototype.getRequestUrl_ = function(tileCoord, tileSize, til
params['DPI'] = 90 * pixelRatio;
break;
default:
_ol_asserts_.assert(false, 52); // Unknown `serverType` configured
assert(false, 52); // Unknown `serverType` configured
break;
}
}

View File

@@ -7,7 +7,7 @@ import _ol_Collection_ from '../Collection.js';
import _ol_CollectionEventType_ from '../CollectionEventType.js';
import _ol_ObjectEventType_ from '../ObjectEventType.js';
import _ol_array_ from '../array.js';
import _ol_asserts_ from '../asserts.js';
import {assert} from '../asserts.js';
import _ol_events_ from '../events.js';
import Event from '../events/Event.js';
import EventType from '../events/EventType.js';
@@ -71,7 +71,7 @@ var _ol_source_Vector_ = function(opt_options) {
if (options.loader !== undefined) {
this.loader_ = options.loader;
} else if (this.url_ !== undefined) {
_ol_asserts_.assert(this.format_, 7); // `format` must be set when `url` is set
assert(this.format_, 7); // `format` must be set when `url` is set
// create a XHR feature loader for "url" and "format"
this.loader_ = xhr(this.url_, /** @type {ol.format.Feature} */ (this.format_));
}
@@ -228,7 +228,7 @@ _ol_source_Vector_.prototype.addToIndex_ = function(featureKey, feature) {
valid = false;
}
} else {
_ol_asserts_.assert(!(featureKey in this.undefIdIndex_),
assert(!(featureKey in this.undefIdIndex_),
30); // The passed `feature` was already added to the source
this.undefIdIndex_[featureKey] = feature;
}

View File

@@ -6,7 +6,7 @@ import {inherits} from '../index.js';
import _ol_ImageTile_ from '../ImageTile.js';
import _ol_TileState_ from '../TileState.js';
import {expandUrl, createFromTileUrlFunctions} from '../tileurlfunction.js';
import _ol_asserts_ from '../asserts.js';
import {assert} from '../asserts.js';
import {createCanvasContext2D} from '../dom.js';
import {getTopLeft} from '../extent.js';
import _ol_size_ from '../size.js';
@@ -62,7 +62,7 @@ var _ol_source_Zoomify_ = function(opt_options) {
}
break;
default:
_ol_asserts_.assert(false, 53); // Unknown `tierSizeCalculation` configured
assert(false, 53); // Unknown `tierSizeCalculation` configured
break;
}