From 7a95947dbbee85ce431745ffb2018e7c87e89d8f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 27 Dec 2016 09:31:06 -0700 Subject: [PATCH] Dedicated module for render event type enum --- src/ol/graticule.js | 6 +++--- src/ol/layer/heatmap.js | 6 +++--- src/ol/layer/layer.js | 4 ++-- src/ol/map.js | 2 +- src/ol/render/event.js | 24 +----------------------- src/ol/render/eventtype.js | 22 ++++++++++++++++++++++ src/ol/renderer/canvas/layer.js | 9 +++++---- src/ol/renderer/canvas/map.js | 7 ++++--- src/ol/renderer/canvas/vectorlayer.js | 4 ++-- src/ol/renderer/webgl/layer.js | 7 ++++--- src/ol/renderer/webgl/map.js | 7 ++++--- 11 files changed, 51 insertions(+), 47 deletions(-) create mode 100644 src/ol/render/eventtype.js diff --git a/src/ol/graticule.js b/src/ol/graticule.js index 488931cad4..3550ceb849 100644 --- a/src/ol/graticule.js +++ b/src/ol/graticule.js @@ -7,7 +7,7 @@ goog.require('ol.geom.LineString'); goog.require('ol.geom.flat.geodesic'); goog.require('ol.math'); goog.require('ol.proj'); -goog.require('ol.render.Event'); +goog.require('ol.render.EventType'); goog.require('ol.style.Stroke'); @@ -519,12 +519,12 @@ ol.Graticule.prototype.updateProjectionInfo_ = function(projection) { */ ol.Graticule.prototype.setMap = function(map) { if (this.map_) { - this.map_.un(ol.render.Event.Type.POSTCOMPOSE, + this.map_.un(ol.render.EventType.POSTCOMPOSE, this.handlePostCompose_, this); this.map_.render(); } if (map) { - map.on(ol.render.Event.Type.POSTCOMPOSE, + map.on(ol.render.EventType.POSTCOMPOSE, this.handlePostCompose_, this); map.render(); } diff --git a/src/ol/layer/heatmap.js b/src/ol/layer/heatmap.js index b3420708ee..072f8107f8 100644 --- a/src/ol/layer/heatmap.js +++ b/src/ol/layer/heatmap.js @@ -7,7 +7,7 @@ goog.require('ol.dom'); goog.require('ol.layer.Vector'); goog.require('ol.math'); goog.require('ol.obj'); -goog.require('ol.render.Event'); +goog.require('ol.render.EventType'); goog.require('ol.style.Icon'); goog.require('ol.style.Style'); @@ -120,7 +120,7 @@ ol.layer.Heatmap = function(opt_options) { // The render order is not relevant for a heatmap representation. this.setRenderOrder(null); - ol.events.listen(this, ol.render.Event.Type.RENDER, this.handleRender_, this); + ol.events.listen(this, ol.render.EventType.RENDER, this.handleRender_, this); }; ol.inherits(ol.layer.Heatmap, ol.layer.Vector); @@ -236,7 +236,7 @@ ol.layer.Heatmap.prototype.handleStyleChanged_ = function() { * @private */ ol.layer.Heatmap.prototype.handleRender_ = function(event) { - ol.DEBUG && console.assert(event.type == ol.render.Event.Type.RENDER, + ol.DEBUG && console.assert(event.type == ol.render.EventType.RENDER, 'event.type should be RENDER'); ol.DEBUG && console.assert(this.gradient_, 'this.gradient_ expected'); var context = event.context; diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index ae7b899207..05cb5cdb8a 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -7,7 +7,7 @@ goog.require('ol.Object'); goog.require('ol.layer.Base'); goog.require('ol.layer.Property'); goog.require('ol.obj'); -goog.require('ol.render.Event'); +goog.require('ol.render.EventType'); goog.require('ol.source.State'); @@ -177,7 +177,7 @@ ol.layer.Layer.prototype.setMap = function(map) { } if (map) { this.mapPrecomposeKey_ = ol.events.listen( - map, ol.render.Event.Type.PRECOMPOSE, function(evt) { + map, ol.render.EventType.PRECOMPOSE, function(evt) { var layerState = this.getLayerState(); layerState.managed = false; layerState.zIndex = Infinity; diff --git a/src/ol/map.js b/src/ol/map.js index 74c36a27ce..051392d679 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -26,8 +26,8 @@ goog.require('ol.interaction'); goog.require('ol.layer.Group'); goog.require('ol.obj'); goog.require('ol.proj.common'); -goog.require('ol.renderer.Type'); goog.require('ol.renderer.Map'); +goog.require('ol.renderer.Type'); goog.require('ol.renderer.canvas.Map'); goog.require('ol.renderer.webgl.Map'); goog.require('ol.size'); diff --git a/src/ol/render/event.js b/src/ol/render/event.js index 4660b7e1f4..4f55455aa0 100644 --- a/src/ol/render/event.js +++ b/src/ol/render/event.js @@ -8,7 +8,7 @@ goog.require('ol.events.Event'); * @constructor * @extends {ol.events.Event} * @implements {oli.render.Event} - * @param {ol.render.Event.Type} type Type. + * @param {ol.render.EventType} type Type. * @param {ol.render.VectorContext=} opt_vectorContext Vector context. * @param {olx.FrameState=} opt_frameState Frame state. * @param {?CanvasRenderingContext2D=} opt_context Context. @@ -52,25 +52,3 @@ ol.render.Event = function( }; ol.inherits(ol.render.Event, ol.events.Event); - - -/** - * @enum {string} - */ -ol.render.Event.Type = { - /** - * @event ol.render.Event#postcompose - * @api - */ - POSTCOMPOSE: 'postcompose', - /** - * @event ol.render.Event#precompose - * @api - */ - PRECOMPOSE: 'precompose', - /** - * @event ol.render.Event#render - * @api - */ - RENDER: 'render' -}; diff --git a/src/ol/render/eventtype.js b/src/ol/render/eventtype.js new file mode 100644 index 0000000000..098fc06c33 --- /dev/null +++ b/src/ol/render/eventtype.js @@ -0,0 +1,22 @@ +goog.provide('ol.render.EventType'); + +/** + * @enum {string} + */ +ol.render.EventType = { + /** + * @event ol.render.Event#postcompose + * @api + */ + POSTCOMPOSE: 'postcompose', + /** + * @event ol.render.Event#precompose + * @api + */ + PRECOMPOSE: 'precompose', + /** + * @event ol.render.Event#render + * @api + */ + RENDER: 'render' +}; diff --git a/src/ol/renderer/canvas/layer.js b/src/ol/renderer/canvas/layer.js index 7601e7403e..fecbb784f1 100644 --- a/src/ol/renderer/canvas/layer.js +++ b/src/ol/renderer/canvas/layer.js @@ -4,6 +4,7 @@ goog.require('ol'); goog.require('ol.extent'); goog.require('ol.functions'); goog.require('ol.render.Event'); +goog.require('ol.render.EventType'); goog.require('ol.render.canvas'); goog.require('ol.render.canvas.Immediate'); goog.require('ol.renderer.Layer'); @@ -69,7 +70,7 @@ ol.renderer.canvas.Layer.prototype.clip = function(context, frameState, extent) /** - * @param {ol.render.Event.Type} type Event type. + * @param {ol.render.EventType} type Event type. * @param {CanvasRenderingContext2D} context Context. * @param {olx.FrameState} frameState Frame state. * @param {ol.Transform=} opt_transform Transform. @@ -124,7 +125,7 @@ ol.renderer.canvas.Layer.prototype.forEachLayerAtCoordinate = function(coordinat * @protected */ ol.renderer.canvas.Layer.prototype.postCompose = function(context, frameState, layerState, opt_transform) { - this.dispatchComposeEvent_(ol.render.Event.Type.POSTCOMPOSE, context, + this.dispatchComposeEvent_(ol.render.EventType.POSTCOMPOSE, context, frameState, opt_transform); }; @@ -136,7 +137,7 @@ ol.renderer.canvas.Layer.prototype.postCompose = function(context, frameState, l * @protected */ ol.renderer.canvas.Layer.prototype.preCompose = function(context, frameState, opt_transform) { - this.dispatchComposeEvent_(ol.render.Event.Type.PRECOMPOSE, context, + this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, context, frameState, opt_transform); }; @@ -148,7 +149,7 @@ ol.renderer.canvas.Layer.prototype.preCompose = function(context, frameState, op * @protected */ ol.renderer.canvas.Layer.prototype.dispatchRenderEvent = function(context, frameState, opt_transform) { - this.dispatchComposeEvent_(ol.render.Event.Type.RENDER, context, + this.dispatchComposeEvent_(ol.render.EventType.RENDER, context, frameState, opt_transform); }; diff --git a/src/ol/renderer/canvas/map.js b/src/ol/renderer/canvas/map.js index 3e78ec20ab..62f922e739 100644 --- a/src/ol/renderer/canvas/map.js +++ b/src/ol/renderer/canvas/map.js @@ -13,6 +13,7 @@ goog.require('ol.layer.Tile'); goog.require('ol.layer.Vector'); goog.require('ol.layer.VectorTile'); goog.require('ol.render.Event'); +goog.require('ol.render.EventType'); goog.require('ol.render.canvas'); goog.require('ol.render.canvas.Immediate'); goog.require('ol.renderer.Map'); @@ -87,7 +88,7 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) { /** - * @param {ol.render.Event.Type} type Event type. + * @param {ol.render.EventType} type Event type. * @param {olx.FrameState} frameState Frame state. * @private */ @@ -165,7 +166,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) { this.calculateMatrices2D(frameState); - this.dispatchComposeEvent_(ol.render.Event.Type.PRECOMPOSE, frameState); + this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState); var layerStatesArray = frameState.layerStatesArray; ol.array.stableSort(layerStatesArray, ol.renderer.Map.sortByZIndex); @@ -190,7 +191,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) { ol.render.canvas.rotateAtOffset(context, -rotation, width / 2, height / 2); this.dispatchComposeEvent_( - ol.render.Event.Type.POSTCOMPOSE, frameState); + ol.render.EventType.POSTCOMPOSE, frameState); if (!this.renderedVisible_) { this.canvas_.style.display = ''; diff --git a/src/ol/renderer/canvas/vectorlayer.js b/src/ol/renderer/canvas/vectorlayer.js index 449df71c7a..6104d4b714 100644 --- a/src/ol/renderer/canvas/vectorlayer.js +++ b/src/ol/renderer/canvas/vectorlayer.js @@ -4,7 +4,7 @@ goog.require('ol'); goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); -goog.require('ol.render.Event'); +goog.require('ol.render.EventType'); goog.require('ol.render.canvas'); goog.require('ol.render.canvas.ReplayGroup'); goog.require('ol.renderer.canvas.Layer'); @@ -97,7 +97,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = function(frameState, lay var drawOffsetX = 0; var drawOffsetY = 0; var replayContext; - if (layer.hasListener(ol.render.Event.Type.RENDER)) { + if (layer.hasListener(ol.render.EventType.RENDER)) { var drawWidth = context.canvas.width; var drawHeight = context.canvas.height; if (rotation) { diff --git a/src/ol/renderer/webgl/layer.js b/src/ol/renderer/webgl/layer.js index 1dd5ae61dd..8311696dd8 100644 --- a/src/ol/renderer/webgl/layer.js +++ b/src/ol/renderer/webgl/layer.js @@ -2,6 +2,7 @@ goog.provide('ol.renderer.webgl.Layer'); goog.require('ol'); goog.require('ol.render.Event'); +goog.require('ol.render.EventType'); goog.require('ol.render.webgl.Immediate'); goog.require('ol.renderer.Layer'); goog.require('ol.renderer.webgl.defaultmapshader'); @@ -139,7 +140,7 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebu ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState, context) { this.dispatchComposeEvent_( - ol.render.Event.Type.PRECOMPOSE, context, frameState); + ol.render.EventType.PRECOMPOSE, context, frameState); context.bindBuffer(ol.webgl.ARRAY_BUFFER, this.arrayBuffer_); @@ -178,13 +179,13 @@ ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState gl.drawArrays(ol.webgl.TRIANGLE_STRIP, 0, 4); this.dispatchComposeEvent_( - ol.render.Event.Type.POSTCOMPOSE, context, frameState); + ol.render.EventType.POSTCOMPOSE, context, frameState); }; /** - * @param {ol.render.Event.Type} type Event type. + * @param {ol.render.EventType} type Event type. * @param {ol.webgl.Context} context WebGL context. * @param {olx.FrameState} frameState Frame state. * @private diff --git a/src/ol/renderer/webgl/map.js b/src/ol/renderer/webgl/map.js index 7359ce0d16..d4752071c9 100644 --- a/src/ol/renderer/webgl/map.js +++ b/src/ol/renderer/webgl/map.js @@ -12,6 +12,7 @@ goog.require('ol.layer.Layer'); goog.require('ol.layer.Tile'); goog.require('ol.layer.Vector'); goog.require('ol.render.Event'); +goog.require('ol.render.EventType'); goog.require('ol.render.webgl.Immediate'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.Type'); @@ -250,7 +251,7 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) { /** - * @param {ol.render.Event.Type} type Event type. + * @param {ol.render.EventType} type Event type. * @param {olx.FrameState} frameState Frame state. * @private */ @@ -432,7 +433,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) { this.textureCache_.set((-frameState.index).toString(), null); ++this.textureCacheFrameMarkerCount_; - this.dispatchComposeEvent_(ol.render.Event.Type.PRECOMPOSE, frameState); + this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState); /** @type {Array.} */ var layerStatesToDraw = []; @@ -491,7 +492,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) { frameState.animate = true; } - this.dispatchComposeEvent_(ol.render.Event.Type.POSTCOMPOSE, frameState); + this.dispatchComposeEvent_(ol.render.EventType.POSTCOMPOSE, frameState); this.scheduleRemoveUnusedLayerRenderers(frameState); this.scheduleExpireIconCache(frameState);