@antv/l7-map 2.21.0 → 2.21.2

package/es/geo/edge_insets.js

@@ -1,7 +1,6 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 // @ts-ignore
-import { clamp, interpolate as _interpolate } from "../util";
+import { clamp, interpolate } from "../util";
 import Point from "./point";
 
 /**
@@ -14,13 +13,12 @@ import Point from "./point";
  * @param {number} [left=0]
  * @param {number} [right=0]
  */
-var EdgeInsets = /*#__PURE__*/function () {
-  function EdgeInsets() {
-    var top = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-    var bottom = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-    var left = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    var right = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-    _classCallCheck(this, EdgeInsets);
+export default class EdgeInsets {
+  constructor(top = 0, bottom = 0, left = 0, right = 0) {
+    _defineProperty(this, "top", void 0);
+    _defineProperty(this, "bottom", void 0);
+    _defineProperty(this, "left", void 0);
+    _defineProperty(this, "right", void 0);
     if (isNaN(top) || top < 0 || isNaN(bottom) || bottom < 0 || isNaN(left) || left < 0 || isNaN(right) || right < 0) {
       throw new Error('Invalid value for edge-insets, top, bottom, left and right must all be numbers');
     }
@@ -39,70 +37,57 @@ var EdgeInsets = /*#__PURE__*/function () {
    * @returns {EdgeInsets}
    * @memberof EdgeInsets
    */
-  _createClass(EdgeInsets, [{
-    key: "interpolate",
-    value: function interpolate(start, target, t) {
-      if (target.top != null && start.top != null) {
-        this.top = _interpolate(start.top, target.top, t);
-      }
-      if (target.bottom != null && start.bottom != null) {
-        this.bottom = _interpolate(start.bottom, target.bottom, t);
-      }
-      if (target.left != null && start.left != null) {
-        this.left = _interpolate(start.left, target.left, t);
-      }
-      if (target.right != null && start.right != null) {
-        this.right = _interpolate(start.right, target.right, t);
-      }
-      return this;
+  interpolate(start, target, t) {
+    if (target.top != null && start.top != null) {
+      this.top = interpolate(start.top, target.top, t);
     }
-
-    /**
-     * Utility method that computes the new apprent center or vanishing point after applying insets.
-     * This is in pixels and with the top left being (0.0) and +y being downwards.
-     *
-     * @param {number} width
-     * @param {number} height
-     * @returns {Point}
-     * @memberof EdgeInsets
-     */
-  }, {
-    key: "getCenter",
-    value: function getCenter(width, height) {
-      // Clamp insets so they never overflow width/height and always calculate a valid center
-      var x = clamp((this.left + width - this.right) / 2, 0, width);
-      var y = clamp((this.top + height - this.bottom) / 2, 0, height);
-      return new Point(x, y);
+    if (target.bottom != null && start.bottom != null) {
+      this.bottom = interpolate(start.bottom, target.bottom, t);
     }
-  }, {
-    key: "equals",
-    value: function equals(other) {
-      return this.top === other.top && this.bottom === other.bottom && this.left === other.left && this.right === other.right;
+    if (target.left != null && start.left != null) {
+      this.left = interpolate(start.left, target.left, t);
     }
-  }, {
-    key: "clone",
-    value: function clone() {
-      return new EdgeInsets(this.top, this.bottom, this.left, this.right);
+    if (target.right != null && start.right != null) {
+      this.right = interpolate(start.right, target.right, t);
     }
+    return this;
+  }
 
-    /**
-     * Returns the current sdtate as json, useful when you want to have a
-     * read-only representation of the inset.
-     *
-     * @returns {PaddingOptions}
-     * @memberof EdgeInsets
-     */
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return {
-        top: this.top,
-        bottom: this.bottom,
-        left: this.left,
-        right: this.right
-      };
-    }
-  }]);
-  return EdgeInsets;
-}();
-export { EdgeInsets as default };
+  /**
+   * Utility method that computes the new apprent center or vanishing point after applying insets.
+   * This is in pixels and with the top left being (0.0) and +y being downwards.
+   *
+   * @param {number} width
+   * @param {number} height
+   * @returns {Point}
+   * @memberof EdgeInsets
+   */
+  getCenter(width, height) {
+    // Clamp insets so they never overflow width/height and always calculate a valid center
+    const x = clamp((this.left + width - this.right) / 2, 0, width);
+    const y = clamp((this.top + height - this.bottom) / 2, 0, height);
+    return new Point(x, y);
+  }
+  equals(other) {
+    return this.top === other.top && this.bottom === other.bottom && this.left === other.left && this.right === other.right;
+  }
+  clone() {
+    return new EdgeInsets(this.top, this.bottom, this.left, this.right);
+  }
+
+  /**
+   * Returns the current sdtate as json, useful when you want to have a
+   * read-only representation of the inset.
+   *
+   * @returns {PaddingOptions}
+   * @memberof EdgeInsets
+   */
+  toJSON() {
+    return {
+      top: this.top,
+      bottom: this.bottom,
+      left: this.left,
+      right: this.right
+    };
+  }
+}

package/es/geo/lng_lat.js

@@ -1,13 +1,27 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import { wrap as _wrap } from "../util";
-export var earthRadius = 6371008.8;
-var LngLat = /*#__PURE__*/function () {
-  function LngLat(lng, lat) {
-    _classCallCheck(this, LngLat);
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { wrap } from "../util";
+export const earthRadius = 6371008.8;
+export default class LngLat {
+  static convert(input) {
+    if (input instanceof LngLat) {
+      return input;
+    }
+    if (Array.isArray(input) && (input.length === 2 || input.length === 3)) {
+      return new LngLat(Number(input[0]), Number(input[1]));
+    }
+    if (!Array.isArray(input) && typeof input === 'object' && input !== null) {
+      const lng = 'lng' in input ? input.lng : input.lon;
+      return new LngLat(
+      // flow can't refine this to have one of lng or lat, so we have to cast to any
+      Number(lng), Number(input.lat));
+    }
+    throw new Error('`LngLatLike` argument must be specified as a LngLat instance, an object {lng: <lng>, lat: <lat>}, an object {lon: <lng>, lat: <lat>}, or an array of [<lng>, <lat>]');
+  }
+  constructor(lng, lat) {
+    _defineProperty(this, "lng", void 0);
+    _defineProperty(this, "lat", void 0);
     if (isNaN(lng) || isNaN(lat)) {
-      throw new Error("Invalid LngLat object: (".concat(lng, ", ").concat(lat, ")"));
+      throw new Error(`Invalid LngLat object: (${lng}, ${lat})`);
     }
     this.lng = +lng;
     this.lat = +lat;
@@ -15,59 +29,31 @@ var LngLat = /*#__PURE__*/function () {
       throw new Error('Invalid LngLat latitude value: must be between -90 and 90');
     }
   }
-  _createClass(LngLat, [{
-    key: "wrap",
-    value: function wrap() {
-      return new LngLat(_wrap(this.lng, -180, 180), this.lat);
-    }
-  }, {
-    key: "toArray",
-    value: function toArray() {
-      return [this.lng, this.lat];
-    }
-    // public toBounds(radius: number = 0) {
-    //   const earthCircumferenceInMetersAtEquator = 40075017;
-    //   const latAccuracy = (360 * radius) / earthCircumferenceInMetersAtEquator;
-    //   const lngAccuracy = latAccuracy / Math.cos((Math.PI / 180) * this.lat);
+  wrap() {
+    return new LngLat(wrap(this.lng, -180, 180), this.lat);
+  }
+  toArray() {
+    return [this.lng, this.lat];
+  }
+  // public toBounds(radius: number = 0) {
+  //   const earthCircumferenceInMetersAtEquator = 40075017;
+  //   const latAccuracy = (360 * radius) / earthCircumferenceInMetersAtEquator;
+  //   const lngAccuracy = latAccuracy / Math.cos((Math.PI / 180) * this.lat);
 
-    //   return new LngLatBounds(
-    //     new LngLat(this.lng - lngAccuracy, this.lat - latAccuracy),
-    //     new LngLat(this.lng + lngAccuracy, this.lat + latAccuracy),
-    //   );
-    // }
-  }, {
-    key: "toString",
-    value: function toString() {
-      return "LngLat(".concat(this.lng, ", ").concat(this.lat, ")");
-    }
-  }, {
-    key: "distanceTo",
-    value: function distanceTo(lngLat) {
-      var rad = Math.PI / 180;
-      var lat1 = this.lat * rad;
-      var lat2 = lngLat.lat * rad;
-      var a = Math.sin(lat1) * Math.sin(lat2) + Math.cos(lat1) * Math.cos(lat2) * Math.cos((lngLat.lng - this.lng) * rad);
-      var maxMeters = earthRadius * Math.acos(Math.min(a, 1));
-      return maxMeters;
-    }
-  }], [{
-    key: "convert",
-    value: function convert(input) {
-      if (input instanceof LngLat) {
-        return input;
-      }
-      if (Array.isArray(input) && (input.length === 2 || input.length === 3)) {
-        return new LngLat(Number(input[0]), Number(input[1]));
-      }
-      if (!Array.isArray(input) && _typeof(input) === 'object' && input !== null) {
-        var lng = 'lng' in input ? input.lng : input.lon;
-        return new LngLat(
-        // flow can't refine this to have one of lng or lat, so we have to cast to any
-        Number(lng), Number(input.lat));
-      }
-      throw new Error('`LngLatLike` argument must be specified as a LngLat instance, an object {lng: <lng>, lat: <lat>}, an object {lon: <lng>, lat: <lat>}, or an array of [<lng>, <lat>]');
-    }
-  }]);
-  return LngLat;
-}();
-export { LngLat as default };
+  //   return new LngLatBounds(
+  //     new LngLat(this.lng - lngAccuracy, this.lat - latAccuracy),
+  //     new LngLat(this.lng + lngAccuracy, this.lat + latAccuracy),
+  //   );
+  // }
+  toString() {
+    return `LngLat(${this.lng}, ${this.lat})`;
+  }
+  distanceTo(lngLat) {
+    const rad = Math.PI / 180;
+    const lat1 = this.lat * rad;
+    const lat2 = lngLat.lat * rad;
+    const a = Math.sin(lat1) * Math.sin(lat2) + Math.cos(lat1) * Math.cos(lat2) * Math.cos((lngLat.lng - this.lng) * rad);
+    const maxMeters = earthRadius * Math.acos(Math.min(a, 1));
+    return maxMeters;
+  }
+}

package/es/geo/lng_lat_bounds.js

@@ -1,9 +1,15 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import LngLat from "./lng_lat";
-var LngLatBounds = /*#__PURE__*/function () {
-  function LngLatBounds(sw, ne) {
-    _classCallCheck(this, LngLatBounds);
+export default class LngLatBounds {
+  static convert(input) {
+    if (input instanceof LngLatBounds) {
+      return input;
+    }
+    return new LngLatBounds(input);
+  }
+  constructor(sw, ne) {
+    _defineProperty(this, "ne", void 0);
+    _defineProperty(this, "sw", void 0);
     if (!sw) {
       // noop
     } else if (ne) {
@@ -14,141 +20,99 @@ var LngLatBounds = /*#__PURE__*/function () {
       this.setSouthWest(sw[0]).setNorthEast(sw[1]);
     }
   }
-  _createClass(LngLatBounds, [{
-    key: "setNorthEast",
-    value: function setNorthEast(ne) {
-      this.ne = ne instanceof LngLat ? new LngLat(ne.lng, ne.lat) : LngLat.convert(ne);
-      return this;
-    }
-  }, {
-    key: "setSouthWest",
-    value: function setSouthWest(sw) {
-      this.sw = sw instanceof LngLat ? new LngLat(sw.lng, sw.lat) : LngLat.convert(sw);
-      return this;
-    }
-  }, {
-    key: "extend",
-    value: function extend(obj) {
-      var sw = this.sw;
-      var ne = this.ne;
-      var sw2;
-      var ne2;
-      if (obj instanceof LngLat) {
-        sw2 = obj;
-        ne2 = obj;
-      } else if (obj instanceof LngLatBounds) {
-        sw2 = obj.sw;
-        ne2 = obj.ne;
-        if (!sw2 || !ne2) {
-          return this;
-        }
-      } else {
-        if (Array.isArray(obj)) {
-          // @ts-ignore
-          if (obj.length === 4 || obj.every(Array.isArray)) {
-            var lngLatBoundsObj = obj;
-            return this.extend(LngLatBounds.convert(lngLatBoundsObj));
-          } else {
-            var lngLatObj = obj;
-            return this.extend(LngLat.convert(lngLatObj));
-          }
-        }
+  setNorthEast(ne) {
+    this.ne = ne instanceof LngLat ? new LngLat(ne.lng, ne.lat) : LngLat.convert(ne);
+    return this;
+  }
+  setSouthWest(sw) {
+    this.sw = sw instanceof LngLat ? new LngLat(sw.lng, sw.lat) : LngLat.convert(sw);
+    return this;
+  }
+  extend(obj) {
+    const sw = this.sw;
+    const ne = this.ne;
+    let sw2;
+    let ne2;
+    if (obj instanceof LngLat) {
+      sw2 = obj;
+      ne2 = obj;
+    } else if (obj instanceof LngLatBounds) {
+      sw2 = obj.sw;
+      ne2 = obj.ne;
+      if (!sw2 || !ne2) {
         return this;
       }
-      if (!sw && !ne) {
-        this.sw = new LngLat(sw2.lng, sw2.lat);
-        this.ne = new LngLat(ne2.lng, ne2.lat);
-      } else {
-        sw.lng = Math.min(sw2.lng, sw.lng);
-        sw.lat = Math.min(sw2.lat, sw.lat);
-        ne.lng = Math.max(ne2.lng, ne.lng);
-        ne.lat = Math.max(ne2.lat, ne.lat);
+    } else {
+      if (Array.isArray(obj)) {
+        // @ts-ignore
+        if (obj.length === 4 || obj.every(Array.isArray)) {
+          const lngLatBoundsObj = obj;
+          return this.extend(LngLatBounds.convert(lngLatBoundsObj));
+        } else {
+          const lngLatObj = obj;
+          return this.extend(LngLat.convert(lngLatObj));
+        }
       }
       return this;
     }
-  }, {
-    key: "getCenter",
-    value: function getCenter() {
-      return new LngLat((this.sw.lng + this.ne.lng) / 2, (this.sw.lat + this.ne.lat) / 2);
-    }
-  }, {
-    key: "getSouthWest",
-    value: function getSouthWest() {
-      return this.sw;
-    }
-  }, {
-    key: "getNorthEast",
-    value: function getNorthEast() {
-      return this.ne;
-    }
-  }, {
-    key: "getNorthWest",
-    value: function getNorthWest() {
-      return new LngLat(this.getWest(), this.getNorth());
-    }
-  }, {
-    key: "getSouthEast",
-    value: function getSouthEast() {
-      return new LngLat(this.getEast(), this.getSouth());
-    }
-  }, {
-    key: "getWest",
-    value: function getWest() {
-      return this.sw.lng;
-    }
-  }, {
-    key: "getSouth",
-    value: function getSouth() {
-      return this.sw.lat;
-    }
-  }, {
-    key: "getEast",
-    value: function getEast() {
-      return this.ne.lng;
-    }
-  }, {
-    key: "getNorth",
-    value: function getNorth() {
-      return this.ne.lat;
-    }
-  }, {
-    key: "toArray",
-    value: function toArray() {
-      return [this.sw.toArray(), this.ne.toArray()];
-    }
-  }, {
-    key: "toString",
-    value: function toString() {
-      return "LngLatBounds(".concat(this.sw.toString(), ", ").concat(this.ne.toString(), ")");
-    }
-  }, {
-    key: "isEmpty",
-    value: function isEmpty() {
-      return !(this.sw && this.ne);
-    }
-  }, {
-    key: "contains",
-    value: function contains(lnglat) {
-      var _LngLat$convert = LngLat.convert(lnglat),
-        lng = _LngLat$convert.lng,
-        lat = _LngLat$convert.lat;
-      var containsLatitude = this.sw.lat <= lat && lat <= this.ne.lat;
-      var containsLongitude = this.sw.lng <= lng && lng <= this.ne.lng;
-      if (this.sw.lng > this.ne.lng) {
-        // wrapped coordinates
-        containsLongitude = this.sw.lng >= lng && lng >= this.ne.lng;
-      }
-      return containsLatitude && containsLongitude;
-    }
-  }], [{
-    key: "convert",
-    value: function convert(input) {
-      if (input instanceof LngLatBounds) {
-        return input;
-      }
-      return new LngLatBounds(input);
+    if (!sw && !ne) {
+      this.sw = new LngLat(sw2.lng, sw2.lat);
+      this.ne = new LngLat(ne2.lng, ne2.lat);
+    } else {
+      sw.lng = Math.min(sw2.lng, sw.lng);
+      sw.lat = Math.min(sw2.lat, sw.lat);
+      ne.lng = Math.max(ne2.lng, ne.lng);
+      ne.lat = Math.max(ne2.lat, ne.lat);
     }
-  }]);
-  return LngLatBounds;
-}();
-export { LngLatBounds as default };
+    return this;
+  }
+  getCenter() {
+    return new LngLat((this.sw.lng + this.ne.lng) / 2, (this.sw.lat + this.ne.lat) / 2);
+  }
+  getSouthWest() {
+    return this.sw;
+  }
+  getNorthEast() {
+    return this.ne;
+  }
+  getNorthWest() {
+    return new LngLat(this.getWest(), this.getNorth());
+  }
+  getSouthEast() {
+    return new LngLat(this.getEast(), this.getSouth());
+  }
+  getWest() {
+    return this.sw.lng;
+  }
+  getSouth() {
+    return this.sw.lat;
+  }
+  getEast() {
+    return this.ne.lng;
+  }
+  getNorth() {
+    return this.ne.lat;
+  }
+  toArray() {
+    return [this.sw.toArray(), this.ne.toArray()];
+  }
+  toString() {
+    return `LngLatBounds(${this.sw.toString()}, ${this.ne.toString()})`;
+  }
+  isEmpty() {
+    return !(this.sw && this.ne);
+  }
+  contains(lnglat) {
+    const {
+      lng,
+      lat
+    } = LngLat.convert(lnglat);
+    const containsLatitude = this.sw.lat <= lat && lat <= this.ne.lat;
+    let containsLongitude = this.sw.lng <= lng && lng <= this.ne.lng;
+    if (this.sw.lng > this.ne.lng) {
+      // wrapped coordinates
+      containsLongitude = this.sw.lng >= lng && lng >= this.ne.lng;
+    }
+    return containsLatitude && containsLongitude;
+  }
+}

package/es/geo/mercator.js

@@ -1,11 +1,10 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import LngLat, { earthRadius } from "../geo/lng_lat";
 
 /*
  * The average circumference of the world in meters.
  */
-var earthCircumfrence = 2 * Math.PI * earthRadius; // meters
+const earthCircumfrence = 2 * Math.PI * earthRadius; // meters
 
 /*
  * The circumference at a line of latitude in meters.
@@ -26,7 +25,7 @@ export function lngFromMercatorX(x) {
   return x * 360 - 180;
 }
 export 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;
 }
 export function altitudeFromMercatorZ(z, y) {
@@ -46,39 +45,28 @@ export function altitudeFromMercatorZ(z, y) {
 export function mercatorScale(lat) {
   return 1 / Math.cos(lat * Math.PI / 180);
 }
-var MercatorCoordinate = /*#__PURE__*/function () {
-  function MercatorCoordinate(x, y) {
-    var z = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    _classCallCheck(this, MercatorCoordinate);
+export default class MercatorCoordinate {
+  static fromLngLat(lngLatLike, altitude = 0) {
+    const lngLat = LngLat.convert(lngLatLike);
+    return new MercatorCoordinate(mercatorXfromLng(lngLat.lng), mercatorYfromLat(lngLat.lat), mercatorZfromAltitude(altitude, lngLat.lat));
+  }
+  constructor(x, y, z = 0) {
+    _defineProperty(this, "x", void 0);
+    _defineProperty(this, "y", void 0);
+    _defineProperty(this, "z", void 0);
     this.x = +x;
     this.y = +y;
     this.z = +z;
   }
-  _createClass(MercatorCoordinate, [{
-    key: "toLngLat",
-    value: function toLngLat() {
-      return new LngLat(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 = LngLat.convert(lngLatLike);
-      return new MercatorCoordinate(mercatorXfromLng(lngLat.lng), mercatorYfromLat(lngLat.lat), mercatorZfromAltitude(altitude, lngLat.lat));
-    }
-  }]);
-  return MercatorCoordinate;
-}();
-export { MercatorCoordinate as default };
+  toLngLat() {
+    return new LngLat(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));
+  }
+}
 export { MercatorCoordinate };