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

Use goog.DEBUG instead of ol.DEBUG for now

Browse Source
This commit is contained in:
Andreas Hocevar
2016-08-04 09:37:42 +02:00
parent 55ab5704d4
commit e0015b3d4e
121 changed files with 712 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvasimagelayerrenderer.js
+1 -1
View File
@@ -162,7 +162,7 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame = function(frameState, laye
if (!ol.ENABLE_RASTER_REPROJECTION) {
var sourceProjection = imageSource.getProjection();
if (sourceProjection) {
ol.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
goog.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
'projection and sourceProjection are equivalent');
projection = sourceProjection;
}
src/ol/renderer/canvas/canvasmaprenderer.js
+1 -1
View File
@@ -82,7 +82,7 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
} else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) {
return new ol.renderer.canvas.VectorLayer(layer);
} else {
ol.DEBUG && console.assert(false, 'unexpected layer configuration');
goog.DEBUG && console.assert(false, 'unexpected layer configuration');
return null;
}
};
src/ol/renderer/canvas/canvastilelayerrenderer.js
+1 -1
View File
@@ -142,7 +142,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame = function(
if (!drawableTile(tile) && tile.interimTile) {
tile = tile.interimTile;
}
ol.DEBUG && console.assert(tile);
goog.DEBUG && console.assert(tile);
if (drawableTile(tile)) {
tilesToDrawByZ[z][tile.tileCoord.toString()] = tile;
continue;
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+1 -1
View File
@@ -172,7 +172,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtCoordinate = function(c
* @return {?} Callback result.
*/
function(feature) {
ol.DEBUG && console.assert(feature !== undefined, 'received a feature');
goog.DEBUG && console.assert(feature !== undefined, 'received a feature');
var key = ol.getUid(feature).toString();
if (!(key in features)) {
features[key] = true;
src/ol/renderer/canvas/canvasvectortilelayerrenderer.js
+1 -1
View File
@@ -306,7 +306,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.forEachFeatureAtCoordinate = functi
* @return {?} Callback result.
*/
function(feature) {
ol.DEBUG && console.assert(feature, 'received a feature');
goog.DEBUG && console.assert(feature, 'received a feature');
var key = ol.getUid(feature).toString();
if (!(key in features)) {
features[key] = true;
src/ol/renderer/dom/domimagelayerrenderer.js
+1 -1
View File
@@ -96,7 +96,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame = function(frameState, layerSt
if (!ol.ENABLE_RASTER_REPROJECTION) {
var sourceProjection = imageSource.getProjection();
if (sourceProjection) {
ol.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
goog.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
'projection and sourceProjection are equivalent');
projection = sourceProjection;
}
src/ol/renderer/dom/dommaprenderer.js
+1 -1
View File
@@ -100,7 +100,7 @@ ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) {
} else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) {
layerRenderer = new ol.renderer.dom.VectorLayer(layer);
} else {
ol.DEBUG && console.assert(false, 'unexpected layer configuration');
goog.DEBUG && console.assert(false, 'unexpected layer configuration');
return null;
}
return layerRenderer;
src/ol/renderer/dom/domtilelayerrenderer.js
+2 -2
View File
@@ -128,7 +128,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = function(frameState, layerSta
if (!drawable && tile.interimTile) {
tile = tile.interimTile;
}
ol.DEBUG && console.assert(tile);
goog.DEBUG && console.assert(tile);
tileState = tile.getState();
if (tileState == ol.TileState.LOADED) {
tilesToDrawByZ[z][tile.tileCoord.toString()] = tile;
@@ -332,7 +332,7 @@ ol.renderer.dom.TileLayerZ_.prototype.addTile = function(tile, tileGutter) {
var tileCoordZ = tileCoord[0];
var tileCoordX = tileCoord[1];
var tileCoordY = tileCoord[2];
ol.DEBUG && console.assert(tileCoordZ == this.tileCoordOrigin_[0],
goog.DEBUG && console.assert(tileCoordZ == this.tileCoordOrigin_[0],
'tileCoordZ matches z of tileCoordOrigin');
var tileCoordKey = tileCoord.toString();
if (tileCoordKey in this.tiles_) {
src/ol/renderer/dom/domvectorlayerrenderer.js
+1 -1
View File
@@ -190,7 +190,7 @@ ol.renderer.dom.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coor
* @return {?} Callback result.
*/
function(feature) {
ol.DEBUG && console.assert(feature !== undefined, 'received a feature');
goog.DEBUG && console.assert(feature !== undefined, 'received a feature');
var key = ol.getUid(feature).toString();
if (!(key in features)) {
features[key] = true;
src/ol/renderer/layerrenderer.js
+2 -2
View File
@@ -143,7 +143,7 @@ ol.renderer.Layer.prototype.loadImage = function(image) {
imageState != ol.ImageState.ERROR) {
// the image is either "idle" or "loading", register the change
// listener (a noop if the listener was already registered)
ol.DEBUG && console.assert(imageState == ol.ImageState.IDLE ||
goog.DEBUG && console.assert(imageState == ol.ImageState.IDLE ||
imageState == ol.ImageState.LOADING,
'imageState is "idle" or "loading"');
ol.events.listen(image, ol.events.EventType.CHANGE,
@@ -152,7 +152,7 @@ ol.renderer.Layer.prototype.loadImage = function(image) {
if (imageState == ol.ImageState.IDLE) {
image.load();
imageState = image.getState();
ol.DEBUG && console.assert(imageState == ol.ImageState.LOADING ||
goog.DEBUG && console.assert(imageState == ol.ImageState.LOADING ||
imageState == ol.ImageState.LOADED,
'imageState is "loading" or "loaded"');
}
src/ol/renderer/maprenderer.js
+5 -5
View File
@@ -66,7 +66,7 @@ ol.renderer.Map.prototype.calculateMatrices2D = function(frameState) {
var viewState = frameState.viewState;
var coordinateToPixelTransform = frameState.coordinateToPixelTransform;
var pixelToCoordinateTransform = frameState.pixelToCoordinateTransform;
ol.DEBUG && console.assert(coordinateToPixelTransform,
goog.DEBUG && console.assert(coordinateToPixelTransform,
'frameState has a coordinateToPixelTransform');
ol.transform.compose(coordinateToPixelTransform,
@@ -135,7 +135,7 @@ ol.renderer.Map.prototype.forEachFeatureAtCoordinate = function(coordinate, fram
* @return {?} Callback result.
*/
function forEachFeatureAtCoordinate(feature, layer) {
ol.DEBUG && console.assert(feature !== undefined, 'received a feature');
goog.DEBUG && console.assert(feature !== undefined, 'received a feature');
var key = ol.getUid(feature).toString();
var managed = frameState.layerStates[ol.getUid(layer)].managed;
if (!(key in frameState.skippedFeatureUids && !managed)) {
@@ -264,7 +264,7 @@ ol.renderer.Map.prototype.getLayerRenderer = function(layer) {
* @return {ol.renderer.Layer} Layer renderer.
*/
ol.renderer.Map.prototype.getLayerRendererByKey = function(layerKey) {
ol.DEBUG && console.assert(layerKey in this.layerRenderers_,
goog.DEBUG && console.assert(layerKey in this.layerRenderers_,
'given layerKey (%s) exists in layerRenderers', layerKey);
return this.layerRenderers_[layerKey];
};
@@ -309,12 +309,12 @@ ol.renderer.Map.prototype.handleLayerRendererChange_ = function() {
* @private
*/
ol.renderer.Map.prototype.removeLayerRendererByKey_ = function(layerKey) {
ol.DEBUG && console.assert(layerKey in this.layerRenderers_,
goog.DEBUG && console.assert(layerKey in this.layerRenderers_,
'given layerKey (%s) exists in layerRenderers', layerKey);
var layerRenderer = this.layerRenderers_[layerKey];
delete this.layerRenderers_[layerKey];
ol.DEBUG && console.assert(layerKey in this.layerRendererListeners_,
goog.DEBUG && console.assert(layerKey in this.layerRendererListeners_,
'given layerKey (%s) exists in layerRendererListeners', layerKey);
ol.events.unlistenByKey(this.layerRendererListeners_[layerKey]);
delete this.layerRendererListeners_[layerKey];
src/ol/renderer/webgl/webglimagelayerrenderer.js
+2 -2
View File
@@ -119,7 +119,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
if (!ol.ENABLE_RASTER_REPROJECTION) {
var sourceProjection = imageSource.getProjection();
if (sourceProjection) {
ol.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
goog.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
'projection and sourceProjection are equivalent');
projection = sourceProjection;
}
@@ -150,7 +150,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
}
if (image) {
ol.DEBUG && console.assert(texture, 'texture is truthy');
goog.DEBUG && console.assert(texture, 'texture is truthy');
var canvas = this.mapRenderer.getContext().getCanvas();
src/ol/renderer/webgl/webglmaprenderer.js
+3 -3
View File
@@ -85,7 +85,7 @@ ol.renderer.webgl.Map = function(container, map) {
preserveDrawingBuffer: false,
stencil: true
});
ol.DEBUG && console.assert(this.gl_, 'got a WebGLRenderingContext');
goog.DEBUG && console.assert(this.gl_, 'got a WebGLRenderingContext');
/**
* @private
@@ -182,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);
ol.DEBUG && console.assert(textureCacheEntry,
goog.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) {
@@ -248,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 {
ol.DEBUG && console.assert(false, 'unexpected layer configuration');
goog.DEBUG && console.assert(false, 'unexpected layer configuration');
return null;
}
};
src/ol/renderer/webgl/webgltilelayerrenderer.js
+1 -1
View File
@@ -258,7 +258,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
if (!drawable && tile.interimTile) {
tile = tile.interimTile;
}
ol.DEBUG && console.assert(tile);
goog.DEBUG && console.assert(tile);
tileState = tile.getState();
if (tileState == ol.TileState.LOADED) {
if (mapRenderer.isTileTextureLoaded(tile)) {
src/ol/renderer/webgl/webglvectorlayerrenderer.js
+1 -1
View File
@@ -120,7 +120,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(co
* @return {?} Callback result.
*/
function(feature) {
ol.DEBUG && console.assert(feature !== undefined, 'received a feature');
goog.DEBUG && console.assert(feature !== undefined, 'received a feature');
var key = ol.getUid(feature).toString();
if (!(key in features)) {
features[key] = true;