@antv/l7-map 2.21.0 → 2.21.2

package/lib/geo/mercator.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,15 +13,14 @@ exports.mercatorScale = mercatorScale;
 exports.mercatorXfromLng = mercatorXfromLng;
 exports.mercatorYfromLat = mercatorYfromLat;
 exports.mercatorZfromAltitude = mercatorZfromAltitude;
-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 _lng_lat = _interopRequireWildcard(require("../geo/lng_lat"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /*
  * The average circumference of the world in meters.
  */
-var earthCircumfrence = 2 * Math.PI * _lng_lat.earthRadius; // meters
+const earthCircumfrence = 2 * Math.PI * _lng_lat.earthRadius; // meters
 
 /*
  * The circumference at a line of latitude in meters.
@@ -43,7 +41,7 @@ function lngFromMercatorX(x) {
   return x * 360 - 180;
 }
 function latFromMercatorY(y) {
-  var y2 = 180 - y * 360;
+  const y2 = 180 - y * 360;
   return 360 / Math.PI * Math.atan(Math.exp(y2 * Math.PI / 180)) - 90;
 }
 function altitudeFromMercatorZ(z, y) {
@@ -63,37 +61,28 @@ function altitudeFromMercatorZ(z, y) {
 function mercatorScale(lat) {
   return 1 / Math.cos(lat * Math.PI / 180);
 }
-var MercatorCoordinate = exports.MercatorCoordinate = exports.default = /*#__PURE__*/function () {
-  function MercatorCoordinate(x, y) {
-    var z = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    (0, _classCallCheck2.default)(this, MercatorCoordinate);
+class MercatorCoordinate {
+  static fromLngLat(lngLatLike, altitude = 0) {
+    const lngLat = _lng_lat.default.convert(lngLatLike);
+    return new MercatorCoordinate(mercatorXfromLng(lngLat.lng), mercatorYfromLat(lngLat.lat), mercatorZfromAltitude(altitude, lngLat.lat));
+  }
+  constructor(x, y, z = 0) {
+    (0, _defineProperty2.default)(this, "x", void 0);
+    (0, _defineProperty2.default)(this, "y", void 0);
+    (0, _defineProperty2.default)(this, "z", void 0);
     this.x = +x;
     this.y = +y;
     this.z = +z;
   }
-  (0, _createClass2.default)(MercatorCoordinate, [{
-    key: "toLngLat",
-    value: function toLngLat() {
-      return new _lng_lat.default(lngFromMercatorX(this.x), latFromMercatorY(this.y));
-    }
-  }, {
-    key: "toAltitude",
-    value: function toAltitude() {
-      return altitudeFromMercatorZ(this.z, this.y);
-    }
-  }, {
-    key: "meterInMercatorCoordinateUnits",
-    value: function meterInMercatorCoordinateUnits() {
-      // 1 meter / circumference at equator in meters * Mercator projection scale factor at this latitude
-      return 1 / earthCircumfrence * mercatorScale(latFromMercatorY(this.y));
-    }
-  }], [{
-    key: "fromLngLat",
-    value: function fromLngLat(lngLatLike) {
-      var altitude = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-      var lngLat = _lng_lat.default.convert(lngLatLike);
-      return new MercatorCoordinate(mercatorXfromLng(lngLat.lng), mercatorYfromLat(lngLat.lat), mercatorZfromAltitude(altitude, lngLat.lat));
-    }
-  }]);
-  return MercatorCoordinate;
-}();
+  toLngLat() {
+    return new _lng_lat.default(lngFromMercatorX(this.x), latFromMercatorY(this.y));
+  }
+  toAltitude() {
+    return altitudeFromMercatorZ(this.z, this.y);
+  }
+  meterInMercatorCoordinateUnits() {
+    // 1 meter / circumference at equator in meters * Mercator projection scale factor at this latitude
+    return 1 / earthCircumfrence * mercatorScale(latFromMercatorY(this.y));
+  }
+}
+exports.MercatorCoordinate = exports.default = MercatorCoordinate;

package/lib/geo/point.d.ts

@@ -0,0 +1,40 @@
+export type PointLike = [number, number] | Point;
+export default class Point {
+    static convert(a: any): any;
+    x: number;
+    y: number;
+    constructor(x: number, y: number);
+    clone(): Point;
+    _add(p: Point): this;
+    add(p: Point): Point;
+    _sub(p: Point): this;
+    sub(p: Point): Point;
+    _multByPoint(p: Point): this;
+    multByPoint(p: Point): Point;
+    _divByPoint(p: Point): this;
+    divByPoint(p: Point): Point;
+    _mult(k: number): this;
+    mult(k: number): Point;
+    _div(k: number): this;
+    div(k: number): Point;
+    _rotate(angle: number): this;
+    rotate(angle: number): Point;
+    _rotateAround(angle: number, p: Point): this;
+    roateAround(angle: number, p: Point): Point;
+    _matMult(m: number[]): this;
+    matMult(m: number[]): Point;
+    _unit(): this;
+    unit(): Point;
+    _perp(): this;
+    perp(): Point;
+    _round(): this;
+    round(): Point;
+    mag(): number;
+    equals(other: Point): boolean;
+    dist(p: Point): number;
+    distSqr(p: Point): number;
+    angle(): number;
+    angleTo(b: Point): number;
+    angleWith(b: Point): number;
+    angleWithSep(x: number, y: number): number;
+}

package/lib/geo/point.js

@@ -5,226 +5,157 @@ 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 Point = exports.default = /*#__PURE__*/function () {
-  function Point(x, y) {
-    (0, _classCallCheck2.default)(this, Point);
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+class Point {
+  static convert(a) {
+    if (a instanceof Point) {
+      return a;
+    }
+    if (Array.isArray(a)) {
+      return new Point(a[0], a[1]);
+    }
+    return a;
+  }
+  constructor(x, y) {
+    (0, _defineProperty2.default)(this, "x", void 0);
+    (0, _defineProperty2.default)(this, "y", void 0);
     this.x = x;
     this.y = y;
   }
-  (0, _createClass2.default)(Point, [{
-    key: "clone",
-    value: function clone() {
-      return new Point(this.x, this.y);
-    }
-  }, {
-    key: "_add",
-    value: function _add(p) {
-      this.x += p.x;
-      this.y += p.y;
-      return this;
-    }
-  }, {
-    key: "add",
-    value: function add(p) {
-      return this.clone()._add(p);
-    }
-  }, {
-    key: "_sub",
-    value: function _sub(p) {
-      this.x -= p.x;
-      this.y -= p.y;
-      return this;
-    }
-  }, {
-    key: "sub",
-    value: function sub(p) {
-      return this.clone()._sub(p);
-    }
-  }, {
-    key: "_multByPoint",
-    value: function _multByPoint(p) {
-      this.x *= p.x;
-      this.y *= p.y;
-      return this;
-    }
-  }, {
-    key: "multByPoint",
-    value: function multByPoint(p) {
-      return this.clone()._multByPoint(p);
-    }
-  }, {
-    key: "_divByPoint",
-    value: function _divByPoint(p) {
-      this.x /= p.x;
-      this.y /= p.y;
-      return this;
-    }
-  }, {
-    key: "divByPoint",
-    value: function divByPoint(p) {
-      return this.clone()._divByPoint(p);
-    }
-  }, {
-    key: "_mult",
-    value: function _mult(k) {
-      this.x *= k;
-      this.y *= k;
-      return this;
-    }
-  }, {
-    key: "mult",
-    value: function mult(k) {
-      return this.clone()._mult(k);
-    }
-  }, {
-    key: "_div",
-    value: function _div(k) {
-      this.x /= k;
-      this.y /= k;
-      return this;
-    }
-  }, {
-    key: "div",
-    value: function div(k) {
-      return this.clone()._div(k);
-    }
-  }, {
-    key: "_rotate",
-    value: function _rotate(angle) {
-      var cos = Math.cos(angle);
-      var sin = Math.sin(angle);
-      var x = cos * this.x - sin * this.y;
-      var y = sin * this.x + cos * this.y;
-      this.x = x;
-      this.y = y;
-      return this;
-    }
-  }, {
-    key: "rotate",
-    value: function rotate(angle) {
-      return this.clone()._rotate(angle);
-    }
-  }, {
-    key: "_rotateAround",
-    value: function _rotateAround(angle, p) {
-      var cos = Math.cos(angle);
-      var sin = Math.sin(angle);
-      var x = p.x + cos * (this.x - p.x) - sin * (this.y - p.y);
-      var y = p.y + sin * (this.x - p.x) + cos * (this.y - p.y);
-      this.x = x;
-      this.y = y;
-      return this;
-    }
-  }, {
-    key: "roateAround",
-    value: function roateAround(angle, p) {
-      return this.clone()._rotateAround(angle, p);
-    }
-  }, {
-    key: "_matMult",
-    value: function _matMult(m) {
-      var x = m[0] * this.x + m[1] * this.y;
-      var y = m[2] * this.x + m[3] * this.y;
-      this.x = x;
-      this.y = y;
-      return this;
-    }
-  }, {
-    key: "matMult",
-    value: function matMult(m) {
-      return this.clone()._matMult(m);
-    }
-  }, {
-    key: "_unit",
-    value: function _unit() {
-      this.div(this.mag());
-      return this;
-    }
-  }, {
-    key: "unit",
-    value: function unit() {
-      return this.clone()._unit();
-    }
-  }, {
-    key: "_perp",
-    value: function _perp() {
-      var y = this.y;
-      this.y = this.x;
-      this.x = -y;
-      return this;
-    }
-  }, {
-    key: "perp",
-    value: function perp() {
-      return this.clone()._perp();
-    }
-  }, {
-    key: "_round",
-    value: function _round() {
-      this.x = Math.round(this.x);
-      this.y = Math.round(this.y);
-      return this;
-    }
-  }, {
-    key: "round",
-    value: function round() {
-      return this.clone()._round();
-    }
-  }, {
-    key: "mag",
-    value: function mag() {
-      return Math.sqrt(this.x * this.x + this.y * this.y);
-    }
-  }, {
-    key: "equals",
-    value: function equals(other) {
-      return this.x === other.x && this.y === other.y;
-    }
-  }, {
-    key: "dist",
-    value: function dist(p) {
-      return Math.sqrt(this.distSqr(p));
-    }
-  }, {
-    key: "distSqr",
-    value: function distSqr(p) {
-      var dx = p.x - this.x;
-      var dy = p.y - this.y;
-      return dx * dx + dy * dy;
-    }
-  }, {
-    key: "angle",
-    value: function angle() {
-      return Math.atan2(this.y, this.x);
-    }
-  }, {
-    key: "angleTo",
-    value: function angleTo(b) {
-      return Math.atan2(this.y - b.y, this.x - b.x);
-    }
-  }, {
-    key: "angleWith",
-    value: function angleWith(b) {
-      return this.angleWithSep(b.x, b.y);
-    }
-  }, {
-    key: "angleWithSep",
-    value: function angleWithSep(x, y) {
-      return Math.atan2(this.x * y - this.y * x, this.x * x + this.y * y);
-    }
-  }], [{
-    key: "convert",
-    value: function convert(a) {
-      if (a instanceof Point) {
-        return a;
-      }
-      if (Array.isArray(a)) {
-        return new Point(a[0], a[1]);
-      }
-      return a;
-    }
-  }]);
-  return Point;
-}();
+  clone() {
+    return new Point(this.x, this.y);
+  }
+  _add(p) {
+    this.x += p.x;
+    this.y += p.y;
+    return this;
+  }
+  add(p) {
+    return this.clone()._add(p);
+  }
+  _sub(p) {
+    this.x -= p.x;
+    this.y -= p.y;
+    return this;
+  }
+  sub(p) {
+    return this.clone()._sub(p);
+  }
+  _multByPoint(p) {
+    this.x *= p.x;
+    this.y *= p.y;
+    return this;
+  }
+  multByPoint(p) {
+    return this.clone()._multByPoint(p);
+  }
+  _divByPoint(p) {
+    this.x /= p.x;
+    this.y /= p.y;
+    return this;
+  }
+  divByPoint(p) {
+    return this.clone()._divByPoint(p);
+  }
+  _mult(k) {
+    this.x *= k;
+    this.y *= k;
+    return this;
+  }
+  mult(k) {
+    return this.clone()._mult(k);
+  }
+  _div(k) {
+    this.x /= k;
+    this.y /= k;
+    return this;
+  }
+  div(k) {
+    return this.clone()._div(k);
+  }
+  _rotate(angle) {
+    const cos = Math.cos(angle);
+    const sin = Math.sin(angle);
+    const x = cos * this.x - sin * this.y;
+    const y = sin * this.x + cos * this.y;
+    this.x = x;
+    this.y = y;
+    return this;
+  }
+  rotate(angle) {
+    return this.clone()._rotate(angle);
+  }
+  _rotateAround(angle, p) {
+    const cos = Math.cos(angle);
+    const sin = Math.sin(angle);
+    const x = p.x + cos * (this.x - p.x) - sin * (this.y - p.y);
+    const y = p.y + sin * (this.x - p.x) + cos * (this.y - p.y);
+    this.x = x;
+    this.y = y;
+    return this;
+  }
+  roateAround(angle, p) {
+    return this.clone()._rotateAround(angle, p);
+  }
+  _matMult(m) {
+    const x = m[0] * this.x + m[1] * this.y;
+    const y = m[2] * this.x + m[3] * this.y;
+    this.x = x;
+    this.y = y;
+    return this;
+  }
+  matMult(m) {
+    return this.clone()._matMult(m);
+  }
+  _unit() {
+    this.div(this.mag());
+    return this;
+  }
+  unit() {
+    return this.clone()._unit();
+  }
+  _perp() {
+    const y = this.y;
+    this.y = this.x;
+    this.x = -y;
+    return this;
+  }
+  perp() {
+    return this.clone()._perp();
+  }
+  _round() {
+    this.x = Math.round(this.x);
+    this.y = Math.round(this.y);
+    return this;
+  }
+  round() {
+    return this.clone()._round();
+  }
+  mag() {
+    return Math.sqrt(this.x * this.x + this.y * this.y);
+  }
+  equals(other) {
+    return this.x === other.x && this.y === other.y;
+  }
+  dist(p) {
+    return Math.sqrt(this.distSqr(p));
+  }
+  distSqr(p) {
+    const dx = p.x - this.x;
+    const dy = p.y - this.y;
+    return dx * dx + dy * dy;
+  }
+  angle() {
+    return Math.atan2(this.y, this.x);
+  }
+  angleTo(b) {
+    return Math.atan2(this.y - b.y, this.x - b.x);
+  }
+  angleWith(b) {
+    return this.angleWithSep(b.x, b.y);
+  }
+  angleWithSep(x, y) {
+    return Math.atan2(this.x * y - this.y * x, this.x * x + this.y * y);
+  }
+}
+exports.default = Point;

package/lib/geo/simple.d.ts

@@ -0,0 +1,30 @@
+import type { LngLatLike } from '../geo/lng_lat';
+import LngLat from '../geo/lng_lat';
+export declare function circumferenceAtLatitude(latitude: number): number;
+export declare function mercatorXfromLng(lng: number): number;
+export declare function mercatorYfromLat(lat: number): number;
+export declare function mercatorZfromAltitude(altitude: number, lat: number): number;
+export declare function lngFromMercatorX(x: number): number;
+export declare function latFromMercatorY(y: number): number;
+export declare function altitudeFromMercatorZ(z: number, y: number): number;
+/**
+ * Determine the Mercator scale factor for a given latitude, see
+ * https://en.wikipedia.org/wiki/Mercator_projection#Scale_factor
+ *
+ * At the equator the scale factor will be 1, which increases at higher latitudes.
+ *
+ * @param {number} lat Latitude
+ * @returns {number} scale factor
+ * @private
+ */
+export declare function mercatorScale(lat: number): number;
+export default class SimpleCoordinate {
+    static fromLngLat(lngLatLike: LngLatLike, altitude?: number): SimpleCoordinate;
+    x: number;
+    y: number;
+    z: number;
+    constructor(x: number, y: number, z?: number);
+    toLngLat(): LngLat;
+    toAltitude(): number;
+    meterInMercatorCoordinateUnits(): number;
+}

package/lib/geo/simple.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,15 +13,14 @@ exports.mercatorScale = mercatorScale;
 exports.mercatorXfromLng = mercatorXfromLng;
 exports.mercatorYfromLat = mercatorYfromLat;
 exports.mercatorZfromAltitude = mercatorZfromAltitude;
-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 _lng_lat = _interopRequireWildcard(require("../geo/lng_lat"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /*
  * The average circumference of the world in meters.
  */
-var earthCircumfrence = 2 * Math.PI * _lng_lat.earthRadius; // meters
+const earthCircumfrence = 2 * Math.PI * _lng_lat.earthRadius; // meters
 
 /*
  * The circumference at a line of latitude in meters.
@@ -67,37 +65,28 @@ function altitudeFromMercatorZ(z, y) {
 function mercatorScale(lat) {
   return 1;
 }
-var SimpleCoordinate = exports.default = /*#__PURE__*/function () {
-  function SimpleCoordinate(x, y) {
-    var z = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    (0, _classCallCheck2.default)(this, SimpleCoordinate);
+class SimpleCoordinate {
+  static fromLngLat(lngLatLike, altitude = 0) {
+    const lngLat = _lng_lat.default.convert(lngLatLike);
+    return new SimpleCoordinate(mercatorXfromLng(lngLat.lng), mercatorYfromLat(lngLat.lat), mercatorZfromAltitude(altitude, lngLat.lat));
+  }
+  constructor(x, y, z = 0) {
+    (0, _defineProperty2.default)(this, "x", void 0);
+    (0, _defineProperty2.default)(this, "y", void 0);
+    (0, _defineProperty2.default)(this, "z", void 0);
     this.x = +x;
     this.y = +y;
     this.z = +z;
   }
-  (0, _createClass2.default)(SimpleCoordinate, [{
-    key: "toLngLat",
-    value: function toLngLat() {
-      return new _lng_lat.default(this.x, this.y);
-    }
-  }, {
-    key: "toAltitude",
-    value: function toAltitude() {
-      return this.z;
-    }
-  }, {
-    key: "meterInMercatorCoordinateUnits",
-    value: function meterInMercatorCoordinateUnits() {
-      // 1 meter / circumference at equator in meters * Mercator projection scale factor at this latitude
-      return 1;
-    }
-  }], [{
-    key: "fromLngLat",
-    value: function fromLngLat(lngLatLike) {
-      var altitude = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-      var lngLat = _lng_lat.default.convert(lngLatLike);
-      return new SimpleCoordinate(mercatorXfromLng(lngLat.lng), mercatorYfromLat(lngLat.lat), mercatorZfromAltitude(altitude, lngLat.lat));
-    }
-  }]);
-  return SimpleCoordinate;
-}();
+  toLngLat() {
+    return new _lng_lat.default(this.x, this.y);
+  }
+  toAltitude() {
+    return this.z;
+  }
+  meterInMercatorCoordinateUnits() {
+    // 1 meter / circumference at equator in meters * Mercator projection scale factor at this latitude
+    return 1;
+  }
+}
+exports.default = SimpleCoordinate;