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

Rename ol.render.RenderEvent to ol.render.Event

Browse Source
This commit is contained in:
Tom Payne
2013-11-12 01:24:06 +01:00
parent cd9b52572a
commit 7fd4e1ba56
5 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,8 @@ 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.Event');
goog.require('ol.render.EventType');
goog.require('ol.render.canvas.Immediate');
goog.require('ol.renderer.Layer');
@@ -78,14 +78,13 @@ ol.renderer.canvas.Layer.prototype.composeFrame =
ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent =
function(context, frameState, opt_transform) {
var layer = this.getLayer();
if (layer.hasListener(ol.render.RenderEventType.POSTCOMPOSE)) {
if (layer.hasListener(ol.render.EventType.POSTCOMPOSE)) {
var transform = goog.isDef(opt_transform) ?
opt_transform : this.getTransform(frameState);
var render = new ol.render.canvas.Immediate(context, frameState.extent,
transform);
var postComposeEvent = new ol.render.RenderEvent(
ol.render.RenderEventType.POSTCOMPOSE, layer, render, frameState,
context, null);
var postComposeEvent = new ol.render.Event(ol.render.EventType.POSTCOMPOSE,
layer, render, frameState, context, null);
layer.dispatchEvent(postComposeEvent);
}
};

11
src/ol/renderer/canvas/canvasmaprenderer.js
View File

@@ -10,8 +10,8 @@ goog.require('ol.css');
goog.require('ol.layer.Image');
goog.require('ol.layer.Tile');
goog.require('ol.layer.Vector');
goog.require('ol.render.RenderEvent');
goog.require('ol.render.RenderEventType');
goog.require('ol.render.Event');
goog.require('ol.render.EventType');
goog.require('ol.render.canvas.Immediate');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.ImageLayer');
@@ -126,12 +126,11 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
}
var map = this.getMap();
if (map.hasListener(ol.render.RenderEventType.POSTCOMPOSE)) {
if (map.hasListener(ol.render.EventType.POSTCOMPOSE)) {
var render = new ol.render.canvas.Immediate(
context, frameState.extent, frameState.coordinateToPixelMatrix);
var postComposeEvent = new ol.render.RenderEvent(
ol.render.RenderEventType.POSTCOMPOSE, map, render, frameState, context,
null);
var postComposeEvent = new ol.render.Event(ol.render.EventType.POSTCOMPOSE,
map, render, frameState, context, null);
map.dispatchEvent(postComposeEvent);
}