ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move dispatchPostComposeEvent into base class

Browse Source
This commit is contained in:
Tom Payne
2013-11-11 08:22:57 +01:00
parent dca4f261ec
commit 7035096fca
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ol/renderer/canvas/canvaslayerrenderer.js
View File

@@ -2,6 +2,9 @@ goog.provide('ol.renderer.canvas.Layer');
goog.require('goog.vec.Mat4');
goog.require('ol.layer.Layer');
goog.require('ol.render.RenderEvent');
goog.require('ol.render.RenderEventType');
goog.require('ol.render.canvas.Immediate');
goog.require('ol.renderer.Layer');
@@ -56,6 +59,24 @@ ol.renderer.canvas.Layer.prototype.composeFrame =
};
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {ol.Extent} extent Extent.
* @param {goog.vec.Mat4.AnyType} transform Transform.
* @protected
*/
ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent =
function(context, extent, transform) {
var layer = this.getLayer();
if (layer.hasListener(ol.render.RenderEventType.POSTCOMPOSE)) {
var render = new ol.render.canvas.Immediate(context, extent, transform);
var postComposeEvent = new ol.render.RenderEvent(
ol.render.RenderEventType.POSTCOMPOSE, layer, render, context, null);
layer.dispatchEvent(postComposeEvent);
}
};
/**
* @return {HTMLCanvasElement|HTMLVideoElement|Image} Canvas.
*/

13
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
View File

@@ -3,9 +3,6 @@ goog.provide('ol.renderer.canvas.VectorLayer');
goog.require('goog.vec.Mat4');
goog.require('ol.ViewHint');
goog.require('ol.extent');
goog.require('ol.render.RenderEvent');
goog.require('ol.render.RenderEventType');
goog.require('ol.render.canvas.Immediate');
goog.require('ol.render.canvas.ReplayGroup');
goog.require('ol.renderer.canvas.Layer');
goog.require('ol.renderer.vector');
@@ -92,16 +89,10 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
context.globalAlpha = layerState.opacity;
replayGroup.draw(context, frameState.extent, transform);
var vectorLayer = this.getVectorLayer();
if (vectorLayer.hasListener(ol.render.RenderEventType.POSTCOMPOSE)) {
var render = new ol.render.canvas.Immediate(
context, frameState.extent, transform);
var postComposeEvent = new ol.render.RenderEvent(
ol.render.RenderEventType.POSTCOMPOSE, vectorLayer, render, context,
null);
vectorLayer.dispatchEvent(postComposeEvent);
}
this.dispatchPostComposeEvent(context, frameState.extent, transform);
};