@antv/l7-map 2.15.2 → 2.15.4
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 +90 -148
- package/es/earthmap.js +13 -65
- package/es/geo/edge_insets.js +4 -14
- package/es/geo/lng_lat.js +5 -13
- package/es/geo/lng_lat_bounds.js +4 -17
- package/es/geo/mercator.js +2 -10
- package/es/geo/point.js +0 -7
- package/es/geo/simple.js +6 -11
- package/es/geo/transform.js +123 -132
- package/es/handler/blockable_map_event.js +7 -12
- package/es/handler/box_zoom.js +10 -30
- package/es/handler/click_zoom.js +0 -5
- package/es/handler/events/event.js +0 -2
- package/es/handler/events/map_mouse_event.js +0 -12
- package/es/handler/events/map_touch_event.js +2 -12
- package/es/handler/events/map_wheel_event.js +1 -12
- package/es/handler/events/render_event.js +0 -13
- package/es/handler/handler_inertia.js +6 -34
- package/es/handler/handler_manager.js +55 -147
- package/es/handler/handler_util.js +1 -2
- package/es/handler/keyboard.js +1 -20
- package/es/handler/map_event.js +3 -9
- package/es/handler/mouse/mouse_handler.js +11 -24
- package/es/handler/mouse/mousepan_handler.js +1 -11
- package/es/handler/mouse/mousepitch_hander.js +1 -11
- package/es/handler/mouse/mouserotate_hander.js +1 -11
- package/es/handler/mouse/util.js +2 -3
- package/es/handler/scroll_zoom.js +43 -71
- package/es/handler/shim/dblclick_zoom.js +4 -9
- package/es/handler/shim/drag_pan.js +4 -11
- package/es/handler/shim/drag_rotate.js +4 -10
- package/es/handler/shim/touch_zoom_rotate.js +6 -16
- package/es/handler/tap/single_tap_recognizer.js +8 -31
- package/es/handler/tap/tap_drag_zoom.js +7 -15
- package/es/handler/tap/tap_recognizer.js +3 -11
- package/es/handler/tap/tap_zoom.js +1 -7
- package/es/handler/touch/touch_pan.js +4 -22
- package/es/handler/touch/touch_pitch.js +10 -27
- package/es/handler/touch/touch_rotate.js +8 -19
- package/es/handler/touch/touch_zoom.js +5 -18
- package/es/handler/touch/two_touch.js +19 -32
- package/es/hash.js +9 -31
- package/es/map.js +16 -78
- package/es/util.js +18 -23
- package/es/utils/Aabb.js +10 -31
- package/es/utils/dom.js +24 -58
- package/es/utils/performance.js +8 -7
- package/es/utils/primitives.js +13 -11
- package/es/utils/task_queue.js +6 -23
- package/lib/camera.js +90 -168
- package/lib/earthmap.js +11 -79
- package/lib/geo/edge_insets.js +3 -18
- package/lib/geo/lng_lat.js +5 -18
- package/lib/geo/lng_lat_bounds.js +4 -20
- package/lib/geo/mercator.js +1 -22
- package/lib/geo/point.js +0 -8
- package/lib/geo/simple.js +5 -24
- package/lib/geo/transform.js +123 -164
- package/lib/handler/blockable_map_event.js +6 -14
- package/lib/handler/box_zoom.js +8 -39
- package/lib/handler/click_zoom.js +0 -6
- package/lib/handler/events/event.js +0 -5
- package/lib/handler/events/index.js +0 -4
- package/lib/handler/events/map_mouse_event.js +0 -19
- package/lib/handler/events/map_touch_event.js +1 -20
- package/lib/handler/events/map_wheel_event.js +1 -16
- package/lib/handler/events/render_event.js +0 -19
- package/lib/handler/handler_inertia.js +4 -37
- package/lib/handler/handler_manager.js +55 -171
- package/lib/handler/handler_util.js +1 -3
- package/lib/handler/keyboard.js +1 -22
- package/lib/handler/map_event.js +2 -11
- package/lib/handler/mouse/index.js +0 -4
- package/lib/handler/mouse/mouse_handler.js +10 -27
- package/lib/handler/mouse/mousepan_handler.js +0 -17
- package/lib/handler/mouse/mousepitch_hander.js +0 -16
- package/lib/handler/mouse/mouserotate_hander.js +0 -16
- package/lib/handler/mouse/util.js +2 -6
- package/lib/handler/scroll_zoom.js +43 -77
- package/lib/handler/shim/dblclick_zoom.js +4 -10
- package/lib/handler/shim/drag_pan.js +4 -13
- package/lib/handler/shim/drag_rotate.js +4 -11
- package/lib/handler/shim/touch_zoom_rotate.js +6 -18
- package/lib/handler/tap/single_tap_recognizer.js +8 -33
- package/lib/handler/tap/tap_drag_zoom.js +6 -18
- package/lib/handler/tap/tap_recognizer.js +2 -17
- package/lib/handler/tap/tap_zoom.js +0 -9
- package/lib/handler/touch/index.js +0 -5
- package/lib/handler/touch/touch_pan.js +4 -25
- package/lib/handler/touch/touch_pitch.js +9 -31
- package/lib/handler/touch/touch_rotate.js +7 -24
- package/lib/handler/touch/touch_zoom.js +4 -23
- package/lib/handler/touch/two_touch.js +18 -35
- package/lib/hash.js +8 -35
- package/lib/index.js +0 -8
- package/lib/map.js +14 -94
- package/lib/util.js +16 -34
- package/lib/utils/Aabb.js +10 -34
- package/lib/utils/dom.js +22 -64
- package/lib/utils/performance.js +8 -9
- package/lib/utils/primitives.js +13 -16
- package/lib/utils/task_queue.js +6 -24
- package/package.json +3 -3
|
@@ -1,28 +1,18 @@
|
|
|
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 _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
-
|
|
12
9
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
10
|
var _point = _interopRequireDefault(require("../geo/point"));
|
|
15
|
-
|
|
16
11
|
var _merge = _interopRequireDefault(require("lodash/merge"));
|
|
17
|
-
|
|
18
12
|
var _util = require("../util");
|
|
19
|
-
|
|
20
13
|
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; } } }; }
|
|
21
|
-
|
|
22
14
|
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); }
|
|
23
|
-
|
|
24
|
-
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; }
|
|
25
|
-
|
|
15
|
+
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; }
|
|
26
16
|
var defaultInertiaOptions = {
|
|
27
17
|
linearity: 0.3,
|
|
28
18
|
easing: (0, _util.bezier)(0, 0, 0.3, 1)
|
|
@@ -43,14 +33,12 @@ var defaultPitchInertiaOptions = (0, _merge.default)({
|
|
|
43
33
|
deceleration: 1000,
|
|
44
34
|
maxSpeed: 90
|
|
45
35
|
}, defaultInertiaOptions);
|
|
46
|
-
|
|
47
36
|
var HandlerInertia = /*#__PURE__*/function () {
|
|
48
37
|
function HandlerInertia(map) {
|
|
49
38
|
(0, _classCallCheck2.default)(this, HandlerInertia);
|
|
50
39
|
this.map = map;
|
|
51
40
|
this.clear();
|
|
52
41
|
}
|
|
53
|
-
|
|
54
42
|
(0, _createClass2.default)(HandlerInertia, [{
|
|
55
43
|
key: "clear",
|
|
56
44
|
value: function clear() {
|
|
@@ -80,11 +68,9 @@ var HandlerInertia = /*#__PURE__*/function () {
|
|
|
80
68
|
key: "onMoveEnd",
|
|
81
69
|
value: function onMoveEnd(panInertiaOptions) {
|
|
82
70
|
this.drainInertiaBuffer();
|
|
83
|
-
|
|
84
71
|
if (this.inertiaBuffer.length < 2) {
|
|
85
72
|
return;
|
|
86
73
|
}
|
|
87
|
-
|
|
88
74
|
var deltas = {
|
|
89
75
|
zoom: 0,
|
|
90
76
|
bearing: 0,
|
|
@@ -93,25 +79,20 @@ var HandlerInertia = /*#__PURE__*/function () {
|
|
|
93
79
|
pinchAround: undefined,
|
|
94
80
|
around: undefined
|
|
95
81
|
};
|
|
96
|
-
|
|
97
82
|
var _iterator = _createForOfIteratorHelper(this.inertiaBuffer),
|
|
98
|
-
|
|
99
|
-
|
|
83
|
+
_step;
|
|
100
84
|
try {
|
|
101
85
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
102
86
|
var settings = _step.value.settings;
|
|
103
87
|
deltas.zoom += settings.zoomDelta || 0;
|
|
104
88
|
deltas.bearing += settings.bearingDelta || 0;
|
|
105
89
|
deltas.pitch += settings.pitchDelta || 0;
|
|
106
|
-
|
|
107
90
|
if (settings.panDelta) {
|
|
108
91
|
deltas.pan._add(settings.panDelta);
|
|
109
92
|
}
|
|
110
|
-
|
|
111
93
|
if (settings.around) {
|
|
112
94
|
deltas.around = settings.around;
|
|
113
95
|
}
|
|
114
|
-
|
|
115
96
|
if (settings.pinchAround) {
|
|
116
97
|
deltas.pinchAround = settings.pinchAround;
|
|
117
98
|
}
|
|
@@ -121,44 +102,34 @@ var HandlerInertia = /*#__PURE__*/function () {
|
|
|
121
102
|
} finally {
|
|
122
103
|
_iterator.f();
|
|
123
104
|
}
|
|
124
|
-
|
|
125
105
|
var lastEntry = this.inertiaBuffer[this.inertiaBuffer.length - 1];
|
|
126
106
|
var duration = lastEntry.time - this.inertiaBuffer[0].time;
|
|
127
107
|
var easeOptions = {};
|
|
128
|
-
|
|
129
108
|
if (deltas.pan.mag()) {
|
|
130
109
|
var result = calculateEasing(deltas.pan.mag(), duration, (0, _merge.default)({}, defaultPanInertiaOptions, panInertiaOptions || {}));
|
|
131
110
|
easeOptions.offset = deltas.pan.mult(result.amount / deltas.pan.mag());
|
|
132
111
|
easeOptions.center = this.map.transform.center;
|
|
133
112
|
extendDuration(easeOptions, result);
|
|
134
113
|
}
|
|
135
|
-
|
|
136
114
|
if (deltas.zoom) {
|
|
137
115
|
var _result = calculateEasing(deltas.zoom, duration, defaultZoomInertiaOptions);
|
|
138
|
-
|
|
139
116
|
easeOptions.zoom = this.map.transform.zoom + _result.amount;
|
|
140
117
|
extendDuration(easeOptions, _result);
|
|
141
118
|
}
|
|
142
|
-
|
|
143
119
|
if (deltas.bearing) {
|
|
144
120
|
var _result2 = calculateEasing(deltas.bearing, duration, defaultBearingInertiaOptions);
|
|
145
|
-
|
|
146
121
|
easeOptions.bearing = this.map.transform.bearing + (0, _util.clamp)(_result2.amount, -179, 179);
|
|
147
122
|
extendDuration(easeOptions, _result2);
|
|
148
123
|
}
|
|
149
|
-
|
|
150
124
|
if (deltas.pitch) {
|
|
151
125
|
var _result3 = calculateEasing(deltas.pitch, duration, defaultPitchInertiaOptions);
|
|
152
|
-
|
|
153
126
|
easeOptions.pitch = this.map.transform.pitch + _result3.amount;
|
|
154
127
|
extendDuration(easeOptions, _result3);
|
|
155
128
|
}
|
|
156
|
-
|
|
157
129
|
if (easeOptions.zoom || easeOptions.bearing) {
|
|
158
130
|
var last = deltas.pinchAround === undefined ? deltas.around : deltas.pinchAround;
|
|
159
131
|
easeOptions.around = last ? this.map.unproject(last) : this.map.getCenter();
|
|
160
132
|
}
|
|
161
|
-
|
|
162
133
|
this.clear();
|
|
163
134
|
return (0, _merge.default)(easeOptions, {
|
|
164
135
|
noMoveStart: true
|
|
@@ -168,21 +139,17 @@ var HandlerInertia = /*#__PURE__*/function () {
|
|
|
168
139
|
return HandlerInertia;
|
|
169
140
|
}(); // Unfortunately zoom, bearing, etc can't have different durations and easings so
|
|
170
141
|
// we need to choose one. We use the longest duration and it's corresponding easing.
|
|
171
|
-
|
|
172
|
-
|
|
173
142
|
exports.default = HandlerInertia;
|
|
174
|
-
|
|
175
143
|
function extendDuration(easeOptions, result) {
|
|
176
144
|
if (!easeOptions.duration || easeOptions.duration < result.duration) {
|
|
177
145
|
easeOptions.duration = result.duration;
|
|
178
146
|
easeOptions.easing = result.easing;
|
|
179
147
|
}
|
|
180
148
|
}
|
|
181
|
-
|
|
182
149
|
function calculateEasing(amount, inertiaDuration, inertiaOptions) {
|
|
183
150
|
var maxSpeed = inertiaOptions.maxSpeed,
|
|
184
|
-
|
|
185
|
-
|
|
151
|
+
linearity = inertiaOptions.linearity,
|
|
152
|
+
deceleration = inertiaOptions.deceleration;
|
|
186
153
|
var speed = (0, _util.clamp)(amount * linearity / (inertiaDuration / 1000), -maxSpeed, maxSpeed);
|
|
187
154
|
var duration = Math.abs(speed) / (deceleration * linearity);
|
|
188
155
|
return {
|