@antv/l7-map 2.22.7 → 2.23.1

package/es/index.d.ts

@@ -1,3 +1,5 @@
+export { MapMouseEvent } from './map/events';
 export { MercatorCoordinate } from './map/geo/mercator_coordinate';
 export { Map } from './map/map';
 export type { MapOptions } from './map/map';
+export { SimpleMapCoord, type ISimpleMapCoord } from './map/util/simpleMapCoord';

package/es/index.js

@@ -1,2 +1,4 @@
+export { MapMouseEvent } from "./map/events";
 export { MercatorCoordinate } from "./map/geo/mercator_coordinate";
-export { Map } from "./map/map";
+export { Map } from "./map/map";
+export { SimpleMapCoord } from "./map/util/simpleMapCoord";

package/es/map/events.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { Event } from "./util/evented";
 import Point from '@mapbox/point-geometry';
 import { DOM } from "./util/dom";
+import { SimpleMapCoord } from "./util/simpleMapCoord";
 
 /**
  * `MapEventType` - a mapping between the event name and the event value.
@@ -94,6 +95,14 @@ export class MapMouseEvent extends Event {
     this.originalEvent = originalEvent;
     this._defaultPrevented = false;
     this.target = map;
+    if (map.version === 'SIMPLE') {
+      const simpleMapCoord = new SimpleMapCoord(map.mapSize);
+      const [lng, lat] = simpleMapCoord.project([lngLat.lng, lngLat.lat]);
+      this.lngLat = {
+        lng,
+        lat
+      };
+    }
   }
 }
 

package/es/map/geo/transform.js

@@ -457,7 +457,7 @@ export class Transform {
     }
   }
   customLayerMatrix() {
-    return this.mercatorMatrix.slice();
+    return mat4.clone(this.mercatorMatrix);
   }
 
   /**

package/es/map/map.d.ts

@@ -25,6 +25,16 @@ import type { TaskID } from './util/task_queue';
  * The {@link Map} options object.
  */
 export type MapOptions = {
+    /**
+     * The MapType of the map.
+     * @defaultValue DEFAUlTMAP
+     */
+    version?: string;
+    /**
+     * The map size for SIMPLE map.
+     * @defaultValue 10000
+     */
+    mapSize?: number;
     /**
      * If `false`, no mouse, touch, or keyboard listeners will be attached to the map, so it will not respond to interaction.
      * @defaultValue true
@@ -209,6 +219,8 @@ export declare class Map extends Camera {
     _mapId: number;
     _removed: boolean;
     _clickTolerance: number;
+    version: string;
+    mapSize: number;
     /**
      * The map's {@link ScrollZoomHandler}, which implements zooming in and out with a scroll wheel or trackpad.
      * Find more details and examples using `scrollZoom` in the {@link ScrollZoomHandler} section.
@@ -508,7 +520,7 @@ export declare class Map extends Camera {
      * @param type - The type of the event.
      * @param listener - The listener callback.
      */
-    on<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & Object) => void): this;
+    on<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & object) => void): this;
     /**
      * Overload of the `on` method that allows to listen to events without specifying a layer.
      * @event
@@ -522,7 +534,7 @@ export declare class Map extends Camera {
      * @param type - The type of the event.
      * @param listener - The listener callback.
      */
-    once<T extends keyof MapEventType>(type: T, listener?: (ev: MapEventType[T] & Object) => void): this | Promise<any>;
+    once<T extends keyof MapEventType>(type: T, listener?: (ev: MapEventType[T] & object) => void): this | Promise<any>;
     /**
      * Overload of the `once` method that allows to listen to events without specifying a layer.
      * @event
@@ -536,7 +548,7 @@ export declare class Map extends Camera {
      * @param type - The type of the event.
      * @param listener - The function previously installed as a listener.
      */
-    off<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & Object) => void): this;
+    off<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & object) => void): this;
     /**
      * Overload of the `off` method that allows to listen to events without specifying a layer.
      * @event

package/es/map/map.js

@@ -319,6 +319,8 @@ export class Map extends Camera {
     _defineProperty(this, "_mapId", uniqueId());
     _defineProperty(this, "_removed", void 0);
     _defineProperty(this, "_clickTolerance", void 0);
+    _defineProperty(this, "version", void 0);
+    _defineProperty(this, "mapSize", void 0);
     /**
      * The map's {@link ScrollZoomHandler}, which implements zooming in and out with a scroll wheel or trackpad.
      * Find more details and examples using `scrollZoom` in the {@link ScrollZoomHandler} section.
@@ -378,6 +380,8 @@ export class Map extends Camera {
     this._bearingSnap = resolvedOptions.bearingSnap;
     this._fadeDuration = resolvedOptions.fadeDuration;
     this._clickTolerance = resolvedOptions.clickTolerance;
+    this.version = options.version;
+    this.mapSize = options.mapSize;
     if (typeof resolvedOptions.container === 'string') {
       this._container = document.getElementById(resolvedOptions.container);
       if (!this._container) {

package/es/map/util/simpleMapCoord.d.ts

@@ -0,0 +1,31 @@
+export interface ISimpleMapCoord {
+    setSize(size: number): void;
+    getSize(): [number, number];
+    project(lnglat: [number, number]): [number, number];
+    unproject(xy: [number, number]): [number, number];
+}
+export declare class SimpleMapCoord implements ISimpleMapCoord {
+    private size;
+    constructor(size?: number);
+    setSize(size: number): void;
+    getSize(): [number, number];
+    /**
+     * coord
+     * ^ y (y > 0)
+     * |
+     * |
+     * |
+     * |(x = 0, y = 0)
+     * ---------------> x (x > 0)
+     */
+    /***
+     * lng: [-180, 180] 360
+     * lat: [-85.05112877980659, 85.05112877980659] 170.10225755961318
+     */
+    mercatorXfromLng(lng: number): number;
+    mercatorYfromLat(lat: number): number;
+    lngFromMercatorX(x: number): number;
+    latFromMercatorY(y: number): number;
+    project(lnglat: [number, number]): [number, number];
+    unproject(xy: [number, number]): [number, number];
+}

package/es/map/util/simpleMapCoord.js

@@ -0,0 +1,54 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+export class SimpleMapCoord {
+  constructor(size) {
+    _defineProperty(this, "size", 10000);
+    this.size = size ? size : 10000;
+  }
+  setSize(size) {
+    this.size = size;
+  }
+  getSize() {
+    return [this.size, this.size];
+  }
+
+  /**
+   * coord
+   * ^ y (y > 0)
+   * |
+   * |
+   * |
+   * |(x = 0, y = 0)
+   * ---------------> x (x > 0)
+   */
+
+  /***
+   * lng: [-180, 180] 360
+   * lat: [-85.05112877980659, 85.05112877980659] 170.10225755961318
+   */
+
+  mercatorXfromLng(lng) {
+    // (0 - 1) * this.size
+    return (180 + lng) / 360 * this.size;
+  }
+  mercatorYfromLat(lat) {
+    // (0 - 1) * this.size
+    return (1 - (180 - 180 / Math.PI * Math.log(Math.tan(Math.PI / 4 + lat * Math.PI / 360))) / 360) * this.size;
+  }
+  lngFromMercatorX(x) {
+    return x / this.size * 360 - 180;
+  }
+  latFromMercatorY(y) {
+    const y2 = 180 - (1 - y / this.size) * 360;
+    return 360 / Math.PI * Math.atan(Math.exp(y2 * Math.PI / 180)) - 90;
+  }
+  project(lnglat) {
+    const x = this.mercatorXfromLng(lnglat[0]);
+    const y = this.mercatorYfromLat(lnglat[1]);
+    return [x, y];
+  }
+  unproject(xy) {
+    const lng = this.lngFromMercatorX(xy[0]);
+    const lat = this.latFromMercatorY(xy[1]);
+    return [lng, lat];
+  }
+}

package/lib/index.d.ts

@@ -1,3 +1,5 @@
+export { MapMouseEvent } from './map/events';
 export { MercatorCoordinate } from './map/geo/mercator_coordinate';
 export { Map } from './map/map';
 export type { MapOptions } from './map/map';
+export { SimpleMapCoord, type ISimpleMapCoord } from './map/util/simpleMapCoord';

package/lib/index.js

@@ -9,11 +9,25 @@ Object.defineProperty(exports, "Map", {
     return _map.Map;
   }
 });
+Object.defineProperty(exports, "MapMouseEvent", {
+  enumerable: true,
+  get: function () {
+    return _events.MapMouseEvent;
+  }
+});
 Object.defineProperty(exports, "MercatorCoordinate", {
   enumerable: true,
   get: function () {
     return _mercator_coordinate.MercatorCoordinate;
   }
 });
+Object.defineProperty(exports, "SimpleMapCoord", {
+  enumerable: true,
+  get: function () {
+    return _simpleMapCoord.SimpleMapCoord;
+  }
+});
+var _events = require("./map/events");
 var _mercator_coordinate = require("./map/geo/mercator_coordinate");
-var _map = require("./map/map");
+var _map = require("./map/map");
+var _simpleMapCoord = require("./map/util/simpleMapCoord");

package/lib/map/events.js

@@ -9,6 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _evented = require("./util/evented");
 var _pointGeometry = _interopRequireDefault(require("@mapbox/point-geometry"));
 var _dom = require("./util/dom");
+var _simpleMapCoord = require("./util/simpleMapCoord");
 /**
  * `MapEventType` - a mapping between the event name and the event value.
  * These events are used with the {@link Map#on} method.
@@ -100,6 +101,14 @@ class MapMouseEvent extends _evented.Event {
     this.originalEvent = originalEvent;
     this._defaultPrevented = false;
     this.target = map;
+    if (map.version === 'SIMPLE') {
+      const simpleMapCoord = new _simpleMapCoord.SimpleMapCoord(map.mapSize);
+      const [lng, lat] = simpleMapCoord.project([lngLat.lng, lngLat.lat]);
+      this.lngLat = {
+        lng,
+        lat
+      };
+    }
   }
 }
 

package/lib/map/geo/transform.js

@@ -464,7 +464,7 @@ class Transform {
     }
   }
   customLayerMatrix() {
-    return this.mercatorMatrix.slice();
+    return _glMatrix.mat4.clone(this.mercatorMatrix);
   }
 
   /**

package/lib/map/map.d.ts

@@ -25,6 +25,16 @@ import type { TaskID } from './util/task_queue';
  * The {@link Map} options object.
  */
 export type MapOptions = {
+    /**
+     * The MapType of the map.
+     * @defaultValue DEFAUlTMAP
+     */
+    version?: string;
+    /**
+     * The map size for SIMPLE map.
+     * @defaultValue 10000
+     */
+    mapSize?: number;
     /**
      * If `false`, no mouse, touch, or keyboard listeners will be attached to the map, so it will not respond to interaction.
      * @defaultValue true
@@ -209,6 +219,8 @@ export declare class Map extends Camera {
     _mapId: number;
     _removed: boolean;
     _clickTolerance: number;
+    version: string;
+    mapSize: number;
     /**
      * The map's {@link ScrollZoomHandler}, which implements zooming in and out with a scroll wheel or trackpad.
      * Find more details and examples using `scrollZoom` in the {@link ScrollZoomHandler} section.
@@ -508,7 +520,7 @@ export declare class Map extends Camera {
      * @param type - The type of the event.
      * @param listener - The listener callback.
      */
-    on<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & Object) => void): this;
+    on<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & object) => void): this;
     /**
      * Overload of the `on` method that allows to listen to events without specifying a layer.
      * @event
@@ -522,7 +534,7 @@ export declare class Map extends Camera {
      * @param type - The type of the event.
      * @param listener - The listener callback.
      */
-    once<T extends keyof MapEventType>(type: T, listener?: (ev: MapEventType[T] & Object) => void): this | Promise<any>;
+    once<T extends keyof MapEventType>(type: T, listener?: (ev: MapEventType[T] & object) => void): this | Promise<any>;
     /**
      * Overload of the `once` method that allows to listen to events without specifying a layer.
      * @event
@@ -536,7 +548,7 @@ export declare class Map extends Camera {
      * @param type - The type of the event.
      * @param listener - The function previously installed as a listener.
      */
-    off<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & Object) => void): this;
+    off<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & object) => void): this;
     /**
      * Overload of the `off` method that allows to listen to events without specifying a layer.
      * @event

package/lib/map/map.js

@@ -325,6 +325,8 @@ class Map extends _camera.Camera {
     (0, _defineProperty2.default)(this, "_mapId", (0, _util.uniqueId)());
     (0, _defineProperty2.default)(this, "_removed", void 0);
     (0, _defineProperty2.default)(this, "_clickTolerance", void 0);
+    (0, _defineProperty2.default)(this, "version", void 0);
+    (0, _defineProperty2.default)(this, "mapSize", void 0);
     /**
      * The map's {@link ScrollZoomHandler}, which implements zooming in and out with a scroll wheel or trackpad.
      * Find more details and examples using `scrollZoom` in the {@link ScrollZoomHandler} section.
@@ -384,6 +386,8 @@ class Map extends _camera.Camera {
     this._bearingSnap = resolvedOptions.bearingSnap;
     this._fadeDuration = resolvedOptions.fadeDuration;
     this._clickTolerance = resolvedOptions.clickTolerance;
+    this.version = options.version;
+    this.mapSize = options.mapSize;
     if (typeof resolvedOptions.container === 'string') {
       this._container = document.getElementById(resolvedOptions.container);
       if (!this._container) {

package/lib/map/util/simpleMapCoord.d.ts

@@ -0,0 +1,31 @@
+export interface ISimpleMapCoord {
+    setSize(size: number): void;
+    getSize(): [number, number];
+    project(lnglat: [number, number]): [number, number];
+    unproject(xy: [number, number]): [number, number];
+}
+export declare class SimpleMapCoord implements ISimpleMapCoord {
+    private size;
+    constructor(size?: number);
+    setSize(size: number): void;
+    getSize(): [number, number];
+    /**
+     * coord
+     * ^ y (y > 0)
+     * |
+     * |
+     * |
+     * |(x = 0, y = 0)
+     * ---------------> x (x > 0)
+     */
+    /***
+     * lng: [-180, 180] 360
+     * lat: [-85.05112877980659, 85.05112877980659] 170.10225755961318
+     */
+    mercatorXfromLng(lng: number): number;
+    mercatorYfromLat(lat: number): number;
+    lngFromMercatorX(x: number): number;
+    latFromMercatorY(y: number): number;
+    project(lnglat: [number, number]): [number, number];
+    unproject(xy: [number, number]): [number, number];
+}

package/lib/map/util/simpleMapCoord.js

@@ -0,0 +1,62 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SimpleMapCoord = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+class SimpleMapCoord {
+  constructor(size) {
+    (0, _defineProperty2.default)(this, "size", 10000);
+    this.size = size ? size : 10000;
+  }
+  setSize(size) {
+    this.size = size;
+  }
+  getSize() {
+    return [this.size, this.size];
+  }
+
+  /**
+   * coord
+   * ^ y (y > 0)
+   * |
+   * |
+   * |
+   * |(x = 0, y = 0)
+   * ---------------> x (x > 0)
+   */
+
+  /***
+   * lng: [-180, 180] 360
+   * lat: [-85.05112877980659, 85.05112877980659] 170.10225755961318
+   */
+
+  mercatorXfromLng(lng) {
+    // (0 - 1) * this.size
+    return (180 + lng) / 360 * this.size;
+  }
+  mercatorYfromLat(lat) {
+    // (0 - 1) * this.size
+    return (1 - (180 - 180 / Math.PI * Math.log(Math.tan(Math.PI / 4 + lat * Math.PI / 360))) / 360) * this.size;
+  }
+  lngFromMercatorX(x) {
+    return x / this.size * 360 - 180;
+  }
+  latFromMercatorY(y) {
+    const y2 = 180 - (1 - y / this.size) * 360;
+    return 360 / Math.PI * Math.atan(Math.exp(y2 * Math.PI / 180)) - 90;
+  }
+  project(lnglat) {
+    const x = this.mercatorXfromLng(lnglat[0]);
+    const y = this.mercatorYfromLat(lnglat[1]);
+    return [x, y];
+  }
+  unproject(xy) {
+    const lng = this.lngFromMercatorX(xy[0]);
+    const lat = this.latFromMercatorY(xy[1]);
+    return [lng, lat];
+  }
+}
+exports.SimpleMapCoord = SimpleMapCoord;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-map",
-  "version": "2.22.7",
+  "version": "2.23.1",
   "description": "L7 Map",
   "keywords": [],
   "homepage": "https://github.com/antvis/L7#readme",
@@ -27,7 +27,7 @@
     "@mapbox/unitbezier": "^0.0.1",
     "eventemitter3": "^4.0.4",
     "gl-matrix": "^3.1.0",
-    "@antv/l7-utils": "2.22.7"
+    "@antv/l7-utils": "2.23.1"
   },
   "devDependencies": {
     "@types/mapbox__point-geometry": "^0.1.4"