From 998dbdabd05e4aa7515381a46af08d9598699be3 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sat, 14 Jul 2012 21:53:20 +0200 Subject: [PATCH] Make ol.Map.layerRenderers protected --- src/ol/map.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/ol/map.js b/src/ol/map.js index 399116d78b..2dba50dacc 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -55,10 +55,10 @@ ol.Map = function(target, opt_values, opt_viewportSizeMonitor) { this.layersListenerKeys_ = null; /** - * @private + * @protected * @type {Object.} */ - this.layerRenderers_ = {}; + this.layerRenderers = {}; /** * @private @@ -113,7 +113,7 @@ ol.Map.prototype.forEachLayerRenderer = function(f, opt_obj) { if (goog.isDefAndNotNull(layers)) { layers.forEach(function(layer) { var key = goog.getUid(layer); - var layerRenderer = this.layerRenderers_[key]; + var layerRenderer = this.layerRenderers[key]; f.call(opt_obj, layerRenderer); }, this); } @@ -243,7 +243,9 @@ ol.Map.prototype.handleLayerAdd = function(layer) { goog.asserts.assert(ol.Projection.equivalent(projection, storeProjection)); var key = goog.getUid(layer); var layerRenderer = this.createLayerRenderer(layer); - this.layerRenderers_[key] = layerRenderer; + if (!goog.isNull(layerRenderer)) { + this.layerRenderers[key] = layerRenderer; + } }; @@ -253,10 +255,11 @@ ol.Map.prototype.handleLayerAdd = function(layer) { */ ol.Map.prototype.handleLayerRemove = function(layer) { var key = goog.getUid(layer); - goog.asserts.assert(key in this.layerRenderers_); - var layerRenderer = this.layerRenderers_[key]; - delete this.layerRenderers_[key]; - goog.dispose(layerRenderer); + if (key in this.layerRenderers) { + var layerRenderer = this.layerRenderers[key]; + delete this.layerRenderers[key]; + goog.dispose(layerRenderer); + } };