@antv/l7-map 2.17.12 → 2.18.0

package/lib/handler/touch/touch_rotate.js

@@ -1,55 +1,40 @@
 "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 _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _two_touch = _interopRequireDefault(require("./two_touch"));
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } // @ts-ignore
 var ROTATION_THRESHOLD = 25; // pixels along circumference of touch circle
 
 function getBearingDelta(a, b) {
   return a.angleWith(b) * 180 / Math.PI;
 }
-
 var TouchRotateHandler = /*#__PURE__*/function (_TwoTouchHandler) {
   (0, _inherits2.default)(TouchRotateHandler, _TwoTouchHandler);
-
   var _super = _createSuper(TouchRotateHandler);
-
   function TouchRotateHandler() {
     (0, _classCallCheck2.default)(this, TouchRotateHandler);
     return _super.apply(this, arguments);
   }
-
   (0, _createClass2.default)(TouchRotateHandler, [{
     key: "reset",
     value: function reset() {
-      (0, _get2.default)((0, _getPrototypeOf2.default)(TouchRotateHandler.prototype), "reset", this).call(this); // @ts-ignore
-
-      delete this.minDiameter; // @ts-ignore
-
-      delete this.startVector; // @ts-ignore
-
+      (0, _get2.default)((0, _getPrototypeOf2.default)(TouchRotateHandler.prototype), "reset", this).call(this);
+      // @ts-ignore
+      delete this.minDiameter;
+      // @ts-ignore
+      delete this.startVector;
+      // @ts-ignore
       delete this.vector;
     }
   }, {
@@ -63,11 +48,9 @@ var TouchRotateHandler = /*#__PURE__*/function (_TwoTouchHandler) {
     value: function move(points, pinchAround) {
       var lastVector = this.vector;
       this.vector = points[0].sub(points[1]);
-
       if (!this.active && this.isBelowThreshold(this.vector)) {
         return;
       }
-
       this.active = true;
       return {
         bearingDelta: getBearingDelta(this.vector, lastVector),
@@ -86,6 +69,7 @@ var TouchRotateHandler = /*#__PURE__*/function (_TwoTouchHandler) {
        * Use the smallest diameter from the whole gesture to reduce sensitivity
        * when pinching in and out.
        */
+
       this.minDiameter = Math.min(this.minDiameter, vector.mag());
       var circumference = Math.PI * this.minDiameter;
       var threshold = ROTATION_THRESHOLD / circumference * 360;
@@ -95,5 +79,4 @@ var TouchRotateHandler = /*#__PURE__*/function (_TwoTouchHandler) {
   }]);
   return TouchRotateHandler;
 }(_two_touch.default);
-
 exports.default = TouchRotateHandler;

package/lib/handler/touch/touch_zoom.js

@@ -1,53 +1,37 @@
 "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 _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _two_touch = _interopRequireDefault(require("./two_touch"));
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } // @ts-ignore
 var ZOOM_THRESHOLD = 0.1;
-
 function getZoomDelta(distance, lastDistance) {
   return Math.log(distance / lastDistance) / Math.LN2;
 }
-
 var TouchZoomHandler = /*#__PURE__*/function (_TwoTouchHandler) {
   (0, _inherits2.default)(TouchZoomHandler, _TwoTouchHandler);
-
   var _super = _createSuper(TouchZoomHandler);
-
   function TouchZoomHandler() {
     (0, _classCallCheck2.default)(this, TouchZoomHandler);
     return _super.apply(this, arguments);
   }
-
   (0, _createClass2.default)(TouchZoomHandler, [{
     key: "reset",
     value: function reset() {
-      (0, _get2.default)((0, _getPrototypeOf2.default)(TouchZoomHandler.prototype), "reset", this).call(this); // @ts-ignore
-
-      delete this.distance; // @ts-ignore
-
+      (0, _get2.default)((0, _getPrototypeOf2.default)(TouchZoomHandler.prototype), "reset", this).call(this);
+      // @ts-ignore
+      delete this.distance;
+      // @ts-ignore
       delete this.startDistance;
     }
   }, {
@@ -60,11 +44,9 @@ var TouchZoomHandler = /*#__PURE__*/function (_TwoTouchHandler) {
     value: function move(points, pinchAround) {
       var lastDistance = this.distance;
       this.distance = points[0].dist(points[1]);
-
       if (!this.active && Math.abs(getZoomDelta(this.distance, this.startDistance)) < ZOOM_THRESHOLD) {
         return;
       }
-
       this.active = true;
       return {
         zoomDelta: getZoomDelta(this.distance, lastDistance),
@@ -74,5 +56,4 @@ var TouchZoomHandler = /*#__PURE__*/function (_TwoTouchHandler) {
   }]);
   return TouchZoomHandler;
 }(_two_touch.default);
-
 exports.default = TouchZoomHandler;

package/lib/handler/touch/two_touch.js

@@ -1,50 +1,44 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _dom = _interopRequireDefault(require("../../utils/dom"));
-
 // @ts-ignore
 var TwoTouchHandler = /*#__PURE__*/function () {
   function TwoTouchHandler() {
     (0, _classCallCheck2.default)(this, TwoTouchHandler);
     this.reset();
   }
-
   (0, _createClass2.default)(TwoTouchHandler, [{
     key: "reset",
     value: function reset() {
-      this.active = false; // @ts-ignore
-
+      this.active = false;
+      // @ts-ignore
       delete this.firstTwoTouches;
-    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "start",
     value: function start(points) {
       return;
     } // eslint-disable-line
-
   }, {
     key: "move",
-    value: function move( // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    points, // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    pinchAround, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    value: function move(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    points,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    pinchAround,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     e) {
       return;
     } // eslint-disable-line
-
   }, {
     key: "touchstart",
     value: function touchstart(e, points, mapTouches) {
@@ -53,9 +47,9 @@ var TwoTouchHandler = /*#__PURE__*/function () {
       if (this.firstTwoTouches || mapTouches.length < 2) {
         return;
       }
+      this.firstTwoTouches = [mapTouches[0].identifier, mapTouches[1].identifier];
 
-      this.firstTwoTouches = [mapTouches[0].identifier, mapTouches[1].identifier]; // implemented by child classes
-
+      // implemented by child classes
       this.start([points[0], points[1]]);
     }
   }, {
@@ -64,22 +58,18 @@ var TwoTouchHandler = /*#__PURE__*/function () {
       if (!this.firstTwoTouches) {
         return;
       }
-
       e.preventDefault();
-
       var _this$firstTwoTouches = (0, _slicedToArray2.default)(this.firstTwoTouches, 2),
-          idA = _this$firstTwoTouches[0],
-          idB = _this$firstTwoTouches[1];
-
+        idA = _this$firstTwoTouches[0],
+        idB = _this$firstTwoTouches[1];
       var a = getTouchById(mapTouches, points, idA);
       var b = getTouchById(mapTouches, points, idB);
-
       if (!a || !b) {
         return;
       }
+      var pinchAround = this.aroundCenter ? null : a.add(b).div(2);
 
-      var pinchAround = this.aroundCenter ? null : a.add(b).div(2); // implemented by child classes
-
+      // implemented by child classes
       return this.move([a, b], pinchAround, e);
     }
   }, {
@@ -88,22 +78,17 @@ var TwoTouchHandler = /*#__PURE__*/function () {
       if (!this.firstTwoTouches) {
         return;
       }
-
       var _this$firstTwoTouches2 = (0, _slicedToArray2.default)(this.firstTwoTouches, 2),
-          idA = _this$firstTwoTouches2[0],
-          idB = _this$firstTwoTouches2[1];
-
+        idA = _this$firstTwoTouches2[0],
+        idB = _this$firstTwoTouches2[1];
       var a = getTouchById(mapTouches, points, idA);
       var b = getTouchById(mapTouches, points, idB);
-
       if (a && b) {
         return;
       }
-
       if (this.active) {
         _dom.default.suppressClick();
       }
-
       this.reset();
     }
   }, {
@@ -136,9 +121,7 @@ var TwoTouchHandler = /*#__PURE__*/function () {
   }]);
   return TwoTouchHandler;
 }();
-
 exports.default = TwoTouchHandler;
-
 function getTouchById(mapTouches, points, identifier) {
   for (var i = 0; i < mapTouches.length; i++) {
     if (mapTouches[i].identifier === identifier) {

package/lib/hash.js

@@ -1,25 +1,18 @@
 "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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _l7Utils = require("@antv/l7-utils");
-
-var _lodash = require("lodash");
-
 // @ts-ignore
 // tslint:disable-next-line:no-submodule-imports
 
+var throttle = _l7Utils.lodashUtil.throttle;
 /*
  * Adds the map's position to its page's location hash.
  * Passed as an option to the map object.
@@ -29,32 +22,26 @@ var _lodash = require("lodash");
 var Hash = /*#__PURE__*/function () {
   function Hash(hashName) {
     var _this = this;
-
     (0, _classCallCheck2.default)(this, Hash);
     (0, _defineProperty2.default)(this, "onHashChange", function () {
       var loc = _this.getCurrentHash();
-
       if (loc.length >= 3 && !loc.some(function (v) {
         return isNaN(+v);
       })) {
         var bearing = _this.map.dragRotate.isEnabled() && _this.map.touchZoomRotate.isEnabled() ? +(loc[3] || 0) : _this.map.getBearing();
-
         _this.map.jumpTo({
           center: [+loc[2], +loc[1]],
           zoom: +loc[0],
           bearing: bearing,
           pitch: +(loc[4] || 0)
         });
-
         return true;
       }
-
       return false;
     });
     (0, _defineProperty2.default)(this, "getCurrentHash", function () {
       // Get the current hash from location, stripped from its number sign
       var hash = window.location.hash.replace('#', '');
-
       if (_this.hashName) {
         // Split the parameter-styled hash into parts and find the value we need
         var keyval;
@@ -67,42 +54,39 @@ var Hash = /*#__PURE__*/function () {
         });
         return (keyval ? keyval[1] || '' : '').split('/');
       }
-
       return hash.split('/');
     });
     (0, _defineProperty2.default)(this, "updateHashUnthrottled", function () {
       var hash = _this.getHashString();
-
       try {
         window.history.replaceState(window.history.state, '', hash);
-      } catch (SecurityError) {// IE11 does not allow this if the page is within an iframe created
+      } catch (SecurityError) {
+        // IE11 does not allow this if the page is within an iframe created
         // with iframe.contentWindow.document.write(...).
         // https://github.com/mapbox/mapbox-gl-js/issues/7410
       }
     });
-    this.hashName = hashName && encodeURIComponent(hashName); // Mobile Safari doesn't allow updating the hash more than 100 times per 30 seconds.
+    this.hashName = hashName && encodeURIComponent(hashName);
 
-    this.updateHash = (0, _lodash.throttle)(this.updateHashUnthrottled, 30 * 1000 / 100);
+    // Mobile Safari doesn't allow updating the hash more than 100 times per 30 seconds.
+    this.updateHash = throttle(this.updateHashUnthrottled, 30 * 1000 / 100);
   }
-
   (0, _createClass2.default)(Hash, [{
     key: "addTo",
     value: function addTo(map) {
       this.map = map;
-
-      _l7Utils.$window.addEventListener('hashchange', this.onHashChange, false);
-
+      window.addEventListener('hashchange', this.onHashChange, false);
       this.map.on('moveend', this.updateHash);
       return this;
     }
   }, {
     key: "remove",
     value: function remove() {
-      _l7Utils.$window.removeEventListener('hashchange', this.onHashChange, false);
+      window.removeEventListener('hashchange', this.onHashChange, false);
+      this.map.off('moveend', this.updateHash);
+      // clearTimeout(this.updateHash());
 
-      this.map.off('moveend', this.updateHash); // clearTimeout(this.updateHash());
       // @ts-ignore
-
       delete this.map;
       return this;
     }
@@ -110,8 +94,8 @@ var Hash = /*#__PURE__*/function () {
     key: "getHashString",
     value: function getHashString(mapFeedback) {
       var center = this.map.getCenter();
-      var zoom = Math.round(this.map.getZoom() * 100) / 100; // derived from equation: 512px * 2^z / 360 / 10^d < 0.5px
-
+      var zoom = Math.round(this.map.getZoom() * 100) / 100;
+      // derived from equation: 512px * 2^z / 360 / 10^d < 0.5px
       var precision = Math.ceil((zoom * Math.LN2 + Math.log(512 / 360 / 0.5)) / Math.LN10);
       var m = Math.pow(10, precision);
       var lng = Math.round(center.lng * m) / m;
@@ -119,7 +103,6 @@ var Hash = /*#__PURE__*/function () {
       var bearing = this.map.getBearing();
       var pitch = this.map.getPitch();
       var hash = '';
-
       if (mapFeedback) {
         // new map feedback site has some constraints that don't allow
         // us to use the same hash format as we do for the Map hash option.
@@ -127,43 +110,34 @@ var Hash = /*#__PURE__*/function () {
       } else {
         hash += "".concat(zoom, "/").concat(lat, "/").concat(lng);
       }
-
       if (bearing || pitch) {
         hash += "/".concat(Math.round(bearing * 10) / 10);
       }
-
       if (pitch) {
         hash += "/".concat(Math.round(pitch));
       }
-
       if (this.hashName) {
         var hashName = this.hashName;
         var found = false;
         var parts = window.location.hash.slice(1).split('&').map(function (part) {
           var key = part.split('=')[0];
-
           if (key === hashName) {
             found = true;
             return "".concat(key, "=").concat(hash);
           }
-
           return part;
         }).filter(function (a) {
           return a;
         });
-
         if (!found) {
           parts.push("".concat(hashName, "=").concat(hash));
         }
-
         return "#".concat(parts.join('&'));
       }
-
       return "#".concat(hash);
     }
   }]);
   return Hash;
 }();
-
 var _default = Hash;
 exports.default = _default;

package/lib/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _earthmap = require("./earthmap");
-
 Object.keys(_earthmap).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _earthmap[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_earthmap).forEach(function (key) {
     }
   });
 });
-
 var _mercator = require("./geo/mercator");
-
 Object.keys(_mercator).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _mercator[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_mercator).forEach(function (key) {
     }
   });
 });
-
 var _interface = require("./interface");
-
 Object.keys(_interface).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _interface[key]) return;
@@ -42,9 +36,7 @@ Object.keys(_interface).forEach(function (key) {
     }
   });
 });
-
 var _map = require("./map");
-
 Object.keys(_map).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _map[key]) return;