@antv/l7-map 2.21.1 → 2.21.3

package/es/handler/events/map_touch_event.js

@@ -1,78 +1,64 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 // @ts-ignore
 
 import Point from "../../geo/point";
 import DOM from "../../utils/dom";
 import { Event } from "./event";
-var MapTouchEvent = /*#__PURE__*/function (_Event) {
-  _inherits(MapTouchEvent, _Event);
-  var _super = _createSuper(MapTouchEvent);
+export default class MapTouchEvent extends Event {
   /**
-   * The event type.
-   */
-
-  /**
-   * The `Map` object that fired the event.
-   */
-
-  /**
-   * The DOM event which caused the map event.
-   */
-
-  /**
-   * The geographic location on the map of the center of the touch event points.
-   */
-
-  /**
-   * The pixel coordinates of the center of the touch event points, relative to the map and measured from the top left
-   * corner.
-   */
-
-  /**
-   * The array of pixel coordinates corresponding to a
-   * [touch event's `touches`](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/touches) property.
-   */
-
-  /**
-   * The geographical locations on the map corresponding to a
-   * [touch event's `touches`](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/touches) property.
-   */
-
-  /**
-   * `true` if `preventDefault` has been called.
    * @private
    */
-
-  /**
-   * @private
-   */
-  function MapTouchEvent(type, map, originalEvent) {
-    var _this;
-    _classCallCheck(this, MapTouchEvent);
-    var touches = type === 'touchend' ? originalEvent.changedTouches : originalEvent.touches;
-    var points = DOM.touchPos(map.getCanvasContainer(), touches);
-    var lngLats = points.map(function (t) {
-      return map.unproject(t);
-    });
-    var point = points.reduce(function (prev, curr, i, arr) {
+  constructor(type, map, originalEvent) {
+    const touches = type === 'touchend' ? originalEvent.changedTouches : originalEvent.touches;
+    const points = DOM.touchPos(map.getCanvasContainer(), touches);
+    const lngLats = points.map(t => map.unproject(t));
+    const point = points.reduce((prev, curr, i, arr) => {
       return prev.add(curr.div(arr.length));
     }, new Point(0, 0));
-    var lngLat = map.unproject(point);
-    _this = _super.call(this, type, {
-      points: points,
-      point: point,
-      lngLats: lngLats,
-      lngLat: lngLat,
-      originalEvent: originalEvent
+    const lngLat = map.unproject(point);
+    super(type, {
+      points,
+      point,
+      lngLats,
+      lngLat,
+      originalEvent
     });
-    _this.defaultPrevented = false;
-    return _this;
+    /**
+     * The event type.
+     */
+    /**
+     * The `Map` object that fired the event.
+     */
+    _defineProperty(this, "target", void 0);
+    /**
+     * The DOM event which caused the map event.
+     */
+    _defineProperty(this, "originalEvent", void 0);
+    /**
+     * The geographic location on the map of the center of the touch event points.
+     */
+    _defineProperty(this, "lngLat", void 0);
+    /**
+     * The pixel coordinates of the center of the touch event points, relative to the map and measured from the top left
+     * corner.
+     */
+    _defineProperty(this, "point", void 0);
+    /**
+     * The array of pixel coordinates corresponding to a
+     * [touch event's `touches`](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/touches) property.
+     */
+    _defineProperty(this, "points", void 0);
+    /**
+     * The geographical locations on the map corresponding to a
+     * [touch event's `touches`](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/touches) property.
+     */
+    _defineProperty(this, "lngLats", void 0);
+    /**
+     * `true` if `preventDefault` has been called.
+     * @private
+     */
+    _defineProperty(this, "defaultPrevented", void 0);
+    this.defaultPrevented = false;
   }
 
   /**
@@ -84,12 +70,7 @@ var MapTouchEvent = /*#__PURE__*/function (_Event) {
    *   * On `touchstart` events, the behavior of {@link TouchZoomRotateHandler}
    *
    */
-  _createClass(MapTouchEvent, [{
-    key: "preventDefault",
-    value: function preventDefault() {
-      this.defaultPrevented = true;
-    }
-  }]);
-  return MapTouchEvent;
-}(Event);
-export { MapTouchEvent as default };
+  preventDefault() {
+    this.defaultPrevented = true;
+  }
+}

package/es/handler/events/map_wheel_event.js

@@ -1,37 +1,26 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { Event } from "./event";
-var MapWheelEvent = /*#__PURE__*/function (_Event) {
-  _inherits(MapWheelEvent, _Event);
-  var _super = _createSuper(MapWheelEvent);
-  /**
-   * The event type.
-   */
-
-  /**
-   * The DOM event which caused the map event.
-   */
-
-  /**
-   * The `Map` object that fired the event.
-   */
-
+export default class MapWheelEvent extends Event {
   /**
    * @private
    */
-  function MapWheelEvent(type, map, originalEvent) {
-    var _this;
-    _classCallCheck(this, MapWheelEvent);
-    _this = _super.call(this, type, {
-      originalEvent: originalEvent
+  constructor(type, map, originalEvent) {
+    super(type, {
+      originalEvent
     });
-    _this.defaultPrevented = false;
-    return _this;
+    /**
+     * The event type.
+     */
+    /**
+     * The DOM event which caused the map event.
+     */
+    _defineProperty(this, "originalEvent", void 0);
+    _defineProperty(this, "defaultPrevented", void 0);
+    /**
+     * The `Map` object that fired the event.
+     */
+    _defineProperty(this, "target", void 0);
+    this.defaultPrevented = false;
   }
 
   /**
@@ -39,12 +28,7 @@ var MapWheelEvent = /*#__PURE__*/function (_Event) {
    *
    * Calling this method will prevent the the behavior of {@link ScrollZoomHandler}.
    */
-  _createClass(MapWheelEvent, [{
-    key: "preventDefault",
-    value: function preventDefault() {
-      this.defaultPrevented = true;
-    }
-  }]);
-  return MapWheelEvent;
-}(Event);
-export { MapWheelEvent as default };
+  preventDefault() {
+    this.defaultPrevented = true;
+  }
+}

package/es/handler/events/render_event.js

@@ -1,26 +1,9 @@
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
 import { Event } from "./event";
-var RenderFrameEvent = /*#__PURE__*/function (_Event) {
-  _inherits(RenderFrameEvent, _Event);
-  var _super = _createSuper(RenderFrameEvent);
-  function RenderFrameEvent() {
-    var _this;
-    _classCallCheck(this, RenderFrameEvent);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "type", 'renderFrame');
-    return _this;
+export default class RenderFrameEvent extends Event {
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "type", 'renderFrame');
+    _defineProperty(this, "timeStamp", void 0);
   }
-  return _createClass(RenderFrameEvent);
-}(Event);
-export { RenderFrameEvent as default };
+}

package/es/handler/handler_inertia.js

@@ -1,142 +1,125 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-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; }
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 // @ts-ignore
 import Point from "../geo/point";
 
 // tslint:disable-next-line:no-submodule-imports
 import { lodashUtil } from '@antv/l7-utils';
 import { bezier, clamp, now } from "../util";
-var merge = lodashUtil.merge;
-var defaultInertiaOptions = {
+const {
+  merge
+} = lodashUtil;
+const defaultInertiaOptions = {
   linearity: 0.3,
   easing: bezier(0, 0, 0.3, 1)
 };
-var defaultPanInertiaOptions = merge({
+const defaultPanInertiaOptions = merge({
   deceleration: 2500,
   maxSpeed: 1400
 }, defaultInertiaOptions);
-var defaultZoomInertiaOptions = merge({
+const defaultZoomInertiaOptions = merge({
   deceleration: 20,
   maxSpeed: 1400
 }, defaultInertiaOptions);
-var defaultBearingInertiaOptions = merge({
+const defaultBearingInertiaOptions = merge({
   deceleration: 1000,
   maxSpeed: 360
 }, defaultInertiaOptions);
-var defaultPitchInertiaOptions = merge({
+const defaultPitchInertiaOptions = merge({
   deceleration: 1000,
   maxSpeed: 90
 }, defaultInertiaOptions);
-var HandlerInertia = /*#__PURE__*/function () {
-  function HandlerInertia(map) {
-    _classCallCheck(this, HandlerInertia);
+export default class HandlerInertia {
+  constructor(map) {
+    _defineProperty(this, "map", void 0);
+    _defineProperty(this, "inertiaBuffer", void 0);
     this.map = map;
     this.clear();
   }
-  _createClass(HandlerInertia, [{
-    key: "clear",
-    value: function clear() {
-      this.inertiaBuffer = [];
-    }
-  }, {
-    key: "record",
-    value: function record(settings) {
-      this.drainInertiaBuffer();
-      this.inertiaBuffer.push({
-        time: now(),
-        settings: settings
-      });
-    }
-  }, {
-    key: "drainInertiaBuffer",
-    value: function drainInertiaBuffer() {
-      var inertia = this.inertiaBuffer;
-      var nowTime = now();
-      var cutoff = 160; // msec
+  clear() {
+    this.inertiaBuffer = [];
+  }
+  record(settings) {
+    this.drainInertiaBuffer();
+    this.inertiaBuffer.push({
+      time: now(),
+      settings
+    });
+  }
+  drainInertiaBuffer() {
+    const inertia = this.inertiaBuffer;
+    const nowTime = now();
+    const cutoff = 160; // msec
 
-      while (inertia.length > 0 && nowTime - inertia[0].time > cutoff) {
-        inertia.shift();
-      }
+    while (inertia.length > 0 && nowTime - inertia[0].time > cutoff) {
+      inertia.shift();
     }
-  }, {
-    key: "onMoveEnd",
-    value: function onMoveEnd(panInertiaOptions) {
-      this.drainInertiaBuffer();
-      if (this.inertiaBuffer.length < 2) {
-        return;
-      }
-      var deltas = {
-        zoom: 0,
-        bearing: 0,
-        pitch: 0,
-        pan: new Point(0, 0),
-        pinchAround: undefined,
-        around: undefined
-      };
-      var _iterator = _createForOfIteratorHelper(this.inertiaBuffer),
-        _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;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } 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, 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 + clamp(_result2.amount, -179, 179);
-        extendDuration(easeOptions, _result2);
+  }
+  onMoveEnd(panInertiaOptions) {
+    this.drainInertiaBuffer();
+    if (this.inertiaBuffer.length < 2) {
+      return;
+    }
+    const deltas = {
+      zoom: 0,
+      bearing: 0,
+      pitch: 0,
+      pan: new Point(0, 0),
+      pinchAround: undefined,
+      around: undefined
+    };
+    for (const {
+      settings
+    } of this.inertiaBuffer) {
+      deltas.zoom += settings.zoomDelta || 0;
+      deltas.bearing += settings.bearingDelta || 0;
+      deltas.pitch += settings.pitchDelta || 0;
+      if (settings.panDelta) {
+        deltas.pan._add(settings.panDelta);
       }
-      if (deltas.pitch) {
-        var _result3 = calculateEasing(deltas.pitch, duration, defaultPitchInertiaOptions);
-        easeOptions.pitch = this.map.transform.pitch + _result3.amount;
-        extendDuration(easeOptions, _result3);
+      if (settings.around) {
+        deltas.around = settings.around;
       }
-      if (easeOptions.zoom || easeOptions.bearing) {
-        var last = deltas.pinchAround === undefined ? deltas.around : deltas.pinchAround;
-        easeOptions.around = last ? this.map.unproject(last) : this.map.getCenter();
+      if (settings.pinchAround) {
+        deltas.pinchAround = settings.pinchAround;
       }
-      this.clear();
-      return merge(easeOptions, {
-        noMoveStart: true
-      });
     }
-  }]);
-  return HandlerInertia;
-}(); // Unfortunately zoom, bearing, etc can't have different durations and easings so
+    const lastEntry = this.inertiaBuffer[this.inertiaBuffer.length - 1];
+    const duration = lastEntry.time - this.inertiaBuffer[0].time;
+    const easeOptions = {};
+    if (deltas.pan.mag()) {
+      const 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) {
+      const result = calculateEasing(deltas.zoom, duration, defaultZoomInertiaOptions);
+      easeOptions.zoom = this.map.transform.zoom + result.amount;
+      extendDuration(easeOptions, result);
+    }
+    if (deltas.bearing) {
+      const result = calculateEasing(deltas.bearing, duration, defaultBearingInertiaOptions);
+      easeOptions.bearing = this.map.transform.bearing + clamp(result.amount, -179, 179);
+      extendDuration(easeOptions, result);
+    }
+    if (deltas.pitch) {
+      const result = calculateEasing(deltas.pitch, duration, defaultPitchInertiaOptions);
+      easeOptions.pitch = this.map.transform.pitch + result.amount;
+      extendDuration(easeOptions, result);
+    }
+    if (easeOptions.zoom || easeOptions.bearing) {
+      const last = deltas.pinchAround === undefined ? deltas.around : deltas.pinchAround;
+      easeOptions.around = last ? this.map.unproject(last) : this.map.getCenter();
+    }
+    this.clear();
+    return merge(easeOptions, {
+      noMoveStart: true
+    });
+  }
+}
+
+// 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.
-export { HandlerInertia as default };
 function extendDuration(easeOptions, result) {
   if (!easeOptions.duration || easeOptions.duration < result.duration) {
     easeOptions.duration = result.duration;
@@ -144,11 +127,13 @@ function extendDuration(easeOptions, result) {
   }
 }
 function calculateEasing(amount, inertiaDuration, inertiaOptions) {
-  var maxSpeed = inertiaOptions.maxSpeed,
-    linearity = inertiaOptions.linearity,
-    deceleration = inertiaOptions.deceleration;
-  var speed = clamp(amount * linearity / (inertiaDuration / 1000), -maxSpeed, maxSpeed);
-  var duration = Math.abs(speed) / (deceleration * linearity);
+  const {
+    maxSpeed,
+    linearity,
+    deceleration
+  } = inertiaOptions;
+  const speed = clamp(amount * linearity / (inertiaDuration / 1000), -maxSpeed, maxSpeed);
+  const duration = Math.abs(speed) / (deceleration * linearity);
   return {
     easing: inertiaOptions.easing,
     duration: duration * 1000,