Skip to content

Commit

Permalink
Merge pull request #568 from twpayne/fix-dom-layer-visibility
Browse files Browse the repository at this point in the history
Fix DOM layer visibility
  • Loading branch information
twpayne committed Apr 18, 2013
2 parents 8735829 + 8831d25 commit 669d47e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
9 changes: 0 additions & 9 deletions src/ol/renderer/dom/domlayerrenderer.js
Expand Up @@ -27,15 +27,6 @@ ol.renderer.dom.Layer = function(mapRenderer, layer, target) {
goog.inherits(ol.renderer.dom.Layer, ol.renderer.Layer);


/**
* @inheritDoc
*/
ol.renderer.dom.Layer.prototype.disposeInternal = function() {
goog.dom.removeNode(this.target);
goog.base(this, 'disposeInternal');
};


/**
* @protected
* @return {!Element} Target.
Expand Down
11 changes: 10 additions & 1 deletion src/ol/renderer/dom/dommaprenderer.js
Expand Up @@ -4,6 +4,7 @@ goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.object');
goog.require('goog.style');
goog.require('ol.css');
goog.require('ol.layer.ImageLayer');
Expand Down Expand Up @@ -81,11 +82,19 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
goog.array.forEach(frameState.layersArray, function(layer) {
var layerRenderer = this.getLayerRenderer(layer);
var layerState = frameState.layerStates[goog.getUid(layer)];
if (layerState.visible && layerState.ready) {
if (layerState.ready) {
layerRenderer.renderFrame(frameState, layerState);
}
}, this);

goog.object.forEach(
this.getLayerRenderers(),
function(layerRenderer, layerKey) {
if (!(layerKey in frameState.layerStates)) {
goog.dom.removeNode(layerRenderer.getTarget());
}
});

if (!this.renderedVisible_) {
goog.style.showElement(this.layersPane_, true);
this.renderedVisible_ = true;
Expand Down

0 comments on commit 669d47e

Please sign in to comment.