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

Use option object rather than positional arguments for ol.animation.create* functions

Browse Source
This commit is contained in:
Frederic Junod
2013-01-23 14:35:14 +01:00
parent 6d3e0778e1
commit 7568688301
4 changed files with 113 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/side-by-side.js
+52 -17
View File
@@ -107,26 +107,41 @@ keyboardInteraction.addCallback('H', function() {
layer.setHue(layer.getHue() + (Math.PI / 5));
});
keyboardInteraction.addCallback('j', function() {
var bounce = ol.animation.createBounce(2 * view.getResolution());
var bounce = ol.animation.createBounce({
resolution: 2 * view.getResolution()
});
domMap.addPreRenderFunction(bounce);
webglMap.addPreRenderFunction(bounce);
canvasMap.addPreRenderFunction(bounce);
});
keyboardInteraction.addCallback('l', function() {
var panFrom = ol.animation.createPanFrom(
view.getCenter(), undefined, undefined, ol.easing.elastic);
var panFrom = ol.animation.createPanFrom({
source: view.getCenter(),
easing: ol.easing.elastic
});
domMap.addPreRenderFunction(panFrom);
webglMap.addPreRenderFunction(panFrom);
canvasMap.addPreRenderFunction(panFrom);
view.setCenter(LONDON);
});
keyboardInteraction.addCallback('L', function() {
var start = Date.now();
var start = goog.now();
var duration = 5000;
var bounce = ol.animation.createBounce(
2 * view.getResolution(), duration, start);
var panFrom = ol.animation.createPanFrom(view.getCenter(), duration, start);
var spin = ol.animation.createSpin(duration, 2, start);
var bounce = ol.animation.createBounce({
resolution: 2 * view.getResolution(),
start: start,
duration: duration
});
var panFrom = ol.animation.createPanFrom({
source: view.getCenter(),
start: start,
duration: duration
});
var spin = ol.animation.createSpin({
turns: 2,
start: start,
duration: duration
});
var preRenderFunctions = [bounce, panFrom, spin];
domMap.addPreRenderFunctions(preRenderFunctions);
webglMap.addPreRenderFunctions(preRenderFunctions);
@@ -134,20 +149,34 @@ keyboardInteraction.addCallback('L', function() {
view.setCenter(LONDON);
});
keyboardInteraction.addCallback('m', function() {
var panFrom = ol.animation.createPanFrom(
view.getCenter(), 1000, undefined, ol.easing.bounce);
var panFrom = ol.animation.createPanFrom({
source: view.getCenter(),
duration: 1000,
easing: ol.easing.bounce
});
domMap.addPreRenderFunction(panFrom);
webglMap.addPreRenderFunction(panFrom);
canvasMap.addPreRenderFunction(panFrom);
view.setCenter(MOSCOW);
});
keyboardInteraction.addCallback('M', function() {
var start = Date.now();
var start = goog.now();
var duration = 5000;
var bounce = ol.animation.createBounce(
2 * view.getResolution(), duration, start);
var panFrom = ol.animation.createPanFrom(view.getCenter(), duration, start);
var spin = ol.animation.createSpin(duration, -2, start);
var bounce = ol.animation.createBounce({
resolution: 2 * view.getResolution(),
start: start,
duration: duration
});
var panFrom = ol.animation.createPanFrom({
source: view.getCenter(),
start: start,
duration: duration
});
var spin = ol.animation.createSpin({
turns: -2,
start: start,
duration: duration
});
var preRenderFunctions = [bounce, panFrom, spin];
domMap.addPreRenderFunctions(preRenderFunctions);
webglMap.addPreRenderFunctions(preRenderFunctions);
@@ -174,13 +203,19 @@ keyboardInteraction.addCallback('vV', function() {
layer.setVisible(!layer.getVisible());
});
keyboardInteraction.addCallback('x', function() {
var spin = ol.animation.createSpin(2000, 2);
var spin = ol.animation.createSpin({
turns: 2,
duration: 2000
});
domMap.addPreRenderFunction(spin);
webglMap.addPreRenderFunction(spin);
canvasMap.addPreRenderFunction(spin);
});
keyboardInteraction.addCallback('X', function() {
var spin = ol.animation.createSpin(2000, -2);
var spin = ol.animation.createSpin({
turns: -2,
duration: 2000
});
domMap.addPreRenderFunction(spin);
webglMap.addPreRenderFunction(spin);
canvasMap.addPreRenderFunction(spin);