@antv/l7-map 2.17.10 → 2.17.12

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 +148 -90
  2. package/es/earthmap.js +65 -13
  3. package/es/geo/edge_insets.js +14 -4
  4. package/es/geo/lng_lat.js +13 -5
  5. package/es/geo/lng_lat_bounds.js +17 -4
  6. package/es/geo/mercator.js +10 -2
  7. package/es/geo/point.js +7 -0
  8. package/es/geo/simple.js +11 -6
  9. package/es/geo/transform.js +132 -127
  10. package/es/handler/blockable_map_event.js +12 -7
  11. package/es/handler/box_zoom.js +30 -10
  12. package/es/handler/click_zoom.js +5 -0
  13. package/es/handler/events/event.js +2 -0
  14. package/es/handler/events/map_mouse_event.js +12 -0
  15. package/es/handler/events/map_touch_event.js +12 -2
  16. package/es/handler/events/map_wheel_event.js +12 -1
  17. package/es/handler/events/render_event.js +13 -0
  18. package/es/handler/handler_inertia.js +34 -6
  19. package/es/handler/handler_manager.js +147 -55
  20. package/es/handler/handler_util.js +2 -1
  21. package/es/handler/keyboard.js +20 -1
  22. package/es/handler/map_event.js +9 -3
  23. package/es/handler/mouse/mouse_handler.js +24 -11
  24. package/es/handler/mouse/mousepan_handler.js +11 -1
  25. package/es/handler/mouse/mousepitch_hander.js +11 -1
  26. package/es/handler/mouse/mouserotate_hander.js +11 -1
  27. package/es/handler/mouse/util.js +3 -2
  28. package/es/handler/scroll_zoom.js +71 -43
  29. package/es/handler/shim/dblclick_zoom.js +9 -4
  30. package/es/handler/shim/drag_pan.js +11 -4
  31. package/es/handler/shim/drag_rotate.js +10 -4
  32. package/es/handler/shim/touch_zoom_rotate.js +16 -6
  33. package/es/handler/tap/single_tap_recognizer.js +31 -8
  34. package/es/handler/tap/tap_drag_zoom.js +15 -7
  35. package/es/handler/tap/tap_recognizer.js +11 -3
  36. package/es/handler/tap/tap_zoom.js +7 -1
  37. package/es/handler/touch/touch_pan.js +22 -4
  38. package/es/handler/touch/touch_pitch.js +27 -10
  39. package/es/handler/touch/touch_rotate.js +19 -8
  40. package/es/handler/touch/touch_zoom.js +18 -5
  41. package/es/handler/touch/two_touch.js +32 -19
  42. package/es/hash.js +31 -9
  43. package/es/map.js +78 -16
  44. package/es/util.js +26 -18
  45. package/es/utils/Aabb.js +31 -10
  46. package/es/utils/dom.js +58 -24
  47. package/es/utils/performance.js +7 -8
  48. package/es/utils/primitives.js +11 -13
  49. package/es/utils/task_queue.js +23 -6
  50. package/lib/camera.js +169 -91
  51. package/lib/earthmap.js +80 -12
  52. package/lib/geo/edge_insets.js +18 -3
  53. package/lib/geo/lng_lat.js +18 -5
  54. package/lib/geo/lng_lat_bounds.js +20 -4
  55. package/lib/geo/mercator.js +22 -1
  56. package/lib/geo/point.js +8 -0
  57. package/lib/geo/simple.js +24 -5
  58. package/lib/geo/transform.js +164 -127
  59. package/lib/handler/blockable_map_event.js +14 -6
  60. package/lib/handler/box_zoom.js +39 -8
  61. package/lib/handler/click_zoom.js +6 -0
  62. package/lib/handler/events/event.js +5 -0
  63. package/lib/handler/events/index.js +4 -0
  64. package/lib/handler/events/map_mouse_event.js +20 -2
  65. package/lib/handler/events/map_touch_event.js +21 -2
  66. package/lib/handler/events/map_wheel_event.js +16 -1
  67. package/lib/handler/events/render_event.js +19 -0
  68. package/lib/handler/handler_inertia.js +37 -5
  69. package/lib/handler/handler_manager.js +171 -56
  70. package/lib/handler/handler_util.js +3 -1
  71. package/lib/handler/keyboard.js +22 -1
  72. package/lib/handler/map_event.js +11 -2
  73. package/lib/handler/mouse/index.js +4 -0
  74. package/lib/handler/mouse/mouse_handler.js +27 -10
  75. package/lib/handler/mouse/mousepan_handler.js +18 -1
  76. package/lib/handler/mouse/mousepitch_hander.js +17 -1
  77. package/lib/handler/mouse/mouserotate_hander.js +17 -1
  78. package/lib/handler/mouse/util.js +6 -2
  79. package/lib/handler/scroll_zoom.js +77 -43
  80. package/lib/handler/shim/dblclick_zoom.js +10 -4
  81. package/lib/handler/shim/drag_pan.js +13 -4
  82. package/lib/handler/shim/drag_rotate.js +11 -4
  83. package/lib/handler/shim/touch_zoom_rotate.js +18 -6
  84. package/lib/handler/tap/single_tap_recognizer.js +33 -8
  85. package/lib/handler/tap/tap_drag_zoom.js +18 -6
  86. package/lib/handler/tap/tap_recognizer.js +17 -2
  87. package/lib/handler/tap/tap_zoom.js +9 -0
  88. package/lib/handler/touch/index.js +5 -0
  89. package/lib/handler/touch/touch_pan.js +25 -4
  90. package/lib/handler/touch/touch_pitch.js +32 -10
  91. package/lib/handler/touch/touch_rotate.js +25 -8
  92. package/lib/handler/touch/touch_zoom.js +24 -5
  93. package/lib/handler/touch/two_touch.js +35 -18
  94. package/lib/hash.js +35 -8
  95. package/lib/index.js +8 -0
  96. package/lib/map.js +95 -15
  97. package/lib/util.js +38 -16
  98. package/lib/utils/Aabb.js +34 -10
  99. package/lib/utils/dom.js +64 -22
  100. package/lib/utils/performance.js +9 -8
  101. package/lib/utils/primitives.js +16 -13
  102. package/lib/utils/task_queue.js +24 -6
  103. package/package.json +3 -3
@@ -1,7 +1,9 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
4
5
  var _typeof = require("@babel/runtime/helpers/typeof");
6
+
5
7
  Object.defineProperty(exports, "__esModule", {
6
8
  value: true
7
9
  });
@@ -14,11 +16,17 @@ exports.mercatorScale = mercatorScale;
14
16
  exports.mercatorXfromLng = mercatorXfromLng;
15
17
  exports.mercatorYfromLat = mercatorYfromLat;
16
18
  exports.mercatorZfromAltitude = mercatorZfromAltitude;
19
+
17
20
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
21
+
18
22
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
23
+
19
24
  var _lng_lat = _interopRequireWildcard(require("../geo/lng_lat"));
25
+
20
26
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
27
+
21
28
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
29
+
22
30
  /*
23
31
  * The average circumference of the world in meters.
24
32
  */
@@ -27,29 +35,35 @@ var earthCircumfrence = 2 * Math.PI * _lng_lat.earthRadius; // meters
27
35
  /*
28
36
  * The circumference at a line of latitude in meters.
29
37
  */
38
+
30
39
  function circumferenceAtLatitude(latitude) {
31
40
  return earthCircumfrence * Math.cos(latitude * Math.PI / 180);
32
41
  }
42
+
33
43
  function mercatorXfromLng(lng) {
34
44
  return (180 + lng) / 360;
35
45
  }
46
+
36
47
  function mercatorYfromLat(lat) {
37
48
  return (180 - 180 / Math.PI * Math.log(Math.tan(Math.PI / 4 + lat * Math.PI / 360))) / 360;
38
49
  }
50
+
39
51
  function mercatorZfromAltitude(altitude, lat) {
40
52
  return altitude / circumferenceAtLatitude(lat);
41
53
  }
54
+
42
55
  function lngFromMercatorX(x) {
43
56
  return x * 360 - 180;
44
57
  }
58
+
45
59
  function latFromMercatorY(y) {
46
60
  var y2 = 180 - y * 360;
47
61
  return 360 / Math.PI * Math.atan(Math.exp(y2 * Math.PI / 180)) - 90;
48
62
  }
63
+
49
64
  function altitudeFromMercatorZ(z, y) {
50
65
  return z * circumferenceAtLatitude(latFromMercatorY(y));
51
66
  }
52
-
53
67
  /**
54
68
  * Determine the Mercator scale factor for a given latitude, see
55
69
  * https://en.wikipedia.org/wiki/Mercator_projection#Scale_factor
@@ -60,9 +74,12 @@ function altitudeFromMercatorZ(z, y) {
60
74
  * @returns {number} scale factor
61
75
  * @private
62
76
  */
77
+
78
+
63
79
  function mercatorScale(lat) {
64
80
  return 1 / Math.cos(lat * Math.PI / 180);
65
81
  }
82
+
66
83
  var MercatorCoordinate = /*#__PURE__*/function () {
67
84
  function MercatorCoordinate(x, y) {
68
85
  var z = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
@@ -71,6 +88,7 @@ var MercatorCoordinate = /*#__PURE__*/function () {
71
88
  this.y = +y;
72
89
  this.z = +z;
73
90
  }
91
+
74
92
  (0, _createClass2.default)(MercatorCoordinate, [{
75
93
  key: "toLngLat",
76
94
  value: function toLngLat() {
@@ -91,10 +109,13 @@ var MercatorCoordinate = /*#__PURE__*/function () {
91
109
  key: "fromLngLat",
92
110
  value: function fromLngLat(lngLatLike) {
93
111
  var altitude = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
112
+
94
113
  var lngLat = _lng_lat.default.convert(lngLatLike);
114
+
95
115
  return new MercatorCoordinate(mercatorXfromLng(lngLat.lng), mercatorYfromLat(lngLat.lat), mercatorZfromAltitude(altitude, lngLat.lat));
96
116
  }
97
117
  }]);
98
118
  return MercatorCoordinate;
99
119
  }();
120
+
100
121
  exports.MercatorCoordinate = exports.default = MercatorCoordinate;
package/lib/geo/point.js CHANGED
@@ -1,18 +1,23 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
4
5
  Object.defineProperty(exports, "__esModule", {
5
6
  value: true
6
7
  });
7
8
  exports.default = void 0;
9
+
8
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
+
9
12
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
13
+
10
14
  var Point = /*#__PURE__*/function () {
11
15
  function Point(x, y) {
12
16
  (0, _classCallCheck2.default)(this, Point);
13
17
  this.x = x;
14
18
  this.y = y;
15
19
  }
20
+
16
21
  (0, _createClass2.default)(Point, [{
17
22
  key: "clone",
18
23
  value: function clone() {
@@ -220,12 +225,15 @@ var Point = /*#__PURE__*/function () {
220
225
  if (a instanceof Point) {
221
226
  return a;
222
227
  }
228
+
223
229
  if (Array.isArray(a)) {
224
230
  return new Point(a[0], a[1]);
225
231
  }
232
+
226
233
  return a;
227
234
  }
228
235
  }]);
229
236
  return Point;
230
237
  }();
238
+
231
239
  exports.default = Point;
package/lib/geo/simple.js CHANGED
@@ -1,7 +1,9 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
4
5
  var _typeof = require("@babel/runtime/helpers/typeof");
6
+
5
7
  Object.defineProperty(exports, "__esModule", {
6
8
  value: true
7
9
  });
@@ -14,11 +16,17 @@ exports.mercatorScale = mercatorScale;
14
16
  exports.mercatorXfromLng = mercatorXfromLng;
15
17
  exports.mercatorYfromLat = mercatorYfromLat;
16
18
  exports.mercatorZfromAltitude = mercatorZfromAltitude;
19
+
17
20
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
21
+
18
22
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
23
+
19
24
  var _lng_lat = _interopRequireWildcard(require("../geo/lng_lat"));
25
+
20
26
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
27
+
21
28
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
29
+
22
30
  /*
23
31
  * The average circumference of the world in meters.
24
32
  */
@@ -27,32 +35,36 @@ var earthCircumfrence = 2 * Math.PI * _lng_lat.earthRadius; // meters
27
35
  /*
28
36
  * The circumference at a line of latitude in meters.
29
37
  */
38
+
30
39
  function circumferenceAtLatitude(latitude) {
31
40
  return earthCircumfrence * Math.cos(latitude * Math.PI / 180);
32
41
  }
42
+
33
43
  function mercatorXfromLng(lng) {
34
44
  return lng;
35
45
  }
46
+
36
47
  function mercatorYfromLat(lat) {
37
48
  return lat;
38
- }
49
+ } // eslint-disable-next-line @typescript-eslint/no-unused-vars
50
+
39
51
 
40
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
41
52
  function mercatorZfromAltitude(altitude, lat) {
42
53
  return altitude;
43
54
  }
55
+
44
56
  function lngFromMercatorX(x) {
45
57
  return x;
46
58
  }
59
+
47
60
  function latFromMercatorY(y) {
48
61
  return y;
49
- }
62
+ } // eslint-disable-next-line @typescript-eslint/no-unused-vars
63
+
50
64
 
51
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
52
65
  function altitudeFromMercatorZ(z, y) {
53
66
  return z;
54
67
  }
55
-
56
68
  /**
57
69
  * Determine the Mercator scale factor for a given latitude, see
58
70
  * https://en.wikipedia.org/wiki/Mercator_projection#Scale_factor
@@ -64,9 +76,12 @@ function altitudeFromMercatorZ(z, y) {
64
76
  * @private
65
77
  */
66
78
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
79
+
80
+
67
81
  function mercatorScale(lat) {
68
82
  return 1;
69
83
  }
84
+
70
85
  var SimpleCoordinate = /*#__PURE__*/function () {
71
86
  function SimpleCoordinate(x, y) {
72
87
  var z = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
@@ -75,6 +90,7 @@ var SimpleCoordinate = /*#__PURE__*/function () {
75
90
  this.y = +y;
76
91
  this.z = +z;
77
92
  }
93
+
78
94
  (0, _createClass2.default)(SimpleCoordinate, [{
79
95
  key: "toLngLat",
80
96
  value: function toLngLat() {
@@ -95,10 +111,13 @@ var SimpleCoordinate = /*#__PURE__*/function () {
95
111
  key: "fromLngLat",
96
112
  value: function fromLngLat(lngLatLike) {
97
113
  var altitude = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
114
+
98
115
  var lngLat = _lng_lat.default.convert(lngLatLike);
116
+
99
117
  return new SimpleCoordinate(mercatorXfromLng(lngLat.lng), mercatorYfromLat(lngLat.lat), mercatorZfromAltitude(altitude, lngLat.lat));
100
118
  }
101
119
  }]);
102
120
  return SimpleCoordinate;
103
121
  }();
122
+
104
123
  exports.default = SimpleCoordinate;