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

Improve type checking in ol.animation

Browse Source
This commit is contained in:
Tom Payne
2013-04-30 21:29:10 +02:00
parent 59a4155651
commit d2979fc4ff
1 changed files with 88 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/animation.js
+28 -8
View File
@@ -17,7 +17,12 @@ ol.animation.bounce = function(options) {
var duration = goog.isDef(options.duration) ? options.duration : 1000;
var easing = goog.isDef(options.easing) ?
options.easing : ol.easing.upAndDown;
return function(map, frameState) {
return (
/**
* @param {ol.Map} map Map.
* @param {?ol.FrameState} frameState Frame state.
*/
function(map, frameState) {
if (frameState.time < start) {
frameState.animate = true;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
@@ -32,7 +37,7 @@ ol.animation.bounce = function(options) {
} else {
return false;
}
};
});
};
@@ -48,7 +53,12 @@ ol.animation.pan = function(options) {
var duration = goog.isDef(options.duration) ? options.duration : 1000;
var easing = goog.isDef(options.easing) ?
options.easing : ol.easing.inAndOut;
return function(map, frameState) {
return (
/**
* @param {ol.Map} map Map.
* @param {?ol.FrameState} frameState Frame state.
*/
function(map, frameState) {
if (frameState.time < start) {
frameState.animate = true;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
@@ -65,7 +75,7 @@ ol.animation.pan = function(options) {
} else {
return false;
}
};
});
};
@@ -80,7 +90,12 @@ ol.animation.rotate = function(options) {
var easing = goog.isDef(options.easing) ?
options.easing : ol.easing.inAndOut;
return function(map, frameState) {
return (
/**
* @param {ol.Map} map Map.
* @param {?ol.FrameState} frameState Frame state.
*/
function(map, frameState) {
if (frameState.time < start) {
frameState.animate = true;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
@@ -96,7 +111,7 @@ ol.animation.rotate = function(options) {
} else {
return false;
}
};
});
};
@@ -110,7 +125,12 @@ ol.animation.zoom = function(options) {
var duration = goog.isDef(options.duration) ? options.duration : 1000;
var easing = goog.isDef(options.easing) ?
options.easing : ol.easing.inAndOut;
return function(map, frameState) {
return (
/**
* @param {ol.Map} map Map.
* @param {?ol.FrameState} frameState Frame state.
*/
function(map, frameState) {
if (frameState.time < start) {
frameState.animate = true;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
@@ -126,5 +146,5 @@ ol.animation.zoom = function(options) {
} else {
return false;
}
};
});
};