Rename _ol_Kinetic_ to Kinetic

This commit is contained in:
Frederic Junod
2017-12-16 08:06:48 +01:00
parent 44faf4462c
commit 935133755e
2 changed files with 10 additions and 9 deletions
+8 -7
View File
@@ -1,6 +1,7 @@
/** /**
* @module ol/Kinetic * @module ol/Kinetic
*/ */
/** /**
* @classdesc * @classdesc
* Implementation of inertial deceleration for map movement. * Implementation of inertial deceleration for map movement.
@@ -13,7 +14,7 @@
* @struct * @struct
* @api * @api
*/ */
var _ol_Kinetic_ = function(decay, minVelocity, delay) { var Kinetic = function(decay, minVelocity, delay) {
/** /**
* @private * @private
@@ -56,7 +57,7 @@ var _ol_Kinetic_ = function(decay, minVelocity, delay) {
/** /**
* FIXME empty description for jsdoc * FIXME empty description for jsdoc
*/ */
_ol_Kinetic_.prototype.begin = function() { Kinetic.prototype.begin = function() {
this.points_.length = 0; this.points_.length = 0;
this.angle_ = 0; this.angle_ = 0;
this.initialVelocity_ = 0; this.initialVelocity_ = 0;
@@ -67,7 +68,7 @@ _ol_Kinetic_.prototype.begin = function() {
* @param {number} x X. * @param {number} x X.
* @param {number} y Y. * @param {number} y Y.
*/ */
_ol_Kinetic_.prototype.update = function(x, y) { Kinetic.prototype.update = function(x, y) {
this.points_.push(x, y, Date.now()); this.points_.push(x, y, Date.now());
}; };
@@ -75,7 +76,7 @@ _ol_Kinetic_.prototype.update = function(x, y) {
/** /**
* @return {boolean} Whether we should do kinetic animation. * @return {boolean} Whether we should do kinetic animation.
*/ */
_ol_Kinetic_.prototype.end = function() { Kinetic.prototype.end = function() {
if (this.points_.length < 6) { if (this.points_.length < 6) {
// at least 2 points are required (i.e. there must be at least 6 elements // at least 2 points are required (i.e. there must be at least 6 elements
// in the array) // in the array)
@@ -114,7 +115,7 @@ _ol_Kinetic_.prototype.end = function() {
/** /**
* @return {number} Total distance travelled (pixels). * @return {number} Total distance travelled (pixels).
*/ */
_ol_Kinetic_.prototype.getDistance = function() { Kinetic.prototype.getDistance = function() {
return (this.minVelocity_ - this.initialVelocity_) / this.decay_; return (this.minVelocity_ - this.initialVelocity_) / this.decay_;
}; };
@@ -122,7 +123,7 @@ _ol_Kinetic_.prototype.getDistance = function() {
/** /**
* @return {number} Angle of the kinetic panning animation (radians). * @return {number} Angle of the kinetic panning animation (radians).
*/ */
_ol_Kinetic_.prototype.getAngle = function() { Kinetic.prototype.getAngle = function() {
return this.angle_; return this.angle_;
}; };
export default _ol_Kinetic_; export default Kinetic;
+2 -2
View File
@@ -2,7 +2,7 @@
* @module ol/interaction * @module ol/interaction
*/ */
import _ol_Collection_ from './Collection.js'; import _ol_Collection_ from './Collection.js';
import _ol_Kinetic_ from './Kinetic.js'; import Kinetic from './Kinetic.js';
import DoubleClickZoom from './interaction/DoubleClickZoom.js'; import DoubleClickZoom from './interaction/DoubleClickZoom.js';
import DragPan from './interaction/DragPan.js'; import DragPan from './interaction/DragPan.js';
import DragRotate from './interaction/DragRotate.js'; import DragRotate from './interaction/DragRotate.js';
@@ -44,7 +44,7 @@ _ol_interaction_.defaults = function(opt_options) {
var interactions = new _ol_Collection_(); var interactions = new _ol_Collection_();
var kinetic = new _ol_Kinetic_(-0.005, 0.05, 100); var kinetic = new Kinetic(-0.005, 0.05, 100);
var altShiftDragRotate = options.altShiftDragRotate !== undefined ? var altShiftDragRotate = options.altShiftDragRotate !== undefined ?
options.altShiftDragRotate : true; options.altShiftDragRotate : true;