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

Rename ol.layer.VectorEvent to ol.render.RenderEvent

Browse Source
This commit is contained in:
Tom Payne
2013-11-11 03:12:58 +01:00
parent 2839aea6b1
commit a990f0921e
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/layer/vectorevent.exports
View File

@@ -1,3 +0,0 @@
@exportProperty ol.layer.VectorEvent.prototype.getContext
@exportProperty ol.layer.VectorEvent.prototype.getGL
@exportProperty ol.layer.VectorEvent.prototype.getRender

3
src/ol/render/renderevent.exports Normal file
View File

@@ -0,0 +1,3 @@
@exportProperty ol.render.RenderEvent.prototype.getContext
@exportProperty ol.render.RenderEvent.prototype.getGL
@exportProperty ol.render.RenderEvent.prototype.getRender

18
src/ol/layer/vectorevent.js → src/ol/render/renderevent.js
View File

@@ -1,5 +1,5 @@
goog.provide('ol.layer.VectorEvent');
goog.provide('ol.layer.VectorEventType');
goog.provide('ol.render.RenderEvent');
goog.provide('ol.render.RenderEventType');
goog.require('goog.events.Event');
goog.require('ol.render.IRender');
@@ -8,7 +8,7 @@ goog.require('ol.render.IRender');
/**
* @enum {string}
*/
ol.layer.VectorEventType = {
ol.render.RenderEventType = {
POSTRENDER: 'postrender'
};
@@ -17,13 +17,13 @@ ol.layer.VectorEventType = {
/**
* @constructor
* @extends {goog.events.Event}
* @param {ol.layer.VectorEventType} type Type.
* @param {ol.render.RenderEventType} type Type.
* @param {Object=} opt_target Target.
* @param {ol.render.IRender=} opt_render Render.
* @param {?CanvasRenderingContext2D=} opt_context Context.
* @param {?WebGLRenderingContext=} opt_gl GL.
*/
ol.layer.VectorEvent =
ol.render.RenderEvent =
function(type, opt_target, opt_render, opt_context, opt_gl) {
goog.base(this, type, opt_target);
@@ -47,13 +47,13 @@ ol.layer.VectorEvent =
this.gl_ = opt_gl;
};
goog.inherits(ol.layer.VectorEvent, goog.events.Event);
goog.inherits(ol.render.RenderEvent, goog.events.Event);
/**
* @return {CanvasRenderingContext2D|null|undefined} Context.
*/
ol.layer.VectorEvent.prototype.getContext = function() {
ol.render.RenderEvent.prototype.getContext = function() {
return this.context_;
};
@@ -61,7 +61,7 @@ ol.layer.VectorEvent.prototype.getContext = function() {
/**
* @return {WebGLRenderingContext|null|undefined} GL.
*/
ol.layer.VectorEvent.prototype.getGL = function() {
ol.render.RenderEvent.prototype.getGL = function() {
return this.gl_;
};
@@ -69,6 +69,6 @@ ol.layer.VectorEvent.prototype.getGL = function() {
/**
* @return {ol.render.IRender|undefined} Render.
*/
ol.layer.VectorEvent.prototype.getRender = function() {
ol.render.RenderEvent.prototype.getRender = function() {
return this.render_;
};

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

@@ -3,8 +3,8 @@ goog.provide('ol.renderer.canvas.VectorLayer');
goog.require('goog.vec.Mat4');
goog.require('ol.ViewHint');
goog.require('ol.extent');
goog.require('ol.layer.VectorEvent');
goog.require('ol.layer.VectorEventType');
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');
@@ -93,11 +93,11 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
replayGroup.draw(context, frameState.extent, transform);
var vectorLayer = this.getVectorLayer();
if (vectorLayer.hasListener(ol.layer.VectorEventType.POSTRENDER)) {
if (vectorLayer.hasListener(ol.render.RenderEventType.POSTRENDER)) {
var render = new ol.render.canvas.Immediate(
context, frameState.extent, transform);
var postRenderEvent = new ol.layer.VectorEvent(
ol.layer.VectorEventType.POSTRENDER, vectorLayer, render, context,
var postRenderEvent = new ol.render.RenderEvent(
ol.render.RenderEventType.POSTRENDER, vectorLayer, render, context,
null);
vectorLayer.dispatchEvent(postRenderEvent);
}