@antv/l7-map 2.21.0 → 2.21.2

package/lib/handler/shim/touch_zoom_rotate.js

@@ -5,8 +5,7 @@ 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 /**
  * The `TouchZoomRotateHandler` allows the user to zoom and rotate the map by
  * pinching on a touchscreen.
@@ -14,12 +13,17 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
  * They can zoom with one finger by double tapping and dragging. On the second tap,
  * hold the finger down and drag up or down to zoom in or out.
  */
-var TouchZoomRotateHandler = exports.default = /*#__PURE__*/function () {
+class TouchZoomRotateHandler {
   /**
    * @private
    */
-  function TouchZoomRotateHandler(el, touchZoom, touchRotate, tapDragZoom) {
-    (0, _classCallCheck2.default)(this, TouchZoomRotateHandler);
+  constructor(el, touchZoom, touchRotate, tapDragZoom) {
+    (0, _defineProperty2.default)(this, "el", void 0);
+    (0, _defineProperty2.default)(this, "touchZoom", void 0);
+    (0, _defineProperty2.default)(this, "touchRotate", void 0);
+    (0, _defineProperty2.default)(this, "tapDragZoom", void 0);
+    (0, _defineProperty2.default)(this, "rotationDisabled", void 0);
+    (0, _defineProperty2.default)(this, "enabled", void 0);
     this.el = el;
     this.touchZoom = touchZoom;
     this.touchRotate = touchRotate;
@@ -39,83 +43,70 @@ var TouchZoomRotateHandler = exports.default = /*#__PURE__*/function () {
    * @example
    *   map.touchZoomRotate.enable({ around: 'center' });
    */
-  (0, _createClass2.default)(TouchZoomRotateHandler, [{
-    key: "enable",
-    value: function enable(options) {
-      this.touchZoom.enable(options);
-      if (!this.rotationDisabled) {
-        this.touchRotate.enable(options);
-      }
-      this.tapDragZoom.enable();
-      this.el.classList.add('l7-touch-zoom-rotate');
+  enable(options) {
+    this.touchZoom.enable(options);
+    if (!this.rotationDisabled) {
+      this.touchRotate.enable(options);
     }
+    this.tapDragZoom.enable();
+    this.el.classList.add('l7-touch-zoom-rotate');
+  }
 
-    /**
-     * Disables the "pinch to rotate and zoom" interaction.
-     *
-     * @example
-     *   map.touchZoomRotate.disable();
-     */
-  }, {
-    key: "disable",
-    value: function disable() {
-      this.touchZoom.disable();
-      this.touchRotate.disable();
-      this.tapDragZoom.disable();
-      this.el.classList.remove('l7-touch-zoom-rotate');
-    }
+  /**
+   * Disables the "pinch to rotate and zoom" interaction.
+   *
+   * @example
+   *   map.touchZoomRotate.disable();
+   */
+  disable() {
+    this.touchZoom.disable();
+    this.touchRotate.disable();
+    this.tapDragZoom.disable();
+    this.el.classList.remove('l7-touch-zoom-rotate');
+  }
 
-    /**
-     * Returns a Boolean indicating whether the "pinch to rotate and zoom" interaction is enabled.
-     *
-     * @returns {boolean} `true` if the "pinch to rotate and zoom" interaction is enabled.
-     */
-  }, {
-    key: "isEnabled",
-    value: function isEnabled() {
-      return this.touchZoom.isEnabled() && (this.rotationDisabled || this.touchRotate.isEnabled()) && this.tapDragZoom.isEnabled();
-    }
+  /**
+   * Returns a Boolean indicating whether the "pinch to rotate and zoom" interaction is enabled.
+   *
+   * @returns {boolean} `true` if the "pinch to rotate and zoom" interaction is enabled.
+   */
+  isEnabled() {
+    return this.touchZoom.isEnabled() && (this.rotationDisabled || this.touchRotate.isEnabled()) && this.tapDragZoom.isEnabled();
+  }
 
-    /**
-     * Returns true if the handler is enabled and has detected the start of a zoom/rotate gesture.
-     *
-     * @returns {boolean} //eslint-disable-line
-     */
-  }, {
-    key: "isActive",
-    value: function isActive() {
-      return this.touchZoom.isActive() || this.touchRotate.isActive() || this.tapDragZoom.isActive();
-    }
+  /**
+   * Returns true if the handler is enabled and has detected the start of a zoom/rotate gesture.
+   *
+   * @returns {boolean} //eslint-disable-line
+   */
+  isActive() {
+    return this.touchZoom.isActive() || this.touchRotate.isActive() || this.tapDragZoom.isActive();
+  }
 
-    /**
-     * Disables the "pinch to rotate" interaction, leaving the "pinch to zoom"
-     * interaction enabled.
-     *
-     * @example
-     *   map.touchZoomRotate.disableRotation();
-     */
-  }, {
-    key: "disableRotation",
-    value: function disableRotation() {
-      this.rotationDisabled = true;
-      this.touchRotate.disable();
-    }
+  /**
+   * Disables the "pinch to rotate" interaction, leaving the "pinch to zoom"
+   * interaction enabled.
+   *
+   * @example
+   *   map.touchZoomRotate.disableRotation();
+   */
+  disableRotation() {
+    this.rotationDisabled = true;
+    this.touchRotate.disable();
+  }
 
-    /**
-     * Enables the "pinch to rotate" interaction.
-     *
-     * @example
-     *   map.touchZoomRotate.enable();
-     *   map.touchZoomRotate.enableRotation();
-     */
-  }, {
-    key: "enableRotation",
-    value: function enableRotation() {
-      this.rotationDisabled = false;
-      if (this.touchZoom.isEnabled()) {
-        this.touchRotate.enable();
-      }
+  /**
+   * Enables the "pinch to rotate" interaction.
+   *
+   * @example
+   *   map.touchZoomRotate.enable();
+   *   map.touchZoomRotate.enableRotation();
+   */
+  enableRotation() {
+    this.rotationDisabled = false;
+    if (this.touchZoom.isEnabled()) {
+      this.touchRotate.enable();
     }
-  }]);
-  return TouchZoomRotateHandler;
-}();
+  }
+}
+exports.default = TouchZoomRotateHandler;

package/lib/handler/tap/single_tap_recognizer.d.ts

@@ -0,0 +1,20 @@
+import Point from '../../geo/point';
+export declare const MAX_TAP_INTERVAL = 500;
+export declare const MAX_TOUCH_TIME = 500;
+export declare const MAX_DIST = 30;
+export default class SingleTapRecognizer {
+    numTouches: number;
+    centroid: Point;
+    startTime: number;
+    aborted: boolean;
+    touches: {
+        [key: string]: Point;
+    };
+    constructor(options: {
+        numTouches: number;
+    });
+    reset(): void;
+    touchstart(e: TouchEvent, points: Point[], mapTouches: Touch[]): void;
+    touchmove(e: TouchEvent, points: Point[], mapTouches: Touch[]): void;
+    touchend(e: TouchEvent, points: Point[], mapTouches: Touch[]): Point | undefined;
+}

package/lib/handler/tap/single_tap_recognizer.js

@@ -5,98 +5,82 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.MAX_TOUCH_TIME = exports.MAX_TAP_INTERVAL = exports.MAX_DIST = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _point = _interopRequireDefault(require("../../geo/point"));
 var _handler_util = require("../handler_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; } // @ts-ignore
+// @ts-ignore
+
 function getCentroid(points) {
-  var sum = new _point.default(0, 0);
-  var _iterator = _createForOfIteratorHelper(points),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var point = _step.value;
-      sum._add(point);
-    }
-    // @ts-ignore
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+  const sum = new _point.default(0, 0);
+  for (const point of points) {
+    sum._add(point);
   }
+  // @ts-ignore
   return sum.div(points.length);
 }
-var MAX_TAP_INTERVAL = exports.MAX_TAP_INTERVAL = 500;
-var MAX_TOUCH_TIME = exports.MAX_TOUCH_TIME = 500;
-var MAX_DIST = exports.MAX_DIST = 30;
-var SingleTapRecognizer = exports.default = /*#__PURE__*/function () {
-  function SingleTapRecognizer(options) {
-    (0, _classCallCheck2.default)(this, SingleTapRecognizer);
+const MAX_TAP_INTERVAL = exports.MAX_TAP_INTERVAL = 500;
+const MAX_TOUCH_TIME = exports.MAX_TOUCH_TIME = 500;
+const MAX_DIST = exports.MAX_DIST = 30;
+class SingleTapRecognizer {
+  constructor(options) {
+    (0, _defineProperty2.default)(this, "numTouches", void 0);
+    (0, _defineProperty2.default)(this, "centroid", void 0);
+    (0, _defineProperty2.default)(this, "startTime", void 0);
+    (0, _defineProperty2.default)(this, "aborted", void 0);
+    (0, _defineProperty2.default)(this, "touches", void 0);
     this.reset();
     this.numTouches = options.numTouches;
   }
-  (0, _createClass2.default)(SingleTapRecognizer, [{
-    key: "reset",
-    value: function reset() {
-      // @ts-ignore
-      delete this.centroid;
-      // @ts-ignore
-      delete this.startTime;
-      // @ts-ignore
-      delete this.touches;
-      this.aborted = false;
+  reset() {
+    // @ts-ignore
+    delete this.centroid;
+    // @ts-ignore
+    delete this.startTime;
+    // @ts-ignore
+    delete this.touches;
+    this.aborted = false;
+  }
+  touchstart(e, points, mapTouches) {
+    if (this.centroid || mapTouches.length > this.numTouches) {
+      this.aborted = true;
     }
-  }, {
-    key: "touchstart",
-    value: function touchstart(e, points, mapTouches) {
-      if (this.centroid || mapTouches.length > this.numTouches) {
-        this.aborted = true;
-      }
-      if (this.aborted) {
-        return;
-      }
-      if (this.startTime === undefined) {
-        this.startTime = e.timeStamp;
-      }
-      if (mapTouches.length === this.numTouches) {
-        this.centroid = getCentroid(points);
-        this.touches = (0, _handler_util.indexTouches)(mapTouches, points);
-      }
+    if (this.aborted) {
+      return;
     }
-  }, {
-    key: "touchmove",
-    value: function touchmove(e, points, mapTouches) {
-      if (this.aborted || !this.centroid) {
-        return;
-      }
-      var newTouches = (0, _handler_util.indexTouches)(mapTouches, points);
-      for (var id in this.touches) {
-        if (this.touches[id]) {
-          var prevPos = this.touches[id];
-          var pos = newTouches[id];
-          if (!pos || pos.dist(prevPos) > MAX_DIST) {
-            this.aborted = true;
-          }
+    if (this.startTime === undefined) {
+      this.startTime = e.timeStamp;
+    }
+    if (mapTouches.length === this.numTouches) {
+      this.centroid = getCentroid(points);
+      this.touches = (0, _handler_util.indexTouches)(mapTouches, points);
+    }
+  }
+  touchmove(e, points, mapTouches) {
+    if (this.aborted || !this.centroid) {
+      return;
+    }
+    const newTouches = (0, _handler_util.indexTouches)(mapTouches, points);
+    for (const id in this.touches) {
+      if (this.touches[id]) {
+        const prevPos = this.touches[id];
+        const pos = newTouches[id];
+        if (!pos || pos.dist(prevPos) > MAX_DIST) {
+          this.aborted = true;
         }
       }
     }
-  }, {
-    key: "touchend",
-    value: function touchend(e, points, mapTouches) {
-      if (!this.centroid || e.timeStamp - this.startTime > MAX_TOUCH_TIME) {
-        this.aborted = true;
-      }
-      if (mapTouches.length === 0) {
-        var centroid = !this.aborted && this.centroid;
-        this.reset();
-        if (centroid) {
-          return centroid;
-        }
+  }
+  touchend(e, points, mapTouches) {
+    if (!this.centroid || e.timeStamp - this.startTime > MAX_TOUCH_TIME) {
+      this.aborted = true;
+    }
+    if (mapTouches.length === 0) {
+      const centroid = !this.aborted && this.centroid;
+      this.reset();
+      if (centroid) {
+        return centroid;
       }
     }
-  }]);
-  return SingleTapRecognizer;
-}();
+  }
+}
+exports.default = SingleTapRecognizer;

package/lib/handler/tap/tap_drag_zoom.d.ts

@@ -0,0 +1,22 @@
+import type Point from '../../geo/point';
+import TapRecognizer from './tap_recognizer';
+export default class TapDragZoomHandler {
+    enabled: boolean;
+    active: boolean;
+    swipePoint: Point;
+    swipeTouch: number;
+    tapTime: number;
+    tap: TapRecognizer;
+    constructor();
+    reset(): void;
+    touchstart(e: TouchEvent, points: Point[], mapTouches: Touch[]): void;
+    touchmove(e: TouchEvent, points: Point[], mapTouches: Touch[]): {
+        zoomDelta: number;
+    } | undefined;
+    touchend(e: TouchEvent, points: Point[], mapTouches: Touch[]): void;
+    touchcancel(): void;
+    enable(): void;
+    disable(): void;
+    isEnabled(): boolean;
+    isActive(): boolean;
+}

package/lib/handler/tap/tap_drag_zoom.js

@@ -5,107 +5,93 @@ 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _single_tap_recognizer = require("./single_tap_recognizer");
 var _tap_recognizer = _interopRequireDefault(require("./tap_recognizer"));
 // @ts-ignore
-var TapDragZoomHandler = exports.default = /*#__PURE__*/function () {
-  function TapDragZoomHandler() {
-    (0, _classCallCheck2.default)(this, TapDragZoomHandler);
+
+class TapDragZoomHandler {
+  constructor() {
+    (0, _defineProperty2.default)(this, "enabled", void 0);
+    (0, _defineProperty2.default)(this, "active", void 0);
+    (0, _defineProperty2.default)(this, "swipePoint", void 0);
+    (0, _defineProperty2.default)(this, "swipeTouch", void 0);
+    (0, _defineProperty2.default)(this, "tapTime", void 0);
+    (0, _defineProperty2.default)(this, "tap", void 0);
     this.tap = new _tap_recognizer.default({
       numTouches: 1,
       numTaps: 1
     });
     this.reset();
   }
-  (0, _createClass2.default)(TapDragZoomHandler, [{
-    key: "reset",
-    value: function reset() {
-      this.active = false;
-      // @ts-ignore
-      delete this.swipePoint;
-      // @ts-ignore
-      delete this.swipeTouch;
-      // @ts-ignore
-      delete this.tapTime;
-      this.tap.reset();
+  reset() {
+    this.active = false;
+    // @ts-ignore
+    delete this.swipePoint;
+    // @ts-ignore
+    delete this.swipeTouch;
+    // @ts-ignore
+    delete this.tapTime;
+    this.tap.reset();
+  }
+  touchstart(e, points, mapTouches) {
+    if (this.swipePoint) {
+      return;
+    }
+    if (this.tapTime && e.timeStamp - this.tapTime > _single_tap_recognizer.MAX_TAP_INTERVAL) {
+      this.reset();
     }
-  }, {
-    key: "touchstart",
-    value: function touchstart(e, points, mapTouches) {
-      if (this.swipePoint) {
+    if (!this.tapTime) {
+      this.tap.touchstart(e, points, mapTouches);
+    } else if (mapTouches.length > 0) {
+      this.swipePoint = points[0];
+      this.swipeTouch = mapTouches[0].identifier;
+    }
+  }
+  touchmove(e, points, mapTouches) {
+    if (!this.tapTime) {
+      this.tap.touchmove(e, points, mapTouches);
+    } else if (this.swipePoint) {
+      if (mapTouches[0].identifier !== this.swipeTouch) {
         return;
       }
-      if (this.tapTime && e.timeStamp - this.tapTime > _single_tap_recognizer.MAX_TAP_INTERVAL) {
-        this.reset();
-      }
-      if (!this.tapTime) {
-        this.tap.touchstart(e, points, mapTouches);
-      } else if (mapTouches.length > 0) {
-        this.swipePoint = points[0];
-        this.swipeTouch = mapTouches[0].identifier;
-      }
+      const newSwipePoint = points[0];
+      const dist = newSwipePoint.y - this.swipePoint.y;
+      this.swipePoint = newSwipePoint;
+      e.preventDefault();
+      this.active = true;
+      return {
+        zoomDelta: dist / 128
+      };
     }
-  }, {
-    key: "touchmove",
-    value: function touchmove(e, points, mapTouches) {
-      if (!this.tapTime) {
-        this.tap.touchmove(e, points, mapTouches);
-      } else if (this.swipePoint) {
-        if (mapTouches[0].identifier !== this.swipeTouch) {
-          return;
-        }
-        var newSwipePoint = points[0];
-        var dist = newSwipePoint.y - this.swipePoint.y;
-        this.swipePoint = newSwipePoint;
-        e.preventDefault();
-        this.active = true;
-        return {
-          zoomDelta: dist / 128
-        };
+  }
+  touchend(e, points, mapTouches) {
+    if (!this.tapTime) {
+      const point = this.tap.touchend(e, points, mapTouches);
+      if (point) {
+        this.tapTime = e.timeStamp;
       }
-    }
-  }, {
-    key: "touchend",
-    value: function touchend(e, points, mapTouches) {
-      if (!this.tapTime) {
-        var point = this.tap.touchend(e, points, mapTouches);
-        if (point) {
-          this.tapTime = e.timeStamp;
-        }
-      } else if (this.swipePoint) {
-        if (mapTouches.length === 0) {
-          this.reset();
-        }
+    } else if (this.swipePoint) {
+      if (mapTouches.length === 0) {
+        this.reset();
       }
     }
-  }, {
-    key: "touchcancel",
-    value: function touchcancel() {
-      this.reset();
-    }
-  }, {
-    key: "enable",
-    value: function enable() {
-      this.enabled = true;
-    }
-  }, {
-    key: "disable",
-    value: function disable() {
-      this.enabled = false;
-      this.reset();
-    }
-  }, {
-    key: "isEnabled",
-    value: function isEnabled() {
-      return this.enabled;
-    }
-  }, {
-    key: "isActive",
-    value: function isActive() {
-      return this.active;
-    }
-  }]);
-  return TapDragZoomHandler;
-}();
+  }
+  touchcancel() {
+    this.reset();
+  }
+  enable() {
+    this.enabled = true;
+  }
+  disable() {
+    this.enabled = false;
+    this.reset();
+  }
+  isEnabled() {
+    return this.enabled;
+  }
+  isActive() {
+    return this.active;
+  }
+}
+exports.default = TapDragZoomHandler;

package/lib/handler/tap/tap_recognizer.d.ts

@@ -0,0 +1,17 @@
+import type Point from '../../geo/point';
+import SingleTapRecognizer from './single_tap_recognizer';
+export default class TapRecognizer {
+    singleTap: SingleTapRecognizer;
+    numTaps: number;
+    lastTime: number;
+    lastTap: Point;
+    count: number;
+    constructor(options: {
+        numTaps: number;
+        numTouches: number;
+    });
+    reset(): void;
+    touchstart(e: TouchEvent, points: Point[], mapTouches: Touch[]): void;
+    touchmove(e: TouchEvent, points: Point[], mapTouches: Touch[]): void;
+    touchend(e: TouchEvent, points: Point[], mapTouches: Touch[]): Point | undefined;
+}