Convert ol.render.Event#get* methods into properties

This commit is contained in:
Tom Payne
2014-01-23 20:21:55 +01:00
parent 37351c530c
commit df0912bdd3
13 changed files with 42 additions and 60 deletions

View File

@@ -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;

View File

@@ -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();

View File

@@ -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);

View File

@@ -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);
});

View File

@@ -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();
});

View File

@@ -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();
});

View File

@@ -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();
});

View File

@@ -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);