@antv/l7-map 2.17.12 → 2.18.0

package/lib/utils/dom.js

@@ -1,60 +1,41 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _l7Utils = require("@antv/l7-utils");
-
 var _point = _interopRequireDefault(require("../geo/point"));
-
 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; }
-
+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; } // @ts-ignore
 var DOM = {};
 var _default = DOM;
 exports.default = _default;
-
 DOM.create = function (tagName, className, container) {
-  var el = _l7Utils.$window.document.createElement(tagName);
-
+  var el = window.document.createElement(tagName);
   if (className !== undefined) {
     el.className = className;
   }
-
   if (container) {
     container.appendChild(el);
   }
-
   return el;
 };
-
 DOM.createNS = function (namespaceURI, tagName) {
-  var el = _l7Utils.$window.document.createElementNS(namespaceURI, tagName);
-
+  var el = window.document.createElementNS(namespaceURI, tagName);
   return el;
 };
-
-var docStyle = _l7Utils.$window.document && _l7Utils.$window.document.documentElement.style;
-
+var docStyle = window.document && window.document.documentElement.style;
 function testProp(props) {
   if (!docStyle) {
     return props[0];
   }
-
   var _iterator = _createForOfIteratorHelper(props),
-      _step;
-
+    _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var i = _step.value;
-
       if (i in docStyle) {
         return i;
       }
@@ -64,37 +45,30 @@ function testProp(props) {
   } finally {
     _iterator.f();
   }
-
   return props[0];
 }
-
 var selectProp = testProp(['userSelect', 'MozUserSelect', 'WebkitUserSelect', 'msUserSelect']);
 var userSelect;
-
 DOM.disableDrag = function () {
   if (docStyle && selectProp) {
     userSelect = docStyle[selectProp];
     docStyle[selectProp] = 'none';
   }
 };
-
 DOM.enableDrag = function () {
   if (docStyle && selectProp) {
     docStyle[selectProp] = userSelect;
   }
 };
-
 var transformProp = testProp(['transform', 'WebkitTransform']);
-
 DOM.setTransform = function (el, value) {
   // https://github.com/facebook/flow/issues/7754
   // $FlowFixMe
   el.style[transformProp] = value;
-}; // Feature detection for {passive: false} support in add/removeEventListener.
-
+};
 
+// Feature detection for {passive: false} support in add/removeEventListener.
 var passiveSupported = false;
-
 try {
   // https://github.com/facebook/flow/issues/285
   // $FlowFixMe
@@ -103,129 +77,69 @@ try {
       // eslint-disable-line
       passiveSupported = true;
     }
-  }); // @ts-ignore
-
-  _l7Utils.$window.addEventListener('test', options, options); // @ts-ignore
-
-
-  _l7Utils.$window.removeEventListener('test', options, options);
+  });
+  // @ts-ignore
+  window.addEventListener('test', options, options);
+  // @ts-ignore
+  window.removeEventListener('test', options, options);
 } catch (err) {
   passiveSupported = false;
 }
-
 DOM.addEventListener = function (target, type, callback) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
   if ('passive' in options && passiveSupported) {
     target.addEventListener(type, callback, options);
   } else {
     target.addEventListener(type, callback, options.capture);
   }
 };
-
 DOM.removeEventListener = function (target, type, callback) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
   if ('passive' in options && passiveSupported) {
     target.removeEventListener(type, callback, options);
   } else {
     target.removeEventListener(type, callback, options.capture);
   }
-}; // Suppress the next click, but only if it's immediate.
-
+};
 
+// Suppress the next click, but only if it's immediate.
 var suppressClick = function suppressClick(e) {
   e.preventDefault();
   e.stopPropagation();
-
-  _l7Utils.$window.removeEventListener('click', suppressClick, true);
+  window.removeEventListener('click', suppressClick, true);
 };
-
 DOM.suppressClick = function () {
-  if (_l7Utils.isMini) {
-    return;
-  }
-
-  _l7Utils.$window.addEventListener('click', suppressClick, true);
-
+  window.addEventListener('click', suppressClick, true);
   setTimeout(function () {
-    _l7Utils.$window.removeEventListener('click', suppressClick, true);
+    window.removeEventListener('click', suppressClick, true);
   }, 0);
 };
-
 DOM.mousePos = function (el, e) {
   // 暂时从 el 上获取 top/left， 后面需要动态获取
-  if (!_l7Utils.isMini) {
-    var rect = el.getBoundingClientRect();
-    return new _point.default(e.clientX - rect.left - el.clientLeft, e.clientY - rect.top - el.clientTop);
-  } else {
-    return new _point.default( // @ts-ignore
-    e.clientX - el.left - 0, // @ts-ignore
-    e.clientY - el.top - 0);
-  }
+  var rect = el.getBoundingClientRect();
+  return new _point.default(e.clientX - rect.left - el.clientLeft, e.clientY - rect.top - el.clientTop);
 };
-
 DOM.touchPos = function (el, touches) {
   // 暂时从 el 上获取 top/left， 后面需要动态获取
-  if (!_l7Utils.isMini) {
-    var rect = el.getBoundingClientRect();
-    var points = [];
-
-    var _iterator2 = _createForOfIteratorHelper(touches),
-        _step2;
-
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var touche = _step2.value;
-        points.push(new _point.default(touche.clientX - rect.left - el.clientLeft, touche.clientY - rect.top - el.clientTop));
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-
-    return points;
-  } else {
-    var _points = [];
-
-    var _iterator3 = _createForOfIteratorHelper(touches),
-        _step3;
-
-    try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var _touche = _step3.value;
-
-        _points.push(new _point.default( // @ts-ignore
-        _touche.clientX - el.left, // @ts-ignore
-        _touche.clientY - el.top));
-      }
-    } catch (err) {
-      _iterator3.e(err);
-    } finally {
-      _iterator3.f();
+  var rect = el.getBoundingClientRect();
+  var points = [];
+  var _iterator2 = _createForOfIteratorHelper(touches),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var touche = _step2.value;
+      points.push(new _point.default(touche.clientX - rect.left - el.clientLeft, touche.clientY - rect.top - el.clientTop));
     }
-
-    return _points;
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
   }
+  return points;
 };
-
 DOM.mouseButton = function (e) {
-  if (!_l7Utils.isMini) {
-    return e.button;
-  }
-
-  if ( // @ts-ignore
-  typeof _l7Utils.$window.InstallTrigger !== 'undefined' && e.button === 2 && e.ctrlKey && _l7Utils.$window.navigator.platform.toUpperCase().indexOf('MAC') >= 0) {
-    // Fix for https://github.com/mapbox/mapbox-gl-js/issues/3131:
-    // Firefox (detected by InstallTrigger) on Mac determines e.button = 2 when
-    // using Control + left click
-    return 0;
-  }
-
   return e.button;
 };
-
 DOM.remove = function (node) {
   if (node.parentNode) {
     node.parentNode.removeChild(node);

package/lib/utils/performance.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PerformanceUtils = exports.PerformanceMarkers = void 0;
-
-var _l7Utils = require("@antv/l7-utils");
-
 var lastFrameTime = null;
 var frameTimes = [];
 var minFramerateTarget = 30;
 var frameTimeTarget = 1000 / minFramerateTarget;
-var performance = _l7Utils.$window.performance;
+var performance = window.performance;
 var PerformanceMarkers = {
   create: 'create',
   load: 'load',
@@ -24,37 +21,38 @@ var PerformanceUtils = {
   },
   frame: function frame(timestamp) {
     var currTimestamp = timestamp;
-
     if (lastFrameTime != null) {
       var frameTime = currTimestamp - lastFrameTime;
       frameTimes.push(frameTime);
     }
-
     lastFrameTime = currTimestamp;
   },
   clearMetrics: function clearMetrics() {
     lastFrameTime = null;
     frameTimes = [];
     performance.clearMeasures('loadTime');
-    performance.clearMeasures('fullLoadTime'); // @ts-ignore
+    performance.clearMeasures('fullLoadTime');
+    // @ts-ignore
     // tslint:disable-next-line:forin
-
     for (var marker in PerformanceMarkers) {
       // @ts-ignore
       performance.clearMarks(PerformanceMarkers[marker]);
     }
   },
   getPerformanceMetrics: function getPerformanceMetrics() {
-    var loadTime = performance.measure('loadTime', PerformanceMarkers.create, PerformanceMarkers.load // @ts-ignore
+    var loadTime = performance.measure('loadTime', PerformanceMarkers.create, PerformanceMarkers.load
+    // @ts-ignore
     ).duration;
-    var fullLoadTime = performance.measure('fullLoadTime', PerformanceMarkers.create, PerformanceMarkers.fullLoad // @ts-ignore
+    var fullLoadTime = performance.measure('fullLoadTime', PerformanceMarkers.create, PerformanceMarkers.fullLoad
+    // @ts-ignore
     ).duration;
     var totalFrames = frameTimes.length;
     var avgFrameTime = frameTimes.reduce(function (prev, curr) {
       return prev + curr;
     }, 0) / totalFrames / 1000;
-    var fps = 1 / avgFrameTime; // count frames that missed our framerate target
+    var fps = 1 / avgFrameTime;
 
+    // count frames that missed our framerate target
     var droppedFrames = frameTimes.filter(function (frameTime) {
       return frameTime > frameTimeTarget;
     }).reduce(function (acc, curr) {

package/lib/utils/primitives.js

@@ -1,50 +1,48 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 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 _glMatrix = require("gl-matrix");
-
 var Frustum = /*#__PURE__*/function () {
   function Frustum(points, planes) {
     (0, _classCallCheck2.default)(this, Frustum);
     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 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
+      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);
       });
@@ -53,5 +51,4 @@ var Frustum = /*#__PURE__*/function () {
   }]);
   return Frustum;
 }();
-
 exports.default = Frustum;

package/lib/utils/task_queue.js

@@ -1,22 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 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; }
-
+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; }
 // can't mark opaque due to https://github.com/flowtype/flow-remove-types/pull/61
 var TaskQueue = /*#__PURE__*/function () {
   function TaskQueue() {
@@ -26,7 +19,6 @@ var TaskQueue = /*#__PURE__*/function () {
     this.cleared = false;
     this.currentlyRunning = false;
   }
-
   (0, _createClass2.default)(TaskQueue, [{
     key: "add",
     value: function add(callback) {
@@ -44,14 +36,11 @@ var TaskQueue = /*#__PURE__*/function () {
     value: function remove(id) {
       var running = this.currentlyRunning;
       var queue = running ? this.queue.concat(running) : this.queue;
-
       var _iterator = _createForOfIteratorHelper(queue),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var task = _step.value;
-
           if (task.id === id) {
             task.cancelled = true;
             return;
@@ -67,24 +56,20 @@ var TaskQueue = /*#__PURE__*/function () {
     key: "run",
     value: function run() {
       var timeStamp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-      var queue = this.currentlyRunning = this.queue; // Tasks queued by callbacks in the current queue should be executed
-      // on the next run, not the current run.
+      var 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;
-
+        _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var task = _step2.value;
-
           if (task.cancelled) {
             continue;
           }
-
           task.callback(timeStamp);
-
           if (this.cleared) {
             break;
           }
@@ -94,7 +79,6 @@ var TaskQueue = /*#__PURE__*/function () {
       } finally {
         _iterator2.f();
       }
-
       this.cleared = false;
       this.currentlyRunning = false;
     }
@@ -104,12 +88,10 @@ var TaskQueue = /*#__PURE__*/function () {
       if (this.currentlyRunning) {
         this.cleared = true;
       }
-
       this.queue = [];
     }
   }]);
   return TaskQueue;
 }();
-
 var _default = TaskQueue;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-map",
-  "version": "2.17.12",
+  "version": "2.18.0",
   "description": "l7 map",
   "keywords": [],
   "author": "thinkinggis <lzx199065@gmail.com>",
@@ -40,13 +40,13 @@
   },
   "homepage": "https://github.com/antvis/L7#readme",
   "dependencies": {
-    "@antv/l7-utils": "2.17.12",
+    "@antv/l7-utils": "2.18.0",
     "@babel/runtime": "^7.7.7",
     "@mapbox/point-geometry": "^0.1.0",
     "@mapbox/unitbezier": "^0.0.0",
     "eventemitter3": "^4.0.4",
     "gl-matrix": "^3.1.0",
-    "lodash": "^4.17.15"
+    "lodash-es": "^4.17.21"
   },
-  "gitHead": "e1d345d25c580a3a44b79a112654d12953293fe6"
+  "gitHead": "89fc0b84737ea58f9eda2fe28d70773a900939f6"
 }