From 4a64837ba1acdd26772e73e40b6e38185d214f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 24 Jan 2013 22:12:10 +0100 Subject: [PATCH] Make map handle background color changes --- src/ol/map.js | 11 +++++++++++ src/ol/renderer/canvas/canvasmaprenderer.js | 8 -------- src/ol/renderer/maprenderer.js | 10 ---------- src/ol/renderer/webgl/webglmaprenderer.js | 8 -------- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/src/ol/map.js b/src/ol/map.js index a5ebaae2aa..277ef4a172 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -287,6 +287,9 @@ ol.Map = function(mapOptions) { this.handleViewChanged_, false, this); goog.events.listen(this, ol.Object.getChangedEventType(ol.MapProperty.SIZE), this.handleSizeChanged_, false, this); + goog.events.listen( + this, ol.Object.getChangedEventType(ol.MapProperty.BACKGROUND_COLOR), + this.handleBackgroundColorChanged_, false, this), this.setValues(mapOptionsInternal.values); // this gives the map an initial size @@ -561,6 +564,14 @@ ol.Map.prototype.handlePostRender = function() { }; +/** + * @private + */ +ol.Map.prototype.handleBackgroundColorChanged_ = function() { + this.render(); +}; + + /** * @protected */ diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index d06eeda438..e740898e42 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -76,14 +76,6 @@ ol.renderer.canvas.Map.prototype.getCanvas = function() { }; -/** - * @inheritDoc - */ -ol.renderer.canvas.Map.prototype.handleBackgroundColorChanged = function() { - this.getMap().render(); -}; - - /** * @param {goog.events.Event} event Event. * @protected diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index 5eb3c507bb..1e953dfc24 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -52,10 +52,6 @@ ol.renderer.Map = function(container, map) { * @type {Array.} */ this.mapListenerKeys_ = [ - goog.events.listen( - map, ol.Object.getChangedEventType(ol.MapProperty.BACKGROUND_COLOR), - this.handleBackgroundColorChanged, false, this), - goog.events.listen( map, ol.Object.getChangedEventType(ol.MapProperty.LAYERS), this.handleLayersChanged, false, this) @@ -157,12 +153,6 @@ ol.renderer.Map.prototype.getMap = function() { }; -/** - * Handle background color changed. - */ -ol.renderer.Map.prototype.handleBackgroundColorChanged = goog.nullFunction; - - /** * @param {ol.CollectionEvent} collectionEvent Collection event. * @protected diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index a1eefb7326..6a62129e67 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -409,14 +409,6 @@ ol.renderer.webgl.Map.prototype.getShader = function(shaderObject) { }; -/** - * @inheritDoc - */ -ol.renderer.webgl.Map.prototype.handleBackgroundColorChanged = function() { - this.getMap().render(); -}; - - /** * @param {goog.events.Event} event Event. * @protected