@antv/l7-map 2.15.2 → 2.15.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (103) hide show
  1. package/es/camera.js +90 -148
  2. package/es/earthmap.js +13 -65
  3. package/es/geo/edge_insets.js +4 -14
  4. package/es/geo/lng_lat.js +5 -13
  5. package/es/geo/lng_lat_bounds.js +4 -17
  6. package/es/geo/mercator.js +2 -10
  7. package/es/geo/point.js +0 -7
  8. package/es/geo/simple.js +6 -11
  9. package/es/geo/transform.js +123 -132
  10. package/es/handler/blockable_map_event.js +7 -12
  11. package/es/handler/box_zoom.js +10 -30
  12. package/es/handler/click_zoom.js +0 -5
  13. package/es/handler/events/event.js +0 -2
  14. package/es/handler/events/map_mouse_event.js +0 -12
  15. package/es/handler/events/map_touch_event.js +2 -12
  16. package/es/handler/events/map_wheel_event.js +1 -12
  17. package/es/handler/events/render_event.js +0 -13
  18. package/es/handler/handler_inertia.js +6 -34
  19. package/es/handler/handler_manager.js +55 -147
  20. package/es/handler/handler_util.js +1 -2
  21. package/es/handler/keyboard.js +1 -20
  22. package/es/handler/map_event.js +3 -9
  23. package/es/handler/mouse/mouse_handler.js +11 -24
  24. package/es/handler/mouse/mousepan_handler.js +1 -11
  25. package/es/handler/mouse/mousepitch_hander.js +1 -11
  26. package/es/handler/mouse/mouserotate_hander.js +1 -11
  27. package/es/handler/mouse/util.js +2 -3
  28. package/es/handler/scroll_zoom.js +43 -71
  29. package/es/handler/shim/dblclick_zoom.js +4 -9
  30. package/es/handler/shim/drag_pan.js +4 -11
  31. package/es/handler/shim/drag_rotate.js +4 -10
  32. package/es/handler/shim/touch_zoom_rotate.js +6 -16
  33. package/es/handler/tap/single_tap_recognizer.js +8 -31
  34. package/es/handler/tap/tap_drag_zoom.js +7 -15
  35. package/es/handler/tap/tap_recognizer.js +3 -11
  36. package/es/handler/tap/tap_zoom.js +1 -7
  37. package/es/handler/touch/touch_pan.js +4 -22
  38. package/es/handler/touch/touch_pitch.js +10 -27
  39. package/es/handler/touch/touch_rotate.js +8 -19
  40. package/es/handler/touch/touch_zoom.js +5 -18
  41. package/es/handler/touch/two_touch.js +19 -32
  42. package/es/hash.js +9 -31
  43. package/es/map.js +16 -78
  44. package/es/util.js +18 -23
  45. package/es/utils/Aabb.js +10 -31
  46. package/es/utils/dom.js +24 -58
  47. package/es/utils/performance.js +8 -7
  48. package/es/utils/primitives.js +13 -11
  49. package/es/utils/task_queue.js +6 -23
  50. package/lib/camera.js +90 -168
  51. package/lib/earthmap.js +11 -79
  52. package/lib/geo/edge_insets.js +3 -18
  53. package/lib/geo/lng_lat.js +5 -18
  54. package/lib/geo/lng_lat_bounds.js +4 -20
  55. package/lib/geo/mercator.js +1 -22
  56. package/lib/geo/point.js +0 -8
  57. package/lib/geo/simple.js +5 -24
  58. package/lib/geo/transform.js +123 -164
  59. package/lib/handler/blockable_map_event.js +6 -14
  60. package/lib/handler/box_zoom.js +8 -39
  61. package/lib/handler/click_zoom.js +0 -6
  62. package/lib/handler/events/event.js +0 -5
  63. package/lib/handler/events/index.js +0 -4
  64. package/lib/handler/events/map_mouse_event.js +0 -19
  65. package/lib/handler/events/map_touch_event.js +1 -20
  66. package/lib/handler/events/map_wheel_event.js +1 -16
  67. package/lib/handler/events/render_event.js +0 -19
  68. package/lib/handler/handler_inertia.js +4 -37
  69. package/lib/handler/handler_manager.js +55 -171
  70. package/lib/handler/handler_util.js +1 -3
  71. package/lib/handler/keyboard.js +1 -22
  72. package/lib/handler/map_event.js +2 -11
  73. package/lib/handler/mouse/index.js +0 -4
  74. package/lib/handler/mouse/mouse_handler.js +10 -27
  75. package/lib/handler/mouse/mousepan_handler.js +0 -17
  76. package/lib/handler/mouse/mousepitch_hander.js +0 -16
  77. package/lib/handler/mouse/mouserotate_hander.js +0 -16
  78. package/lib/handler/mouse/util.js +2 -6
  79. package/lib/handler/scroll_zoom.js +43 -77
  80. package/lib/handler/shim/dblclick_zoom.js +4 -10
  81. package/lib/handler/shim/drag_pan.js +4 -13
  82. package/lib/handler/shim/drag_rotate.js +4 -11
  83. package/lib/handler/shim/touch_zoom_rotate.js +6 -18
  84. package/lib/handler/tap/single_tap_recognizer.js +8 -33
  85. package/lib/handler/tap/tap_drag_zoom.js +6 -18
  86. package/lib/handler/tap/tap_recognizer.js +2 -17
  87. package/lib/handler/tap/tap_zoom.js +0 -9
  88. package/lib/handler/touch/index.js +0 -5
  89. package/lib/handler/touch/touch_pan.js +4 -25
  90. package/lib/handler/touch/touch_pitch.js +9 -31
  91. package/lib/handler/touch/touch_rotate.js +7 -24
  92. package/lib/handler/touch/touch_zoom.js +4 -23
  93. package/lib/handler/touch/two_touch.js +18 -35
  94. package/lib/hash.js +8 -35
  95. package/lib/index.js +0 -8
  96. package/lib/map.js +14 -94
  97. package/lib/util.js +16 -34
  98. package/lib/utils/Aabb.js +10 -34
  99. package/lib/utils/dom.js +22 -64
  100. package/lib/utils/performance.js +8 -9
  101. package/lib/utils/primitives.js +13 -16
  102. package/lib/utils/task_queue.js +6 -24
  103. package/package.json +3 -3
@@ -1,80 +1,47 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
8
7
  exports.default = void 0;
9
-
10
8
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
-
12
9
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
13
-
14
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
15
-
16
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
-
18
12
  var _l7Utils = require("@antv/l7-utils");
19
-
20
13
  var _lodash = require("lodash");
21
-
22
14
  var _point = _interopRequireDefault(require("../geo/point"));
23
-
24
15
  var _dom = _interopRequireDefault(require("../utils/dom"));
25
-
26
16
  var _blockable_map_event = _interopRequireDefault(require("./blockable_map_event"));
27
-
28
17
  var _box_zoom = _interopRequireDefault(require("./box_zoom"));
29
-
30
18
  var _click_zoom = _interopRequireDefault(require("./click_zoom"));
31
-
32
19
  var _event = require("./events/event");
33
-
34
20
  var _render_event = _interopRequireDefault(require("./events/render_event"));
35
-
36
21
  var _handler_inertia = _interopRequireDefault(require("./handler_inertia"));
37
-
38
22
  var _keyboard = _interopRequireDefault(require("./keyboard"));
39
-
40
23
  var _map_event = _interopRequireDefault(require("./map_event"));
41
-
42
24
  var _mouse = require("./mouse");
43
-
44
25
  var _scroll_zoom = _interopRequireDefault(require("./scroll_zoom"));
45
-
46
26
  var _dblclick_zoom = _interopRequireDefault(require("./shim/dblclick_zoom"));
47
-
48
27
  var _drag_pan = _interopRequireDefault(require("./shim/drag_pan"));
49
-
50
28
  var _drag_rotate = _interopRequireDefault(require("./shim/drag_rotate"));
51
-
52
29
  var _touch_zoom_rotate = _interopRequireDefault(require("./shim/touch_zoom_rotate"));
53
-
54
30
  var _tap_drag_zoom = _interopRequireDefault(require("./tap/tap_drag_zoom"));
55
-
56
31
  var _tap_zoom = _interopRequireDefault(require("./tap/tap_zoom"));
57
-
58
32
  var _touch = require("./touch");
59
-
60
33
  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; } } }; }
61
-
62
34
  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); }
63
-
64
- 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; }
65
-
35
+ 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; }
66
36
  var _isMoving = function isMoving(p) {
67
37
  return p.zoom || p.drag || p.pitch || p.rotate;
68
38
  };
69
-
70
39
  function hasChange(result) {
71
40
  return result.panDelta && result.panDelta.mag() || result.zoomDelta || result.bearingDelta || result.pitchDelta;
72
41
  }
73
-
74
42
  var HandlerManager = /*#__PURE__*/function () {
75
43
  function HandlerManager(map, options) {
76
44
  var _this = this;
77
-
78
45
  (0, _classCallCheck2.default)(this, HandlerManager);
79
46
  (0, _defineProperty2.default)(this, "handleWindowEvent", function (e) {
80
47
  _this.handleEvent(e, "".concat(e.type, "Window"));
@@ -82,12 +49,11 @@ var HandlerManager = /*#__PURE__*/function () {
82
49
  (0, _defineProperty2.default)(this, "handleEvent", function (e, eventName) {
83
50
  if (e.type === 'blur') {
84
51
  _this.stop();
85
-
86
52
  return;
87
53
  }
88
-
89
54
  _this.updatingCamera = true;
90
55
  var inputEvent = e.type === 'renderFrame' ? undefined : e;
56
+
91
57
  /*
92
58
  * We don't call e.preventDefault() for any events by default.
93
59
  * Handlers are responsible for calling it where necessary.
@@ -97,46 +63,39 @@ var HandlerManager = /*#__PURE__*/function () {
97
63
  needsRenderFrame: false
98
64
  };
99
65
  var eventsInProgress = {};
100
- var activeHandlers = {}; // @ts-ignore
101
-
102
- var mapTouches = e.touches ? // @ts-ignore
66
+ var activeHandlers = {};
67
+ // @ts-ignore
68
+ var mapTouches = e.touches ?
69
+ // @ts-ignore
103
70
  _this.getMapTouches(e.touches) : undefined;
104
71
  var points = mapTouches ? _dom.default.touchPos(_this.el, mapTouches) : _dom.default.mousePos(_this.el, e);
105
-
106
72
  var _iterator = _createForOfIteratorHelper(_this.handlers),
107
- _step;
108
-
73
+ _step;
109
74
  try {
110
75
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
111
76
  var _step$value = _step.value,
112
- handlerName = _step$value.handlerName,
113
- handler = _step$value.handler,
114
- allowed = _step$value.allowed;
115
-
77
+ handlerName = _step$value.handlerName,
78
+ handler = _step$value.handler,
79
+ allowed = _step$value.allowed;
116
80
  if (!handler.isEnabled()) {
117
81
  continue;
118
82
  }
119
-
120
83
  var data = void 0;
121
-
122
84
  if (_this.blockedByActive(activeHandlers, allowed, handlerName)) {
123
85
  handler.reset();
124
86
  } else {
125
- var handerName = eventName || e.type; // @ts-ignore
126
-
87
+ var handerName = eventName || e.type;
88
+ // @ts-ignore
127
89
  if (handler && handler[handerName]) {
128
90
  // @ts-ignore
129
91
  data = handler[handerName](e, points, mapTouches);
130
-
131
92
  _this.mergeIHandlerResult(mergedIHandlerResult, eventsInProgress, data, handlerName, inputEvent);
132
-
133
93
  if (data && data.needsRenderFrame) {
134
94
  _this.triggerRenderFrame();
135
95
  }
136
96
  }
137
- } // @ts-ignore
138
-
139
-
97
+ }
98
+ // @ts-ignore
140
99
  if (data || handler.isActive()) {
141
100
  activeHandlers[handlerName] = handler;
142
101
  }
@@ -146,35 +105,25 @@ var HandlerManager = /*#__PURE__*/function () {
146
105
  } finally {
147
106
  _iterator.f();
148
107
  }
149
-
150
108
  var deactivatedHandlers = {};
151
-
152
109
  for (var name in _this.previousActiveHandlers) {
153
110
  if (!activeHandlers[name]) {
154
111
  deactivatedHandlers[name] = inputEvent;
155
112
  }
156
113
  }
157
-
158
114
  _this.previousActiveHandlers = activeHandlers;
159
-
160
115
  if (Object.keys(deactivatedHandlers).length || hasChange(mergedIHandlerResult)) {
161
116
  _this.changes.push([mergedIHandlerResult, eventsInProgress, deactivatedHandlers]);
162
-
163
117
  _this.triggerRenderFrame();
164
118
  }
165
-
166
119
  if (Object.keys(activeHandlers).length || hasChange(mergedIHandlerResult)) {
167
120
  _this.map.stop(true);
168
121
  }
169
-
170
122
  _this.updatingCamera = false;
171
123
  var cameraAnimation = mergedIHandlerResult.cameraAnimation;
172
-
173
124
  if (cameraAnimation) {
174
125
  _this.inertia.clear();
175
-
176
126
  _this.fireEvents({}, {});
177
-
178
127
  _this.changes = [];
179
128
  cameraAnimation(_this.map);
180
129
  }
@@ -188,16 +137,17 @@ var HandlerManager = /*#__PURE__*/function () {
188
137
  this.bearingSnap = options.bearingSnap;
189
138
  this.rotateEnabled = options.rotateEnabled;
190
139
  this.pitchEnabled = options.pitchEnabled;
191
- this.previousActiveHandlers = {}; // Track whether map is currently moving, to compute start/move/end events
140
+ this.previousActiveHandlers = {};
192
141
 
142
+ // Track whether map is currently moving, to compute start/move/end events
193
143
  this.eventsInProgress = {};
194
144
  this.addDefaultHandlers(options);
195
145
  var el = this.el;
196
146
  this.listeners = [];
197
-
198
147
  if (!_l7Utils.isMini) {
199
148
  // l7 - mini
200
- this.listeners = [// Bind touchstart and touchmove with passive: false because, even though
149
+ this.listeners = [
150
+ // Bind touchstart and touchmove with passive: false because, even though
201
151
  // they only fire a map events and therefore could theoretically be
202
152
  // passive, binding with passive: true causes iOS not to respect
203
153
  // e.preventDefault() in _other_ handlers, even if they are non-passive
@@ -206,7 +156,8 @@ var HandlerManager = /*#__PURE__*/function () {
206
156
  passive: false
207
157
  }], [el, 'touchmove', {
208
158
  passive: false
209
- }], [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
159
+ }], [el, 'touchend', undefined], [el, 'touchcancel', undefined], [el, 'mousedown', undefined], [el, 'mousemove', undefined], [el, 'mouseup', undefined],
160
+ // Bind window-level event listeners for move and up/end events. In the absence of
210
161
  // the pointer capture API, which is not supported by all necessary platforms,
211
162
  // window-level event listeners give us the best shot at capturing events that
212
163
  // fall outside the map canvas element. Use `{capture: true}` for the move event
@@ -214,26 +165,26 @@ var HandlerManager = /*#__PURE__*/function () {
214
165
  // @ts-ignore
215
166
  [window.document, 'mousemove', {
216
167
  capture: true
217
- }], // @ts-ignore
168
+ }],
169
+ // @ts-ignore
218
170
  [window.document, 'mouseup', undefined], [el, 'mouseover', undefined], [el, 'mouseout', undefined], [el, 'dblclick', undefined], [el, 'click', undefined], [el, 'keydown', {
219
171
  capture: false
220
172
  }], [el, 'keyup', undefined], [el, 'wheel', {
221
173
  passive: false
222
- }], [el, 'contextmenu', undefined], // @ts-ignore
174
+ }], [el, 'contextmenu', undefined],
175
+ // @ts-ignore
223
176
  [window, 'blur', undefined]];
224
-
225
177
  var _iterator2 = _createForOfIteratorHelper(this.listeners),
226
- _step2;
227
-
178
+ _step2;
228
179
  try {
229
180
  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
230
181
  var _step2$value = (0, _slicedToArray2.default)(_step2.value, 3),
231
- target = _step2$value[0],
232
- type = _step2$value[1],
233
- listenerOptions = _step2$value[2];
234
-
182
+ target = _step2$value[0],
183
+ type = _step2$value[1],
184
+ listenerOptions = _step2$value[2];
185
+ // @ts-ignore
186
+ _dom.default.addEventListener(target, type,
235
187
  // @ts-ignore
236
- _dom.default.addEventListener(target, type, // @ts-ignore
237
188
  target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
238
189
  }
239
190
  } catch (err) {
@@ -245,36 +196,31 @@ var HandlerManager = /*#__PURE__*/function () {
245
196
  _l7Utils.$window.document.addEventListener('touchstart', function (e) {
246
197
  _this.handleEvent(e);
247
198
  }, {});
248
-
249
199
  _l7Utils.$window.document.addEventListener('touchmove', function (e) {
250
200
  _this.handleEvent(e);
251
201
  }, {});
252
-
253
202
  _l7Utils.$window.document.addEventListener('touchend', function (e) {
254
203
  _this.handleEvent(e);
255
204
  }, {});
256
-
257
205
  _l7Utils.$window.document.addEventListener('touchcancel', function (e) {
258
206
  _this.handleEvent(e);
259
207
  }, {});
260
208
  }
261
209
  }
262
-
263
210
  (0, _createClass2.default)(HandlerManager, [{
264
211
  key: "destroy",
265
212
  value: function destroy() {
266
213
  var _iterator3 = _createForOfIteratorHelper(this.listeners),
267
- _step3;
268
-
214
+ _step3;
269
215
  try {
270
216
  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
271
217
  var _step3$value = (0, _slicedToArray2.default)(_step3.value, 3),
272
- target = _step3$value[0],
273
- type = _step3$value[1],
274
- listenerOptions = _step3$value[2];
275
-
218
+ target = _step3$value[0],
219
+ type = _step3$value[1],
220
+ listenerOptions = _step3$value[2];
221
+ // @ts-ignore
222
+ _dom.default.removeEventListener(target, type,
276
223
  // @ts-ignore
277
- _dom.default.removeEventListener(target, type, // @ts-ignore
278
224
  target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
279
225
  }
280
226
  } catch (err) {
@@ -290,10 +236,8 @@ var HandlerManager = /*#__PURE__*/function () {
290
236
  if (this.updatingCamera) {
291
237
  return;
292
238
  }
293
-
294
239
  var _iterator4 = _createForOfIteratorHelper(this.handlers),
295
- _step4;
296
-
240
+ _step4;
297
241
  try {
298
242
  for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
299
243
  var handler = _step4.value.handler;
@@ -304,7 +248,6 @@ var HandlerManager = /*#__PURE__*/function () {
304
248
  } finally {
305
249
  _iterator4.f();
306
250
  }
307
-
308
251
  this.inertia.clear();
309
252
  this.fireEvents({}, {});
310
253
  this.changes = [];
@@ -313,12 +256,10 @@ var HandlerManager = /*#__PURE__*/function () {
313
256
  key: "isActive",
314
257
  value: function isActive() {
315
258
  var _iterator5 = _createForOfIteratorHelper(this.handlers),
316
- _step5;
317
-
259
+ _step5;
318
260
  try {
319
261
  for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
320
262
  var handler = _step5.value.handler;
321
-
322
263
  if (handler.isActive()) {
323
264
  return true;
324
265
  }
@@ -328,7 +269,6 @@ var HandlerManager = /*#__PURE__*/function () {
328
269
  } finally {
329
270
  _iterator5.f();
330
271
  }
331
-
332
272
  return false;
333
273
  }
334
274
  }, {
@@ -352,25 +292,22 @@ var HandlerManager = /*#__PURE__*/function () {
352
292
  if (!HandlerResult) {
353
293
  return;
354
294
  }
355
-
356
295
  (0, _lodash.merge)(mergedIHandlerResult, HandlerResult);
357
296
  var eventData = {
358
297
  handlerName: name,
359
298
  originalEvent: HandlerResult.originalEvent || e
360
- }; // track which handler changed which camera property
299
+ };
361
300
 
301
+ // track which handler changed which camera property
362
302
  if (HandlerResult.zoomDelta !== undefined) {
363
303
  eventsInProgress.zoom = eventData;
364
304
  }
365
-
366
305
  if (HandlerResult.panDelta !== undefined) {
367
306
  eventsInProgress.drag = eventData;
368
307
  }
369
-
370
308
  if (HandlerResult.pitchDelta !== undefined) {
371
309
  eventsInProgress.pitch = eventData;
372
310
  }
373
-
374
311
  if (HandlerResult.bearingDelta !== undefined) {
375
312
  eventsInProgress.rotate = eventData;
376
313
  }
@@ -379,16 +316,13 @@ var HandlerManager = /*#__PURE__*/function () {
379
316
  key: "triggerRenderFrame",
380
317
  value: function triggerRenderFrame() {
381
318
  var _this2 = this;
382
-
383
319
  if (this.frameId === undefined) {
384
320
  this.frameId = this.map.requestRenderFrame(function (timeStamp) {
385
321
  // @ts-ignore
386
322
  delete _this2.frameId;
387
-
388
323
  _this2.handleEvent(new _render_event.default('renderFrame', {
389
324
  timeStamp: timeStamp
390
325
  }));
391
-
392
326
  _this2.applyChanges();
393
327
  });
394
328
  }
@@ -430,10 +364,8 @@ var HandlerManager = /*#__PURE__*/function () {
430
364
  var keyboard = map.keyboard = new _keyboard.default();
431
365
  this.add('keyboard', keyboard);
432
366
  this.add('blockableMapEvent', new _blockable_map_event.default(map));
433
-
434
367
  for (var _i = 0, _arr = ['boxZoom', 'doubleClickZoom', 'tapDragZoom', 'touchPitch', 'dragRotate', 'dragPan', 'touchZoomRotate', 'scrollZoom', 'keyboard']; _i < _arr.length; _i++) {
435
368
  var name = _arr[_i];
436
-
437
369
  // @ts-ignore
438
370
  if (options.interactive && options[name]) {
439
371
  // @ts-ignore
@@ -458,27 +390,22 @@ var HandlerManager = /*#__PURE__*/function () {
458
390
  if (name === myName) {
459
391
  continue;
460
392
  }
461
-
462
393
  if (!allowed || allowed.indexOf(name) < 0) {
463
394
  return true;
464
395
  }
465
396
  }
466
-
467
397
  return false;
468
398
  }
469
399
  }, {
470
400
  key: "getMapTouches",
471
401
  value: function getMapTouches(touches) {
472
402
  var mapTouches = [];
473
-
474
403
  var _iterator6 = _createForOfIteratorHelper(touches),
475
- _step6;
476
-
404
+ _step6;
477
405
  try {
478
406
  for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
479
407
  var t = _step6.value;
480
408
  var target = t.target;
481
-
482
409
  if (_l7Utils.isMini || this.el.contains(target)) {
483
410
  mapTouches.push(t);
484
411
  }
@@ -488,7 +415,6 @@ var HandlerManager = /*#__PURE__*/function () {
488
415
  } finally {
489
416
  _iterator6.f();
490
417
  }
491
-
492
418
  return mapTouches;
493
419
  }
494
420
  }, {
@@ -497,45 +423,35 @@ var HandlerManager = /*#__PURE__*/function () {
497
423
  var combined = {};
498
424
  var combinedEventsInProgress = {};
499
425
  var combinedDeactivatedHandlers = {};
500
-
501
426
  var _iterator7 = _createForOfIteratorHelper(this.changes),
502
- _step7;
503
-
427
+ _step7;
504
428
  try {
505
429
  for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
506
430
  var _step7$value = (0, _slicedToArray2.default)(_step7.value, 3),
507
- change = _step7$value[0],
508
- eventsInProgress = _step7$value[1],
509
- deactivatedHandlers = _step7$value[2];
510
-
431
+ change = _step7$value[0],
432
+ eventsInProgress = _step7$value[1],
433
+ deactivatedHandlers = _step7$value[2];
511
434
  if (change.panDelta) {
512
435
  combined.panDelta = (combined.panDelta || new _point.default(0, 0))._add(change.panDelta);
513
436
  }
514
-
515
437
  if (change.zoomDelta) {
516
438
  combined.zoomDelta = (combined.zoomDelta || 0) + change.zoomDelta;
517
439
  }
518
-
519
440
  if (change.bearingDelta) {
520
441
  combined.bearingDelta = (combined.bearingDelta || 0) + change.bearingDelta;
521
442
  }
522
-
523
443
  if (change.pitchDelta) {
524
444
  combined.pitchDelta = (combined.pitchDelta || 0) + change.pitchDelta;
525
445
  }
526
-
527
446
  if (change.around !== undefined) {
528
447
  combined.around = change.around;
529
448
  }
530
-
531
449
  if (change.pinchAround !== undefined) {
532
450
  combined.pinchAround = change.pinchAround;
533
451
  }
534
-
535
452
  if (change.noInertia) {
536
453
  combined.noInertia = change.noInertia;
537
454
  }
538
-
539
455
  (0, _lodash.merge)(combinedEventsInProgress, eventsInProgress);
540
456
  (0, _lodash.merge)(combinedDeactivatedHandlers, deactivatedHandlers);
541
457
  }
@@ -544,7 +460,6 @@ var HandlerManager = /*#__PURE__*/function () {
544
460
  } finally {
545
461
  _iterator7.f();
546
462
  }
547
-
548
463
  this.updateMapTransform(combined, combinedEventsInProgress, combinedDeactivatedHandlers);
549
464
  this.changes = [];
550
465
  }
@@ -553,106 +468,84 @@ var HandlerManager = /*#__PURE__*/function () {
553
468
  value: function updateMapTransform(combinedResult, combinedEventsInProgress, deactivatedHandlers) {
554
469
  var map = this.map;
555
470
  var tr = map.transform;
556
-
557
471
  if (!hasChange(combinedResult)) {
558
472
  return this.fireEvents(combinedEventsInProgress, deactivatedHandlers);
559
473
  }
560
-
561
474
  var panDelta = combinedResult.panDelta,
562
- zoomDelta = combinedResult.zoomDelta,
563
- bearingDelta = combinedResult.bearingDelta,
564
- pitchDelta = combinedResult.pitchDelta,
565
- pinchAround = combinedResult.pinchAround;
475
+ zoomDelta = combinedResult.zoomDelta,
476
+ bearingDelta = combinedResult.bearingDelta,
477
+ pitchDelta = combinedResult.pitchDelta,
478
+ pinchAround = combinedResult.pinchAround;
566
479
  var around = combinedResult.around;
567
-
568
480
  if (pinchAround !== undefined) {
569
481
  around = pinchAround;
570
- } // stop any ongoing camera animations (easeTo, flyTo)
571
-
482
+ }
572
483
 
484
+ // stop any ongoing camera animations (easeTo, flyTo)
573
485
  map.stop(true);
574
486
  around = around || map.transform.centerPoint;
575
487
  var loc = tr.pointLocation(panDelta ? around.sub(panDelta) : around);
576
-
577
488
  if (bearingDelta && this.rotateEnabled) {
578
489
  tr.bearing += bearingDelta;
579
490
  }
580
-
581
491
  if (pitchDelta && this.pitchEnabled) {
582
492
  tr.pitch += pitchDelta;
583
493
  }
584
-
585
494
  if (zoomDelta) {
586
495
  tr.zoom += zoomDelta;
587
496
  }
588
-
589
497
  tr.setLocationAtPoint(loc, around);
590
498
  this.map.update();
591
-
592
499
  if (!combinedResult.noInertia) {
593
500
  this.inertia.record(combinedResult);
594
501
  }
595
-
596
502
  this.fireEvents(combinedEventsInProgress, deactivatedHandlers);
597
503
  }
598
504
  }, {
599
505
  key: "fireEvents",
600
506
  value: function fireEvents(newEventsInProgress, deactivatedHandlers) {
601
507
  var _this3 = this;
602
-
603
508
  var wasMoving = _isMoving(this.eventsInProgress);
604
-
605
509
  var nowMoving = _isMoving(newEventsInProgress);
606
-
607
510
  var startEvents = {};
608
-
609
511
  for (var eventName in newEventsInProgress) {
610
512
  if (newEventsInProgress[eventName]) {
611
513
  var originalEvent = newEventsInProgress[eventName].originalEvent;
612
-
613
514
  if (!this.eventsInProgress[eventName]) {
614
515
  startEvents["".concat(eventName, "start")] = originalEvent;
615
516
  }
616
-
617
517
  this.eventsInProgress[eventName] = newEventsInProgress[eventName];
618
518
  }
619
- } // fire start events only after this.eventsInProgress has been updated
620
-
519
+ }
621
520
 
521
+ // fire start events only after this.eventsInProgress has been updated
622
522
  if (!wasMoving && nowMoving) {
623
523
  this.fireEvent('movestart', nowMoving.originalEvent);
624
524
  }
625
-
626
525
  for (var name in startEvents) {
627
526
  if (startEvents[name]) {
628
527
  this.fireEvent(name, startEvents[name]);
629
528
  }
630
529
  }
631
-
632
530
  if (newEventsInProgress.rotate) {
633
531
  this.bearingChanged = true;
634
532
  }
635
-
636
533
  if (nowMoving) {
637
534
  this.fireEvent('move', nowMoving.originalEvent);
638
535
  }
639
-
640
536
  for (var _eventName in newEventsInProgress) {
641
537
  if (newEventsInProgress[_eventName]) {
642
538
  var _originalEvent = newEventsInProgress[_eventName].originalEvent;
643
539
  this.fireEvent(_eventName, _originalEvent);
644
540
  }
645
541
  }
646
-
647
542
  var endEvents = {};
648
543
  var originalEndEvent;
649
-
650
544
  for (var _eventName2 in this.eventsInProgress) {
651
545
  if (this.eventsInProgress[_eventName2]) {
652
546
  var _this$eventsInProgres = this.eventsInProgress[_eventName2],
653
- handlerName = _this$eventsInProgres.handlerName,
654
- _originalEvent2 = _this$eventsInProgres.originalEvent;
655
-
547
+ handlerName = _this$eventsInProgres.handlerName,
548
+ _originalEvent2 = _this$eventsInProgres.originalEvent;
656
549
  if (!this.handlersById[handlerName].isActive()) {
657
550
  delete this.eventsInProgress[_eventName2];
658
551
  originalEndEvent = deactivatedHandlers[handlerName] || _originalEvent2;
@@ -660,28 +553,22 @@ var HandlerManager = /*#__PURE__*/function () {
660
553
  }
661
554
  }
662
555
  }
663
-
664
556
  for (var _name in endEvents) {
665
557
  if (endEvents[_name]) {
666
558
  this.fireEvent(_name, endEvents[_name]);
667
559
  }
668
560
  }
669
-
670
561
  var stillMoving = _isMoving(this.eventsInProgress);
671
-
672
562
  if ((wasMoving || nowMoving) && !stillMoving) {
673
563
  this.updatingCamera = true;
674
564
  var inertialEase = this.inertia.onMoveEnd(this.map.dragPan.inertiaOptions);
675
-
676
565
  var shouldSnapToNorth = function shouldSnapToNorth(bearing) {
677
566
  return bearing !== 0 && -_this3.bearingSnap < bearing && bearing < _this3.bearingSnap;
678
567
  };
679
-
680
568
  if (inertialEase) {
681
569
  if (shouldSnapToNorth(inertialEase.bearing || this.map.getBearing())) {
682
570
  inertialEase.bearing = 0;
683
571
  }
684
-
685
572
  this.map.easeTo(inertialEase, {
686
573
  originalEvent: originalEndEvent
687
574
  });
@@ -689,12 +576,10 @@ var HandlerManager = /*#__PURE__*/function () {
689
576
  this.map.emit('moveend', new _event.Event('moveend', {
690
577
  originalEvent: originalEndEvent
691
578
  }));
692
-
693
579
  if (shouldSnapToNorth(this.map.getBearing())) {
694
580
  this.map.resetNorth();
695
581
  }
696
582
  }
697
-
698
583
  this.bearingChanged = false;
699
584
  this.updatingCamera = false;
700
585
  }
@@ -709,6 +594,5 @@ var HandlerManager = /*#__PURE__*/function () {
709
594
  }]);
710
595
  return HandlerManager;
711
596
  }();
712
-
713
597
  var _default = HandlerManager;
714
598
  exports.default = _default;
@@ -4,14 +4,12 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.indexTouches = indexTouches;
7
-
8
7
  // @ts-ignore
8
+
9
9
  function indexTouches(touches, points) {
10
10
  var obj = {};
11
-
12
11
  for (var i = 0; i < touches.length; i++) {
13
12
  obj[touches[i].identifier] = points[i];
14
13
  }
15
-
16
14
  return obj;
17
15
  }