maplair 4.0.0 → 4.1.0

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 (270) hide show
  1. package/CHANGELOG.md +118 -0
  2. package/dist/esm/Maplair.js +14 -14
  3. package/dist/esm/control/AttributionControl.js +24 -14
  4. package/dist/esm/control/AttributionControl.js.map +1 -1
  5. package/dist/esm/control/ButtonControl.js +9 -11
  6. package/dist/esm/control/ButtonControl.js.map +1 -1
  7. package/dist/esm/control/ContextMenu.js +1 -3
  8. package/dist/esm/control/ContextMenu.js.map +1 -1
  9. package/dist/esm/control/Control.js +9 -16
  10. package/dist/esm/control/Control.js.map +1 -1
  11. package/dist/esm/control/FullscreenControl.js +5 -7
  12. package/dist/esm/control/FullscreenControl.js.map +1 -1
  13. package/dist/esm/control/LayersControl.js +144 -35
  14. package/dist/esm/control/LayersControl.js.map +1 -1
  15. package/dist/esm/control/LegendControl.js +7 -9
  16. package/dist/esm/control/LegendControl.js.map +1 -1
  17. package/dist/esm/control/MiniMapControl.js +14 -16
  18. package/dist/esm/control/MiniMapControl.js.map +1 -1
  19. package/dist/esm/control/RotateControl.js +1 -3
  20. package/dist/esm/control/RotateControl.js.map +1 -1
  21. package/dist/esm/control/ScaleControl.js +7 -9
  22. package/dist/esm/control/ScaleControl.js.map +1 -1
  23. package/dist/esm/control/SearchControl.js +99 -17
  24. package/dist/esm/control/SearchControl.js.map +1 -1
  25. package/dist/esm/control/SideBySideControl.js +1 -3
  26. package/dist/esm/control/SideBySideControl.js.map +1 -1
  27. package/dist/esm/control/TextControl.js +5 -7
  28. package/dist/esm/control/TextControl.js.map +1 -1
  29. package/dist/esm/control/TimeControl.js +408 -0
  30. package/dist/esm/control/TimeControl.js.map +1 -0
  31. package/dist/esm/control/ZoomControl.js +5 -7
  32. package/dist/esm/control/ZoomControl.js.map +1 -1
  33. package/dist/esm/core/Class.js +28 -37
  34. package/dist/esm/core/Class.js.map +1 -1
  35. package/dist/esm/core/Events.js +21 -8
  36. package/dist/esm/core/Events.js.map +1 -1
  37. package/dist/esm/core/Handler.js +13 -11
  38. package/dist/esm/core/Handler.js.map +1 -1
  39. package/dist/esm/core/Util.js +13 -1
  40. package/dist/esm/core/Util.js.map +1 -1
  41. package/dist/esm/dom/DomEvent.DoubleTap.js +25 -22
  42. package/dist/esm/dom/DomEvent.DoubleTap.js.map +1 -1
  43. package/dist/esm/dom/DomEvent.PointerEvents.js +2 -16
  44. package/dist/esm/dom/DomEvent.PointerEvents.js.map +1 -1
  45. package/dist/esm/dom/DomEvent.js +8 -42
  46. package/dist/esm/dom/DomEvent.js.map +1 -1
  47. package/dist/esm/dom/DomUtil.js +14 -68
  48. package/dist/esm/dom/DomUtil.js.map +1 -1
  49. package/dist/esm/dom/Draggable.js +17 -18
  50. package/dist/esm/dom/Draggable.js.map +1 -1
  51. package/dist/esm/dom/PosAnimation.js +3 -25
  52. package/dist/esm/dom/PosAnimation.js.map +1 -1
  53. package/dist/esm/geo/LatLng.js +15 -5
  54. package/dist/esm/geo/LatLng.js.map +1 -1
  55. package/dist/esm/geo/crs/EPSG3395.js +1 -1
  56. package/dist/esm/geo/crs/EPSG3395.js.map +1 -1
  57. package/dist/esm/geo/crs/EPSG3857.js +1 -1
  58. package/dist/esm/geo/crs/EPSG3857.js.map +1 -1
  59. package/dist/esm/geo/crs/EPSG4326.js +1 -1
  60. package/dist/esm/geo/crs/EPSG4326.js.map +1 -1
  61. package/dist/esm/geo/crs/EarthCRS.js +2 -2
  62. package/dist/esm/geo/crs/EarthCRS.js.map +1 -1
  63. package/dist/esm/geo/crs/SimpleCRS.js +1 -1
  64. package/dist/esm/geo/crs/SimpleCRS.js.map +1 -1
  65. package/dist/esm/geo/projection/Projection.LonLat.js +1 -1
  66. package/dist/esm/geo/projection/Projection.LonLat.js.map +1 -1
  67. package/dist/esm/geo/projection/Projection.Mercator.js +1 -1
  68. package/dist/esm/geo/projection/Projection.Mercator.js.map +1 -1
  69. package/dist/esm/geo/projection/Projection.SphericalMercator.js +1 -1
  70. package/dist/esm/geo/projection/Projection.SphericalMercator.js.map +1 -1
  71. package/dist/esm/geometry/LineUtil.js +36 -30
  72. package/dist/esm/geometry/LineUtil.js.map +1 -1
  73. package/dist/esm/geometry/PolyUtil.js +8 -27
  74. package/dist/esm/geometry/PolyUtil.js.map +1 -1
  75. package/dist/esm/layer/BlanketOverlay.js +6 -8
  76. package/dist/esm/layer/BlanketOverlay.js.map +1 -1
  77. package/dist/esm/layer/DivOverlay.js +15 -20
  78. package/dist/esm/layer/DivOverlay.js.map +1 -1
  79. package/dist/esm/layer/GeoJSON.js +9 -145
  80. package/dist/esm/layer/GeoJSON.js.map +1 -1
  81. package/dist/esm/layer/GeoJSONUtil.js +75 -0
  82. package/dist/esm/layer/GeoJSONUtil.js.map +1 -0
  83. package/dist/esm/layer/HeatLayer.js +15 -17
  84. package/dist/esm/layer/HeatLayer.js.map +1 -1
  85. package/dist/esm/layer/ImageOverlay.js +20 -26
  86. package/dist/esm/layer/ImageOverlay.js.map +1 -1
  87. package/dist/esm/layer/Layer.js +8 -10
  88. package/dist/esm/layer/Layer.js.map +1 -1
  89. package/dist/esm/layer/LayerGroup.js +51 -0
  90. package/dist/esm/layer/LayerGroup.js.map +1 -1
  91. package/dist/esm/layer/Popup.js +26 -42
  92. package/dist/esm/layer/Popup.js.map +1 -1
  93. package/dist/esm/layer/SVGOverlay.js +2 -5
  94. package/dist/esm/layer/SVGOverlay.js.map +1 -1
  95. package/dist/esm/layer/Tooltip.js +15 -17
  96. package/dist/esm/layer/Tooltip.js.map +1 -1
  97. package/dist/esm/layer/VideoOverlay.js +12 -15
  98. package/dist/esm/layer/VideoOverlay.js.map +1 -1
  99. package/dist/esm/layer/marker/DefaultIcon.js +15 -48
  100. package/dist/esm/layer/marker/DefaultIcon.js.map +1 -1
  101. package/dist/esm/layer/marker/DivIcon.js +7 -9
  102. package/dist/esm/layer/marker/DivIcon.js.map +1 -1
  103. package/dist/esm/layer/marker/Icon.js +7 -10
  104. package/dist/esm/layer/marker/Icon.js.map +1 -1
  105. package/dist/esm/layer/marker/Marker.Drag.js +1 -1
  106. package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
  107. package/dist/esm/layer/marker/Marker.Move.js +1 -2
  108. package/dist/esm/layer/marker/Marker.Move.js.map +1 -1
  109. package/dist/esm/layer/marker/Marker.js +61 -33
  110. package/dist/esm/layer/marker/Marker.js.map +1 -1
  111. package/dist/esm/layer/marker/MarkerClusterGroup.js +302 -0
  112. package/dist/esm/layer/marker/MarkerClusterGroup.js.map +1 -0
  113. package/dist/esm/layer/marker/SvgIcon.js +6 -8
  114. package/dist/esm/layer/marker/SvgIcon.js.map +1 -1
  115. package/dist/esm/layer/tile/GridLayer.js +85 -97
  116. package/dist/esm/layer/tile/GridLayer.js.map +1 -1
  117. package/dist/esm/layer/tile/TileLayer.js +28 -36
  118. package/dist/esm/layer/tile/TileLayer.js.map +1 -1
  119. package/dist/esm/layer/tile/WMSTileLayer.js +28 -23
  120. package/dist/esm/layer/tile/WMSTileLayer.js.map +1 -1
  121. package/dist/esm/layer/vector/Canvas.js +1 -3
  122. package/dist/esm/layer/vector/Canvas.js.map +1 -1
  123. package/dist/esm/layer/vector/Circle.js +2 -2
  124. package/dist/esm/layer/vector/Circle.js.map +1 -1
  125. package/dist/esm/layer/vector/CircleMarker.js +17 -7
  126. package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
  127. package/dist/esm/layer/vector/Path.DashAnimation.js +2 -3
  128. package/dist/esm/layer/vector/Path.DashAnimation.js.map +1 -1
  129. package/dist/esm/layer/vector/Path.js +27 -20
  130. package/dist/esm/layer/vector/Path.js.map +1 -1
  131. package/dist/esm/layer/vector/Polygon.js +20 -4
  132. package/dist/esm/layer/vector/Polygon.js.map +1 -1
  133. package/dist/esm/layer/vector/Polyline.Decorations.js +2 -2
  134. package/dist/esm/layer/vector/Polyline.js +23 -7
  135. package/dist/esm/layer/vector/Polyline.js.map +1 -1
  136. package/dist/esm/layer/vector/Renderer.getRenderer.js +14 -13
  137. package/dist/esm/layer/vector/Renderer.getRenderer.js.map +1 -1
  138. package/dist/esm/layer/vector/SVG.js +5 -5
  139. package/dist/esm/layer/vector/SVG.js.map +1 -1
  140. package/dist/esm/map/Map.Rotation.js +10 -6
  141. package/dist/esm/map/Map.Rotation.js.map +1 -1
  142. package/dist/esm/map/Map.js +116 -110
  143. package/dist/esm/map/Map.js.map +1 -1
  144. package/dist/esm/map/handler/BoxZoomHandler.js +5 -7
  145. package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
  146. package/dist/esm/map/handler/DisplaceHandler.js +6 -8
  147. package/dist/esm/map/handler/DisplaceHandler.js.map +1 -1
  148. package/dist/esm/map/handler/DragHandler.js +19 -19
  149. package/dist/esm/map/handler/DragHandler.js.map +1 -1
  150. package/dist/esm/map/handler/KeyboardHandler.js +35 -35
  151. package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
  152. package/dist/esm/map/handler/PinchZoomHandler.js +12 -3
  153. package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
  154. package/dist/esm/map/handler/ScrollWheelZoomHandler.js +3 -4
  155. package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
  156. package/dist/esm/map/handler/TapHoldHandler.js +12 -5
  157. package/dist/esm/map/handler/TapHoldHandler.js.map +1 -1
  158. package/dist/esm/package.js +1 -1
  159. package/dist/maplair-global-src.js +8009 -7369
  160. package/dist/maplair-global-src.js.map +1 -1
  161. package/dist/maplair-global.js +2 -2
  162. package/dist/maplair-global.js.map +1 -1
  163. package/dist/maplair-src.js +10040 -9381
  164. package/dist/maplair-src.js.map +1 -1
  165. package/dist/maplair.css +148 -98
  166. package/dist/maplair.js +2 -2
  167. package/dist/maplair.js.map +1 -1
  168. package/i18n/cs.json +6 -0
  169. package/i18n/de.json +6 -0
  170. package/i18n/en.json +6 -0
  171. package/i18n/es.json +6 -0
  172. package/i18n/fr.json +6 -0
  173. package/i18n/hu.json +6 -0
  174. package/i18n/it.json +6 -0
  175. package/i18n/rm.json +6 -0
  176. package/i18n/sk.json +6 -0
  177. package/i18n/sl.json +6 -0
  178. package/package.json +9 -11
  179. package/src/control/AttributionControl.js +25 -18
  180. package/src/control/ButtonControl.js +9 -11
  181. package/src/control/ContextMenu.js +3 -5
  182. package/src/control/Control.js +9 -19
  183. package/src/control/FullscreenControl.js +5 -7
  184. package/src/control/LayersControl.js +159 -36
  185. package/src/control/LegendControl.js +7 -9
  186. package/src/control/MiniMapControl.js +9 -11
  187. package/src/control/RotateControl.js +3 -5
  188. package/src/control/ScaleControl.js +7 -9
  189. package/src/control/SearchControl.js +102 -19
  190. package/src/control/SideBySideControl.js +3 -5
  191. package/src/control/TextControl.js +5 -7
  192. package/src/control/TimeControl.js +471 -0
  193. package/src/control/ZoomControl.js +5 -7
  194. package/src/control/index.js +1 -0
  195. package/src/core/Class.js +35 -34
  196. package/src/core/Events.js +22 -3
  197. package/src/core/Handler.js +14 -12
  198. package/src/core/Util.js +19 -1
  199. package/src/core/index.js +0 -1
  200. package/src/dom/DomEvent.DoubleTap.js +18 -10
  201. package/src/dom/DomEvent.PointerEvents.js +3 -26
  202. package/src/dom/DomEvent.js +8 -66
  203. package/src/dom/DomUtil.js +22 -78
  204. package/src/dom/Draggable.js +27 -22
  205. package/src/dom/PosAnimation.js +3 -25
  206. package/src/dom/index.js +0 -1
  207. package/src/geo/LatLng.js +20 -3
  208. package/src/geo/crs/EPSG3395.js +1 -1
  209. package/src/geo/crs/EPSG3857.js +1 -1
  210. package/src/geo/crs/EPSG4326.js +1 -1
  211. package/src/geo/crs/EarthCRS.js +2 -8
  212. package/src/geo/crs/SimpleCRS.js +1 -1
  213. package/src/geo/projection/Projection.LonLat.js +1 -1
  214. package/src/geo/projection/Projection.Mercator.js +1 -1
  215. package/src/geo/projection/Projection.SphericalMercator.js +1 -1
  216. package/src/geometry/LineUtil.js +47 -48
  217. package/src/geometry/PolyUtil.js +14 -43
  218. package/src/layer/BlanketOverlay.js +6 -10
  219. package/src/layer/DivOverlay.js +15 -26
  220. package/src/layer/GeoJSON.js +7 -205
  221. package/src/layer/GeoJSONUtil.js +85 -0
  222. package/src/layer/HeatLayer.js +9 -11
  223. package/src/layer/ImageOverlay.js +19 -30
  224. package/src/layer/Layer.js +8 -10
  225. package/src/layer/LayerGroup.js +71 -0
  226. package/src/layer/Popup.js +28 -43
  227. package/src/layer/SVGOverlay.js +1 -5
  228. package/src/layer/Tooltip.js +15 -19
  229. package/src/layer/VideoOverlay.js +12 -15
  230. package/src/layer/marker/DefaultIcon.js +15 -61
  231. package/src/layer/marker/DivIcon.js +9 -11
  232. package/src/layer/marker/Icon.js +7 -10
  233. package/src/layer/marker/Marker.Drag.js +1 -1
  234. package/src/layer/marker/Marker.Move.js +1 -2
  235. package/src/layer/marker/Marker.js +81 -39
  236. package/src/layer/marker/MarkerClusterGroup.js +370 -0
  237. package/src/layer/marker/SvgIcon.js +7 -9
  238. package/src/layer/marker/index.js +1 -0
  239. package/src/layer/tile/GridLayer.js +103 -133
  240. package/src/layer/tile/TileLayer.js +35 -43
  241. package/src/layer/tile/WMSTileLayer.js +26 -24
  242. package/src/layer/vector/Canvas.js +3 -5
  243. package/src/layer/vector/Circle.js +5 -2
  244. package/src/layer/vector/CircleMarker.js +17 -6
  245. package/src/layer/vector/Path.DashAnimation.js +1 -2
  246. package/src/layer/vector/Path.js +30 -21
  247. package/src/layer/vector/Polygon.js +28 -5
  248. package/src/layer/vector/Polyline.js +25 -6
  249. package/src/layer/vector/Renderer.getRenderer.js +17 -17
  250. package/src/layer/vector/SVG.js +5 -5
  251. package/src/map/Map.Rotation.js +12 -4
  252. package/src/map/Map.js +142 -133
  253. package/src/map/handler/BoxZoomHandler.js +9 -8
  254. package/src/map/handler/DisplaceHandler.js +6 -8
  255. package/src/map/handler/DragHandler.js +25 -28
  256. package/src/map/handler/KeyboardHandler.js +42 -48
  257. package/src/map/handler/PinchZoomHandler.js +16 -5
  258. package/src/map/handler/ScrollWheelZoomHandler.js +6 -4
  259. package/src/map/handler/TapHoldHandler.js +15 -4
  260. package/src/map/index.js +1 -1
  261. package/src/maplair.css +148 -98
  262. package/dist/esm/core/Browser.js +0 -100
  263. package/dist/esm/core/Browser.js.map +0 -1
  264. package/dist/images/layers.svg +0 -1
  265. package/dist/images/marker-icon.svg +0 -1
  266. package/dist/images/marker-shadow.svg +0 -1
  267. package/src/core/Browser.js +0 -110
  268. package/src/images/layers.svg +0 -1
  269. package/src/images/marker-icon.svg +0 -1
  270. package/src/images/marker-shadow.svg +0 -1
@@ -2,7 +2,6 @@ import {Handler} from '../../core/Handler.js';
2
2
  import {Draggable} from '../../dom/Draggable.js';
3
3
  import {LatLngBounds} from '../../geo/LatLngBounds.js';
4
4
  import {Bounds} from '../../geometry/Bounds.js';
5
- import {Point} from '../../geometry/Point.js';
6
5
  /** @import {MaplairMap} from '../Map.js' */
7
6
  /** @import {MaplairEvent, DragEndEvent} from '../../core/Events.js' */
8
7
 
@@ -16,13 +15,14 @@ import {Point} from '../../geometry/Point.js';
16
15
  * the same direction for some time. Feels especially nice on touch devices.
17
16
  * @property {number} [inertiaDeceleration=3400] The rate with which the inertial
18
17
  * movement slows down, in pixels/second².
19
- * @property {number} [inertiaMaxSpeed=Infinity] Max speed of the inertial movement,
18
+ * @property {number} [inertiaMaxSpeed=1400] Max speed of the inertial movement,
20
19
  * in pixels/second.
21
20
  * @property {number} [easeLinearity=0.2] The linearity of the easing of the inertial
22
21
  * movement.
23
22
  * @property {boolean} [worldCopyJump=false] With this option enabled, the map tracks
24
23
  * when you pan to another "copy" of the world and seamlessly jumps to the original one
25
- * so that all overlays like markers and vector layers are still visible.
24
+ * so that all overlays like markers and vector layers are still visible. A map with an
25
+ * infinite CRS, such as `SimpleCRS`, does not jump, as it has no copies of the world.
26
26
  * @property {number} [maxBoundsViscosity=0.0] If `maxBounds` is set, this option will
27
27
  * control how solid the bounds are when dragging the map around. The default value of
28
28
  * `0.0` allows the user to drag outside the bounds at normal speed, higher values will
@@ -64,6 +64,7 @@ export class DragHandler extends Handler {
64
64
  this._draggable = new Draggable(map._mapPane, map._container);
65
65
 
66
66
  this._draggable.on({
67
+ down: this._onDown,
67
68
  dragstart: this._onDragStart,
68
69
  drag: this._onDrag,
69
70
  dragend: this._onDragEnd
@@ -72,9 +73,6 @@ export class DragHandler extends Handler {
72
73
  this._draggable.on('predrag', this._onPreDragLimit, this);
73
74
  if (map.options.worldCopyJump) {
74
75
  this._draggable.on('predrag', this._onPreDragWrap, this);
75
- map.on('zoomend crschange', this._onZoomEnd, this);
76
-
77
- map.whenReady(this._onZoomEnd, this);
78
76
  }
79
77
  }
80
78
  this._map._container.classList.add('maplair-grab', 'maplair-touch-drag');
@@ -107,6 +105,11 @@ export class DragHandler extends Handler {
107
105
  return this._draggable?._moving;
108
106
  }
109
107
 
108
+ _onDown() {
109
+ // Stop inertia before Draggable captures _startPos (#10376).
110
+ this._map._stop();
111
+ }
112
+
110
113
  _onDragStart(e) {
111
114
  const map = this._map;
112
115
 
@@ -158,14 +161,6 @@ export class DragHandler extends Handler {
158
161
  }
159
162
  }
160
163
 
161
- _onZoomEnd() {
162
- const pxCenter = this._map.getSize().divideBy(2),
163
- pxWorldCenter = this._map.latLngToLayerPoint([0, 0]);
164
-
165
- this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x;
166
- this._worldWidth = this._map.getPixelWorldBounds().getSize().x;
167
- }
168
-
169
164
  _viscousLimit(value, threshold) {
170
165
  return value - (value - threshold) * this._viscosity;
171
166
  }
@@ -185,17 +180,9 @@ export class DragHandler extends Handler {
185
180
  }
186
181
 
187
182
  _onPreDragWrap() {
188
- // TODO refactor to be able to adjust map pane position after zoom
189
- const worldWidth = this._worldWidth,
190
- halfWidth = Math.round(worldWidth / 2),
191
- dx = this._initialWorldOffset,
192
- x = this._draggable._newPos.x,
193
- newX1 = (x - halfWidth + dx) % worldWidth + halfWidth - dx,
194
- newX2 = (x + halfWidth + dx) % worldWidth - halfWidth - dx,
195
- newX = Math.abs(newX1 + dx) < Math.abs(newX2 + dx) ? newX1 : newX2;
196
-
197
- this._draggable._absPos = new Point(this._draggable._newPos);
198
- this._draggable._newPos.x = newX;
183
+ const draggable = this._draggable;
184
+ draggable._absPos = draggable._newPos;
185
+ draggable._newPos = this._map._wrapWorldCopy(draggable._newPos);
199
186
  }
200
187
 
201
188
  _onDragEnd(e) {
@@ -222,8 +209,18 @@ export class DragHandler extends Handler {
222
209
  limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
223
210
  limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
224
211
 
225
- decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease);
226
- let offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
212
+ maxOffset = map.getSize().divideBy(2);
213
+
214
+ let decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
215
+ offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
216
+
217
+ // with reduced motion, shorten the coast to fit within half the map size; distance grows with the
218
+ // square of duration, so scaling the duration by the square root keeps the deceleration the same
219
+ if (map._prefersReducedMotion() && !maxOffset.contains(offset)) {
220
+ const k = Math.min(maxOffset.x / Math.abs(offset.x), maxOffset.y / Math.abs(offset.y));
221
+ offset = offset.multiplyBy(k).round();
222
+ decelerationDuration *= Math.sqrt(k);
223
+ }
227
224
 
228
225
  if (!offset.x && !offset.y) {
229
226
  map.fire('moveend');
@@ -253,7 +250,7 @@ export class DragHandler extends Handler {
253
250
  dragging: true,
254
251
  inertia: true,
255
252
  inertiaDeceleration: 3400, // px/s^2
256
- inertiaMaxSpeed: Infinity, // px/s
253
+ inertiaMaxSpeed: 1400, // px/s
257
254
  easeLinearity: 0.2,
258
255
  // TODO refactor, move to CRS
259
256
  worldCopyJump: false,
@@ -14,6 +14,10 @@ import {I18n} from '../../core/I18n.js';
14
14
  * navigate the map with keyboard arrows and `+`/`-` keys.
15
15
  * @property {number} [keyboardPanDelta=80] Amount of pixels to pan when pressing an
16
16
  * arrow key.
17
+ * @property {boolean|string} [ariaKeyShortcuts=false] Sets the `aria-keyshortcuts`
18
+ * attribute of the map container. ARIA names keys by what they type on a given layout,
19
+ * so `true` uses the names for a US English layout, which can be wrong for pages in
20
+ * other languages; pass a string to set the value for your audience's layout instead.
17
21
  */
18
22
 
19
23
  /**
@@ -33,17 +37,19 @@ import {I18n} from '../../core/I18n.js';
33
37
  export class KeyboardHandler extends Handler {
34
38
 
35
39
  /**
36
- * The [codes](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/code)
37
- * of the keys for panning and zooming the map.
40
+ * The [values](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key)
41
+ * of the keys for panning and zooming the map, so zoom keys follow the keyboard
42
+ * layout and cover the numpad too; `=` and `_` keep the US `+` and `-` keys working
43
+ * both with and without Shift.
38
44
  * @type {Record<'left'|'right'|'down'|'up'|'zoomIn'|'zoomOut', string[]>}
39
45
  */
40
- static keyCodes = {
46
+ static keys = {
41
47
  left: ['ArrowLeft'],
42
48
  right: ['ArrowRight'],
43
49
  down: ['ArrowDown'],
44
50
  up: ['ArrowUp'],
45
- zoomIn: ['Equal', 'NumpadAdd', 'BracketRight'],
46
- zoomOut: ['Minus', 'NumpadSubtract', 'Digit6', 'Slash']
51
+ zoomIn: ['+', '='],
52
+ zoomOut: ['-', '_']
47
53
  };
48
54
 
49
55
  /**
@@ -66,11 +72,15 @@ export class KeyboardHandler extends Handler {
66
72
 
67
73
  // make the container focusable by tabbing
68
74
  if (container.tabIndex <= 0) {
69
- container.tabIndex = '0';
75
+ container.tabIndex = 0;
70
76
  }
71
77
 
72
- // add aria-attribute for keyboard shortcuts to the container
73
- container.ariaKeyShortcuts = Object.values(KeyboardHandler.keyCodes).flat().join(' ');
78
+ const shortcuts = this._map.options.ariaKeyShortcuts;
79
+ if (shortcuts) {
80
+ // ARIA names physical keys by their unshifted character, so the default is for a US layout
81
+ container.ariaKeyShortcuts = shortcuts === true ?
82
+ 'ArrowLeft ArrowRight ArrowUp ArrowDown = Plus -' : shortcuts;
83
+ }
74
84
 
75
85
  on(container, {
76
86
  focus: this._onFocus,
@@ -90,6 +100,10 @@ export class KeyboardHandler extends Handler {
90
100
  removeHooks() {
91
101
  this._removeHooks();
92
102
 
103
+ if (this._map.options.ariaKeyShortcuts) {
104
+ this._map._container.removeAttribute('aria-keyshortcuts');
105
+ }
106
+
93
107
  off(this._map._container, {
94
108
  focus: this._onFocus,
95
109
  blur: this._onBlur,
@@ -146,14 +160,8 @@ export class KeyboardHandler extends Handler {
146
160
  _onPointerDown() {
147
161
  if (this._focused) { return; }
148
162
 
149
- const body = document.body,
150
- docEl = document.documentElement,
151
- top = body.scrollTop || docEl.scrollTop,
152
- left = body.scrollLeft || docEl.scrollLeft;
153
-
154
- this._map._container.focus();
155
-
156
- window.scrollTo(left, top);
163
+ // script focus matches :focus-visible by default, which would show a focus ring on every click
164
+ this._map._container.focus({preventScroll: true, focusVisible: false});
157
165
  }
158
166
 
159
167
  _onFocus() {
@@ -167,33 +175,21 @@ export class KeyboardHandler extends Handler {
167
175
  }
168
176
 
169
177
  _setPanDelta(panDelta) {
170
- const keys = this._panKeys = {},
171
- codes = KeyboardHandler.keyCodes;
178
+ const panKeys = this._panKeys = {},
179
+ {left, right, down, up} = KeyboardHandler.keys;
172
180
 
173
- for (const code of codes.left) {
174
- keys[code] = [-1 * panDelta, 0];
175
- }
176
- for (const code of codes.right) {
177
- keys[code] = [panDelta, 0];
178
- }
179
- for (const code of codes.down) {
180
- keys[code] = [0, panDelta];
181
- }
182
- for (const code of codes.up) {
183
- keys[code] = [0, -1 * panDelta];
184
- }
181
+ for (const key of left) { panKeys[key] = [-panDelta, 0]; }
182
+ for (const key of right) { panKeys[key] = [panDelta, 0]; }
183
+ for (const key of down) { panKeys[key] = [0, panDelta]; }
184
+ for (const key of up) { panKeys[key] = [0, -panDelta]; }
185
185
  }
186
186
 
187
187
  _setZoomDelta(zoomDelta) {
188
- const keys = this._zoomKeys = {},
189
- codes = KeyboardHandler.keyCodes;
188
+ const zoomKeys = this._zoomKeys = {},
189
+ {zoomIn, zoomOut} = KeyboardHandler.keys;
190
190
 
191
- for (const code of codes.zoomIn) {
192
- keys[code] = zoomDelta;
193
- }
194
- for (const code of codes.zoomOut) {
195
- keys[code] = -zoomDelta;
196
- }
191
+ for (const key of zoomIn) { zoomKeys[key] = zoomDelta; }
192
+ for (const key of zoomOut) { zoomKeys[key] = -zoomDelta; }
197
193
  }
198
194
 
199
195
  _addHooks() {
@@ -213,7 +209,7 @@ export class KeyboardHandler extends Handler {
213
209
  return;
214
210
  }
215
211
 
216
- const key = e.code,
212
+ const key = e.key,
217
213
  map = this._map;
218
214
  let offset;
219
215
 
@@ -229,16 +225,13 @@ export class KeyboardHandler extends Handler {
229
225
  }
230
226
 
231
227
  map._setUserEvent(e);
232
- if (map.options.worldCopyJump) {
233
- const newLatLng = map.wrapLatLng(map.unproject(map.project(map.getCenter()).add(offset)));
234
- map.panTo(newLatLng);
235
- } else {
236
- map.panBy(offset);
237
- }
228
+ map.panBy(offset);
238
229
  }
239
230
  } else if (key in this._zoomKeys) {
240
- map._setUserEvent(e);
241
- map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);
231
+ if (!map._zoomInputBlocked()) {
232
+ map._setUserEvent(e);
233
+ map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);
234
+ }
242
235
 
243
236
  } else if (key === 'Escape' && map._popup && map._popup.options.closeOnEscapeKey) {
244
237
  map.closePopup();
@@ -258,7 +251,8 @@ export class KeyboardHandler extends Handler {
258
251
  static register(MaplairMap) {
259
252
  MaplairMap.mergeOptions({
260
253
  keyboard: true,
261
- keyboardPanDelta: 80
254
+ keyboardPanDelta: 80,
255
+ ariaKeyShortcuts: false
262
256
  });
263
257
 
264
258
  MaplairMap.addInitHook('addHandler', 'keyboard', KeyboardHandler);
@@ -1,5 +1,7 @@
1
1
  import {Handler} from '../../core/Handler.js';
2
2
  import * as DomEvent from '../../dom/DomEvent.js';
3
+ import * as DomUtil from '../../dom/DomUtil.js';
4
+ import {Point} from '../../geometry/Point.js';
3
5
  import * as PointerEvents from '../../dom/DomEvent.PointerEvents.js';
4
6
  /** @import {MaplairMap} from '../Map.js' */
5
7
 
@@ -61,8 +63,13 @@ export class PinchZoomHandler extends Handler {
61
63
  const pointers = PointerEvents.getPointers();
62
64
  if (pointers.length !== 2 || map._animatingZoom || this._zooming) { return; }
63
65
 
64
- const p1 = map.pointerEventToContainerPoint(pointers[0]),
65
- p2 = map.pointerEventToContainerPoint(pointers[1]);
66
+ const p1 = map.pointerEventToContainerPoint(pointers[0]);
67
+ const p2 = map.pointerEventToContainerPoint(pointers[1]);
68
+ const {x, y} = DomUtil.getScale(map._container);
69
+
70
+ // the container doesn't move during a pinch, so keep its client offset and CSS scale to avoid reading layout on every move
71
+ this._containerScale = new Point(x, y);
72
+ this._containerOrigin = new Point(pointers[0].clientX, pointers[0].clientY)._subtract(p1.scaleBy(this._containerScale));
66
73
 
67
74
  this._centerPoint = map.getSize()._divideBy(2);
68
75
  this._startLatLng = map.containerPointToLatLng(this._centerPoint);
@@ -89,8 +96,8 @@ export class PinchZoomHandler extends Handler {
89
96
  if (pointers.length !== 2 || !this._zooming) { return; }
90
97
 
91
98
  const map = this._map,
92
- p1 = map.pointerEventToContainerPoint(pointers[0]),
93
- p2 = map.pointerEventToContainerPoint(pointers[1]),
99
+ p1 = this._toContainerPoint(pointers[0]),
100
+ p2 = this._toContainerPoint(pointers[1]),
94
101
  scale = p1.distanceTo(p2) / this._startDist;
95
102
 
96
103
  this._zoom = map.getScaleZoom(scale, this._startZoom);
@@ -125,6 +132,10 @@ export class PinchZoomHandler extends Handler {
125
132
  e.preventDefault();
126
133
  }
127
134
 
135
+ _toContainerPoint(e) {
136
+ return new Point(e.clientX, e.clientY)._subtract(this._containerOrigin).unscaleBy(this._containerScale);
137
+ }
138
+
128
139
  _onPointerEnd() {
129
140
  DomEvent.off(this._map._container, 'pointermove', this._onPointerMove, this);
130
141
  DomEvent.off(this._map._container, 'pointerup pointercancel', this._onPointerEnd, this);
@@ -138,7 +149,7 @@ export class PinchZoomHandler extends Handler {
138
149
  cancelAnimationFrame(this._animRequest);
139
150
 
140
151
  // Pinch updates GridLayers' levels only when zoomSnap is off, so zoomSnap becomes noUpdate.
141
- if (this._map.options.zoomAnimation) {
152
+ if (this._map._zoomAnimated) {
142
153
  this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);
143
154
  } else {
144
155
  this._map._resetView(this._center, this._map._limitZoom(this._zoom));
@@ -223,7 +223,7 @@ export class ScrollWheelZoomHandler extends Handler {
223
223
  const debounce = this._map.options.wheelDebounceTime;
224
224
 
225
225
  this._delta += delta;
226
- this._lastMousePos = this._map.pointerEventToContainerPoint(e);
226
+ // resolving the container point reads layout, so defer it to _performZoom
227
227
  this._lastEvent = e;
228
228
 
229
229
  if (!this._startTime) {
@@ -249,18 +249,20 @@ export class ScrollWheelZoomHandler extends Handler {
249
249
  const d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4),
250
250
  d3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2,
251
251
  d4 = snap ? Math.ceil(d3 / snap) * snap : d3,
252
- delta = map._limitZoom(zoom + (this._delta > 0 ? d4 : -d4)) - zoom;
252
+ // with reduced motion, only zooms by up to one level are animated, so a hard scroll is capped to that
253
+ d5 = map._prefersReducedMotion() ? Math.min(d4, 1) : d4,
254
+ delta = map._limitZoom(zoom + (this._delta > 0 ? d5 : -d5)) - zoom;
253
255
 
254
256
  this._delta = 0;
255
257
  this._startTime = null;
256
258
 
257
- if (!delta) { return; }
259
+ if (!delta || map._zoomInputBlocked()) { return; }
258
260
 
259
261
  map._setUserEvent(this._lastEvent);
260
262
  if (map.options.scrollWheelZoom === 'center') {
261
263
  map.setZoom(zoom + delta);
262
264
  } else {
263
- map.setZoomAround(this._lastMousePos, zoom + delta);
265
+ map.setZoomAround(map.pointerEventToContainerPoint(this._lastEvent), zoom + delta);
264
266
  }
265
267
  }
266
268
 
@@ -1,7 +1,6 @@
1
1
  import {Handler} from '../../core/Handler.js';
2
2
  import * as DomEvent from '../../dom/DomEvent.js';
3
3
  import {Point} from '../../geometry/Point.js';
4
- import Browser from '../../core/Browser.js';
5
4
  import * as PointerEvents from '../../dom/DomEvent.PointerEvents.js';
6
5
  /** @import {MaplairMap} from '../Map.js' */
7
6
 
@@ -11,8 +10,8 @@ const tapHoldDelay = 600;
11
10
  * Map options of `TapHoldHandler`, touch interaction options.
12
11
  * @typedef {object} TapHoldHandlerMapOptions
13
12
  * @lends MaplairMapOptions
14
- * @property {boolean} [tapHold] Enables simulation of `contextmenu` event, default is
15
- * `true` for mobile Safari.
13
+ * @property {boolean} [tapHold=true] Enables simulation of `contextmenu` event on touch
14
+ * and hold.
16
15
  * @property {number} [tapTolerance=15] The max number of pixels a user can shift his
17
16
  * finger during touch for it to be considered a valid tap.
18
17
  */
@@ -52,6 +51,7 @@ export class TapHoldHandler extends Handler {
52
51
  DomEvent.off(this._map._container, 'pointerdown', this._onDown, this);
53
52
  this._cancel();
54
53
  this._cancelClickPrevent();
54
+ this._stopPreventingNative();
55
55
  }
56
56
 
57
57
  _onDown(e) {
@@ -68,6 +68,11 @@ export class TapHoldHandler extends Handler {
68
68
  DomEvent.on(el, 'pointerup', DomEvent.preventDefault);
69
69
  DomEvent.on(el, 'pointerup pointercancel', this._cancelClickPrevent, this);
70
70
  this._simulateEvent('contextmenu', e);
71
+
72
+ // browsers that fire a native contextmenu on touch may do it later than us (e.g. Android with a longer
73
+ // touch & hold delay, or Windows on release), so swallow it until the next press
74
+ el.addEventListener('contextmenu', DomEvent.stop, true);
75
+ el.addEventListener('pointerdown', this._stopPreventingNative, true);
71
76
  }), tapHoldDelay);
72
77
 
73
78
  DomEvent.on(el, 'pointerup pointercancel contextmenu', this._cancel, this);
@@ -80,6 +85,12 @@ export class TapHoldHandler extends Handler {
80
85
  DomEvent.off(el, 'pointerup pointercancel', this._cancelClickPrevent, this);
81
86
  };
82
87
 
88
+ _stopPreventingNative = () => {
89
+ const el = this._map._container;
90
+ el.removeEventListener('contextmenu', DomEvent.stop, true);
91
+ el.removeEventListener('pointerdown', this._stopPreventingNative, true);
92
+ };
93
+
83
94
  _cancel() {
84
95
  clearTimeout(this._holdTimeout);
85
96
  const el = this._map._container;
@@ -121,7 +132,7 @@ export class TapHoldHandler extends Handler {
121
132
  */
122
133
  static register(MaplairMap) {
123
134
  MaplairMap.mergeOptions({
124
- tapHold: Browser.safari && Browser.mobile,
135
+ tapHold: true,
125
136
  tapTolerance: 15
126
137
  });
127
138
 
package/src/map/index.js CHANGED
@@ -1,4 +1,4 @@
1
- export {Map, MaplairMap} from './Map.js';
1
+ export {LeafletMap, Map, MaplairMap} from './Map.js';
2
2
  export {Hash} from './Hash.js';
3
3
  export {MapSync} from './MapSync.js';
4
4
  export {BoxZoomHandler} from './handler/BoxZoomHandler.js';