@antv/l7-map 2.21.6 → 2.21.8

package/es/handler/events/event.d.ts

@@ -1,4 +1,4 @@
 export declare class Event {
     type: string;
-    constructor(type: string, data?: any);
+    constructor(type: string, data?: {});
 }

package/es/handler/events/event.js

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-// tslint:disable-next-line:no-submodule-imports
 import { lodashUtil } from '@antv/l7-utils';
 const {
   merge

package/es/handler/events/map_mouse_event.d.ts

@@ -29,6 +29,6 @@ export default class MapMouseEvent extends Event {
     /**
      * @private
      */
-    constructor(type: string, map: Map | EarthMap, originalEvent: MouseEvent, data?: any);
+    constructor(type: string, map: Map | EarthMap, originalEvent: MouseEvent);
     preventDefault(): void;
 }

package/es/handler/events/map_mouse_event.js

@@ -1,24 +1,15 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 // @ts-ignore
 // tslint:disable-next-line:no-submodule-imports
-import { lodashUtil } from '@antv/l7-utils';
+
 import DOM from "../../utils/dom";
 import { Event } from "./event";
-const {
-  merge
-} = lodashUtil;
 export default class MapMouseEvent extends Event {
   /**
    * @private
    */
-  constructor(type, map, originalEvent, data = {}) {
-    const point = DOM.mousePos(map.getCanvasContainer(), originalEvent);
-    const lngLat = map.unproject(point);
-    super(type, merge({
-      point,
-      lngLat,
-      originalEvent
-    }, data));
+  constructor(type, map, originalEvent) {
+    super(type);
     /**
      * `true` if `preventDefault` has been called.
      * @private
@@ -40,6 +31,11 @@ export default class MapMouseEvent extends Event {
      */
     _defineProperty(this, "lngLat", void 0);
     _defineProperty(this, "defaultPrevented", void 0);
+    const point = DOM.mousePos(map.getCanvasContainer(), originalEvent);
+    const lngLat = map.unproject(point);
+    this.point = point;
+    this.lngLat = lngLat;
+    this.originalEvent = originalEvent;
     this.defaultPrevented = false;
     this.target = map;
   }

package/es/handler/events/map_touch_event.js

@@ -9,20 +9,7 @@ export default class MapTouchEvent extends Event {
    * @private
    */
   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));
-    const lngLat = map.unproject(point);
-    super(type, {
-      points,
-      point,
-      lngLats,
-      lngLat,
-      originalEvent
-    });
+    super(type);
     /**
      * The event type.
      */
@@ -58,6 +45,18 @@ export default class MapTouchEvent extends Event {
      * @private
      */
     _defineProperty(this, "defaultPrevented", void 0);
+    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));
+    const lngLat = map.unproject(point);
+    this.points = points;
+    this.point = point;
+    this.lngLats = lngLats;
+    this.lngLat = lngLat;
+    this.originalEvent = originalEvent;
     this.defaultPrevented = false;
   }
 

package/es/handler/events/map_wheel_event.js

@@ -5,9 +5,7 @@ export default class MapWheelEvent extends Event {
    * @private
    */
   constructor(type, map, originalEvent) {
-    super(type, {
-      originalEvent
-    });
+    super(type);
     /**
      * The event type.
      */
@@ -20,6 +18,7 @@ export default class MapWheelEvent extends Event {
      * The `Map` object that fired the event.
      */
     _defineProperty(this, "target", void 0);
+    this.originalEvent = originalEvent;
     this.defaultPrevented = false;
   }
 

package/es/handler/events/render_event.d.ts

@@ -2,4 +2,5 @@ import { Event } from './event';
 export default class RenderFrameEvent extends Event {
     type: string;
     timeStamp: number;
+    constructor(type: string, timeStamp: number);
 }

package/es/handler/events/render_event.js

@@ -1,9 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { Event } from "./event";
 export default class RenderFrameEvent extends Event {
-  constructor(...args) {
-    super(...args);
+  constructor(type, timeStamp) {
+    super(type);
     _defineProperty(this, "type", 'renderFrame');
     _defineProperty(this, "timeStamp", void 0);
+    this.timeStamp = timeStamp;
   }
 }

package/es/handler/handler_manager.js

@@ -246,9 +246,7 @@ class HandlerManager {
       this.frameId = this.map.requestRenderFrame(timeStamp => {
         // @ts-ignore
         delete this.frameId;
-        this.handleEvent(new RenderFrameEvent('renderFrame', {
-          timeStamp
-        }));
+        this.handleEvent(new RenderFrameEvent('renderFrame', timeStamp));
         this.applyChanges();
       });
     }

package/lib/handler/events/event.d.ts

@@ -1,4 +1,4 @@
 export declare class Event {
     type: string;
-    constructor(type: string, data?: any);
+    constructor(type: string, data?: {});
 }

package/lib/handler/events/event.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.Event = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Utils = require("@antv/l7-utils");
-// tslint:disable-next-line:no-submodule-imports
-
 const {
   merge
 } = _l7Utils.lodashUtil;

package/lib/handler/events/map_mouse_event.d.ts

@@ -29,6 +29,6 @@ export default class MapMouseEvent extends Event {
     /**
      * @private
      */
-    constructor(type: string, map: Map | EarthMap, originalEvent: MouseEvent, data?: any);
+    constructor(type: string, map: Map | EarthMap, originalEvent: MouseEvent);
     preventDefault(): void;
 }

package/lib/handler/events/map_mouse_event.js

@@ -6,27 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _l7Utils = require("@antv/l7-utils");
 var _dom = _interopRequireDefault(require("../../utils/dom"));
 var _event = require("./event");
 // @ts-ignore
 // tslint:disable-next-line:no-submodule-imports
 
-const {
-  merge
-} = _l7Utils.lodashUtil;
 class MapMouseEvent extends _event.Event {
   /**
    * @private
    */
-  constructor(type, map, originalEvent, data = {}) {
-    const point = _dom.default.mousePos(map.getCanvasContainer(), originalEvent);
-    const lngLat = map.unproject(point);
-    super(type, merge({
-      point,
-      lngLat,
-      originalEvent
-    }, data));
+  constructor(type, map, originalEvent) {
+    super(type);
     /**
      * `true` if `preventDefault` has been called.
      * @private
@@ -48,6 +38,11 @@ class MapMouseEvent extends _event.Event {
      */
     (0, _defineProperty2.default)(this, "lngLat", void 0);
     (0, _defineProperty2.default)(this, "defaultPrevented", void 0);
+    const point = _dom.default.mousePos(map.getCanvasContainer(), originalEvent);
+    const lngLat = map.unproject(point);
+    this.point = point;
+    this.lngLat = lngLat;
+    this.originalEvent = originalEvent;
     this.defaultPrevented = false;
     this.target = map;
   }

package/lib/handler/events/map_touch_event.js

@@ -16,20 +16,7 @@ class MapTouchEvent extends _event.Event {
    * @private
    */
   constructor(type, map, originalEvent) {
-    const touches = type === 'touchend' ? originalEvent.changedTouches : originalEvent.touches;
-    const points = _dom.default.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.default(0, 0));
-    const lngLat = map.unproject(point);
-    super(type, {
-      points,
-      point,
-      lngLats,
-      lngLat,
-      originalEvent
-    });
+    super(type);
     /**
      * The event type.
      */
@@ -65,6 +52,18 @@ class MapTouchEvent extends _event.Event {
      * @private
      */
     (0, _defineProperty2.default)(this, "defaultPrevented", void 0);
+    const touches = type === 'touchend' ? originalEvent.changedTouches : originalEvent.touches;
+    const points = _dom.default.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.default(0, 0));
+    const lngLat = map.unproject(point);
+    this.points = points;
+    this.point = point;
+    this.lngLats = lngLats;
+    this.lngLat = lngLat;
+    this.originalEvent = originalEvent;
     this.defaultPrevented = false;
   }
 

package/lib/handler/events/map_wheel_event.js

@@ -12,9 +12,7 @@ class MapWheelEvent extends _event.Event {
    * @private
    */
   constructor(type, map, originalEvent) {
-    super(type, {
-      originalEvent
-    });
+    super(type);
     /**
      * The event type.
      */
@@ -27,6 +25,7 @@ class MapWheelEvent extends _event.Event {
      * The `Map` object that fired the event.
      */
     (0, _defineProperty2.default)(this, "target", void 0);
+    this.originalEvent = originalEvent;
     this.defaultPrevented = false;
   }
 

package/lib/handler/events/render_event.d.ts

@@ -2,4 +2,5 @@ import { Event } from './event';
 export default class RenderFrameEvent extends Event {
     type: string;
     timeStamp: number;
+    constructor(type: string, timeStamp: number);
 }

package/lib/handler/events/render_event.js

@@ -8,10 +8,11 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _event = require("./event");
 class RenderFrameEvent extends _event.Event {
-  constructor(...args) {
-    super(...args);
+  constructor(type, timeStamp) {
+    super(type);
     (0, _defineProperty2.default)(this, "type", 'renderFrame');
     (0, _defineProperty2.default)(this, "timeStamp", void 0);
+    this.timeStamp = timeStamp;
   }
 }
 exports.default = RenderFrameEvent;

package/lib/handler/handler_manager.js

@@ -254,9 +254,7 @@ class HandlerManager {
       this.frameId = this.map.requestRenderFrame(timeStamp => {
         // @ts-ignore
         delete this.frameId;
-        this.handleEvent(new _render_event.default('renderFrame', {
-          timeStamp
-        }));
+        this.handleEvent(new _render_event.default('renderFrame', timeStamp));
         this.applyChanges();
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-map",
-  "version": "2.21.6",
+  "version": "2.21.8",
   "description": "L7 Map",
   "keywords": [],
   "homepage": "https://github.com/antvis/L7#readme",
@@ -27,7 +27,7 @@
     "@mapbox/unitbezier": "^0.0.0",
     "eventemitter3": "^4.0.4",
     "gl-matrix": "^3.1.0",
-    "@antv/l7-utils": "2.21.6"
+    "@antv/l7-utils": "2.21.8"
   },
   "publishConfig": {
     "access": "public",