cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable worldCopyJump by default, minor cleanup

Browse Source
This commit is contained in:
Vladimir Agafonkin 2012-12-11 15:02:15 +02:00
parent f203c244d4
commit b9d0d60a04
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/map/handler/Map.Drag.js
View File

@ -14,7 +14,7 @@ L.Map.mergeOptions({
longPress: true, longPress: true,
// TODO refactor, move to CRS // TODO refactor, move to CRS
worldCopyJump: true worldCopyJump: false
}); });
L.Map.Drag = L.Handler.extend({ L.Map.Drag = L.Handler.extend({
@ -83,6 +83,7 @@ L.Map.Drag = L.Handler.extend({
}, },
_onViewReset: function () { _onViewReset: function () {
// TODO fix hardcoded Earth values
var pxCenter = this._map.getSize()._divideBy(2), var pxCenter = this._map.getSize()._divideBy(2),
pxWorldCenter = this._map.latLngToLayerPoint(new L.LatLng(0, 0)); pxWorldCenter = this._map.latLngToLayerPoint(new L.LatLng(0, 0));
@ -109,9 +110,7 @@ L.Map.Drag = L.Handler.extend({
options = map.options, options = map.options,
delay = +new Date() - this._lastTime, delay = +new Date() - this._lastTime,
noInertia = !options.inertia || noInertia = !options.inertia || delay > options.inertiaThreshold || !this._positions[0];
delay > options.inertiaThreshold ||
!this._positions[0];
if (noInertia) { if (noInertia) {
map.fire('moveend'); map.fire('moveend');
@ -120,18 +119,19 @@ L.Map.Drag = L.Handler.extend({
var direction = this._lastPos.subtract(this._positions[0]), var direction = this._lastPos.subtract(this._positions[0]),
duration = (this._lastTime + delay - this._times[0]) / 1000, duration = (this._lastTime + delay - this._times[0]) / 1000,
ease = options.easeLinearity,
speedVector = direction.multiplyBy(options.easeLinearity / duration), speedVector = direction.multiplyBy(ease / duration),
speed = speedVector.distanceTo(new L.Point(0, 0)), speed = speedVector.distanceTo(new L.Point(0, 0)),
limitedSpeed = Math.min(options.inertiaMaxSpeed, speed), limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed), limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
decelerationDuration = limitedSpeed / (options.inertiaDeceleration * options.easeLinearity), decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round(); offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
L.Util.requestAnimFrame(function () { L.Util.requestAnimFrame(function () {
map.panBy(offset, decelerationDuration, options.easeLinearity); map.panBy(offset, decelerationDuration, ease);
}); });
} }