Promote handleLayerRendererChange from ol.renderer.webgl.Map to ol.renderer.Map

This commit is contained in:
Tom Payne
2013-01-28 19:39:54 +01:00
parent 49734de240
commit 5558d6108c
2 changed files with 30 additions and 51 deletions

View File

@@ -206,12 +206,6 @@ ol.renderer.webgl.Map = function(container, map) {
*/
this.vertexShader_ = ol.renderer.webgl.map.shader.Vertex.getInstance();
/**
* @private
* @type {Object.<number, null|number>}
*/
this.layerRendererChangeListenKeys_ = {};
this.initializeGL_();
};
@@ -409,15 +403,6 @@ ol.renderer.webgl.Map.prototype.getShader = function(shaderObject) {
};
/**
* @param {goog.events.Event} event Event.
* @protected
*/
ol.renderer.webgl.Map.prototype.handleLayerRendererChange = function(event) {
this.getMap().render();
};
/**
* @param {goog.events.Event} event Event.
* @protected
@@ -484,20 +469,6 @@ ol.renderer.webgl.Map.prototype.removeLayer = function(layer) {
};
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.removeLayerRenderer = function(layer) {
var layerRenderer = goog.base(this, 'removeLayerRenderer', layer);
if (!goog.isNull(layerRenderer)) {
var layerKey = goog.getUid(layer);
goog.events.unlistenByKey(this.layerRendererChangeListenKeys_[layerKey]);
delete this.layerRendererChangeListenKeys_[layerKey];
}
return layerRenderer;
};
/**
* @inheritDoc
*/
@@ -604,16 +575,3 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
}
};
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.setLayerRenderer = function(
layer, layerRenderer) {
goog.base(this, 'setLayerRenderer', layer, layerRenderer);
var layerKey = goog.getUid(layer);
this.layerRendererChangeListenKeys_[layerKey] = goog.events.listen(
layerRenderer, goog.events.EventType.CHANGE,
this.handleLayerRendererChange, false, this);
};