@antv/l7-map 2.17.11 → 2.17.12

package/es/handler/handler_manager.js

@@ -2,9 +2,13 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
 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
 // tslint:disable-next-line: no-submodule-imports
 import { $window, isMini } from '@antv/l7-utils';
@@ -28,27 +32,34 @@ import TouchZoomRotateHandler from "./shim/touch_zoom_rotate";
 import TapDragZoomHandler from "./tap/tap_drag_zoom";
 import TapZoomHandler from "./tap/tap_zoom";
 import { TouchPanHandler, TouchPitchHandler, TouchRotateHandler, TouchZoomHandler } from "./touch";
+
 var _isMoving = function isMoving(p) {
   return p.zoom || p.drag || p.pitch || p.rotate;
 };
+
 function hasChange(result) {
   return result.panDelta && result.panDelta.mag() || result.zoomDelta || result.bearingDelta || result.pitchDelta;
 }
+
 var HandlerManager = /*#__PURE__*/function () {
   function HandlerManager(map, options) {
     var _this = this;
+
     _classCallCheck(this, HandlerManager);
+
     _defineProperty(this, "handleWindowEvent", function (e) {
       _this.handleEvent(e, "".concat(e.type, "Window"));
     });
+
     _defineProperty(this, "handleEvent", function (e, eventName) {
       if (e.type === 'blur') {
         _this.stop();
+
         return;
       }
+
       _this.updatingCamera = true;
       var inputEvent = e.type === 'renderFrame' ? undefined : e;
-
       /*
        * We don't call e.preventDefault() for any events by default.
        * Handlers are responsible for calling it where necessary.
@@ -58,39 +69,46 @@ var HandlerManager = /*#__PURE__*/function () {
         needsRenderFrame: false
       };
       var eventsInProgress = {};
-      var activeHandlers = {};
-      // @ts-ignore
-      var mapTouches = e.touches ?
-      // @ts-ignore
+      var activeHandlers = {}; // @ts-ignore
+
+      var mapTouches = e.touches ? // @ts-ignore
       _this.getMapTouches(e.touches) : undefined;
       var points = mapTouches ? DOM.touchPos(_this.el, mapTouches) : DOM.mousePos(_this.el, e);
+
       var _iterator = _createForOfIteratorHelper(_this.handlers),
-        _step;
+          _step;
+
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var _step$value = _step.value,
-            handlerName = _step$value.handlerName,
-            handler = _step$value.handler,
-            allowed = _step$value.allowed;
+              handlerName = _step$value.handlerName,
+              handler = _step$value.handler,
+              allowed = _step$value.allowed;
+
           if (!handler.isEnabled()) {
             continue;
           }
+
           var data = void 0;
+
           if (_this.blockedByActive(activeHandlers, allowed, handlerName)) {
             handler.reset();
           } else {
-            var handerName = eventName || e.type;
-            // @ts-ignore
+            var handerName = eventName || e.type; // @ts-ignore
+
             if (handler && handler[handerName]) {
               // @ts-ignore
               data = handler[handerName](e, points, mapTouches);
+
               _this.mergeIHandlerResult(mergedIHandlerResult, eventsInProgress, data, handlerName, inputEvent);
+
               if (data && data.needsRenderFrame) {
                 _this.triggerRenderFrame();
               }
             }
-          }
-          // @ts-ignore
+          } // @ts-ignore
+
+
           if (data || handler.isActive()) {
             activeHandlers[handlerName] = handler;
           }
@@ -100,29 +118,40 @@ var HandlerManager = /*#__PURE__*/function () {
       } finally {
         _iterator.f();
       }
+
       var deactivatedHandlers = {};
+
       for (var name in _this.previousActiveHandlers) {
         if (!activeHandlers[name]) {
           deactivatedHandlers[name] = inputEvent;
         }
       }
+
       _this.previousActiveHandlers = activeHandlers;
+
       if (Object.keys(deactivatedHandlers).length || hasChange(mergedIHandlerResult)) {
         _this.changes.push([mergedIHandlerResult, eventsInProgress, deactivatedHandlers]);
+
         _this.triggerRenderFrame();
       }
+
       if (Object.keys(activeHandlers).length || hasChange(mergedIHandlerResult)) {
         _this.map.stop(true);
       }
+
       _this.updatingCamera = false;
       var cameraAnimation = mergedIHandlerResult.cameraAnimation;
+
       if (cameraAnimation) {
         _this.inertia.clear();
+
         _this.fireEvents({}, {});
+
         _this.changes = [];
         cameraAnimation(_this.map);
       }
     });
+
     this.map = map;
     this.el = this.map.getCanvasContainer();
     this.handlers = [];
@@ -132,17 +161,16 @@ var HandlerManager = /*#__PURE__*/function () {
     this.bearingSnap = options.bearingSnap;
     this.rotateEnabled = options.rotateEnabled;
     this.pitchEnabled = options.pitchEnabled;
-    this.previousActiveHandlers = {};
+    this.previousActiveHandlers = {}; // Track whether map is currently moving, to compute start/move/end events
 
-    // Track whether map is currently moving, to compute start/move/end events
     this.eventsInProgress = {};
     this.addDefaultHandlers(options);
     var el = this.el;
     this.listeners = [];
+
     if (!isMini) {
       // l7 - mini
-      this.listeners = [
-      // Bind touchstart and touchmove with passive: false because, even though
+      this.listeners = [// Bind touchstart and touchmove with passive: false because, even though
       // they only fire a map events and therefore could theoretically be
       // passive, binding with passive: true causes iOS not to respect
       // e.preventDefault() in _other_ handlers, even if they are non-passive
@@ -151,8 +179,7 @@ var HandlerManager = /*#__PURE__*/function () {
         passive: false
       }], [el, 'touchmove', {
         passive: false
-      }], [el, 'touchend', undefined], [el, 'touchcancel', undefined], [el, 'mousedown', undefined], [el, 'mousemove', undefined], [el, 'mouseup', undefined],
-      // Bind window-level event listeners for move and up/end events. In the absence of
+      }], [el, 'touchend', undefined], [el, 'touchcancel', undefined], [el, 'mousedown', undefined], [el, 'mousemove', undefined], [el, 'mouseup', undefined], // Bind window-level event listeners for move and up/end events. In the absence of
       // the pointer capture API, which is not supported by all necessary platforms,
       // window-level event listeners give us the best shot at capturing events that
       // fall outside the map canvas element. Use `{capture: true}` for the move event
@@ -160,26 +187,26 @@ var HandlerManager = /*#__PURE__*/function () {
       // @ts-ignore
       [window.document, 'mousemove', {
         capture: true
-      }],
-      // @ts-ignore
+      }], // @ts-ignore
       [window.document, 'mouseup', undefined], [el, 'mouseover', undefined], [el, 'mouseout', undefined], [el, 'dblclick', undefined], [el, 'click', undefined], [el, 'keydown', {
         capture: false
       }], [el, 'keyup', undefined], [el, 'wheel', {
         passive: false
-      }], [el, 'contextmenu', undefined],
-      // @ts-ignore
+      }], [el, 'contextmenu', undefined], // @ts-ignore
       [window, 'blur', undefined]];
+
       var _iterator2 = _createForOfIteratorHelper(this.listeners),
-        _step2;
+          _step2;
+
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var _step2$value = _slicedToArray(_step2.value, 3),
-            target = _step2$value[0],
-            type = _step2$value[1],
-            listenerOptions = _step2$value[2];
-          // @ts-ignore
-          DOM.addEventListener(target, type,
+              target = _step2$value[0],
+              type = _step2$value[1],
+              listenerOptions = _step2$value[2];
+
           // @ts-ignore
+          DOM.addEventListener(target, type, // @ts-ignore
           target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
         }
       } catch (err) {
@@ -202,20 +229,22 @@ var HandlerManager = /*#__PURE__*/function () {
       }, {});
     }
   }
+
   _createClass(HandlerManager, [{
     key: "destroy",
     value: function destroy() {
       var _iterator3 = _createForOfIteratorHelper(this.listeners),
-        _step3;
+          _step3;
+
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           var _step3$value = _slicedToArray(_step3.value, 3),
-            target = _step3$value[0],
-            type = _step3$value[1],
-            listenerOptions = _step3$value[2];
-          // @ts-ignore
-          DOM.removeEventListener(target, type,
+              target = _step3$value[0],
+              type = _step3$value[1],
+              listenerOptions = _step3$value[2];
+
           // @ts-ignore
+          DOM.removeEventListener(target, type, // @ts-ignore
           target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
         }
       } catch (err) {
@@ -231,8 +260,10 @@ var HandlerManager = /*#__PURE__*/function () {
       if (this.updatingCamera) {
         return;
       }
+
       var _iterator4 = _createForOfIteratorHelper(this.handlers),
-        _step4;
+          _step4;
+
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           var handler = _step4.value.handler;
@@ -243,6 +274,7 @@ var HandlerManager = /*#__PURE__*/function () {
       } finally {
         _iterator4.f();
       }
+
       this.inertia.clear();
       this.fireEvents({}, {});
       this.changes = [];
@@ -251,10 +283,12 @@ var HandlerManager = /*#__PURE__*/function () {
     key: "isActive",
     value: function isActive() {
       var _iterator5 = _createForOfIteratorHelper(this.handlers),
-        _step5;
+          _step5;
+
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
           var handler = _step5.value.handler;
+
           if (handler.isActive()) {
             return true;
           }
@@ -264,6 +298,7 @@ var HandlerManager = /*#__PURE__*/function () {
       } finally {
         _iterator5.f();
       }
+
       return false;
     }
   }, {
@@ -287,22 +322,25 @@ var HandlerManager = /*#__PURE__*/function () {
       if (!HandlerResult) {
         return;
       }
+
       merge(mergedIHandlerResult, HandlerResult);
       var eventData = {
         handlerName: name,
         originalEvent: HandlerResult.originalEvent || e
-      };
+      }; // track which handler changed which camera property
 
-      // track which handler changed which camera property
       if (HandlerResult.zoomDelta !== undefined) {
         eventsInProgress.zoom = eventData;
       }
+
       if (HandlerResult.panDelta !== undefined) {
         eventsInProgress.drag = eventData;
       }
+
       if (HandlerResult.pitchDelta !== undefined) {
         eventsInProgress.pitch = eventData;
       }
+
       if (HandlerResult.bearingDelta !== undefined) {
         eventsInProgress.rotate = eventData;
       }
@@ -311,13 +349,16 @@ var HandlerManager = /*#__PURE__*/function () {
     key: "triggerRenderFrame",
     value: function triggerRenderFrame() {
       var _this2 = this;
+
       if (this.frameId === undefined) {
         this.frameId = this.map.requestRenderFrame(function (timeStamp) {
           // @ts-ignore
           delete _this2.frameId;
+
           _this2.handleEvent(new RenderFrameEvent('renderFrame', {
             timeStamp: timeStamp
           }));
+
           _this2.applyChanges();
         });
       }
@@ -359,8 +400,10 @@ var HandlerManager = /*#__PURE__*/function () {
       var keyboard = map.keyboard = new KeyboardHandler();
       this.add('keyboard', keyboard);
       this.add('blockableMapEvent', new BlockableMapEventHandler(map));
+
       for (var _i = 0, _arr = ['boxZoom', 'doubleClickZoom', 'tapDragZoom', 'touchPitch', 'dragRotate', 'dragPan', 'touchZoomRotate', 'scrollZoom', 'keyboard']; _i < _arr.length; _i++) {
         var name = _arr[_i];
+
         // @ts-ignore
         if (options.interactive && options[name]) {
           // @ts-ignore
@@ -385,22 +428,27 @@ var HandlerManager = /*#__PURE__*/function () {
         if (name === myName) {
           continue;
         }
+
         if (!allowed || allowed.indexOf(name) < 0) {
           return true;
         }
       }
+
       return false;
     }
   }, {
     key: "getMapTouches",
     value: function getMapTouches(touches) {
       var mapTouches = [];
+
       var _iterator6 = _createForOfIteratorHelper(touches),
-        _step6;
+          _step6;
+
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
           var t = _step6.value;
           var target = t.target;
+
           if (isMini || this.el.contains(target)) {
             mapTouches.push(t);
           }
@@ -410,6 +458,7 @@ var HandlerManager = /*#__PURE__*/function () {
       } finally {
         _iterator6.f();
       }
+
       return mapTouches;
     }
   }, {
@@ -418,35 +467,45 @@ var HandlerManager = /*#__PURE__*/function () {
       var combined = {};
       var combinedEventsInProgress = {};
       var combinedDeactivatedHandlers = {};
+
       var _iterator7 = _createForOfIteratorHelper(this.changes),
-        _step7;
+          _step7;
+
       try {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
           var _step7$value = _slicedToArray(_step7.value, 3),
-            change = _step7$value[0],
-            eventsInProgress = _step7$value[1],
-            deactivatedHandlers = _step7$value[2];
+              change = _step7$value[0],
+              eventsInProgress = _step7$value[1],
+              deactivatedHandlers = _step7$value[2];
+
           if (change.panDelta) {
             combined.panDelta = (combined.panDelta || new Point(0, 0))._add(change.panDelta);
           }
+
           if (change.zoomDelta) {
             combined.zoomDelta = (combined.zoomDelta || 0) + change.zoomDelta;
           }
+
           if (change.bearingDelta) {
             combined.bearingDelta = (combined.bearingDelta || 0) + change.bearingDelta;
           }
+
           if (change.pitchDelta) {
             combined.pitchDelta = (combined.pitchDelta || 0) + change.pitchDelta;
           }
+
           if (change.around !== undefined) {
             combined.around = change.around;
           }
+
           if (change.pinchAround !== undefined) {
             combined.pinchAround = change.pinchAround;
           }
+
           if (change.noInertia) {
             combined.noInertia = change.noInertia;
           }
+
           merge(combinedEventsInProgress, eventsInProgress);
           merge(combinedDeactivatedHandlers, deactivatedHandlers);
         }
@@ -455,6 +514,7 @@ var HandlerManager = /*#__PURE__*/function () {
       } finally {
         _iterator7.f();
       }
+
       this.updateMapTransform(combined, combinedEventsInProgress, combinedDeactivatedHandlers);
       this.changes = [];
     }
@@ -463,84 +523,106 @@ var HandlerManager = /*#__PURE__*/function () {
     value: function updateMapTransform(combinedResult, combinedEventsInProgress, deactivatedHandlers) {
       var map = this.map;
       var tr = map.transform;
+
       if (!hasChange(combinedResult)) {
         return this.fireEvents(combinedEventsInProgress, deactivatedHandlers);
       }
+
       var panDelta = combinedResult.panDelta,
-        zoomDelta = combinedResult.zoomDelta,
-        bearingDelta = combinedResult.bearingDelta,
-        pitchDelta = combinedResult.pitchDelta,
-        pinchAround = combinedResult.pinchAround;
+          zoomDelta = combinedResult.zoomDelta,
+          bearingDelta = combinedResult.bearingDelta,
+          pitchDelta = combinedResult.pitchDelta,
+          pinchAround = combinedResult.pinchAround;
       var around = combinedResult.around;
+
       if (pinchAround !== undefined) {
         around = pinchAround;
-      }
+      } // stop any ongoing camera animations (easeTo, flyTo)
+
 
-      // stop any ongoing camera animations (easeTo, flyTo)
       map.stop(true);
       around = around || map.transform.centerPoint;
       var loc = tr.pointLocation(panDelta ? around.sub(panDelta) : around);
+
       if (bearingDelta && this.rotateEnabled) {
         tr.bearing += bearingDelta;
       }
+
       if (pitchDelta && this.pitchEnabled) {
         tr.pitch += pitchDelta;
       }
+
       if (zoomDelta) {
         tr.zoom += zoomDelta;
       }
+
       tr.setLocationAtPoint(loc, around);
       this.map.update();
+
       if (!combinedResult.noInertia) {
         this.inertia.record(combinedResult);
       }
+
       this.fireEvents(combinedEventsInProgress, deactivatedHandlers);
     }
   }, {
     key: "fireEvents",
     value: function fireEvents(newEventsInProgress, deactivatedHandlers) {
       var _this3 = this;
+
       var wasMoving = _isMoving(this.eventsInProgress);
+
       var nowMoving = _isMoving(newEventsInProgress);
+
       var startEvents = {};
+
       for (var eventName in newEventsInProgress) {
         if (newEventsInProgress[eventName]) {
           var originalEvent = newEventsInProgress[eventName].originalEvent;
+
           if (!this.eventsInProgress[eventName]) {
             startEvents["".concat(eventName, "start")] = originalEvent;
           }
+
           this.eventsInProgress[eventName] = newEventsInProgress[eventName];
         }
-      }
+      } // fire start events only after this.eventsInProgress has been updated
+
 
-      // fire start events only after this.eventsInProgress has been updated
       if (!wasMoving && nowMoving) {
         this.fireEvent('movestart', nowMoving.originalEvent);
       }
+
       for (var name in startEvents) {
         if (startEvents[name]) {
           this.fireEvent(name, startEvents[name]);
         }
       }
+
       if (newEventsInProgress.rotate) {
         this.bearingChanged = true;
       }
+
       if (nowMoving) {
         this.fireEvent('move', nowMoving.originalEvent);
       }
+
       for (var _eventName in newEventsInProgress) {
         if (newEventsInProgress[_eventName]) {
           var _originalEvent = newEventsInProgress[_eventName].originalEvent;
           this.fireEvent(_eventName, _originalEvent);
         }
       }
+
       var endEvents = {};
       var originalEndEvent;
+
       for (var _eventName2 in this.eventsInProgress) {
         if (this.eventsInProgress[_eventName2]) {
           var _this$eventsInProgres = this.eventsInProgress[_eventName2],
-            handlerName = _this$eventsInProgres.handlerName,
-            _originalEvent2 = _this$eventsInProgres.originalEvent;
+              handlerName = _this$eventsInProgres.handlerName,
+              _originalEvent2 = _this$eventsInProgres.originalEvent;
+
           if (!this.handlersById[handlerName].isActive()) {
             delete this.eventsInProgress[_eventName2];
             originalEndEvent = deactivatedHandlers[handlerName] || _originalEvent2;
@@ -548,22 +630,28 @@ var HandlerManager = /*#__PURE__*/function () {
           }
         }
       }
+
       for (var _name in endEvents) {
         if (endEvents[_name]) {
           this.fireEvent(_name, endEvents[_name]);
         }
       }
+
       var stillMoving = _isMoving(this.eventsInProgress);
+
       if ((wasMoving || nowMoving) && !stillMoving) {
         this.updatingCamera = true;
         var inertialEase = this.inertia.onMoveEnd(this.map.dragPan.inertiaOptions);
+
         var shouldSnapToNorth = function shouldSnapToNorth(bearing) {
           return bearing !== 0 && -_this3.bearingSnap < bearing && bearing < _this3.bearingSnap;
         };
+
         if (inertialEase) {
           if (shouldSnapToNorth(inertialEase.bearing || this.map.getBearing())) {
             inertialEase.bearing = 0;
           }
+
           this.map.easeTo(inertialEase, {
             originalEvent: originalEndEvent
           });
@@ -571,10 +659,12 @@ var HandlerManager = /*#__PURE__*/function () {
           this.map.emit('moveend', new Event('moveend', {
             originalEvent: originalEndEvent
           }));
+
           if (shouldSnapToNorth(this.map.getBearing())) {
             this.map.resetNorth();
           }
         }
+
         this.bearingChanged = false;
         this.updatingCamera = false;
       }
@@ -587,6 +677,8 @@ var HandlerManager = /*#__PURE__*/function () {
       } : {}));
     }
   }]);
+
   return HandlerManager;
 }();
+
 export default HandlerManager;

package/es/handler/handler_util.js

@@ -1,9 +1,10 @@
 // @ts-ignore
-
 export function indexTouches(touches, points) {
   var obj = {};
+
   for (var i = 0; i < touches.length; i++) {
     obj[touches[i].identifier] = points[i];
   }
+
   return obj;
 }