diff --git a/buildcfg/base.json b/buildcfg/base.json index 557581927e..291e0e6268 100644 --- a/buildcfg/base.json +++ b/buildcfg/base.json @@ -98,7 +98,8 @@ "goog.debug.logRecordSerializer", "goog.debug.makeWhitespaceVisible", "goog.debug.normalizeErrorObject", - "goog.debug.reflect" + "goog.debug.reflect", + "goog.log" ] } diff --git a/src/ol/map.js b/src/ol/map.js index 6ac5afa782..3dded4b5d5 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -13,8 +13,6 @@ goog.require('goog.asserts'); goog.require('goog.async.AnimationDelay'); goog.require('goog.async.Delay'); goog.require('goog.debug.Console'); -goog.require('goog.debug.Logger'); -goog.require('goog.debug.Logger.Level'); goog.require('goog.dispose'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); @@ -27,6 +25,8 @@ goog.require('goog.events.KeyHandler'); goog.require('goog.events.KeyHandler.EventType'); goog.require('goog.events.MouseWheelHandler'); goog.require('goog.events.MouseWheelHandler.EventType'); +goog.require('goog.log'); +goog.require('goog.log.Level'); goog.require('goog.object'); goog.require('goog.style'); goog.require('goog.vec.Mat4'); @@ -1169,7 +1169,7 @@ ol.proj.addCommonProjections(); if (goog.DEBUG) { (function() { goog.debug.Console.autoInstall(); - var logger = goog.debug.Logger.getLogger('ol'); - logger.setLevel(goog.debug.Logger.Level.FINEST); + var logger = goog.log.getLogger('ol'); + logger.setLevel(goog.log.Level.FINEST); })(); } diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index cf223ff6e5..54cfe1a895 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -4,11 +4,12 @@ goog.provide('ol.renderer.webgl.Map'); goog.require('goog.array'); goog.require('goog.asserts'); -goog.require('goog.debug.Logger'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); goog.require('goog.events'); goog.require('goog.events.Event'); +goog.require('goog.log'); +goog.require('goog.log.Logger'); goog.require('goog.object'); goog.require('goog.style'); goog.require('goog.webgl'); @@ -417,7 +418,7 @@ ol.renderer.webgl.Map.prototype.getProgram = function( if (goog.DEBUG) { if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) && !gl.isContextLost()) { - this.logger_.severe(gl.getProgramInfoLog(program)); + goog.log.error(this.logger_, gl.getProgramInfoLog(program)); } } goog.asserts.assert( @@ -445,7 +446,7 @@ ol.renderer.webgl.Map.prototype.getShader = function(shaderObject) { if (goog.DEBUG) { if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) && !gl.isContextLost()) { - this.logger_.severe(gl.getShaderInfoLog(shader)); + goog.log.error(this.logger_, gl.getShaderInfoLog(shader)); } } goog.asserts.assert( @@ -519,10 +520,10 @@ ol.renderer.webgl.Map.prototype.isTileTextureLoaded = function(tile) { /** * @private - * @type {goog.debug.Logger} + * @type {goog.log.Logger} */ ol.renderer.webgl.Map.prototype.logger_ = - goog.debug.Logger.getLogger('ol.renderer.webgl.Map'); + goog.log.getLogger('ol.renderer.webgl.Map'); /**