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

Remove ol.DEBUG

Browse Source
This commit is contained in:
Tim Schaub
2016-12-29 09:09:24 -07:00
parent 7b9690a691
commit 137cdc04c8
128 changed files with 309 additions and 2027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/renderer/canvas/imagelayer.js
View File

@@ -3,7 +3,6 @@ goog.provide('ol.renderer.canvas.ImageLayer');
goog.require('ol');
goog.require('ol.ViewHint');
goog.require('ol.extent');
goog.require('ol.proj');
goog.require('ol.renderer.canvas.IntermediateCanvas');
goog.require('ol.transform');
@@ -78,8 +77,6 @@ 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),
'projection and sourceProjection are equivalent');
projection = sourceProjection;
}
}

8
src/ol/renderer/layer.js
View File

@@ -116,20 +116,12 @@ ol.renderer.Layer.prototype.loadImage = function(image) {
var imageState = image.getState();
if (imageState != ol.ImageState.LOADED &&
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 ||
imageState == ol.ImageState.LOADING,
'imageState is "idle" or "loading"');
ol.events.listen(image, ol.events.EventType.CHANGE,
this.handleImageChange_, this);
}
if (imageState == ol.ImageState.IDLE) {
image.load();
imageState = image.getState();
ol.DEBUG && console.assert(imageState == ol.ImageState.LOADING ||
imageState == ol.ImageState.LOADED,
'imageState is "loading" or "loaded"');
}
return imageState == ol.ImageState.LOADED;
};

8
src/ol/renderer/map.js
View File

@@ -53,8 +53,6 @@ ol.renderer.Map.prototype.calculateMatrices2D = function(frameState) {
var viewState = frameState.viewState;
var coordinateToPixelTransform = frameState.coordinateToPixelTransform;
var pixelToCoordinateTransform = frameState.pixelToCoordinateTransform;
ol.DEBUG && console.assert(coordinateToPixelTransform,
'frameState has a coordinateToPixelTransform');
ol.transform.compose(coordinateToPixelTransform,
frameState.size[0] / 2, frameState.size[1] / 2,
@@ -223,8 +221,6 @@ 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_,
'given layerKey (%s) exists in layerRenderers', layerKey);
return this.layerRenderers_[layerKey];
};
@@ -268,13 +264,9 @@ ol.renderer.Map.prototype.handleLayerRendererChange_ = function() {
* @private
*/
ol.renderer.Map.prototype.removeLayerRendererByKey_ = function(layerKey) {
ol.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_,
'given layerKey (%s) exists in layerRendererListeners', layerKey);
ol.events.unlistenByKey(this.layerRendererListeners_[layerKey]);
delete this.layerRendererListeners_[layerKey];

2
src/ol/renderer/vector.js
View File

@@ -87,8 +87,6 @@ ol.renderer.vector.renderFeature = function(
imageStyle.load();
}
imageState = imageStyle.getImageState();
ol.DEBUG && console.assert(imageState == ol.ImageState.LOADING,
'imageState should be LOADING');
imageStyle.listenImageChange(listener, thisArg);
loading = true;
}

26
src/ol/renderer/webgl/defaultmapshader.js
View File

@@ -35,9 +35,7 @@ ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE = 'precision medium
* @const
* @type {string}
*/
ol.renderer.webgl.defaultmapshader.Fragment.SOURCE = ol.DEBUG ?
ol.renderer.webgl.defaultmapshader.Fragment.DEBUG_SOURCE :
ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE;
ol.renderer.webgl.defaultmapshader.Fragment.SOURCE = ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE;
ol.renderer.webgl.defaultmapshader.fragment = new ol.renderer.webgl.defaultmapshader.Fragment();
@@ -72,9 +70,7 @@ ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;att
* @const
* @type {string}
*/
ol.renderer.webgl.defaultmapshader.Vertex.SOURCE = ol.DEBUG ?
ol.renderer.webgl.defaultmapshader.Vertex.DEBUG_SOURCE :
ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE;
ol.renderer.webgl.defaultmapshader.Vertex.SOURCE = ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE;
ol.renderer.webgl.defaultmapshader.vertex = new ol.renderer.webgl.defaultmapshader.Vertex();
@@ -91,36 +87,30 @@ ol.renderer.webgl.defaultmapshader.Locations = function(gl, program) {
/**
* @type {WebGLUniformLocation}
*/
this.u_opacity = gl.getUniformLocation(
program, ol.DEBUG ? 'u_opacity' : 'f');
this.u_opacity = gl.getUniformLocation(program, 'f');
/**
* @type {WebGLUniformLocation}
*/
this.u_projectionMatrix = gl.getUniformLocation(
program, ol.DEBUG ? 'u_projectionMatrix' : 'e');
this.u_projectionMatrix = gl.getUniformLocation(program, 'e');
/**
* @type {WebGLUniformLocation}
*/
this.u_texCoordMatrix = gl.getUniformLocation(
program, ol.DEBUG ? 'u_texCoordMatrix' : 'd');
this.u_texCoordMatrix = gl.getUniformLocation(program, 'd');
/**
* @type {WebGLUniformLocation}
*/
this.u_texture = gl.getUniformLocation(
program, ol.DEBUG ? 'u_texture' : 'g');
this.u_texture = gl.getUniformLocation(program, 'g');
/**
* @type {number}
*/
this.a_position = gl.getAttribLocation(
program, ol.DEBUG ? 'a_position' : 'b');
this.a_position = gl.getAttribLocation(program, 'b');
/**
* @type {number}
*/
this.a_texCoord = gl.getAttribLocation(
program, ol.DEBUG ? 'a_texCoord' : 'c');
this.a_texCoord = gl.getAttribLocation(program, 'c');
};

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

@@ -5,7 +5,6 @@ goog.require('ol.ViewHint');
goog.require('ol.dom');
goog.require('ol.extent');
goog.require('ol.functions');
goog.require('ol.proj');
goog.require('ol.renderer.webgl.Layer');
goog.require('ol.source.ImageVector');
goog.require('ol.transform');
@@ -118,8 +117,6 @@ 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),
'projection and sourceProjection are equivalent');
projection = sourceProjection;
}
}
@@ -149,8 +146,6 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
}
if (image) {
ol.DEBUG && console.assert(texture, 'texture is truthy');
var canvas = this.mapRenderer.getContext().getCanvas();
this.updateProjectionMatrix_(canvas.width, canvas.height,

15
src/ol/renderer/webgl/map.js
View File

@@ -28,7 +28,6 @@ goog.require('ol.webgl.ContextEventType');
* @param {ol.Map} map Map.
*/
ol.renderer.webgl.Map = function(container, map) {
ol.renderer.Map.call(this, container, map);
/**
@@ -77,7 +76,6 @@ ol.renderer.webgl.Map = function(container, map) {
preserveDrawingBuffer: false,
stencil: true
});
ol.DEBUG && console.assert(this.gl_, 'got a WebGLRenderingContext');
/**
* @private
@@ -129,12 +127,12 @@ ol.renderer.webgl.Map = function(container, map) {
});
/**
* @param {ol.Map} map Map.
* @param {?olx.FrameState} frameState Frame state.
* @return {boolean} false.
* @this {ol.renderer.webgl.Map}
*/
/**
* @param {ol.Map} map Map.
* @param {?olx.FrameState} frameState Frame state.
* @return {boolean} false.
* @this {ol.renderer.webgl.Map}
*/
this.loadNextTileTexture_ =
function(map, frameState) {
if (!this.tileTextureQueue_.isEmpty()) {
@@ -157,7 +155,6 @@ ol.renderer.webgl.Map = function(container, map) {
this.textureCacheFrameMarkerCount_ = 0;
this.initializeGL_();
};
ol.inherits(ol.renderer.webgl.Map, ol.renderer.Map);

20
src/ol/renderer/webgl/tilelayershader.js
View File

@@ -35,9 +35,7 @@ ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE = 'precision mediump
* @const
* @type {string}
*/
ol.renderer.webgl.tilelayershader.Fragment.SOURCE = ol.DEBUG ?
ol.renderer.webgl.tilelayershader.Fragment.DEBUG_SOURCE :
ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE;
ol.renderer.webgl.tilelayershader.Fragment.SOURCE = ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE;
ol.renderer.webgl.tilelayershader.fragment = new ol.renderer.webgl.tilelayershader.Fragment();
@@ -72,9 +70,7 @@ ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;attr
* @const
* @type {string}
*/
ol.renderer.webgl.tilelayershader.Vertex.SOURCE = ol.DEBUG ?
ol.renderer.webgl.tilelayershader.Vertex.DEBUG_SOURCE :
ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE;
ol.renderer.webgl.tilelayershader.Vertex.SOURCE = ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE;
ol.renderer.webgl.tilelayershader.vertex = new ol.renderer.webgl.tilelayershader.Vertex();
@@ -91,24 +87,20 @@ ol.renderer.webgl.tilelayershader.Locations = function(gl, program) {
/**
* @type {WebGLUniformLocation}
*/
this.u_texture = gl.getUniformLocation(
program, ol.DEBUG ? 'u_texture' : 'e');
this.u_texture = gl.getUniformLocation(program, 'e');
/**
* @type {WebGLUniformLocation}
*/
this.u_tileOffset = gl.getUniformLocation(
program, ol.DEBUG ? 'u_tileOffset' : 'd');
this.u_tileOffset = gl.getUniformLocation(program, 'd');
/**
* @type {number}
*/
this.a_position = gl.getAttribLocation(
program, ol.DEBUG ? 'a_position' : 'b');
this.a_position = gl.getAttribLocation(program, 'b');
/**
* @type {number}
*/
this.a_texCoord = gl.getAttribLocation(
program, ol.DEBUG ? 'a_texCoord' : 'c');
this.a_texCoord = gl.getAttribLocation(program, 'c');
};