@antv/l7-map 2.17.12 → 2.18.0

package/es/handler/touch/touch_zoom.js

@@ -4,38 +4,29 @@ import _get from "@babel/runtime/helpers/esm/get";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-
 // @ts-ignore
+
 import TwoTouchHandler from "./two_touch";
 var ZOOM_THRESHOLD = 0.1;
-
 function getZoomDelta(distance, lastDistance) {
   return Math.log(distance / lastDistance) / Math.LN2;
 }
-
 var TouchZoomHandler = /*#__PURE__*/function (_TwoTouchHandler) {
   _inherits(TouchZoomHandler, _TwoTouchHandler);
-
   var _super = _createSuper(TouchZoomHandler);
-
   function TouchZoomHandler() {
     _classCallCheck(this, TouchZoomHandler);
-
     return _super.apply(this, arguments);
   }
-
   _createClass(TouchZoomHandler, [{
     key: "reset",
     value: function reset() {
-      _get(_getPrototypeOf(TouchZoomHandler.prototype), "reset", this).call(this); // @ts-ignore
-
-
-      delete this.distance; // @ts-ignore
-
+      _get(_getPrototypeOf(TouchZoomHandler.prototype), "reset", this).call(this);
+      // @ts-ignore
+      delete this.distance;
+      // @ts-ignore
       delete this.startDistance;
     }
   }, {
@@ -48,11 +39,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),
@@ -60,8 +49,6 @@ var TouchZoomHandler = /*#__PURE__*/function (_TwoTouchHandler) {
       };
     }
   }]);
-
   return TouchZoomHandler;
 }(TwoTouchHandler);
-
 export { TouchZoomHandler as default };

package/es/handler/touch/two_touch.js

@@ -2,38 +2,37 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 // @ts-ignore
-import DOM from "../../utils/dom";
 
+import DOM from "../../utils/dom";
 var TwoTouchHandler = /*#__PURE__*/function () {
   function TwoTouchHandler() {
     _classCallCheck(this, TwoTouchHandler);
-
     this.reset();
   }
-
   _createClass(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) {
@@ -42,9 +41,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]]);
     }
   }, {
@@ -53,22 +52,18 @@ var TwoTouchHandler = /*#__PURE__*/function () {
       if (!this.firstTwoTouches) {
         return;
       }
-
       e.preventDefault();
-
       var _this$firstTwoTouches = _slicedToArray(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);
     }
   }, {
@@ -77,22 +72,17 @@ var TwoTouchHandler = /*#__PURE__*/function () {
       if (!this.firstTwoTouches) {
         return;
       }
-
       var _this$firstTwoTouches2 = _slicedToArray(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.suppressClick();
       }
-
       this.reset();
     }
   }, {
@@ -123,12 +113,9 @@ var TwoTouchHandler = /*#__PURE__*/function () {
       return this.active;
     }
   }]);
-
   return TwoTouchHandler;
 }();
-
 export { TwoTouchHandler as default };
-
 function getTouchById(mapTouches, points, identifier) {
   for (var i = 0; i < mapTouches.length; i++) {
     if (mapTouches[i].identifier === identifier) {

package/es/hash.js

@@ -3,9 +3,8 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 // @ts-ignore
 // tslint:disable-next-line:no-submodule-imports
-import { $window } from '@antv/l7-utils';
-import { throttle } from 'lodash';
-
+import { lodashUtil } from '@antv/l7-utils';
+var throttle = lodashUtil.throttle;
 /*
  * Adds the map's position to its page's location hash.
  * Passed as an option to the map object.
@@ -15,34 +14,26 @@ import { throttle } from 'lodash';
 var Hash = /*#__PURE__*/function () {
   function Hash(hashName) {
     var _this = this;
-
     _classCallCheck(this, Hash);
-
     _defineProperty(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;
     });
-
     _defineProperty(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;
@@ -55,41 +46,39 @@ var Hash = /*#__PURE__*/function () {
         });
         return (keyval ? keyval[1] || '' : '').split('/');
       }
-
       return hash.split('/');
     });
-
     _defineProperty(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);
 
-    this.hashName = hashName && encodeURIComponent(hashName); // Mobile Safari doesn't allow updating the hash more than 100 times per 30 seconds.
-
+    // Mobile Safari doesn't allow updating the hash more than 100 times per 30 seconds.
     this.updateHash = throttle(this.updateHashUnthrottled, 30 * 1000 / 100);
   }
-
   _createClass(Hash, [{
     key: "addTo",
     value: function addTo(map) {
       this.map = map;
-      $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() {
-      $window.removeEventListener('hashchange', this.onHashChange, false);
-      this.map.off('moveend', this.updateHash); // clearTimeout(this.updateHash());
-      // @ts-ignore
+      window.removeEventListener('hashchange', this.onHashChange, false);
+      this.map.off('moveend', this.updateHash);
+      // clearTimeout(this.updateHash());
 
+      // @ts-ignore
       delete this.map;
       return this;
     }
@@ -97,8 +86,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;
@@ -106,7 +95,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.
@@ -114,43 +102,33 @@ 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;
 }();
-
 export default Hash;