@antv/l7-map 2.17.12 → 2.18.0

package/lib/handler/handler_inertia.js

@@ -1,56 +1,46 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _point = _interopRequireDefault(require("../geo/point"));
-
-var _merge = _interopRequireDefault(require("lodash/merge"));
-
+var _l7Utils = require("@antv/l7-utils");
 var _util = require("../util");
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } // @ts-ignore
+// tslint:disable-next-line:no-submodule-imports
+var merge = _l7Utils.lodashUtil.merge;
 var defaultInertiaOptions = {
   linearity: 0.3,
   easing: (0, _util.bezier)(0, 0, 0.3, 1)
 };
-var defaultPanInertiaOptions = (0, _merge.default)({
+var defaultPanInertiaOptions = merge({
   deceleration: 2500,
   maxSpeed: 1400
 }, defaultInertiaOptions);
-var defaultZoomInertiaOptions = (0, _merge.default)({
+var defaultZoomInertiaOptions = merge({
   deceleration: 20,
   maxSpeed: 1400
 }, defaultInertiaOptions);
-var defaultBearingInertiaOptions = (0, _merge.default)({
+var defaultBearingInertiaOptions = merge({
   deceleration: 1000,
   maxSpeed: 360
 }, defaultInertiaOptions);
-var defaultPitchInertiaOptions = (0, _merge.default)({
+var defaultPitchInertiaOptions = merge({
   deceleration: 1000,
   maxSpeed: 90
 }, defaultInertiaOptions);
-
 var HandlerInertia = /*#__PURE__*/function () {
   function HandlerInertia(map) {
     (0, _classCallCheck2.default)(this, HandlerInertia);
     this.map = map;
     this.clear();
   }
-
   (0, _createClass2.default)(HandlerInertia, [{
     key: "clear",
     value: function clear() {
@@ -80,11 +70,9 @@ var HandlerInertia = /*#__PURE__*/function () {
     key: "onMoveEnd",
     value: function onMoveEnd(panInertiaOptions) {
       this.drainInertiaBuffer();
-
       if (this.inertiaBuffer.length < 2) {
         return;
       }
-
       var deltas = {
         zoom: 0,
         bearing: 0,
@@ -93,25 +81,20 @@ var HandlerInertia = /*#__PURE__*/function () {
         pinchAround: undefined,
         around: undefined
       };
-
       var _iterator = _createForOfIteratorHelper(this.inertiaBuffer),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var settings = _step.value.settings;
           deltas.zoom += settings.zoomDelta || 0;
           deltas.bearing += settings.bearingDelta || 0;
           deltas.pitch += settings.pitchDelta || 0;
-
           if (settings.panDelta) {
             deltas.pan._add(settings.panDelta);
           }
-
           if (settings.around) {
             deltas.around = settings.around;
           }
-
           if (settings.pinchAround) {
             deltas.pinchAround = settings.pinchAround;
           }
@@ -121,46 +104,36 @@ var HandlerInertia = /*#__PURE__*/function () {
       } finally {
         _iterator.f();
       }
-
       var lastEntry = this.inertiaBuffer[this.inertiaBuffer.length - 1];
       var duration = lastEntry.time - this.inertiaBuffer[0].time;
       var easeOptions = {};
-
       if (deltas.pan.mag()) {
-        var result = calculateEasing(deltas.pan.mag(), duration, (0, _merge.default)({}, defaultPanInertiaOptions, panInertiaOptions || {}));
+        var result = calculateEasing(deltas.pan.mag(), duration, merge({}, defaultPanInertiaOptions, panInertiaOptions || {}));
         easeOptions.offset = deltas.pan.mult(result.amount / deltas.pan.mag());
         easeOptions.center = this.map.transform.center;
         extendDuration(easeOptions, result);
       }
-
       if (deltas.zoom) {
         var _result = calculateEasing(deltas.zoom, duration, defaultZoomInertiaOptions);
-
         easeOptions.zoom = this.map.transform.zoom + _result.amount;
         extendDuration(easeOptions, _result);
       }
-
       if (deltas.bearing) {
         var _result2 = calculateEasing(deltas.bearing, duration, defaultBearingInertiaOptions);
-
         easeOptions.bearing = this.map.transform.bearing + (0, _util.clamp)(_result2.amount, -179, 179);
         extendDuration(easeOptions, _result2);
       }
-
       if (deltas.pitch) {
         var _result3 = calculateEasing(deltas.pitch, duration, defaultPitchInertiaOptions);
-
         easeOptions.pitch = this.map.transform.pitch + _result3.amount;
         extendDuration(easeOptions, _result3);
       }
-
       if (easeOptions.zoom || easeOptions.bearing) {
         var last = deltas.pinchAround === undefined ? deltas.around : deltas.pinchAround;
         easeOptions.around = last ? this.map.unproject(last) : this.map.getCenter();
       }
-
       this.clear();
-      return (0, _merge.default)(easeOptions, {
+      return merge(easeOptions, {
         noMoveStart: true
       });
     }
@@ -168,21 +141,17 @@ var HandlerInertia = /*#__PURE__*/function () {
   return HandlerInertia;
 }(); // Unfortunately zoom, bearing, etc can't have different durations and easings so
 // we need to choose one. We use the longest duration and it's corresponding easing.
-
-
 exports.default = HandlerInertia;
-
 function extendDuration(easeOptions, result) {
   if (!easeOptions.duration || easeOptions.duration < result.duration) {
     easeOptions.duration = result.duration;
     easeOptions.easing = result.easing;
   }
 }
-
 function calculateEasing(amount, inertiaDuration, inertiaOptions) {
   var maxSpeed = inertiaOptions.maxSpeed,
-      linearity = inertiaOptions.linearity,
-      deceleration = inertiaOptions.deceleration;
+    linearity = inertiaOptions.linearity,
+    deceleration = inertiaOptions.deceleration;
   var speed = (0, _util.clamp)(amount * linearity / (inertiaDuration / 1000), -maxSpeed, maxSpeed);
   var duration = Math.abs(speed) / (deceleration * linearity);
   return {