@antv/l7-map 2.17.11 → 2.17.12

package/es/handler/scroll_zoom.js

@@ -2,25 +2,22 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 // @ts-ignore
-
 import LngLat from "../geo/lng_lat";
 import { bezier, ease, interpolate, now } from "../util";
 import DOM from "../utils/dom";
 // deltaY value for mouse scroll wheel identification
-var wheelZoomDelta = 4.000244140625;
-
-// These magic numbers control the rate of zoom. Trackpad events fire at a greater
+var wheelZoomDelta = 4.000244140625; // These magic numbers control the rate of zoom. Trackpad events fire at a greater
 // frequency than mouse scroll wheel, so reduce the zoom rate per wheel tick
-var defaultZoomRate = 1 / 100;
-var wheelZoomRate = 1 / 450;
 
-// upper bound on how much we scale the map in any single render frame; this
+var defaultZoomRate = 1 / 100;
+var wheelZoomRate = 1 / 450; // upper bound on how much we scale the map in any single render frame; this
 // is used to limit zoom rate in the case of very fast scrolling
-var maxScalePerFrame = 2;
 
+var maxScalePerFrame = 2;
 /**
  * The `ScrollZoomHandler` allows the user to zoom the map by scrolling.
  */
+
 var ScrollZoomHandler = /*#__PURE__*/function () {
   // used for delayed-handling of a single wheel movement
   // used to delay final '{move,zoom}end' events
@@ -30,48 +27,57 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
    */
   function ScrollZoomHandler(map, handler) {
     var _this = this;
+
     _classCallCheck(this, ScrollZoomHandler);
+
     _defineProperty(this, "onScrollFrame", function () {
       if (!_this.frameId) {
         return;
       }
+
       _this.frameId = null;
+
       if (!_this.isActive()) {
         return;
       }
-      var tr = _this.map.transform;
 
-      // if we've had scroll events since the last render frame, consume the
+      var tr = _this.map.transform; // if we've had scroll events since the last render frame, consume the
       // accumulated delta, and update the target zoom level accordingly
+
       if (_this.delta !== 0) {
         // For trackpad events and single mouse wheel ticks, use the default zoom rate
-        var zoomRate = _this.type === 'wheel' && Math.abs(_this.delta) > wheelZoomDelta ? _this.wheelZoomRate : _this.defaultZoomRate;
-        // Scale by sigmoid of scroll wheel delta.
+        var zoomRate = _this.type === 'wheel' && Math.abs(_this.delta) > wheelZoomDelta ? _this.wheelZoomRate : _this.defaultZoomRate; // Scale by sigmoid of scroll wheel delta.
+
         var scale = maxScalePerFrame / (1 + Math.exp(-Math.abs(_this.delta * zoomRate)));
+
         if (_this.delta < 0 && scale !== 0) {
           scale = 1 / scale;
         }
-        var fromScale = typeof _this.targetZoom === 'number' ? tr.zoomScale(_this.targetZoom) : tr.scale;
-        _this.targetZoom = Math.min(tr.maxZoom, Math.max(tr.minZoom, tr.scaleZoom(fromScale * scale)));
 
-        // if this is a mouse wheel, refresh the starting zoom and easing
+        var fromScale = typeof _this.targetZoom === 'number' ? tr.zoomScale(_this.targetZoom) : tr.scale;
+        _this.targetZoom = Math.min(tr.maxZoom, Math.max(tr.minZoom, tr.scaleZoom(fromScale * scale))); // if this is a mouse wheel, refresh the starting zoom and easing
         // function we're using to smooth out the zooming between wheel
         // events
+
         if (_this.type === 'wheel') {
           _this.startZoom = tr.zoom;
           _this.easing = _this.smoothOutEasing(200);
         }
+
         _this.delta = 0;
       }
+
       var targetZoom = typeof _this.targetZoom === 'number' ? _this.targetZoom : tr.zoom;
       var startZoom = _this.startZoom;
       var easing = _this.easing;
       var finished = false;
       var zoom;
+
       if (_this.type === 'wheel' && startZoom && easing) {
         var t = Math.min((now() - _this.lastWheelEventTime) / 200, 1);
         var k = easing(t);
         zoom = interpolate(startZoom, targetZoom, k);
+
         if (t < 1) {
           if (!_this.frameId) {
             _this.frameId = true;
@@ -83,19 +89,24 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
         zoom = targetZoom;
         finished = true;
       }
+
       _this.active = true;
+
       if (finished) {
-        _this.active = false;
-        // @ts-ignore
+        _this.active = false; // @ts-ignore
+
         _this.finishTimeout = setTimeout(function () {
           _this.zooming = false;
-          _this.handler.triggerRenderFrame();
-          // @ts-ignore
-          delete _this.targetZoom;
-          // @ts-ignore
+
+          _this.handler.triggerRenderFrame(); // @ts-ignore
+
+
+          delete _this.targetZoom; // @ts-ignore
+
           delete _this.finishTimeout;
         }, 200);
       }
+
       return {
         noInertia: true,
         needsRenderFrame: !finished,
@@ -104,6 +115,7 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
         originalEvent: _this.lastWheelEvent
       };
     });
+
     this.map = map;
     this.el = map.getCanvasContainer();
     this.handler = handler;
@@ -111,7 +123,6 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
     this.defaultZoomRate = defaultZoomRate;
     this.wheelZoomRate = wheelZoomRate;
   }
-
   /**
    * Set the zoom rate of a trackpad
    * @param {number} [zoomRate=1/100] The rate used to scale trackpad movement to a zoom value.
@@ -119,12 +130,13 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
    * // Speed up trackpad zoom
    * map.scrollZoom.setZoomRate(1/25);
    */
+
+
   _createClass(ScrollZoomHandler, [{
     key: "setZoomRate",
     value: function setZoomRate(zoomRate) {
       this.defaultZoomRate = zoomRate;
     }
-
     /**
      * Set the zoom rate of a mouse wheel
      * @param {number} [wheelZoomRate=1/450] The rate used to scale mouse wheel movement to a zoom value.
@@ -132,28 +144,29 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
      * // Slow down zoom of mouse wheel
      * map.scrollZoom.setWheelZoomRate(1/600);
      */
+
   }, {
     key: "setWheelZoomRate",
     value: function setWheelZoomRate(zoomRate) {
       this.wheelZoomRate = zoomRate;
     }
-
     /**
      * Returns a Boolean indicating whether the "scroll to zoom" interaction is enabled.
      *
      * @returns {boolean} `true` if the "scroll to zoom" interaction is enabled.
      */
+
   }, {
     key: "isEnabled",
     value: function isEnabled() {
       return !!this.enabled;
     }
-
     /*
      * Active state is turned on and off with every scroll wheel event and is set back to false before the map
      * render is called, so _active is not a good candidate for determining if a scroll zoom animation is in
      * progress.
      */
+
   }, {
     key: "isActive",
     value: function isActive() {
@@ -164,7 +177,6 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
     value: function isZooming() {
       return !!this.zooming;
     }
-
     /**
      * Enables the "scroll to zoom" interaction.
      *
@@ -176,28 +188,31 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
      * @example
      *  map.scrollZoom.enable({ around: 'center' })
      */
+
   }, {
     key: "enable",
     value: function enable(options) {
       if (this.isEnabled()) {
         return;
       }
+
       this.enabled = true;
       this.aroundCenter = options && options.around === 'center';
     }
-
     /**
      * Disables the "scroll to zoom" interaction.
      *
      * @example
      *   map.scrollZoom.disable();
      */
+
   }, {
     key: "disable",
     value: function disable() {
       if (!this.isEnabled()) {
         return;
       }
+
       this.enabled = false;
     }
   }, {
@@ -205,12 +220,14 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
     value: function wheel(e) {
       if (!this.isEnabled()) {
         return;
-      }
-      // Remove `any` cast when https://github.com/facebook/flow/issues/4879 is fixed.
+      } // Remove `any` cast when https://github.com/facebook/flow/issues/4879 is fixed.
+
+
       var value = e.deltaMode === window.WheelEvent.DOM_DELTA_LINE ? e.deltaY * 40 : e.deltaY;
       var nowTime = now();
       var timeDelta = nowTime - (this.lastWheelEventTime || 0);
       this.lastWheelEventTime = nowTime;
+
       if (value !== 0 && value % wheelZoomDelta === 0) {
         // This one is definitely a mouse wheel event.
         this.type = 'wheel';
@@ -220,37 +237,38 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
       } else if (timeDelta > 400) {
         // This is likely a new scroll action.
         this.type = null;
-        this.lastValue = value;
-
-        // Start a timeout in case this was a singular event, and dely it by up to 40ms.
+        this.lastValue = value; // Start a timeout in case this was a singular event, and dely it by up to 40ms.
         // @ts-ignore
+
         this.timeout = setTimeout(this.onTimeout, 40, e);
       } else if (!this.type) {
         // This is a repeating event, but we don't know the type of event just yet.
         // If the delta per time is small, we assume it's a fast trackpad; otherwise we switch into wheel mode.
-        this.type = Math.abs(timeDelta * value) < 200 ? 'trackpad' : 'wheel';
-
-        // Make sure our delayed event isn't fired again, because we accumulate
+        this.type = Math.abs(timeDelta * value) < 200 ? 'trackpad' : 'wheel'; // Make sure our delayed event isn't fired again, because we accumulate
         // the previous event (which was less than 40ms ago) into this event.
+
         if (this.timeout) {
           clearTimeout(this.timeout);
           this.timeout = null;
           value += this.lastValue;
         }
-      }
+      } // Slow down zoom if shift key is held for more precise zooming
+
 
-      // Slow down zoom if shift key is held for more precise zooming
       if (e.shiftKey && value) {
         value = value / 4;
-      }
-      // Only fire the callback if we actually know what type of scrolling device the user uses.
+      } // Only fire the callback if we actually know what type of scrolling device the user uses.
+
+
       if (this.type) {
         this.lastWheelEvent = e;
         this.delta -= value;
+
         if (!this.active) {
           this.start(e);
         }
       }
+
       e.preventDefault();
     }
   }, {
@@ -268,6 +286,7 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
     value: function onTimeout(initialEvent) {
       this.type = 'wheel';
       this.delta -= this.lastValue;
+
       if (!this.active && this.start) {
         this.start(initialEvent);
       }
@@ -278,21 +297,27 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
       if (!this.delta) {
         return;
       }
+
       if (this.frameId) {
         this.frameId = null;
       }
+
       this.active = true;
+
       if (!this.isZooming()) {
         this.zooming = true;
       }
+
       if (this.finishTimeout) {
-        clearTimeout(this.finishTimeout);
-        // @ts-ignore
+        clearTimeout(this.finishTimeout); // @ts-ignore
+
         delete this.finishTimeout;
       }
+
       var pos = DOM.mousePos(this.el, e);
       this.around = LngLat.convert(this.aroundCenter ? this.map.getCenter() : this.map.unproject(pos));
       this.aroundPoint = this.map.transform.locationPoint(this.around);
+
       if (!this.frameId) {
         this.frameId = true;
         this.handler.triggerRenderFrame();
@@ -302,16 +327,17 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
     key: "smoothOutEasing",
     value: function smoothOutEasing(duration) {
       var easing = ease;
+
       if (this.prevEase) {
         var preEase = this.prevEase;
         var t = (now() - preEase.start) / preEase.duration;
-        var speed = preEase.easing(t + 0.01) - preEase.easing(t);
+        var speed = preEase.easing(t + 0.01) - preEase.easing(t); // Quick hack to make new bezier that is continuous with last
 
-        // Quick hack to make new bezier that is continuous with last
         var x = 0.27 / Math.sqrt(speed * speed + 0.0001) * 0.01;
         var y = Math.sqrt(0.27 * 0.27 - x * x);
         easing = bezier(x, y, 0.25, 1);
       }
+
       this.prevEase = {
         start: now(),
         duration: duration,
@@ -320,6 +346,8 @@ var ScrollZoomHandler = /*#__PURE__*/function () {
       return easing;
     }
   }]);
+
   return ScrollZoomHandler;
 }();
+
 export default ScrollZoomHandler;

package/es/handler/shim/dblclick_zoom.js

@@ -1,5 +1,6 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+
 /**
  * The `DoubleClickZoomHandler` allows the user to zoom the map at a point by
  * double clicking or double tapping.
@@ -10,58 +11,62 @@ var DoubleClickZoomHandler = /*#__PURE__*/function () {
    */
   function DoubleClickZoomHandler(clickZoom, TapZoom) {
     _classCallCheck(this, DoubleClickZoomHandler);
+
     this.clickZoom = clickZoom;
     this.tapZoom = TapZoom;
   }
-
   /**
    * Enables the "double click to zoom" interaction.
    *
    * @example
    * map.doubleClickZoom.enable();
    */
+
+
   _createClass(DoubleClickZoomHandler, [{
     key: "enable",
     value: function enable() {
       this.clickZoom.enable();
       this.tapZoom.enable();
     }
-
     /**
      * Disables the "double click to zoom" interaction.
      *
      * @example
      * map.doubleClickZoom.disable();
      */
+
   }, {
     key: "disable",
     value: function disable() {
       this.clickZoom.disable();
       this.tapZoom.disable();
     }
-
     /**
      * Returns a Boolean indicating whether the "double click to zoom" interaction is enabled.
      *
      * @returns {boolean} `true` if the "double click to zoom" interaction is enabled.
      */
+
   }, {
     key: "isEnabled",
     value: function isEnabled() {
       return this.clickZoom.isEnabled() && this.tapZoom.isEnabled();
     }
-
     /**
      * Returns a Boolean indicating whether the "double click to zoom" interaction is active, i.e. currently being used.
      *
      * @returns {boolean} `true` if the "double click to zoom" interaction is active.
      */
+
   }, {
     key: "isActive",
     value: function isActive() {
       return this.clickZoom.isActive() || this.tapZoom.isActive();
     }
   }]);
+
   return DoubleClickZoomHandler;
 }();
+
 export { DoubleClickZoomHandler as default };

package/es/handler/shim/drag_pan.js

@@ -1,6 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { isMini } from '@antv/l7-utils';
+
 /**
  * The `DragPanHandler` allows the user to pan the map by clicking and dragging
  * the cursor.
@@ -11,11 +12,11 @@ var DragPanHandler = /*#__PURE__*/function () {
    */
   function DragPanHandler(el, mousePan, touchPan) {
     _classCallCheck(this, DragPanHandler);
+
     this.el = el;
     this.mousePan = mousePan;
     this.touchPan = touchPan;
   }
-
   /**
    * Enables the "drag to pan" interaction.
    *
@@ -35,55 +36,61 @@ var DragPanHandler = /*#__PURE__*/function () {
    *      deceleration: 2500,
    *   });
    */
+
+
   _createClass(DragPanHandler, [{
     key: "enable",
     value: function enable(options) {
       this.inertiaOptions = options || {};
       this.mousePan.enable();
       this.touchPan.enable();
+
       if (!isMini) {
         this.el.classList.add('l7-touch-drag-pan');
       }
     }
-
     /**
      * Disables the "drag to pan" interaction.
      *
      * @example
      * map.dragPan.disable();
      */
+
   }, {
     key: "disable",
     value: function disable() {
       this.mousePan.disable();
       this.touchPan.disable();
+
       if (!isMini) {
         this.el.classList.remove('l7-touch-drag-pan');
       }
     }
-
     /**
      * Returns a Boolean indicating whether the "drag to pan" interaction is enabled.
      *
      * @returns {boolean} `true` if the "drag to pan" interaction is enabled.
      */
+
   }, {
     key: "isEnabled",
     value: function isEnabled() {
       return this.mousePan.isEnabled() && this.touchPan.isEnabled();
     }
-
     /**
      * Returns a Boolean indicating whether the "drag to pan" interaction is active, i.e. currently being used.
      *
      * @returns {boolean} `true` if the "drag to pan" interaction is active.
      */
+
   }, {
     key: "isActive",
     value: function isActive() {
       return this.mousePan.isActive() || this.touchPan.isActive();
     }
   }]);
+
   return DragPanHandler;
 }();
+
 export { DragPanHandler as default };

package/es/handler/shim/drag_rotate.js

@@ -1,5 +1,6 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+
 /**
  * The `DragRotateHandler` allows the user to rotate the map by clicking and
  * dragging the cursor while holding the right mouse button or `ctrl` key.
@@ -14,61 +15,66 @@ var DragRotateHandler = /*#__PURE__*/function () {
    */
   function DragRotateHandler(options, mouseRotate, mousePitch) {
     _classCallCheck(this, DragRotateHandler);
+
     this.pitchWithRotate = options.pitchWithRotate;
     this.mouseRotate = mouseRotate;
     this.mousePitch = mousePitch;
   }
-
   /**
    * Enables the "drag to rotate" interaction.
    *
    * @example
    * map.dragRotate.enable();
    */
+
+
   _createClass(DragRotateHandler, [{
     key: "enable",
     value: function enable() {
       this.mouseRotate.enable();
+
       if (this.pitchWithRotate) {
         this.mousePitch.enable();
       }
     }
-
     /**
      * Disables the "drag to rotate" interaction.
      *
      * @example
      * map.dragRotate.disable();
      */
+
   }, {
     key: "disable",
     value: function disable() {
       this.mouseRotate.disable();
       this.mousePitch.disable();
     }
-
     /**
      * Returns a Boolean indicating whether the "drag to rotate" interaction is enabled.
      *
      * @returns {boolean} `true` if the "drag to rotate" interaction is enabled.
      */
+
   }, {
     key: "isEnabled",
     value: function isEnabled() {
       return this.mouseRotate.isEnabled() && (!this.pitchWithRotate || this.mousePitch.isEnabled());
     }
-
     /**
      * Returns a Boolean indicating whether the "drag to rotate" interaction is active, i.e. currently being used.
      *
      * @returns {boolean} `true` if the "drag to rotate" interaction is active.
      */
+
   }, {
     key: "isActive",
     value: function isActive() {
       return this.mouseRotate.isActive() || this.mousePitch.isActive();
     }
   }]);
+
   return DragRotateHandler;
 }();
+
 export { DragRotateHandler as default };