@antv/l7-map 2.17.11 → 2.18.0

package/lib/util.js

@@ -16,7 +16,6 @@ exports.prefersReducedMotion = prefersReducedMotion;
 exports.raf = void 0;
 exports.renderframe = renderframe;
 exports.wrap = wrap;
-var _l7Utils = require("@antv/l7-utils");
 var _unitbezier = _interopRequireDefault(require("@mapbox/unitbezier"));
 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); }
@@ -42,14 +41,10 @@ function bezier(p1x, p1y, p2x, p2y) {
 var ease = bezier(0.25, 0.1, 0.25, 1);
 exports.ease = ease;
 function prefersReducedMotion() {
-  // @ts-ignore
-  if (_l7Utils.isMini || !_l7Utils.$window.matchMedia) {
-    return false;
-  }
   // Lazily initialize media query
   if (reducedMotionQuery == null) {
     // @ts-ignore
-    reducedMotionQuery = _l7Utils.$window.matchMedia('(prefers-reduced-motion: reduce)');
+    reducedMotionQuery = window.matchMedia('(prefers-reduced-motion: reduce)');
   }
   return reducedMotionQuery.matches;
 }
@@ -71,23 +66,23 @@ function pick(src, properties) {
   }
   return result;
 }
-var now = _l7Utils.isMini ? Date.now.bind(Date) : _l7Utils.$window.performance && _l7Utils.$window.performance.now ? _l7Utils.$window.performance.now.bind(_l7Utils.$window.performance) : Date.now.bind(Date);
+var now = window.performance && window.performance.now ? window.performance.now.bind(window.performance) : Date.now.bind(Date);
 exports.now = now;
-var raf = _l7Utils.$window.requestAnimationFrame ||
+var raf = window.requestAnimationFrame ||
 // @ts-ignore
-_l7Utils.$window.mozRequestAnimationFrame ||
+window.mozRequestAnimationFrame ||
 // @ts-ignore
-_l7Utils.$window.webkitRequestAnimationFrame ||
+window.webkitRequestAnimationFrame ||
 // @ts-ignore
-_l7Utils.$window.msRequestAnimationFrame;
+window.msRequestAnimationFrame;
 exports.raf = raf;
-var _cancel = _l7Utils.$window.cancelAnimationFrame ||
+var _cancel = window.cancelAnimationFrame ||
 // @ts-ignore
-_l7Utils.$window.mozCancelAnimationFrame ||
+window.mozCancelAnimationFrame ||
 // @ts-ignore
-_l7Utils.$window.webkitCancelAnimationFrame ||
+window.webkitCancelAnimationFrame ||
 // @ts-ignore
-_l7Utils.$window.msCancelAnimationFrame;
+window.msCancelAnimationFrame;
 exports.cancel = _cancel;
 function renderframe(fn) {
   var frame = raf(fn);

package/lib/utils/dom.js

@@ -5,7 +5,6 @@ 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); }
@@ -14,7 +13,7 @@ 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;
   }
@@ -24,10 +23,10 @@ DOM.create = function (tagName, className, container) {
   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];
@@ -80,9 +79,9 @@ try {
     }
   });
   // @ts-ignore
-  _l7Utils.$window.addEventListener('test', options, options);
+  window.addEventListener('test', options, options);
   // @ts-ignore
-  _l7Utils.$window.removeEventListener('test', options, options);
+  window.removeEventListener('test', options, options);
 } catch (err) {
   passiveSupported = false;
 }
@@ -107,81 +106,38 @@ DOM.removeEventListener = function (target, type, callback) {
 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) {

package/lib/utils/performance.js

@@ -4,12 +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',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-map",
-  "version": "2.17.11",
+  "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.11",
+    "@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": "eb65a689e6078899cfae55ae15232c36d3366e58"
+  "gitHead": "89fc0b84737ea58f9eda2fe28d70773a900939f6"
 }