@antv/l7-map 2.9.33 → 2.9.34

package/lib/handler/touch/touch_pitch.js

@@ -1,86 +1,120 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/handler/touch/touch_pitch.ts
-var touch_pitch_exports = {};
-__export(touch_pitch_exports, {
-  default: () => TouchPitchHandler
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(touch_pitch_exports);
-var import_two_touch = __toESM(require("./two_touch"));
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _two_touch = _interopRequireDefault(require("./two_touch"));
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 function isVertical(vector) {
   return Math.abs(vector.y) > Math.abs(vector.x);
 }
+
 var ALLOWED_SINGLE_TOUCH_TIME = 100;
-var TouchPitchHandler = class extends import_two_touch.default {
-  reset() {
-    super.reset();
-    this.valid = void 0;
-    delete this.firstMove;
-    delete this.lastPoints;
-  }
-  start(points) {
-    this.lastPoints = points;
-    if (isVertical(points[0].sub(points[1]))) {
-      this.valid = false;
-    }
+
+var TouchPitchHandler = /*#__PURE__*/function (_TwoTouchHandler) {
+  (0, _inherits2.default)(TouchPitchHandler, _TwoTouchHandler);
+
+  var _super = _createSuper(TouchPitchHandler);
+
+  function TouchPitchHandler() {
+    (0, _classCallCheck2.default)(this, TouchPitchHandler);
+    return _super.apply(this, arguments);
   }
-  move(points, center, e) {
-    const vectorA = points[0].sub(this.lastPoints[0]);
-    const vectorB = points[1].sub(this.lastPoints[1]);
-    this.valid = this.gestureBeginsVertically(vectorA, vectorB, e.timeStamp);
-    if (!this.valid) {
-      return;
+
+  (0, _createClass2.default)(TouchPitchHandler, [{
+    key: "reset",
+    value: function reset() {
+      (0, _get2.default)((0, _getPrototypeOf2.default)(TouchPitchHandler.prototype), "reset", this).call(this);
+      this.valid = undefined; //@ts-ignore
+
+      delete this.firstMove; //@ts-ignore
+
+      delete this.lastPoints;
     }
-    this.lastPoints = points;
-    this.active = true;
-    const yDeltaAverage = (vectorA.y + vectorB.y) / 2;
-    const degreesPerPixelMoved = -0.5;
-    return {
-      pitchDelta: yDeltaAverage * degreesPerPixelMoved
-    };
-  }
-  gestureBeginsVertically(vectorA, vectorB, timeStamp) {
-    if (this.valid !== void 0) {
-      return this.valid;
+  }, {
+    key: "start",
+    value: function start(points) {
+      this.lastPoints = points;
+
+      if (isVertical(points[0].sub(points[1]))) {
+        // fingers are more horizontal than vertical
+        this.valid = false;
+      }
     }
-    const threshold = 2;
-    const movedA = vectorA.mag() >= threshold;
-    const movedB = vectorB.mag() >= threshold;
-    if (!movedA && !movedB) {
-      return;
+  }, {
+    key: "move",
+    value: function move(points, center, e) {
+      var vectorA = points[0].sub(this.lastPoints[0]);
+      var vectorB = points[1].sub(this.lastPoints[1]);
+      this.valid = this.gestureBeginsVertically(vectorA, vectorB, e.timeStamp);
+
+      if (!this.valid) {
+        return;
+      }
+
+      this.lastPoints = points;
+      this.active = true;
+      var yDeltaAverage = (vectorA.y + vectorB.y) / 2;
+      var degreesPerPixelMoved = -0.5;
+      return {
+        pitchDelta: yDeltaAverage * degreesPerPixelMoved
+      };
     }
-    if (!movedA || !movedB) {
-      if (this.firstMove === void 0) {
-        this.firstMove = timeStamp;
+  }, {
+    key: "gestureBeginsVertically",
+    value: function gestureBeginsVertically(vectorA, vectorB, timeStamp) {
+      if (this.valid !== undefined) {
+        return this.valid;
       }
-      if (timeStamp - this.firstMove < ALLOWED_SINGLE_TOUCH_TIME) {
-        return void 0;
-      } else {
-        return false;
+
+      var threshold = 2;
+      var movedA = vectorA.mag() >= threshold;
+      var movedB = vectorB.mag() >= threshold; // neither finger has moved a meaningful amount, wait
+
+      if (!movedA && !movedB) {
+        return;
+      } // One finger has moved and the other has not.
+      // If enough time has passed, decide it is not a pitch.
+
+
+      if (!movedA || !movedB) {
+        if (this.firstMove === undefined) {
+          this.firstMove = timeStamp;
+        }
+
+        if (timeStamp - this.firstMove < ALLOWED_SINGLE_TOUCH_TIME) {
+          // still waiting for a movement from the second finger
+          return undefined;
+        } else {
+          return false;
+        }
       }
+
+      var isSameDirection = vectorA.y > 0 === vectorB.y > 0;
+      return isVertical(vectorA) && isVertical(vectorB) && isSameDirection;
     }
-    const isSameDirection = vectorA.y > 0 === vectorB.y > 0;
-    return isVertical(vectorA) && isVertical(vectorB) && isSameDirection;
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }]);
+  return TouchPitchHandler;
+}(_two_touch.default);
+
+exports.default = TouchPitchHandler;

package/lib/handler/touch/touch_rotate.js

@@ -1,65 +1,99 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/handler/touch/touch_rotate.ts
-var touch_rotate_exports = {};
-__export(touch_rotate_exports, {
-  default: () => TouchRotateHandler
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(touch_rotate_exports);
-var import_two_touch = __toESM(require("./two_touch"));
-var ROTATION_THRESHOLD = 25;
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _two_touch = _interopRequireDefault(require("./two_touch"));
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+var ROTATION_THRESHOLD = 25; // pixels along circumference of touch circle
+
 function getBearingDelta(a, b) {
   return a.angleWith(b) * 180 / Math.PI;
 }
-var TouchRotateHandler = class extends import_two_touch.default {
-  reset() {
-    super.reset();
-    delete this.minDiameter;
-    delete this.startVector;
-    delete this.vector;
-  }
-  start(points) {
-    this.startVector = this.vector = points[0].sub(points[1]);
-    this.minDiameter = points[0].dist(points[1]);
+
+var TouchRotateHandler = /*#__PURE__*/function (_TwoTouchHandler) {
+  (0, _inherits2.default)(TouchRotateHandler, _TwoTouchHandler);
+
+  var _super = _createSuper(TouchRotateHandler);
+
+  function TouchRotateHandler() {
+    (0, _classCallCheck2.default)(this, TouchRotateHandler);
+    return _super.apply(this, arguments);
   }
-  move(points, pinchAround) {
-    const lastVector = this.vector;
-    this.vector = points[0].sub(points[1]);
-    if (!this.active && this.isBelowThreshold(this.vector)) {
-      return;
+
+  (0, _createClass2.default)(TouchRotateHandler, [{
+    key: "reset",
+    value: function reset() {
+      (0, _get2.default)((0, _getPrototypeOf2.default)(TouchRotateHandler.prototype), "reset", this).call(this); //@ts-ignore
+
+      delete this.minDiameter; //@ts-ignore
+
+      delete this.startVector; //@ts-ignore
+
+      delete this.vector;
     }
-    this.active = true;
-    return {
-      bearingDelta: getBearingDelta(this.vector, lastVector),
-      pinchAround
-    };
-  }
-  isBelowThreshold(vector) {
-    this.minDiameter = Math.min(this.minDiameter, vector.mag());
-    const circumference = Math.PI * this.minDiameter;
-    const threshold = ROTATION_THRESHOLD / circumference * 360;
-    const bearingDeltaSinceStart = getBearingDelta(vector, this.startVector);
-    return Math.abs(bearingDeltaSinceStart) < threshold;
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }, {
+    key: "start",
+    value: function start(points) {
+      this.startVector = this.vector = points[0].sub(points[1]);
+      this.minDiameter = points[0].dist(points[1]);
+    }
+  }, {
+    key: "move",
+    value: function move(points, pinchAround) {
+      var lastVector = this.vector;
+      this.vector = points[0].sub(points[1]);
+
+      if (!this.active && this.isBelowThreshold(this.vector)) {
+        return;
+      }
+
+      this.active = true;
+      return {
+        bearingDelta: getBearingDelta(this.vector, lastVector),
+        pinchAround: pinchAround
+      };
+    }
+  }, {
+    key: "isBelowThreshold",
+    value: function isBelowThreshold(vector) {
+      /*
+       * The threshold before a rotation actually happens is configured in
+       * pixels alongth circumference of the circle formed by the two fingers.
+       * This makes the threshold in degrees larger when the fingers are close
+       * together and smaller when the fingers are far apart.
+       *
+       * Use the smallest diameter from the whole gesture to reduce sensitivity
+       * when pinching in and out.
+       */
+      this.minDiameter = Math.min(this.minDiameter, vector.mag());
+      var circumference = Math.PI * this.minDiameter;
+      var threshold = ROTATION_THRESHOLD / circumference * 360;
+      var bearingDeltaSinceStart = getBearingDelta(vector, this.startVector);
+      return Math.abs(bearingDeltaSinceStart) < threshold;
+    }
+  }]);
+  return TouchRotateHandler;
+}(_two_touch.default);
+
+exports.default = TouchRotateHandler;

package/lib/handler/touch/touch_zoom.js

@@ -1,56 +1,78 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/handler/touch/touch_zoom.ts
-var touch_zoom_exports = {};
-__export(touch_zoom_exports, {
-  default: () => TouchZoomHandler
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(touch_zoom_exports);
-var import_two_touch = __toESM(require("./two_touch"));
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _two_touch = _interopRequireDefault(require("./two_touch"));
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 var ZOOM_THRESHOLD = 0.1;
+
 function getZoomDelta(distance, lastDistance) {
   return Math.log(distance / lastDistance) / Math.LN2;
 }
-var TouchZoomHandler = class extends import_two_touch.default {
-  reset() {
-    super.reset();
-    delete this.distance;
-    delete this.startDistance;
-  }
-  start(points) {
-    this.startDistance = this.distance = points[0].dist(points[1]);
+
+var TouchZoomHandler = /*#__PURE__*/function (_TwoTouchHandler) {
+  (0, _inherits2.default)(TouchZoomHandler, _TwoTouchHandler);
+
+  var _super = _createSuper(TouchZoomHandler);
+
+  function TouchZoomHandler() {
+    (0, _classCallCheck2.default)(this, TouchZoomHandler);
+    return _super.apply(this, arguments);
   }
-  move(points, pinchAround) {
-    const lastDistance = this.distance;
-    this.distance = points[0].dist(points[1]);
-    if (!this.active && Math.abs(getZoomDelta(this.distance, this.startDistance)) < ZOOM_THRESHOLD) {
-      return;
+
+  (0, _createClass2.default)(TouchZoomHandler, [{
+    key: "reset",
+    value: function reset() {
+      (0, _get2.default)((0, _getPrototypeOf2.default)(TouchZoomHandler.prototype), "reset", this).call(this); //@ts-ignore
+
+      delete this.distance; //@ts-ignore
+
+      delete this.startDistance;
     }
-    this.active = true;
-    return {
-      zoomDelta: getZoomDelta(this.distance, lastDistance),
-      pinchAround
-    };
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }, {
+    key: "start",
+    value: function start(points) {
+      this.startDistance = this.distance = points[0].dist(points[1]);
+    }
+  }, {
+    key: "move",
+    value: function move(points, pinchAround) {
+      var lastDistance = this.distance;
+      this.distance = points[0].dist(points[1]);
+
+      if (!this.active && Math.abs(getZoomDelta(this.distance, this.startDistance)) < ZOOM_THRESHOLD) {
+        return;
+      }
+
+      this.active = true;
+      return {
+        zoomDelta: getZoomDelta(this.distance, lastDistance),
+        pinchAround: pinchAround
+      };
+    }
+  }]);
+  return TouchZoomHandler;
+}(_two_touch.default);
+
+exports.default = TouchZoomHandler;