@antv/l7-map 2.21.1 → 2.21.3

package/lib/utils/primitives.js

@@ -5,48 +5,41 @@ 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _glMatrix = require("gl-matrix");
-var Frustum = exports.default = /*#__PURE__*/function () {
-  function Frustum(points, planes) {
-    (0, _classCallCheck2.default)(this, Frustum);
+class Frustum {
+  static fromInvProjectionMatrix(invProj, worldSize, zoom) {
+    const clipSpaceCorners = [[-1, 1, -1, 1], [1, 1, -1, 1], [1, -1, -1, 1], [-1, -1, -1, 1], [-1, 1, 1, 1], [1, 1, 1, 1], [1, -1, 1, 1], [-1, -1, 1, 1]];
+    const scale = Math.pow(2, zoom);
+
+    // Transform frustum corner points from clip space to tile space
+    const frustumCoords = clipSpaceCorners.map(v => _glMatrix.vec4.transformMat4(new Float32Array([]), v, invProj)).map(v => _glMatrix.vec4.scale(new Float32Array([]), v, 1.0 / v[3] / worldSize * scale));
+    const frustumPlanePointIndices = [[0, 1, 2],
+    // near
+    [6, 5, 4],
+    // far
+    [0, 3, 7],
+    // left
+    [2, 1, 5],
+    // right
+    [3, 2, 6],
+    // bottom
+    [0, 4, 5] // top
+    ];
+    const frustumPlanes = frustumPlanePointIndices.map(p => {
+      const a = _glMatrix.vec3.sub(new Float32Array(3), new Float32Array(frustumCoords[p[0]]), new Float32Array(frustumCoords[p[1]]));
+      const b = _glMatrix.vec3.sub(new Float32Array(3), new Float32Array(frustumCoords[p[2]]), new Float32Array(frustumCoords[p[1]]));
+      const n = _glMatrix.vec3.normalize(new Float32Array(3), _glMatrix.vec3.cross(new Float32Array(3), a, b));
+      const d = -_glMatrix.vec3.dot(n, new Float32Array(frustumCoords[p[1]]));
+      return n.concat(d);
+    });
+    return new Frustum(frustumCoords, frustumPlanes);
+  }
+  constructor(points, planes) {
+    (0, _defineProperty2.default)(this, "points", void 0);
+    (0, _defineProperty2.default)(this, "planes", void 0);
     this.points = points;
     this.planes = planes;
   }
-  (0, _createClass2.default)(Frustum, null, [{
-    key: "fromInvProjectionMatrix",
-    value: function fromInvProjectionMatrix(invProj, worldSize, zoom) {
-      var clipSpaceCorners = [[-1, 1, -1, 1], [1, 1, -1, 1], [1, -1, -1, 1], [-1, -1, -1, 1], [-1, 1, 1, 1], [1, 1, 1, 1], [1, -1, 1, 1], [-1, -1, 1, 1]];
-      var scale = Math.pow(2, zoom);
-
-      // Transform frustum corner points from clip space to tile space
-      var frustumCoords = clipSpaceCorners.map(function (v) {
-        return _glMatrix.vec4.transformMat4(new Float32Array([]), v, invProj);
-      }).map(function (v) {
-        return _glMatrix.vec4.scale(new Float32Array([]), v, 1.0 / v[3] / worldSize * scale);
-      });
-      var frustumPlanePointIndices = [[0, 1, 2],
-      // near
-      [6, 5, 4],
-      // far
-      [0, 3, 7],
-      // left
-      [2, 1, 5],
-      // right
-      [3, 2, 6],
-      // bottom
-      [0, 4, 5] // top
-      ];
-      var frustumPlanes = frustumPlanePointIndices.map(function (p) {
-        var a = _glMatrix.vec3.sub(new Float32Array(3), new Float32Array(frustumCoords[p[0]]), new Float32Array(frustumCoords[p[1]]));
-        var b = _glMatrix.vec3.sub(new Float32Array(3), new Float32Array(frustumCoords[p[2]]), new Float32Array(frustumCoords[p[1]]));
-        var n = _glMatrix.vec3.normalize(new Float32Array(3), _glMatrix.vec3.cross(new Float32Array(3), a, b));
-        var d = -_glMatrix.vec3.dot(n, new Float32Array(frustumCoords[p[1]]));
-        return n.concat(d);
-      });
-      return new Frustum(frustumCoords, frustumPlanes);
-    }
-  }]);
-  return Frustum;
-}();
+}
+exports.default = Frustum;

package/lib/utils/task_queue.d.ts

@@ -0,0 +1,13 @@
+export type TaskID = number;
+declare class TaskQueue {
+    private queue;
+    private id;
+    private cleared;
+    private currentlyRunning;
+    constructor();
+    add(callback: (timeStamp: number) => void): TaskID;
+    remove(id: TaskID): void;
+    run(timeStamp?: number): void;
+    clear(): void;
+}
+export default TaskQueue;

package/lib/utils/task_queue.js

@@ -5,92 +5,63 @@ 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"));
-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; }
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 // can't mark opaque due to https://github.com/flowtype/flow-remove-types/pull/61
-var TaskQueue = /*#__PURE__*/function () {
-  function TaskQueue() {
-    (0, _classCallCheck2.default)(this, TaskQueue);
+
+class TaskQueue {
+  constructor() {
+    (0, _defineProperty2.default)(this, "queue", void 0);
+    (0, _defineProperty2.default)(this, "id", void 0);
+    (0, _defineProperty2.default)(this, "cleared", void 0);
+    (0, _defineProperty2.default)(this, "currentlyRunning", void 0);
     this.queue = [];
     this.id = 0;
     this.cleared = false;
     this.currentlyRunning = false;
   }
-  (0, _createClass2.default)(TaskQueue, [{
-    key: "add",
-    value: function add(callback) {
-      var id = ++this.id;
-      var queue = this.queue;
-      queue.push({
-        callback: callback,
-        id: id,
-        cancelled: false
-      });
-      return id;
-    }
-  }, {
-    key: "remove",
-    value: function remove(id) {
-      var running = this.currentlyRunning;
-      var queue = running ? this.queue.concat(running) : this.queue;
-      var _iterator = _createForOfIteratorHelper(queue),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var task = _step.value;
-          if (task.id === id) {
-            task.cancelled = true;
-            return;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+  add(callback) {
+    const id = ++this.id;
+    const queue = this.queue;
+    queue.push({
+      callback,
+      id,
+      cancelled: false
+    });
+    return id;
+  }
+  remove(id) {
+    const running = this.currentlyRunning;
+    const queue = running ? this.queue.concat(running) : this.queue;
+    for (const task of queue) {
+      if (task.id === id) {
+        task.cancelled = true;
+        return;
       }
     }
-  }, {
-    key: "run",
-    value: function run() {
-      var timeStamp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-      var queue = this.currentlyRunning = this.queue;
+  }
+  run(timeStamp = 0) {
+    const queue = this.currentlyRunning = this.queue;
 
-      // Tasks queued by callbacks in the current queue should be executed
-      // on the next run, not the current run.
-      this.queue = [];
-      var _iterator2 = _createForOfIteratorHelper(queue),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var task = _step2.value;
-          if (task.cancelled) {
-            continue;
-          }
-          task.callback(timeStamp);
-          if (this.cleared) {
-            break;
-          }
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
+    // Tasks queued by callbacks in the current queue should be executed
+    // on the next run, not the current run.
+    this.queue = [];
+    for (const task of queue) {
+      if (task.cancelled) {
+        continue;
       }
-      this.cleared = false;
-      this.currentlyRunning = false;
-    }
-  }, {
-    key: "clear",
-    value: function clear() {
-      if (this.currentlyRunning) {
-        this.cleared = true;
+      task.callback(timeStamp);
+      if (this.cleared) {
+        break;
       }
-      this.queue = [];
     }
-  }]);
-  return TaskQueue;
-}();
+    this.cleared = false;
+    this.currentlyRunning = false;
+  }
+  clear() {
+    if (this.currentlyRunning) {
+      this.cleared = true;
+    }
+    this.queue = [];
+  }
+}
 var _default = exports.default = TaskQueue;

package/package.json

@@ -1,46 +1,36 @@
 {
   "name": "@antv/l7-map",
-  "version": "2.21.1",
-  "description": "l7 map",
+  "version": "2.21.3",
+  "description": "L7 Map",
   "keywords": [],
-  "author": "thinkinggis <lzx199065@gmail.com>",
-  "license": "ISC",
+  "homepage": "https://github.com/antvis/L7#readme",
+  "bugs": {
+    "url": "https://github.com/antvis/L7/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/antvis/L7.git"
+  },
+  "license": "MIT",
+  "author": "https://github.com/orgs/antvis/people",
+  "sideEffects": true,
   "main": "lib/index.js",
   "module": "es/index.js",
-  "unpkg": "dist/l7-map.js",
   "types": "es/index.d.ts",
-  "sideEffects": true,
   "files": [
-    "dist",
     "lib",
-    "es",
-    "README.md"
+    "es"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/antvis/L7.git"
-  },
   "scripts": {
-    "tsc": "tsc --project tsconfig.build.json",
-    "clean": "rimraf dist; rimraf es; rimraf lib;",
-    "build": "father build",
-    "lint:ts": "run-p -c lint:ts-*",
-    "build:cjs": "BABEL_ENV=cjs babel src --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
-    "build:esm": "BABEL_ENV=esm babel src --root-mode upward --out-dir es --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
-    "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
-    "sync": "tnpm sync",
-    "test": "umi-test --passWithNoTests",
-    "test-live": "umi-test --watch"
-  },
-  "bugs": {
-    "url": "https://github.com/antvis/L7/issues"
+    "dev": "father dev",
+    "build": "npm run clean && father build",
+    "check-deps": "father doctor",
+    "lint": "eslint src __tests__",
+    "clean": "rimraf dist es lib",
+    "sync": "tnpm sync"
   },
-  "homepage": "https://github.com/antvis/L7#readme",
   "dependencies": {
-    "@antv/l7-utils": "2.21.1",
+    "@antv/l7-utils": "^2.21.3",
     "@babel/runtime": "^7.7.7",
     "@mapbox/point-geometry": "^0.1.0",
     "@mapbox/unitbezier": "^0.0.0",
@@ -48,5 +38,8 @@
     "gl-matrix": "^3.1.0",
     "lodash-es": "^4.17.21"
   },
-  "gitHead": "1e0d2e5920f479f77095a2c5eddda8a8d7ac9e0f"
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "522dec125e1d49bfe3b7325239bb6c9103311b2d"
 }