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

Add message to assertions.

Browse Source
This commit is contained in:
Marc Jansen
2015-03-30 22:50:15 +02:00
parent 2c40d74a15
commit fb9ba22c30
45 changed files with 394 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/renderer/webgl/webglimagelayerrenderer.js
View File

@@ -110,7 +110,8 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
var image = this.image_;
var texture = this.texture;
var imageLayer = this.getLayer();
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image);
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image,
'layer is an instance of ol.layer.Image');
var imageSource = imageLayer.getSource();
var hints = frameState.viewHints;
@@ -125,7 +126,8 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
var projection = viewState.projection;
var sourceProjection = imageSource.getProjection();
if (!goog.isNull(sourceProjection)) {
goog.asserts.assert(ol.proj.equivalent(projection, sourceProjection));
goog.asserts.assert(ol.proj.equivalent(projection, sourceProjection),
'projection and sourceProjection are equivalent');
projection = sourceProjection;
}
var image_ = imageSource.getImage(renderedExtent, viewResolution,
@@ -153,7 +155,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
}
if (!goog.isNull(image)) {
goog.asserts.assert(!goog.isNull(texture));
goog.asserts.assert(!goog.isNull(texture), 'texture is not null');
var canvas = this.mapRenderer.getContext().getCanvas();

18
src/ol/renderer/webgl/webglmaprenderer.js
View File

@@ -96,7 +96,7 @@ ol.renderer.webgl.Map = function(container, map) {
preserveDrawingBuffer: false,
stencil: true
});
goog.asserts.assert(!goog.isNull(this.gl_));
goog.asserts.assert(!goog.isNull(this.gl_), 'got a WebGLRenderingContext');
/**
* @private
@@ -190,7 +190,8 @@ ol.renderer.webgl.Map.prototype.bindTileTexture =
var tileKey = tile.getKey();
if (this.textureCache_.containsKey(tileKey)) {
var textureCacheEntry = this.textureCache_.get(tileKey);
goog.asserts.assert(!goog.isNull(textureCacheEntry));
goog.asserts.assert(!goog.isNull(textureCacheEntry),
'a texture cache entry exists for key %s', tileKey);
gl.bindTexture(goog.webgl.TEXTURE_2D, textureCacheEntry.texture);
if (textureCacheEntry.magFilter != magFilter) {
gl.texParameteri(
@@ -253,7 +254,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();
goog.asserts.fail('unexpected layer configuration');
return null;
}
};
@@ -397,7 +398,8 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
* @param {Object.<string, ol.renderer.Layer>} object Object.
*/
function(layerRenderer, key, object) {
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer,
'renderer is an instance of ol.renderer.webgl.Layer');
var webGLLayerRenderer = /** @type {ol.renderer.webgl.Layer} */
(layerRenderer);
webGLLayerRenderer.handleWebGLContextLost();
@@ -482,7 +484,8 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
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);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer,
'renderer is an instance of ol.renderer.webgl.Layer');
if (layerRenderer.prepareFrame(frameState, layerState, context)) {
layerStatesToDraw.push(layerState);
}
@@ -508,7 +511,8 @@ 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);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer,
'renderer is an instance of ol.renderer.webgl.Layer');
layerRenderer.composeFrame(frameState, layerState, context);
}
@@ -569,7 +573,7 @@ ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate =
* @return {?} Callback result.
*/
function(feature) {
goog.asserts.assert(goog.isDef(feature));
goog.asserts.assert(goog.isDef(feature), 'received a feature');
var key = goog.getUid(feature).toString();
if (!(key in features)) {
features[key] = true;

3
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -151,7 +151,8 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
var projection = viewState.projection;
var tileLayer = this.getLayer();
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile,
'layer is an instance of ol.layer.Tile');
var tileSource = tileLayer.getSource();
var tileGrid = tileSource.getTileGridForProjection(projection);
var z = tileGrid.getZForResolution(viewState.resolution);

5
src/ol/renderer/webgl/webglvectorlayerrenderer.js
View File

@@ -127,7 +127,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate =
* @return {?} Callback result.
*/
function(feature) {
goog.asserts.assert(goog.isDef(feature));
goog.asserts.assert(goog.isDef(feature), 'received a feature');
var key = goog.getUid(feature).toString();
if (!(key in features)) {
features[key] = true;
@@ -194,7 +194,8 @@ 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);
goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector,
'layer is an instance of ol.layer.Vector');
var vectorSource = vectorLayer.getSource();
this.updateAttributions(