Merge pull request #568 from twpayne/fix-dom-layer-visibility
Fix DOM layer visibility
This commit is contained in:
@@ -27,15 +27,6 @@ ol.renderer.dom.Layer = function(mapRenderer, layer, target) {
|
|||||||
goog.inherits(ol.renderer.dom.Layer, ol.renderer.Layer);
|
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
|
* @protected
|
||||||
* @return {!Element} Target.
|
* @return {!Element} Target.
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ goog.require('goog.array');
|
|||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.dom');
|
goog.require('goog.dom');
|
||||||
goog.require('goog.dom.TagName');
|
goog.require('goog.dom.TagName');
|
||||||
|
goog.require('goog.object');
|
||||||
goog.require('goog.style');
|
goog.require('goog.style');
|
||||||
goog.require('ol.css');
|
goog.require('ol.css');
|
||||||
goog.require('ol.layer.ImageLayer');
|
goog.require('ol.layer.ImageLayer');
|
||||||
@@ -81,11 +82,19 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
|
|||||||
goog.array.forEach(frameState.layersArray, function(layer) {
|
goog.array.forEach(frameState.layersArray, function(layer) {
|
||||||
var layerRenderer = this.getLayerRenderer(layer);
|
var layerRenderer = this.getLayerRenderer(layer);
|
||||||
var layerState = frameState.layerStates[goog.getUid(layer)];
|
var layerState = frameState.layerStates[goog.getUid(layer)];
|
||||||
if (layerState.visible && layerState.ready) {
|
if (layerState.ready) {
|
||||||
layerRenderer.renderFrame(frameState, layerState);
|
layerRenderer.renderFrame(frameState, layerState);
|
||||||
}
|
}
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
|
goog.object.forEach(
|
||||||
|
this.getLayerRenderers(),
|
||||||
|
function(layerRenderer, layerKey) {
|
||||||
|
if (!(layerKey in frameState.layerStates)) {
|
||||||
|
goog.dom.removeNode(layerRenderer.getTarget());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
if (!this.renderedVisible_) {
|
if (!this.renderedVisible_) {
|
||||||
goog.style.showElement(this.layersPane_, true);
|
goog.style.showElement(this.layersPane_, true);
|
||||||
this.renderedVisible_ = true;
|
this.renderedVisible_ = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user