@antv/l7-map 2.21.1 → 2.21.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.
- package/es/camera.js +595 -674
- package/es/earthmap.js +313 -276
- package/es/geo/edge_insets.js +57 -72
- package/es/geo/lng_lat.js +50 -64
- package/es/geo/lng_lat_bounds.js +101 -137
- package/es/geo/mercator.js +23 -35
- package/es/geo/point.js +150 -221
- package/es/geo/simple.js +22 -34
- package/es/geo/transform.js +839 -905
- package/es/handler/blockable_map_event.js +46 -66
- package/es/handler/box_zoom.js +125 -143
- package/es/handler/click_zoom.js +37 -51
- package/es/handler/events/event.js +11 -9
- package/es/handler/events/map_mouse_event.js +39 -54
- package/es/handler/events/map_touch_event.js +54 -73
- package/es/handler/events/map_wheel_event.js +22 -38
- package/es/handler/events/render_event.js +6 -23
- package/es/handler/handler_inertia.js +98 -113
- package/es/handler/handler_manager.js +349 -437
- package/es/handler/handler_util.js +2 -2
- package/es/handler/keyboard.js +98 -110
- package/es/handler/map_event.js +81 -117
- package/es/handler/mouse/mouse_handler.js +81 -100
- package/es/handler/mouse/mousepan_handler.js +16 -39
- package/es/handler/mouse/mousepitch_hander.js +18 -40
- package/es/handler/mouse/mouserotate_hander.js +18 -40
- package/es/handler/mouse/util.js +7 -5
- package/es/handler/scroll_zoom.js +221 -231
- package/es/handler/shim/dblclick_zoom.js +36 -47
- package/es/handler/shim/drag_pan.js +41 -50
- package/es/handler/shim/drag_rotate.js +38 -48
- package/es/handler/shim/touch_zoom_rotate.js +68 -79
- package/es/handler/tap/single_tap_recognizer.js +60 -80
- package/es/handler/tap/tap_drag_zoom.js +72 -89
- package/es/handler/tap/tap_recognizer.js +37 -45
- package/es/handler/tap/tap_zoom.js +67 -95
- package/es/handler/touch/touch_pan.js +77 -96
- package/es/handler/touch/touch_pitch.js +61 -79
- package/es/handler/touch/touch_rotate.js +47 -67
- package/es/handler/touch/touch_zoom.js +29 -46
- package/es/handler/touch/two_touch.js +79 -104
- package/es/hash.js +75 -88
- package/es/map.js +318 -284
- package/es/util.js +18 -37
- package/es/utils/Aabb.js +60 -100
- package/es/utils/dom.js +32 -55
- package/es/utils/performance.js +25 -29
- package/es/utils/primitives.js +33 -42
- package/es/utils/task_queue.js +47 -76
- package/lib/camera.d.ts +86 -0
- package/lib/camera.js +597 -672
- package/lib/earthmap.d.ts +69 -0
- package/lib/earthmap.js +314 -276
- package/lib/geo/edge_insets.d.ts +54 -0
- package/lib/geo/edge_insets.js +58 -70
- package/lib/geo/lng_lat.d.ts +18 -0
- package/lib/geo/lng_lat.js +50 -62
- package/lib/geo/lng_lat_bounds.d.ts +25 -0
- package/lib/geo/lng_lat_bounds.js +102 -136
- package/lib/geo/mercator.d.ts +30 -0
- package/lib/geo/mercator.js +26 -37
- package/lib/geo/point.d.ts +40 -0
- package/lib/geo/point.js +151 -220
- package/lib/geo/simple.d.ts +30 -0
- package/lib/geo/simple.js +25 -36
- package/lib/geo/transform.d.ts +198 -0
- package/lib/geo/transform.js +844 -907
- package/lib/handler/IHandler.d.ts +34 -0
- package/lib/handler/blockable_map_event.d.ts +17 -0
- package/lib/handler/blockable_map_event.js +48 -65
- package/lib/handler/box_zoom.d.ts +59 -0
- package/lib/handler/box_zoom.js +126 -143
- package/lib/handler/click_zoom.d.ts +16 -0
- package/lib/handler/click_zoom.js +38 -50
- package/lib/handler/events/event.d.ts +4 -0
- package/lib/handler/events/event.js +12 -9
- package/lib/handler/events/index.d.ts +4 -0
- package/lib/handler/events/index.js +3 -3
- package/lib/handler/events/map_mouse_event.d.ts +34 -0
- package/lib/handler/events/map_mouse_event.js +41 -52
- package/lib/handler/events/map_touch_event.d.ts +57 -0
- package/lib/handler/events/map_touch_event.js +56 -71
- package/lib/handler/events/map_wheel_event.d.ts +33 -0
- package/lib/handler/events/map_wheel_event.js +23 -37
- package/lib/handler/events/render_event.d.ts +5 -0
- package/lib/handler/events/render_event.js +7 -22
- package/lib/handler/handler_inertia.d.ts +23 -0
- package/lib/handler/handler_inertia.js +102 -112
- package/lib/handler/handler_manager.d.ts +61 -0
- package/lib/handler/handler_manager.js +351 -437
- package/lib/handler/handler_util.d.ts +4 -0
- package/lib/handler/handler_util.js +2 -2
- package/lib/handler/keyboard.d.ts +36 -0
- package/lib/handler/keyboard.js +98 -110
- package/lib/handler/map_event.d.ts +29 -0
- package/lib/handler/map_event.js +83 -116
- package/lib/handler/mouse/index.d.ts +4 -0
- package/lib/handler/mouse/index.js +3 -3
- package/lib/handler/mouse/mouse_handler.d.ts +22 -0
- package/lib/handler/mouse/mouse_handler.js +83 -99
- package/lib/handler/mouse/mousepan_handler.d.ts +10 -0
- package/lib/handler/mouse/mousepan_handler.js +19 -38
- package/lib/handler/mouse/mousepitch_hander.d.ts +9 -0
- package/lib/handler/mouse/mousepitch_hander.js +21 -39
- package/lib/handler/mouse/mouserotate_hander.d.ts +9 -0
- package/lib/handler/mouse/mouserotate_hander.js +21 -39
- package/lib/handler/mouse/util.d.ts +6 -0
- package/lib/handler/mouse/util.js +7 -6
- package/lib/handler/scroll_zoom.d.ts +93 -0
- package/lib/handler/scroll_zoom.js +221 -231
- package/lib/handler/shim/dblclick_zoom.d.ts +40 -0
- package/lib/handler/shim/dblclick_zoom.js +37 -46
- package/lib/handler/shim/drag_pan.d.ts +61 -0
- package/lib/handler/shim/drag_pan.js +42 -49
- package/lib/handler/shim/drag_rotate.d.ts +46 -0
- package/lib/handler/shim/drag_rotate.js +39 -47
- package/lib/handler/shim/touch_zoom_rotate.d.ts +70 -0
- package/lib/handler/shim/touch_zoom_rotate.js +69 -78
- package/lib/handler/tap/single_tap_recognizer.d.ts +20 -0
- package/lib/handler/tap/single_tap_recognizer.js +63 -79
- package/lib/handler/tap/tap_drag_zoom.d.ts +22 -0
- package/lib/handler/tap/tap_drag_zoom.js +74 -88
- package/lib/handler/tap/tap_recognizer.d.ts +17 -0
- package/lib/handler/tap/tap_recognizer.js +41 -47
- package/lib/handler/tap/tap_zoom.d.ts +22 -0
- package/lib/handler/tap/tap_zoom.js +69 -94
- package/lib/handler/touch/index.d.ts +5 -0
- package/lib/handler/touch/index.js +4 -4
- package/lib/handler/touch/touch_pan.d.ts +30 -0
- package/lib/handler/touch/touch_pan.js +79 -95
- package/lib/handler/touch/touch_pitch.d.ts +13 -0
- package/lib/handler/touch/touch_pitch.js +64 -78
- package/lib/handler/touch/touch_rotate.d.ts +12 -0
- package/lib/handler/touch/touch_rotate.js +50 -66
- package/lib/handler/touch/touch_zoom.d.ts +12 -0
- package/lib/handler/touch/touch_zoom.js +32 -45
- package/lib/handler/touch/two_touch.d.ts +23 -0
- package/lib/handler/touch/two_touch.js +81 -103
- package/lib/hash.d.ts +14 -0
- package/lib/hash.js +75 -88
- package/lib/index.d.ts +4 -0
- package/lib/index.js +4 -4
- package/lib/interface.d.ts +34 -0
- package/lib/map.d.ts +70 -0
- package/lib/map.js +319 -284
- package/lib/util.d.ts +25 -0
- package/lib/util.js +20 -36
- package/lib/utils/Aabb.d.ts +12 -0
- package/lib/utils/Aabb.js +61 -99
- package/lib/utils/dom.d.ts +4 -0
- package/lib/utils/dom.js +34 -55
- package/lib/utils/performance.d.ts +17 -0
- package/lib/utils/performance.js +25 -29
- package/lib/utils/primitives.d.ts +6 -0
- package/lib/utils/primitives.js +34 -41
- package/lib/utils/task_queue.d.ts +13 -0
- package/lib/utils/task_queue.js +47 -76
- package/package.json +25 -32
|
@@ -5,9 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = void 0;
|
|
8
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
10
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
9
|
var _l7Utils = require("@antv/l7-utils");
|
|
13
10
|
var _point = _interopRequireDefault(require("../geo/point"));
|
|
@@ -29,104 +26,110 @@ var _touch_zoom_rotate = _interopRequireDefault(require("./shim/touch_zoom_rotat
|
|
|
29
26
|
var _tap_drag_zoom = _interopRequireDefault(require("./tap/tap_drag_zoom"));
|
|
30
27
|
var _tap_zoom = _interopRequireDefault(require("./tap/tap_zoom"));
|
|
31
28
|
var _touch = require("./touch");
|
|
32
|
-
|
|
33
|
-
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); }
|
|
34
|
-
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
|
|
29
|
+
// @ts-ignore
|
|
35
30
|
// tslint:disable-next-line: no-submodule-imports
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
};
|
|
31
|
+
|
|
32
|
+
const {
|
|
33
|
+
merge
|
|
34
|
+
} = _l7Utils.lodashUtil;
|
|
35
|
+
const isMoving = p => p.zoom || p.drag || p.pitch || p.rotate;
|
|
40
36
|
function hasChange(result) {
|
|
41
37
|
return result.panDelta && result.panDelta.mag() || result.zoomDelta || result.bearingDelta || result.pitchDelta;
|
|
42
38
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
(0,
|
|
47
|
-
(0, _defineProperty2.default)(this, "
|
|
48
|
-
|
|
39
|
+
class HandlerManager {
|
|
40
|
+
constructor(map, options) {
|
|
41
|
+
(0, _defineProperty2.default)(this, "map", void 0);
|
|
42
|
+
(0, _defineProperty2.default)(this, "el", void 0);
|
|
43
|
+
(0, _defineProperty2.default)(this, "handlers", void 0);
|
|
44
|
+
(0, _defineProperty2.default)(this, "eventsInProgress", void 0);
|
|
45
|
+
(0, _defineProperty2.default)(this, "frameId", void 0);
|
|
46
|
+
(0, _defineProperty2.default)(this, "inertia", void 0);
|
|
47
|
+
(0, _defineProperty2.default)(this, "bearingSnap", void 0);
|
|
48
|
+
(0, _defineProperty2.default)(this, "handlersById", void 0);
|
|
49
|
+
(0, _defineProperty2.default)(this, "updatingCamera", void 0);
|
|
50
|
+
(0, _defineProperty2.default)(this, "changes", void 0);
|
|
51
|
+
(0, _defineProperty2.default)(this, "previousActiveHandlers", void 0);
|
|
52
|
+
(0, _defineProperty2.default)(this, "bearingChanged", void 0);
|
|
53
|
+
(0, _defineProperty2.default)(this, "rotateEnabled", void 0);
|
|
54
|
+
(0, _defineProperty2.default)(this, "pitchEnabled", void 0);
|
|
55
|
+
(0, _defineProperty2.default)(this, "listeners", void 0);
|
|
56
|
+
(0, _defineProperty2.default)(this, "handleWindowEvent", e => {
|
|
57
|
+
this.handleEvent(e, `${e.type}Window`);
|
|
49
58
|
});
|
|
50
|
-
(0, _defineProperty2.default)(this, "handleEvent",
|
|
59
|
+
(0, _defineProperty2.default)(this, "handleEvent", (e, eventName) => {
|
|
51
60
|
if (e.type === 'blur') {
|
|
52
|
-
|
|
61
|
+
this.stop();
|
|
53
62
|
return;
|
|
54
63
|
}
|
|
55
|
-
|
|
56
|
-
|
|
64
|
+
this.updatingCamera = true;
|
|
65
|
+
const inputEvent = e.type === 'renderFrame' ? undefined : e;
|
|
57
66
|
|
|
58
67
|
/*
|
|
59
68
|
* We don't call e.preventDefault() for any events by default.
|
|
60
69
|
* Handlers are responsible for calling it where necessary.
|
|
61
70
|
*/
|
|
62
71
|
|
|
63
|
-
|
|
72
|
+
const mergedIHandlerResult = {
|
|
64
73
|
needsRenderFrame: false
|
|
65
74
|
};
|
|
66
|
-
|
|
67
|
-
|
|
75
|
+
const eventsInProgress = {};
|
|
76
|
+
const activeHandlers = {};
|
|
68
77
|
// @ts-ignore
|
|
69
|
-
|
|
78
|
+
const mapTouches = e.touches ?
|
|
70
79
|
// @ts-ignore
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
var handerName = eventName || e.type;
|
|
80
|
+
this.getMapTouches(e.touches) : undefined;
|
|
81
|
+
const points = mapTouches ? _dom.default.touchPos(this.el, mapTouches) : _dom.default.mousePos(this.el, e);
|
|
82
|
+
for (const {
|
|
83
|
+
handlerName,
|
|
84
|
+
handler,
|
|
85
|
+
allowed
|
|
86
|
+
} of this.handlers) {
|
|
87
|
+
if (!handler.isEnabled()) {
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
let data;
|
|
91
|
+
if (this.blockedByActive(activeHandlers, allowed, handlerName)) {
|
|
92
|
+
handler.reset();
|
|
93
|
+
} else {
|
|
94
|
+
const handerName = eventName || e.type;
|
|
95
|
+
// @ts-ignore
|
|
96
|
+
if (handler && handler[handerName]) {
|
|
89
97
|
// @ts-ignore
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
if (data && data.needsRenderFrame) {
|
|
95
|
-
_this.triggerRenderFrame();
|
|
96
|
-
}
|
|
98
|
+
data = handler[handerName](e, points, mapTouches);
|
|
99
|
+
this.mergeIHandlerResult(mergedIHandlerResult, eventsInProgress, data, handlerName, inputEvent);
|
|
100
|
+
if (data && data.needsRenderFrame) {
|
|
101
|
+
this.triggerRenderFrame();
|
|
97
102
|
}
|
|
98
103
|
}
|
|
99
|
-
// @ts-ignore
|
|
100
|
-
if (data || handler.isActive()) {
|
|
101
|
-
activeHandlers[handlerName] = handler;
|
|
102
|
-
}
|
|
103
104
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
105
|
+
// @ts-ignore
|
|
106
|
+
if (data || handler.isActive()) {
|
|
107
|
+
activeHandlers[handlerName] = handler;
|
|
108
|
+
}
|
|
108
109
|
}
|
|
109
|
-
|
|
110
|
-
for (
|
|
110
|
+
const deactivatedHandlers = {};
|
|
111
|
+
for (const name in this.previousActiveHandlers) {
|
|
111
112
|
if (!activeHandlers[name]) {
|
|
112
113
|
deactivatedHandlers[name] = inputEvent;
|
|
113
114
|
}
|
|
114
115
|
}
|
|
115
|
-
|
|
116
|
+
this.previousActiveHandlers = activeHandlers;
|
|
116
117
|
if (Object.keys(deactivatedHandlers).length || hasChange(mergedIHandlerResult)) {
|
|
117
|
-
|
|
118
|
-
|
|
118
|
+
this.changes.push([mergedIHandlerResult, eventsInProgress, deactivatedHandlers]);
|
|
119
|
+
this.triggerRenderFrame();
|
|
119
120
|
}
|
|
120
121
|
if (Object.keys(activeHandlers).length || hasChange(mergedIHandlerResult)) {
|
|
121
|
-
|
|
122
|
+
this.map.stop(true);
|
|
122
123
|
}
|
|
123
|
-
|
|
124
|
-
|
|
124
|
+
this.updatingCamera = false;
|
|
125
|
+
const {
|
|
126
|
+
cameraAnimation
|
|
127
|
+
} = mergedIHandlerResult;
|
|
125
128
|
if (cameraAnimation) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
cameraAnimation(
|
|
129
|
+
this.inertia.clear();
|
|
130
|
+
this.fireEvents({}, {});
|
|
131
|
+
this.changes = [];
|
|
132
|
+
cameraAnimation(this.map);
|
|
130
133
|
}
|
|
131
134
|
});
|
|
132
135
|
this.map = map;
|
|
@@ -143,7 +146,7 @@ var HandlerManager = /*#__PURE__*/function () {
|
|
|
143
146
|
// Track whether map is currently moving, to compute start/move/end events
|
|
144
147
|
this.eventsInProgress = {};
|
|
145
148
|
this.addDefaultHandlers(options);
|
|
146
|
-
|
|
149
|
+
const el = this.el;
|
|
147
150
|
this.listeners = [];
|
|
148
151
|
// l7 - mini
|
|
149
152
|
this.listeners = [
|
|
@@ -174,410 +177,321 @@ var HandlerManager = /*#__PURE__*/function () {
|
|
|
174
177
|
}], [el, 'contextmenu', undefined],
|
|
175
178
|
// @ts-ignore
|
|
176
179
|
[window, 'blur', undefined]];
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
target = _step2$value[0],
|
|
183
|
-
type = _step2$value[1],
|
|
184
|
-
listenerOptions = _step2$value[2];
|
|
185
|
-
// @ts-ignore
|
|
186
|
-
_dom.default.addEventListener(target, type,
|
|
187
|
-
// @ts-ignore
|
|
188
|
-
target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
|
|
189
|
-
}
|
|
190
|
-
} catch (err) {
|
|
191
|
-
_iterator2.e(err);
|
|
192
|
-
} finally {
|
|
193
|
-
_iterator2.f();
|
|
180
|
+
for (const [target, type, listenerOptions] of this.listeners) {
|
|
181
|
+
// @ts-ignore
|
|
182
|
+
_dom.default.addEventListener(target, type,
|
|
183
|
+
// @ts-ignore
|
|
184
|
+
target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
|
|
194
185
|
}
|
|
195
186
|
}
|
|
196
|
-
(
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
|
203
|
-
var _step3$value = (0, _slicedToArray2.default)(_step3.value, 3),
|
|
204
|
-
target = _step3$value[0],
|
|
205
|
-
type = _step3$value[1],
|
|
206
|
-
listenerOptions = _step3$value[2];
|
|
207
|
-
// @ts-ignore
|
|
208
|
-
_dom.default.removeEventListener(target, type,
|
|
209
|
-
// @ts-ignore
|
|
210
|
-
target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
|
|
211
|
-
}
|
|
212
|
-
} catch (err) {
|
|
213
|
-
_iterator3.e(err);
|
|
214
|
-
} finally {
|
|
215
|
-
_iterator3.f();
|
|
216
|
-
}
|
|
187
|
+
destroy() {
|
|
188
|
+
for (const [target, type, listenerOptions] of this.listeners) {
|
|
189
|
+
// @ts-ignore
|
|
190
|
+
_dom.default.removeEventListener(target, type,
|
|
191
|
+
// @ts-ignore
|
|
192
|
+
target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
|
|
217
193
|
}
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
return;
|
|
224
|
-
}
|
|
225
|
-
var _iterator4 = _createForOfIteratorHelper(this.handlers),
|
|
226
|
-
_step4;
|
|
227
|
-
try {
|
|
228
|
-
for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
|
|
229
|
-
var handler = _step4.value.handler;
|
|
230
|
-
handler.reset();
|
|
231
|
-
}
|
|
232
|
-
} catch (err) {
|
|
233
|
-
_iterator4.e(err);
|
|
234
|
-
} finally {
|
|
235
|
-
_iterator4.f();
|
|
236
|
-
}
|
|
237
|
-
this.inertia.clear();
|
|
238
|
-
this.fireEvents({}, {});
|
|
239
|
-
this.changes = [];
|
|
194
|
+
}
|
|
195
|
+
stop() {
|
|
196
|
+
// do nothing if this method was triggered by a gesture update
|
|
197
|
+
if (this.updatingCamera) {
|
|
198
|
+
return;
|
|
240
199
|
}
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
_iterator5.f();
|
|
200
|
+
for (const {
|
|
201
|
+
handler
|
|
202
|
+
} of this.handlers) {
|
|
203
|
+
handler.reset();
|
|
204
|
+
}
|
|
205
|
+
this.inertia.clear();
|
|
206
|
+
this.fireEvents({}, {});
|
|
207
|
+
this.changes = [];
|
|
208
|
+
}
|
|
209
|
+
isActive() {
|
|
210
|
+
for (const {
|
|
211
|
+
handler
|
|
212
|
+
} of this.handlers) {
|
|
213
|
+
if (handler.isActive()) {
|
|
214
|
+
return true;
|
|
257
215
|
}
|
|
258
|
-
return false;
|
|
259
216
|
}
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
217
|
+
return false;
|
|
218
|
+
}
|
|
219
|
+
isZooming() {
|
|
220
|
+
return !!this.eventsInProgress.zoom || this.map.scrollZoom.isZooming();
|
|
221
|
+
}
|
|
222
|
+
isRotating() {
|
|
223
|
+
return !!this.eventsInProgress.rotate;
|
|
224
|
+
}
|
|
225
|
+
isMoving() {
|
|
226
|
+
return Boolean(isMoving(this.eventsInProgress)) || this.isZooming();
|
|
227
|
+
}
|
|
228
|
+
mergeIHandlerResult(mergedIHandlerResult, eventsInProgress, HandlerResult, name, e) {
|
|
229
|
+
if (!HandlerResult) {
|
|
230
|
+
return;
|
|
264
231
|
}
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
232
|
+
merge(mergedIHandlerResult, HandlerResult);
|
|
233
|
+
const eventData = {
|
|
234
|
+
handlerName: name,
|
|
235
|
+
originalEvent: HandlerResult.originalEvent || e
|
|
236
|
+
};
|
|
237
|
+
|
|
238
|
+
// track which handler changed which camera property
|
|
239
|
+
if (HandlerResult.zoomDelta !== undefined) {
|
|
240
|
+
eventsInProgress.zoom = eventData;
|
|
269
241
|
}
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
value: function isMoving() {
|
|
273
|
-
return Boolean(_isMoving(this.eventsInProgress)) || this.isZooming();
|
|
242
|
+
if (HandlerResult.panDelta !== undefined) {
|
|
243
|
+
eventsInProgress.drag = eventData;
|
|
274
244
|
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
value: function mergeIHandlerResult(mergedIHandlerResult, eventsInProgress, HandlerResult, name, e) {
|
|
278
|
-
if (!HandlerResult) {
|
|
279
|
-
return;
|
|
280
|
-
}
|
|
281
|
-
merge(mergedIHandlerResult, HandlerResult);
|
|
282
|
-
var eventData = {
|
|
283
|
-
handlerName: name,
|
|
284
|
-
originalEvent: HandlerResult.originalEvent || e
|
|
285
|
-
};
|
|
286
|
-
|
|
287
|
-
// track which handler changed which camera property
|
|
288
|
-
if (HandlerResult.zoomDelta !== undefined) {
|
|
289
|
-
eventsInProgress.zoom = eventData;
|
|
290
|
-
}
|
|
291
|
-
if (HandlerResult.panDelta !== undefined) {
|
|
292
|
-
eventsInProgress.drag = eventData;
|
|
293
|
-
}
|
|
294
|
-
if (HandlerResult.pitchDelta !== undefined) {
|
|
295
|
-
eventsInProgress.pitch = eventData;
|
|
296
|
-
}
|
|
297
|
-
if (HandlerResult.bearingDelta !== undefined) {
|
|
298
|
-
eventsInProgress.rotate = eventData;
|
|
299
|
-
}
|
|
245
|
+
if (HandlerResult.pitchDelta !== undefined) {
|
|
246
|
+
eventsInProgress.pitch = eventData;
|
|
300
247
|
}
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
value: function triggerRenderFrame() {
|
|
304
|
-
var _this2 = this;
|
|
305
|
-
if (this.frameId === undefined) {
|
|
306
|
-
this.frameId = this.map.requestRenderFrame(function (timeStamp) {
|
|
307
|
-
// @ts-ignore
|
|
308
|
-
delete _this2.frameId;
|
|
309
|
-
_this2.handleEvent(new _render_event.default('renderFrame', {
|
|
310
|
-
timeStamp: timeStamp
|
|
311
|
-
}));
|
|
312
|
-
_this2.applyChanges();
|
|
313
|
-
});
|
|
314
|
-
}
|
|
248
|
+
if (HandlerResult.bearingDelta !== undefined) {
|
|
249
|
+
eventsInProgress.rotate = eventData;
|
|
315
250
|
}
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
var el = map.getCanvasContainer();
|
|
321
|
-
this.add('mapEvent', new _map_event.default(map, options));
|
|
322
|
-
var boxZoom = map.boxZoom = new _box_zoom.default(map, options);
|
|
323
|
-
this.add('boxZoom', boxZoom);
|
|
324
|
-
var tapZoom = new _tap_zoom.default();
|
|
325
|
-
var clickZoom = new _click_zoom.default();
|
|
326
|
-
map.doubleClickZoom = new _dblclick_zoom.default(clickZoom, tapZoom);
|
|
327
|
-
this.add('tapZoom', tapZoom);
|
|
328
|
-
this.add('clickZoom', clickZoom);
|
|
329
|
-
var tapDragZoom = new _tap_drag_zoom.default();
|
|
330
|
-
this.add('tapDragZoom', tapDragZoom);
|
|
331
|
-
var touchPitch = map.touchPitch = new _touch.TouchPitchHandler();
|
|
332
|
-
this.add('touchPitch', touchPitch);
|
|
333
|
-
var mouseRotate = new _mouse.MouseRotateHandler(options);
|
|
334
|
-
var mousePitch = new _mouse.MousePitchHandler(options);
|
|
335
|
-
map.dragRotate = new _drag_rotate.default(options, mouseRotate, mousePitch);
|
|
336
|
-
this.add('mouseRotate', mouseRotate, ['mousePitch']);
|
|
337
|
-
this.add('mousePitch', mousePitch, ['mouseRotate']);
|
|
338
|
-
var mousePan = new _mouse.MousePanHandler(options);
|
|
339
|
-
var touchPan = new _touch.TouchPanHandler(options);
|
|
340
|
-
map.dragPan = new _drag_pan.default(el, mousePan, touchPan);
|
|
341
|
-
this.add('mousePan', mousePan);
|
|
342
|
-
this.add('touchPan', touchPan, ['touchZoom', 'touchRotate']);
|
|
343
|
-
var touchRotate = new _touch.TouchRotateHandler();
|
|
344
|
-
var touchZoom = new _touch.TouchZoomHandler();
|
|
345
|
-
map.touchZoomRotate = new _touch_zoom_rotate.default(el, touchZoom, touchRotate, tapDragZoom);
|
|
346
|
-
this.add('touchRotate', touchRotate, ['touchPan', 'touchZoom']);
|
|
347
|
-
this.add('touchZoom', touchZoom, ['touchPan', 'touchRotate']);
|
|
348
|
-
var scrollZoom = map.scrollZoom = new _scroll_zoom.default(map, this);
|
|
349
|
-
this.add('scrollZoom', scrollZoom, ['mousePan']);
|
|
350
|
-
var keyboard = map.keyboard = new _keyboard.default();
|
|
351
|
-
this.add('keyboard', keyboard);
|
|
352
|
-
this.add('blockableMapEvent', new _blockable_map_event.default(map));
|
|
353
|
-
for (var _i = 0, _arr = ['boxZoom', 'doubleClickZoom', 'tapDragZoom', 'touchPitch', 'dragRotate', 'dragPan', 'touchZoomRotate', 'scrollZoom', 'keyboard']; _i < _arr.length; _i++) {
|
|
354
|
-
var name = _arr[_i];
|
|
251
|
+
}
|
|
252
|
+
triggerRenderFrame() {
|
|
253
|
+
if (this.frameId === undefined) {
|
|
254
|
+
this.frameId = this.map.requestRenderFrame(timeStamp => {
|
|
355
255
|
// @ts-ignore
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
}
|
|
360
|
-
|
|
361
|
-
}
|
|
362
|
-
}, {
|
|
363
|
-
key: "add",
|
|
364
|
-
value: function add(handlerName, handler, allowed) {
|
|
365
|
-
this.handlers.push({
|
|
366
|
-
handlerName: handlerName,
|
|
367
|
-
handler: handler,
|
|
368
|
-
allowed: allowed
|
|
256
|
+
delete this.frameId;
|
|
257
|
+
this.handleEvent(new _render_event.default('renderFrame', {
|
|
258
|
+
timeStamp
|
|
259
|
+
}));
|
|
260
|
+
this.applyChanges();
|
|
369
261
|
});
|
|
370
|
-
this.handlersById[handlerName] = handler;
|
|
371
262
|
}
|
|
372
|
-
}
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
263
|
+
}
|
|
264
|
+
addDefaultHandlers(options) {
|
|
265
|
+
const map = this.map;
|
|
266
|
+
const el = map.getCanvasContainer();
|
|
267
|
+
this.add('mapEvent', new _map_event.default(map, options));
|
|
268
|
+
const boxZoom = map.boxZoom = new _box_zoom.default(map, options);
|
|
269
|
+
this.add('boxZoom', boxZoom);
|
|
270
|
+
const tapZoom = new _tap_zoom.default();
|
|
271
|
+
const clickZoom = new _click_zoom.default();
|
|
272
|
+
map.doubleClickZoom = new _dblclick_zoom.default(clickZoom, tapZoom);
|
|
273
|
+
this.add('tapZoom', tapZoom);
|
|
274
|
+
this.add('clickZoom', clickZoom);
|
|
275
|
+
const tapDragZoom = new _tap_drag_zoom.default();
|
|
276
|
+
this.add('tapDragZoom', tapDragZoom);
|
|
277
|
+
const touchPitch = map.touchPitch = new _touch.TouchPitchHandler();
|
|
278
|
+
this.add('touchPitch', touchPitch);
|
|
279
|
+
const mouseRotate = new _mouse.MouseRotateHandler(options);
|
|
280
|
+
const mousePitch = new _mouse.MousePitchHandler(options);
|
|
281
|
+
map.dragRotate = new _drag_rotate.default(options, mouseRotate, mousePitch);
|
|
282
|
+
this.add('mouseRotate', mouseRotate, ['mousePitch']);
|
|
283
|
+
this.add('mousePitch', mousePitch, ['mouseRotate']);
|
|
284
|
+
const mousePan = new _mouse.MousePanHandler(options);
|
|
285
|
+
const touchPan = new _touch.TouchPanHandler(options);
|
|
286
|
+
map.dragPan = new _drag_pan.default(el, mousePan, touchPan);
|
|
287
|
+
this.add('mousePan', mousePan);
|
|
288
|
+
this.add('touchPan', touchPan, ['touchZoom', 'touchRotate']);
|
|
289
|
+
const touchRotate = new _touch.TouchRotateHandler();
|
|
290
|
+
const touchZoom = new _touch.TouchZoomHandler();
|
|
291
|
+
map.touchZoomRotate = new _touch_zoom_rotate.default(el, touchZoom, touchRotate, tapDragZoom);
|
|
292
|
+
this.add('touchRotate', touchRotate, ['touchPan', 'touchZoom']);
|
|
293
|
+
this.add('touchZoom', touchZoom, ['touchPan', 'touchRotate']);
|
|
294
|
+
const scrollZoom = map.scrollZoom = new _scroll_zoom.default(map, this);
|
|
295
|
+
this.add('scrollZoom', scrollZoom, ['mousePan']);
|
|
296
|
+
const keyboard = map.keyboard = new _keyboard.default();
|
|
297
|
+
this.add('keyboard', keyboard);
|
|
298
|
+
this.add('blockableMapEvent', new _blockable_map_event.default(map));
|
|
299
|
+
for (const name of ['boxZoom', 'doubleClickZoom', 'tapDragZoom', 'touchPitch', 'dragRotate', 'dragPan', 'touchZoomRotate', 'scrollZoom', 'keyboard']) {
|
|
300
|
+
// @ts-ignore
|
|
301
|
+
if (options.interactive && options[name]) {
|
|
302
|
+
// @ts-ignore
|
|
303
|
+
map[name].enable(options[name]);
|
|
382
304
|
}
|
|
383
|
-
return false;
|
|
384
305
|
}
|
|
385
|
-
}
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
} finally {
|
|
402
|
-
_iterator6.f();
|
|
306
|
+
}
|
|
307
|
+
add(handlerName, handler, allowed) {
|
|
308
|
+
this.handlers.push({
|
|
309
|
+
handlerName,
|
|
310
|
+
handler,
|
|
311
|
+
allowed
|
|
312
|
+
});
|
|
313
|
+
this.handlersById[handlerName] = handler;
|
|
314
|
+
}
|
|
315
|
+
blockedByActive(activeHandlers, allowed, myName) {
|
|
316
|
+
for (const name in activeHandlers) {
|
|
317
|
+
if (name === myName) {
|
|
318
|
+
continue;
|
|
319
|
+
}
|
|
320
|
+
if (!allowed || allowed.indexOf(name) < 0) {
|
|
321
|
+
return true;
|
|
403
322
|
}
|
|
404
|
-
return mapTouches;
|
|
405
323
|
}
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
try {
|
|
415
|
-
for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
|
|
416
|
-
var _step7$value = (0, _slicedToArray2.default)(_step7.value, 3),
|
|
417
|
-
change = _step7$value[0],
|
|
418
|
-
eventsInProgress = _step7$value[1],
|
|
419
|
-
deactivatedHandlers = _step7$value[2];
|
|
420
|
-
if (change.panDelta) {
|
|
421
|
-
combined.panDelta = (combined.panDelta || new _point.default(0, 0))._add(change.panDelta);
|
|
422
|
-
}
|
|
423
|
-
if (change.zoomDelta) {
|
|
424
|
-
combined.zoomDelta = (combined.zoomDelta || 0) + change.zoomDelta;
|
|
425
|
-
}
|
|
426
|
-
if (change.bearingDelta) {
|
|
427
|
-
combined.bearingDelta = (combined.bearingDelta || 0) + change.bearingDelta;
|
|
428
|
-
}
|
|
429
|
-
if (change.pitchDelta) {
|
|
430
|
-
combined.pitchDelta = (combined.pitchDelta || 0) + change.pitchDelta;
|
|
431
|
-
}
|
|
432
|
-
if (change.around !== undefined) {
|
|
433
|
-
combined.around = change.around;
|
|
434
|
-
}
|
|
435
|
-
if (change.pinchAround !== undefined) {
|
|
436
|
-
combined.pinchAround = change.pinchAround;
|
|
437
|
-
}
|
|
438
|
-
if (change.noInertia) {
|
|
439
|
-
combined.noInertia = change.noInertia;
|
|
440
|
-
}
|
|
441
|
-
merge(combinedEventsInProgress, eventsInProgress);
|
|
442
|
-
merge(combinedDeactivatedHandlers, deactivatedHandlers);
|
|
443
|
-
}
|
|
444
|
-
} catch (err) {
|
|
445
|
-
_iterator7.e(err);
|
|
446
|
-
} finally {
|
|
447
|
-
_iterator7.f();
|
|
324
|
+
return false;
|
|
325
|
+
}
|
|
326
|
+
getMapTouches(touches) {
|
|
327
|
+
const mapTouches = [];
|
|
328
|
+
for (const t of touches) {
|
|
329
|
+
const target = t.target;
|
|
330
|
+
if (this.el.contains(target)) {
|
|
331
|
+
mapTouches.push(t);
|
|
448
332
|
}
|
|
449
|
-
this.updateMapTransform(combined, combinedEventsInProgress, combinedDeactivatedHandlers);
|
|
450
|
-
this.changes = [];
|
|
451
333
|
}
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
334
|
+
return mapTouches;
|
|
335
|
+
}
|
|
336
|
+
applyChanges() {
|
|
337
|
+
const combined = {};
|
|
338
|
+
const combinedEventsInProgress = {};
|
|
339
|
+
const combinedDeactivatedHandlers = {};
|
|
340
|
+
for (const [change, eventsInProgress, deactivatedHandlers] of this.changes) {
|
|
341
|
+
if (change.panDelta) {
|
|
342
|
+
combined.panDelta = (combined.panDelta || new _point.default(0, 0))._add(change.panDelta);
|
|
459
343
|
}
|
|
460
|
-
|
|
461
|
-
zoomDelta =
|
|
462
|
-
bearingDelta = combinedResult.bearingDelta,
|
|
463
|
-
pitchDelta = combinedResult.pitchDelta,
|
|
464
|
-
pinchAround = combinedResult.pinchAround;
|
|
465
|
-
var around = combinedResult.around;
|
|
466
|
-
if (pinchAround !== undefined) {
|
|
467
|
-
around = pinchAround;
|
|
344
|
+
if (change.zoomDelta) {
|
|
345
|
+
combined.zoomDelta = (combined.zoomDelta || 0) + change.zoomDelta;
|
|
468
346
|
}
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
map.stop(true);
|
|
472
|
-
around = around || map.transform.centerPoint;
|
|
473
|
-
var loc = tr.pointLocation(panDelta ? around.sub(panDelta) : around);
|
|
474
|
-
if (bearingDelta && this.rotateEnabled) {
|
|
475
|
-
tr.bearing += bearingDelta;
|
|
347
|
+
if (change.bearingDelta) {
|
|
348
|
+
combined.bearingDelta = (combined.bearingDelta || 0) + change.bearingDelta;
|
|
476
349
|
}
|
|
477
|
-
if (pitchDelta
|
|
478
|
-
|
|
350
|
+
if (change.pitchDelta) {
|
|
351
|
+
combined.pitchDelta = (combined.pitchDelta || 0) + change.pitchDelta;
|
|
479
352
|
}
|
|
480
|
-
if (
|
|
481
|
-
|
|
353
|
+
if (change.around !== undefined) {
|
|
354
|
+
combined.around = change.around;
|
|
482
355
|
}
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
if (!combinedResult.noInertia) {
|
|
486
|
-
this.inertia.record(combinedResult);
|
|
356
|
+
if (change.pinchAround !== undefined) {
|
|
357
|
+
combined.pinchAround = change.pinchAround;
|
|
487
358
|
}
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
}, {
|
|
491
|
-
key: "fireEvents",
|
|
492
|
-
value: function fireEvents(newEventsInProgress, deactivatedHandlers) {
|
|
493
|
-
var _this3 = this;
|
|
494
|
-
var wasMoving = _isMoving(this.eventsInProgress);
|
|
495
|
-
var nowMoving = _isMoving(newEventsInProgress);
|
|
496
|
-
var startEvents = {};
|
|
497
|
-
for (var eventName in newEventsInProgress) {
|
|
498
|
-
if (newEventsInProgress[eventName]) {
|
|
499
|
-
var originalEvent = newEventsInProgress[eventName].originalEvent;
|
|
500
|
-
if (!this.eventsInProgress[eventName]) {
|
|
501
|
-
startEvents["".concat(eventName, "start")] = originalEvent;
|
|
502
|
-
}
|
|
503
|
-
this.eventsInProgress[eventName] = newEventsInProgress[eventName];
|
|
504
|
-
}
|
|
359
|
+
if (change.noInertia) {
|
|
360
|
+
combined.noInertia = change.noInertia;
|
|
505
361
|
}
|
|
362
|
+
merge(combinedEventsInProgress, eventsInProgress);
|
|
363
|
+
merge(combinedDeactivatedHandlers, deactivatedHandlers);
|
|
364
|
+
}
|
|
365
|
+
this.updateMapTransform(combined, combinedEventsInProgress, combinedDeactivatedHandlers);
|
|
366
|
+
this.changes = [];
|
|
367
|
+
}
|
|
368
|
+
updateMapTransform(combinedResult, combinedEventsInProgress, deactivatedHandlers) {
|
|
369
|
+
const map = this.map;
|
|
370
|
+
const tr = map.transform;
|
|
371
|
+
if (!hasChange(combinedResult)) {
|
|
372
|
+
return this.fireEvents(combinedEventsInProgress, deactivatedHandlers);
|
|
373
|
+
}
|
|
374
|
+
const {
|
|
375
|
+
panDelta,
|
|
376
|
+
zoomDelta,
|
|
377
|
+
bearingDelta,
|
|
378
|
+
pitchDelta,
|
|
379
|
+
pinchAround
|
|
380
|
+
} = combinedResult;
|
|
381
|
+
let {
|
|
382
|
+
around
|
|
383
|
+
} = combinedResult;
|
|
384
|
+
if (pinchAround !== undefined) {
|
|
385
|
+
around = pinchAround;
|
|
386
|
+
}
|
|
506
387
|
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
388
|
+
// stop any ongoing camera animations (easeTo, flyTo)
|
|
389
|
+
map.stop(true);
|
|
390
|
+
around = around || map.transform.centerPoint;
|
|
391
|
+
const loc = tr.pointLocation(panDelta ? around.sub(panDelta) : around);
|
|
392
|
+
if (bearingDelta && this.rotateEnabled) {
|
|
393
|
+
tr.bearing += bearingDelta;
|
|
394
|
+
}
|
|
395
|
+
if (pitchDelta && this.pitchEnabled) {
|
|
396
|
+
tr.pitch += pitchDelta;
|
|
397
|
+
}
|
|
398
|
+
if (zoomDelta) {
|
|
399
|
+
tr.zoom += zoomDelta;
|
|
400
|
+
}
|
|
401
|
+
tr.setLocationAtPoint(loc, around);
|
|
402
|
+
this.map.update();
|
|
403
|
+
if (!combinedResult.noInertia) {
|
|
404
|
+
this.inertia.record(combinedResult);
|
|
405
|
+
}
|
|
406
|
+
this.fireEvents(combinedEventsInProgress, deactivatedHandlers);
|
|
407
|
+
}
|
|
408
|
+
fireEvents(newEventsInProgress, deactivatedHandlers) {
|
|
409
|
+
const wasMoving = isMoving(this.eventsInProgress);
|
|
410
|
+
const nowMoving = isMoving(newEventsInProgress);
|
|
411
|
+
const startEvents = {};
|
|
412
|
+
for (const eventName in newEventsInProgress) {
|
|
413
|
+
if (newEventsInProgress[eventName]) {
|
|
414
|
+
const {
|
|
415
|
+
originalEvent
|
|
416
|
+
} = newEventsInProgress[eventName];
|
|
417
|
+
if (!this.eventsInProgress[eventName]) {
|
|
418
|
+
startEvents[`${eventName}start`] = originalEvent;
|
|
514
419
|
}
|
|
420
|
+
this.eventsInProgress[eventName] = newEventsInProgress[eventName];
|
|
515
421
|
}
|
|
516
|
-
|
|
517
|
-
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
// fire start events only after this.eventsInProgress has been updated
|
|
425
|
+
if (!wasMoving && nowMoving) {
|
|
426
|
+
this.fireEvent('movestart', nowMoving.originalEvent);
|
|
427
|
+
}
|
|
428
|
+
for (const name in startEvents) {
|
|
429
|
+
if (startEvents[name]) {
|
|
430
|
+
this.fireEvent(name, startEvents[name]);
|
|
518
431
|
}
|
|
519
|
-
|
|
520
|
-
|
|
432
|
+
}
|
|
433
|
+
if (newEventsInProgress.rotate) {
|
|
434
|
+
this.bearingChanged = true;
|
|
435
|
+
}
|
|
436
|
+
if (nowMoving) {
|
|
437
|
+
this.fireEvent('move', nowMoving.originalEvent);
|
|
438
|
+
}
|
|
439
|
+
for (const eventName in newEventsInProgress) {
|
|
440
|
+
if (newEventsInProgress[eventName]) {
|
|
441
|
+
const {
|
|
442
|
+
originalEvent
|
|
443
|
+
} = newEventsInProgress[eventName];
|
|
444
|
+
this.fireEvent(eventName, originalEvent);
|
|
521
445
|
}
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
446
|
+
}
|
|
447
|
+
const endEvents = {};
|
|
448
|
+
let originalEndEvent;
|
|
449
|
+
for (const eventName in this.eventsInProgress) {
|
|
450
|
+
if (this.eventsInProgress[eventName]) {
|
|
451
|
+
const {
|
|
452
|
+
handlerName,
|
|
453
|
+
originalEvent
|
|
454
|
+
} = this.eventsInProgress[eventName];
|
|
455
|
+
if (!this.handlersById[handlerName].isActive()) {
|
|
456
|
+
delete this.eventsInProgress[eventName];
|
|
457
|
+
originalEndEvent = deactivatedHandlers[handlerName] || originalEvent;
|
|
458
|
+
endEvents[`${eventName}end`] = originalEndEvent;
|
|
526
459
|
}
|
|
527
460
|
}
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
var _this$eventsInProgres = this.eventsInProgress[_eventName2],
|
|
533
|
-
handlerName = _this$eventsInProgres.handlerName,
|
|
534
|
-
_originalEvent2 = _this$eventsInProgres.originalEvent;
|
|
535
|
-
if (!this.handlersById[handlerName].isActive()) {
|
|
536
|
-
delete this.eventsInProgress[_eventName2];
|
|
537
|
-
originalEndEvent = deactivatedHandlers[handlerName] || _originalEvent2;
|
|
538
|
-
endEvents["".concat(_eventName2, "end")] = originalEndEvent;
|
|
539
|
-
}
|
|
540
|
-
}
|
|
461
|
+
}
|
|
462
|
+
for (const name in endEvents) {
|
|
463
|
+
if (endEvents[name]) {
|
|
464
|
+
this.fireEvent(name, endEvents[name]);
|
|
541
465
|
}
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
466
|
+
}
|
|
467
|
+
const stillMoving = isMoving(this.eventsInProgress);
|
|
468
|
+
if ((wasMoving || nowMoving) && !stillMoving) {
|
|
469
|
+
this.updatingCamera = true;
|
|
470
|
+
const inertialEase = this.inertia.onMoveEnd(this.map.dragPan.inertiaOptions);
|
|
471
|
+
const shouldSnapToNorth = bearing => bearing !== 0 && -this.bearingSnap < bearing && bearing < this.bearingSnap;
|
|
472
|
+
if (inertialEase) {
|
|
473
|
+
if (shouldSnapToNorth(inertialEase.bearing || this.map.getBearing())) {
|
|
474
|
+
inertialEase.bearing = 0;
|
|
545
475
|
}
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
if (shouldSnapToNorth(inertialEase.bearing || this.map.getBearing())) {
|
|
556
|
-
inertialEase.bearing = 0;
|
|
557
|
-
}
|
|
558
|
-
this.map.easeTo(inertialEase, {
|
|
559
|
-
originalEvent: originalEndEvent
|
|
560
|
-
});
|
|
561
|
-
} else {
|
|
562
|
-
this.map.emit('moveend', new _event.Event('moveend', {
|
|
563
|
-
originalEvent: originalEndEvent
|
|
564
|
-
}));
|
|
565
|
-
if (shouldSnapToNorth(this.map.getBearing())) {
|
|
566
|
-
this.map.resetNorth();
|
|
567
|
-
}
|
|
476
|
+
this.map.easeTo(inertialEase, {
|
|
477
|
+
originalEvent: originalEndEvent
|
|
478
|
+
});
|
|
479
|
+
} else {
|
|
480
|
+
this.map.emit('moveend', new _event.Event('moveend', {
|
|
481
|
+
originalEvent: originalEndEvent
|
|
482
|
+
}));
|
|
483
|
+
if (shouldSnapToNorth(this.map.getBearing())) {
|
|
484
|
+
this.map.resetNorth();
|
|
568
485
|
}
|
|
569
|
-
this.bearingChanged = false;
|
|
570
|
-
this.updatingCamera = false;
|
|
571
486
|
}
|
|
487
|
+
this.bearingChanged = false;
|
|
488
|
+
this.updatingCamera = false;
|
|
572
489
|
}
|
|
573
|
-
}
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
}]);
|
|
581
|
-
return HandlerManager;
|
|
582
|
-
}();
|
|
490
|
+
}
|
|
491
|
+
fireEvent(type, e) {
|
|
492
|
+
this.map.emit(type, new _event.Event(type, e ? {
|
|
493
|
+
originalEvent: e
|
|
494
|
+
} : {}));
|
|
495
|
+
}
|
|
496
|
+
}
|
|
583
497
|
var _default = exports.default = HandlerManager;
|