diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js index 31ec3cec8f..e66c23d3f4 100644 --- a/examples/dynamic-data.js +++ b/examples/dynamic-data.js @@ -35,8 +35,8 @@ var R = 7e6; var r = 2e6; var p = 2e6; map.on('postcompose', function(event) { - var render = event.getRender(); - var frameState = event.getFrameState(); + var render = event.render; + var frameState = event.frameState; var theta = 2 * Math.PI * frameState.time / omegaTheta; var coordinates = []; var i; diff --git a/examples/export-map.js b/examples/export-map.js index da7d50dc3f..21341fd7d6 100644 --- a/examples/export-map.js +++ b/examples/export-map.js @@ -24,7 +24,7 @@ var exportPNGElement = document.getElementById('export-png'); if ('download' in exportPNGElement) { exportPNGElement.addEventListener('click', function(e) { map.once('postcompose', function(event) { - var canvas = event.getContext().canvas; + var canvas = event.context.canvas; exportPNGElement.href = canvas.toDataURL('image/png'); }); map.render(); diff --git a/examples/igc.js b/examples/igc.js index 7811f693ef..e503cf2298 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -128,7 +128,7 @@ var strokeStyle = new ol.style.Stroke({ width: 1 }); map.on('postcompose', function(evt) { - var render = evt.getRender(); + var render = evt.render; if (point !== null) { render.setImageStyle(imageStyle); render.drawPointGeometry(point); diff --git a/examples/layer-clipping-webgl.js b/examples/layer-clipping-webgl.js index d493bfb644..bfea0b6932 100644 --- a/examples/layer-clipping-webgl.js +++ b/examples/layer-clipping-webgl.js @@ -41,7 +41,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) { ].join(''); osm.on('precompose', function(event) { - var context = event.getGlContext(); + var context = event.glContext; var gl = context.getGL(); var program = gl.createProgram(); @@ -96,7 +96,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) { }); osm.on('postcompose', function(event) { - var context = event.getGlContext(); + var context = event.glContext; var gl = context.getGL(); gl.disable(gl.STENCIL_TEST); }); diff --git a/examples/layer-clipping.js b/examples/layer-clipping.js index 237335be09..aeebe39437 100644 --- a/examples/layer-clipping.js +++ b/examples/layer-clipping.js @@ -19,7 +19,7 @@ var map = new ol.Map({ }); osm.on('precompose', function(event) { - var ctx = event.getContext(); + var ctx = event.context; ctx.save(); ctx.translate(ctx.canvas.width / 2, ctx.canvas.height / 2); ctx.scale(3, 3); @@ -37,6 +37,6 @@ osm.on('precompose', function(event) { }); osm.on('postcompose', function(event) { - var ctx = event.getContext(); + var ctx = event.context; ctx.restore(); }); diff --git a/examples/layer-spy.js b/examples/layer-spy.js index 7bc24dc4c6..fb282f7283 100644 --- a/examples/layer-spy.js +++ b/examples/layer-spy.js @@ -48,7 +48,7 @@ $(map.getViewport()).on('mousemove', function(evt) { // before rendering the layer, do some clipping imagery.on('precompose', function(event) { - var ctx = event.getContext(); + var ctx = event.context; ctx.save(); ctx.beginPath(); if (mousePosition) { @@ -63,6 +63,6 @@ imagery.on('precompose', function(event) { // after rendering the layer, restore the canvas context imagery.on('postcompose', function(event) { - var ctx = event.getContext(); + var ctx = event.context; ctx.restore(); }); diff --git a/examples/layer-swipe.js b/examples/layer-swipe.js index 87cce34fc7..821576afc5 100644 --- a/examples/layer-swipe.js +++ b/examples/layer-swipe.js @@ -28,7 +28,7 @@ var map = new ol.Map({ var swipe = document.getElementById('swipe'); bing.on('precompose', function(event) { - var ctx = event.getContext(); + var ctx = event.context; var width = ctx.canvas.width * (swipe.value / 100); ctx.save(); @@ -38,7 +38,7 @@ bing.on('precompose', function(event) { }); bing.on('postcompose', function(event) { - var ctx = event.getContext(); + var ctx = event.context; ctx.restore(); }); diff --git a/examples/synthetic-points.js b/examples/synthetic-points.js index 2ed6010a1d..671b5fa51a 100644 --- a/examples/synthetic-points.js +++ b/examples/synthetic-points.js @@ -114,7 +114,7 @@ var strokeStyle = new ol.style.Stroke({ width: 3 }); map.on('postcompose', function(evt) { - var render = evt.getRender(); + var render = evt.render; if (point !== null) { render.setImageStyle(imageStyle); render.drawPointGeometry(point); diff --git a/externs/oli.js b/externs/oli.js index 7b665ab63a..70ba0a7b0c 100644 --- a/externs/oli.js +++ b/externs/oli.js @@ -51,3 +51,24 @@ oli.interaction.DragAndDropEvent.prototype.features; /** @type {ol.proj.Projection} */ oli.interaction.DragAndDropEvent.prototype.projection; + + + +/** @interface */ +oli.render.Event = function() {}; + + +/** @type {CanvasRenderingContext2D|null|undefined} */ +oli.render.Event.prototype.context; + + +/** @type {ol.FrameState|undefined} */ +oli.render.Event.prototype.frameState; + + +/** @type {ol.webgl.Context|null|undefined} */ +oli.render.Event.prototype.glContext; + + +/** @type {ol.render.IRender|undefined} */ +oli.render.Event.prototype.render; diff --git a/src/ol/render/box.js b/src/ol/render/box.js index d21f4953b3..b0810c7c9e 100644 --- a/src/ol/render/box.js +++ b/src/ol/render/box.js @@ -100,7 +100,7 @@ ol.render.Box.prototype.handleMapPostCompose_ = function(event) { var style = this.style_; goog.asserts.assert(!goog.isNull(style)); // use drawAsync(Infinity) to draw above everything - event.getRender().drawAsync(Infinity, function(render) { + event.render.drawAsync(Infinity, function(render) { render.setFillStrokeStyle(style.getFill(), style.getStroke()); render.drawPolygonGeometry(geometry, null); }); diff --git a/src/ol/render/featuresoverlay.js b/src/ol/render/featuresoverlay.js index 03bb17c95f..727f242fb0 100644 --- a/src/ol/render/featuresoverlay.js +++ b/src/ol/render/featuresoverlay.js @@ -141,8 +141,8 @@ ol.render.FeaturesOverlay.prototype.handleMapPostCompose_ = function(event) { if (goog.isNull(this.features_) || !goog.isDef(this.styleFunction_)) { return; } - var resolution = event.getFrameState().view2DState.resolution; - var render = event.getRender(); + var resolution = event.frameState.view2DState.resolution; + var render = event.render; var i, ii, feature, styles; this.features_.forEach(function(feature) { styles = this.styleFunction_(feature, resolution); diff --git a/src/ol/render/renderevent.exports b/src/ol/render/renderevent.exports deleted file mode 100644 index bfb4403ea4..0000000000 --- a/src/ol/render/renderevent.exports +++ /dev/null @@ -1,4 +0,0 @@ -@exportProperty ol.render.Event.prototype.getContext -@exportProperty ol.render.Event.prototype.getFrameState -@exportProperty ol.render.Event.prototype.getGlContext -@exportProperty ol.render.Event.prototype.getRender diff --git a/src/ol/render/renderevent.js b/src/ol/render/renderevent.js index bfabfb1cae..7d95abf152 100644 --- a/src/ol/render/renderevent.js +++ b/src/ol/render/renderevent.js @@ -18,6 +18,7 @@ ol.render.EventType = { /** * @constructor * @extends {goog.events.Event} + * @implements {oli.render.Event} * @param {ol.render.EventType} type Type. * @param {Object=} opt_target Target. * @param {ol.render.IRender=} opt_render Render. @@ -33,59 +34,23 @@ ol.render.Event = function( /** * @type {ol.render.IRender|undefined} - * @private */ - this.render_ = opt_render; + this.render = opt_render; /** * @type {ol.FrameState|undefined} - * @private */ - this.frameState_ = opt_frameState; + this.frameState = opt_frameState; /** * @type {CanvasRenderingContext2D|null|undefined} - * @private */ - this.context_ = opt_context; + this.context = opt_context; /** * @type {ol.webgl.Context|null|undefined} - * @private */ - this.glContext_ = opt_glContext; + this.glContext = opt_glContext; }; goog.inherits(ol.render.Event, goog.events.Event); - - -/** - * @return {CanvasRenderingContext2D|null|undefined} Context. - */ -ol.render.Event.prototype.getContext = function() { - return this.context_; -}; - - -/** - * @return {ol.FrameState|undefined} Frame state. - */ -ol.render.Event.prototype.getFrameState = function() { - return this.frameState_; -}; - - -/** - * @return {ol.webgl.Context|null|undefined} GL context. - */ -ol.render.Event.prototype.getGlContext = function() { - return this.glContext_; -}; - - -/** - * @return {ol.render.IRender|undefined} Render. - */ -ol.render.Event.prototype.getRender = function() { - return this.render_; -};