maplair 4.0.0 → 4.2.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 (305) hide show
  1. package/CHANGELOG.md +178 -0
  2. package/dist/esm/Maplair.js +18 -17
  3. package/dist/esm/Maplair.js.map +1 -1
  4. package/dist/esm/_virtual/_rolldown/runtime.js +1 -2
  5. package/dist/esm/control/AttributionControl.js +25 -16
  6. package/dist/esm/control/AttributionControl.js.map +1 -1
  7. package/dist/esm/control/ButtonControl.js +10 -13
  8. package/dist/esm/control/ButtonControl.js.map +1 -1
  9. package/dist/esm/control/ContextMenu.js +2 -5
  10. package/dist/esm/control/ContextMenu.js.map +1 -1
  11. package/dist/esm/control/Control.js +10 -18
  12. package/dist/esm/control/Control.js.map +1 -1
  13. package/dist/esm/control/FullscreenControl.js +6 -9
  14. package/dist/esm/control/FullscreenControl.js.map +1 -1
  15. package/dist/esm/control/LayersControl.js +170 -65
  16. package/dist/esm/control/LayersControl.js.map +1 -1
  17. package/dist/esm/control/LegendControl.js +8 -11
  18. package/dist/esm/control/LegendControl.js.map +1 -1
  19. package/dist/esm/control/MiniMapControl.js +15 -18
  20. package/dist/esm/control/MiniMapControl.js.map +1 -1
  21. package/dist/esm/control/RotateControl.js +2 -5
  22. package/dist/esm/control/RotateControl.js.map +1 -1
  23. package/dist/esm/control/ScaleControl.js +8 -11
  24. package/dist/esm/control/ScaleControl.js.map +1 -1
  25. package/dist/esm/control/SearchControl.js +100 -19
  26. package/dist/esm/control/SearchControl.js.map +1 -1
  27. package/dist/esm/control/SideBySideControl.js +2 -5
  28. package/dist/esm/control/SideBySideControl.js.map +1 -1
  29. package/dist/esm/control/TextControl.js +6 -9
  30. package/dist/esm/control/TextControl.js.map +1 -1
  31. package/dist/esm/control/TimeControl.js +407 -0
  32. package/dist/esm/control/TimeControl.js.map +1 -0
  33. package/dist/esm/control/ZoomControl.js +23 -36
  34. package/dist/esm/control/ZoomControl.js.map +1 -1
  35. package/dist/esm/core/Class.js +28 -44
  36. package/dist/esm/core/Class.js.map +1 -1
  37. package/dist/esm/core/Events.js +22 -10
  38. package/dist/esm/core/Events.js.map +1 -1
  39. package/dist/esm/core/Handler.js +23 -14
  40. package/dist/esm/core/Handler.js.map +1 -1
  41. package/dist/esm/core/I18n.js +1 -2
  42. package/dist/esm/core/Util.js +15 -4
  43. package/dist/esm/core/Util.js.map +1 -1
  44. package/dist/esm/dom/DomEvent.DoubleTap.js +26 -24
  45. package/dist/esm/dom/DomEvent.DoubleTap.js.map +1 -1
  46. package/dist/esm/dom/DomEvent.PointerEvents.js +3 -18
  47. package/dist/esm/dom/DomEvent.PointerEvents.js.map +1 -1
  48. package/dist/esm/dom/DomEvent.js +18 -60
  49. package/dist/esm/dom/DomEvent.js.map +1 -1
  50. package/dist/esm/dom/DomUtil.js +15 -70
  51. package/dist/esm/dom/DomUtil.js.map +1 -1
  52. package/dist/esm/dom/Draggable.js +21 -21
  53. package/dist/esm/dom/Draggable.js.map +1 -1
  54. package/dist/esm/dom/PosAnimation.js +4 -27
  55. package/dist/esm/dom/PosAnimation.js.map +1 -1
  56. package/dist/esm/geo/LatLng.js +16 -7
  57. package/dist/esm/geo/LatLng.js.map +1 -1
  58. package/dist/esm/geo/LatLngBounds.js +9 -15
  59. package/dist/esm/geo/LatLngBounds.js.map +1 -1
  60. package/dist/esm/geo/crs/CRS.js +1 -2
  61. package/dist/esm/geo/crs/EPSG3395.js +5 -6
  62. package/dist/esm/geo/crs/EPSG3395.js.map +1 -1
  63. package/dist/esm/geo/crs/EPSG3857.js +5 -6
  64. package/dist/esm/geo/crs/EPSG3857.js.map +1 -1
  65. package/dist/esm/geo/crs/EPSG4326.js +4 -5
  66. package/dist/esm/geo/crs/EPSG4326.js.map +1 -1
  67. package/dist/esm/geo/crs/EarthCRS.js +3 -4
  68. package/dist/esm/geo/crs/EarthCRS.js.map +1 -1
  69. package/dist/esm/geo/crs/SimpleCRS.js +4 -5
  70. package/dist/esm/geo/crs/SimpleCRS.js.map +1 -1
  71. package/dist/esm/geo/projection/{Projection.LonLat.js → LonLatProjection.js} +5 -6
  72. package/dist/esm/geo/projection/LonLatProjection.js.map +1 -0
  73. package/dist/esm/geo/projection/{Projection.Mercator.js → MercatorProjection.js} +4 -5
  74. package/dist/esm/geo/projection/MercatorProjection.js.map +1 -0
  75. package/dist/esm/geo/projection/{Projection.SphericalMercator.js → SphericalMercatorProjection.js} +5 -6
  76. package/dist/esm/geo/projection/SphericalMercatorProjection.js.map +1 -0
  77. package/dist/esm/geometry/Bounds.js +10 -14
  78. package/dist/esm/geometry/Bounds.js.map +1 -1
  79. package/dist/esm/geometry/LineUtil.js +37 -32
  80. package/dist/esm/geometry/LineUtil.js.map +1 -1
  81. package/dist/esm/geometry/Point.js +1 -2
  82. package/dist/esm/geometry/PolyUtil.js +24 -51
  83. package/dist/esm/geometry/PolyUtil.js.map +1 -1
  84. package/dist/esm/geometry/Transformation.js +1 -2
  85. package/dist/esm/layer/BlanketOverlay.js +7 -10
  86. package/dist/esm/layer/BlanketOverlay.js.map +1 -1
  87. package/dist/esm/layer/Classification.js +1 -2
  88. package/dist/esm/layer/DivOverlay.js +16 -22
  89. package/dist/esm/layer/DivOverlay.js.map +1 -1
  90. package/dist/esm/layer/FeatureGroup.js +5 -4
  91. package/dist/esm/layer/FeatureGroup.js.map +1 -1
  92. package/dist/esm/layer/GeoJSON.Load.js +1 -2
  93. package/dist/esm/layer/GeoJSON.js +17 -155
  94. package/dist/esm/layer/GeoJSON.js.map +1 -1
  95. package/dist/esm/layer/GeoJSONUtil.js +74 -0
  96. package/dist/esm/layer/GeoJSONUtil.js.map +1 -0
  97. package/dist/esm/layer/HeatLayer.js +17 -20
  98. package/dist/esm/layer/HeatLayer.js.map +1 -1
  99. package/dist/esm/layer/ImageOverlay.js +22 -29
  100. package/dist/esm/layer/ImageOverlay.js.map +1 -1
  101. package/dist/esm/layer/Layer.js +9 -12
  102. package/dist/esm/layer/Layer.js.map +1 -1
  103. package/dist/esm/layer/LayerGroup.js +53 -3
  104. package/dist/esm/layer/LayerGroup.js.map +1 -1
  105. package/dist/esm/layer/Popup.js +35 -58
  106. package/dist/esm/layer/Popup.js.map +1 -1
  107. package/dist/esm/layer/SVGOverlay.js +3 -7
  108. package/dist/esm/layer/SVGOverlay.js.map +1 -1
  109. package/dist/esm/layer/Tooltip.js +31 -34
  110. package/dist/esm/layer/Tooltip.js.map +1 -1
  111. package/dist/esm/layer/VideoOverlay.js +13 -17
  112. package/dist/esm/layer/VideoOverlay.js.map +1 -1
  113. package/dist/esm/layer/marker/DefaultIcon.js +38 -49
  114. package/dist/esm/layer/marker/DefaultIcon.js.map +1 -1
  115. package/dist/esm/layer/marker/DivIcon.js +8 -11
  116. package/dist/esm/layer/marker/DivIcon.js.map +1 -1
  117. package/dist/esm/layer/marker/Icon.js +9 -12
  118. package/dist/esm/layer/marker/Icon.js.map +1 -1
  119. package/dist/esm/layer/marker/Marker.Drag.js +44 -5
  120. package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
  121. package/dist/esm/layer/marker/Marker.Move.js +5 -8
  122. package/dist/esm/layer/marker/Marker.Move.js.map +1 -1
  123. package/dist/esm/layer/marker/Marker.js +115 -47
  124. package/dist/esm/layer/marker/Marker.js.map +1 -1
  125. package/dist/esm/layer/marker/MarkerClusterGroup.js +301 -0
  126. package/dist/esm/layer/marker/MarkerClusterGroup.js.map +1 -0
  127. package/dist/esm/layer/marker/SvgIcon.js +7 -10
  128. package/dist/esm/layer/marker/SvgIcon.js.map +1 -1
  129. package/dist/esm/layer/tile/GridLayer.js +89 -101
  130. package/dist/esm/layer/tile/GridLayer.js.map +1 -1
  131. package/dist/esm/layer/tile/TileLayer.js +36 -44
  132. package/dist/esm/layer/tile/TileLayer.js.map +1 -1
  133. package/dist/esm/layer/tile/WMSTileLayer.js +33 -27
  134. package/dist/esm/layer/tile/WMSTileLayer.js.map +1 -1
  135. package/dist/esm/layer/vector/Canvas.js +8 -17
  136. package/dist/esm/layer/vector/Canvas.js.map +1 -1
  137. package/dist/esm/layer/vector/Circle.js +6 -5
  138. package/dist/esm/layer/vector/Circle.js.map +1 -1
  139. package/dist/esm/layer/vector/CircleMarker.js +19 -10
  140. package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
  141. package/dist/esm/layer/vector/Path.DashAnimation.js +3 -5
  142. package/dist/esm/layer/vector/Path.DashAnimation.js.map +1 -1
  143. package/dist/esm/layer/vector/Path.ZoomStyles.js +1 -2
  144. package/dist/esm/layer/vector/Path.js +28 -22
  145. package/dist/esm/layer/vector/Path.js.map +1 -1
  146. package/dist/esm/layer/vector/Polygon.js +22 -7
  147. package/dist/esm/layer/vector/Polygon.js.map +1 -1
  148. package/dist/esm/layer/vector/Polyline.Decorations.js +3 -4
  149. package/dist/esm/layer/vector/Polyline.js +25 -10
  150. package/dist/esm/layer/vector/Polyline.js.map +1 -1
  151. package/dist/esm/layer/vector/Rectangle.js +1 -2
  152. package/dist/esm/layer/vector/Renderer.getRenderer.js +17 -17
  153. package/dist/esm/layer/vector/Renderer.getRenderer.js.map +1 -1
  154. package/dist/esm/layer/vector/Renderer.js +1 -2
  155. package/dist/esm/layer/vector/SVG.js +12 -9
  156. package/dist/esm/layer/vector/SVG.js.map +1 -1
  157. package/dist/esm/map/Hash.js +1 -2
  158. package/dist/esm/map/Map.Rotation.js +41 -22
  159. package/dist/esm/map/Map.Rotation.js.map +1 -1
  160. package/dist/esm/map/Map.js +125 -126
  161. package/dist/esm/map/Map.js.map +1 -1
  162. package/dist/esm/map/MapSync.js +1 -2
  163. package/dist/esm/map/handler/BoxZoomHandler.js +25 -47
  164. package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
  165. package/dist/esm/map/handler/DisplaceHandler.js +7 -10
  166. package/dist/esm/map/handler/DisplaceHandler.js.map +1 -1
  167. package/dist/esm/map/handler/DoubleClickZoomHandler.js +1 -2
  168. package/dist/esm/map/handler/DragHandler.js +20 -21
  169. package/dist/esm/map/handler/DragHandler.js.map +1 -1
  170. package/dist/esm/map/handler/KeyboardHandler.js +48 -68
  171. package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
  172. package/dist/esm/map/handler/PinchZoomHandler.js +13 -5
  173. package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
  174. package/dist/esm/map/handler/ScrollWheelZoomHandler.js +4 -6
  175. package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
  176. package/dist/esm/map/handler/TapDragZoomHandler.js +1 -2
  177. package/dist/esm/map/handler/TapHoldHandler.js +13 -7
  178. package/dist/esm/map/handler/TapHoldHandler.js.map +1 -1
  179. package/dist/esm/package.js +2 -3
  180. package/dist/maplair-global-src.js +6495 -5981
  181. package/dist/maplair-global-src.js.map +1 -1
  182. package/dist/maplair-global.js +2 -2
  183. package/dist/maplair-global.js.map +1 -1
  184. package/dist/maplair-src.js +6206 -5673
  185. package/dist/maplair-src.js.map +1 -1
  186. package/dist/maplair.css +1 -1213
  187. package/dist/maplair.js +2 -2
  188. package/dist/maplair.js.map +1 -1
  189. package/i18n/cs.json +6 -0
  190. package/i18n/de.json +6 -0
  191. package/i18n/en.json +6 -0
  192. package/i18n/es.json +6 -0
  193. package/i18n/fr.json +6 -0
  194. package/i18n/hu.json +6 -0
  195. package/i18n/it.json +6 -0
  196. package/i18n/rm.json +6 -0
  197. package/i18n/sk.json +6 -0
  198. package/i18n/sl.json +6 -0
  199. package/package.json +11 -18
  200. package/src/Maplair.all.js +0 -1
  201. package/src/control/AttributionControl.js +25 -18
  202. package/src/control/ButtonControl.js +9 -11
  203. package/src/control/ContextMenu.js +3 -5
  204. package/src/control/Control.js +9 -19
  205. package/src/control/FullscreenControl.js +5 -7
  206. package/src/control/LayersControl.js +196 -86
  207. package/src/control/LegendControl.js +7 -9
  208. package/src/control/MiniMapControl.js +9 -11
  209. package/src/control/RotateControl.js +3 -5
  210. package/src/control/ScaleControl.js +7 -9
  211. package/src/control/SearchControl.js +102 -19
  212. package/src/control/SideBySideControl.js +3 -5
  213. package/src/control/TextControl.js +5 -7
  214. package/src/control/TimeControl.js +471 -0
  215. package/src/control/ZoomControl.js +22 -38
  216. package/src/control/index.js +1 -0
  217. package/src/core/Class.js +37 -45
  218. package/src/core/Events.js +22 -3
  219. package/src/core/Handler.js +25 -13
  220. package/src/core/Util.js +20 -2
  221. package/src/core/index.js +0 -1
  222. package/src/dom/DomEvent.DoubleTap.js +18 -10
  223. package/src/dom/DomEvent.PointerEvents.js +3 -26
  224. package/src/dom/DomEvent.js +17 -85
  225. package/src/dom/DomUtil.js +22 -78
  226. package/src/dom/Draggable.js +32 -23
  227. package/src/dom/PosAnimation.js +3 -25
  228. package/src/dom/index.js +0 -1
  229. package/src/geo/LatLng.js +20 -3
  230. package/src/geo/LatLngBounds.js +8 -15
  231. package/src/geo/crs/EPSG3395.js +4 -4
  232. package/src/geo/crs/EPSG3857.js +4 -4
  233. package/src/geo/crs/EPSG4326.js +3 -3
  234. package/src/geo/crs/EarthCRS.js +2 -8
  235. package/src/geo/crs/SimpleCRS.js +3 -3
  236. package/src/geo/index.js +1 -2
  237. package/src/geo/projection/{Projection.LonLat.js → LonLatProjection.js} +2 -2
  238. package/src/geo/projection/{Projection.Mercator.js → MercatorProjection.js} +2 -2
  239. package/src/geo/projection/{Projection.SphericalMercator.js → SphericalMercatorProjection.js} +2 -2
  240. package/src/geo/projection/index.js +5 -5
  241. package/src/geometry/Bounds.js +12 -17
  242. package/src/geometry/LineUtil.js +48 -49
  243. package/src/geometry/PolyUtil.js +39 -76
  244. package/src/layer/BlanketOverlay.js +6 -10
  245. package/src/layer/DivOverlay.js +16 -27
  246. package/src/layer/FeatureGroup.js +8 -2
  247. package/src/layer/GeoJSON.js +17 -218
  248. package/src/layer/GeoJSONUtil.js +85 -0
  249. package/src/layer/HeatLayer.js +10 -12
  250. package/src/layer/ImageOverlay.js +21 -32
  251. package/src/layer/Layer.js +8 -10
  252. package/src/layer/LayerGroup.js +72 -1
  253. package/src/layer/Popup.js +37 -62
  254. package/src/layer/SVGOverlay.js +1 -5
  255. package/src/layer/Tooltip.js +34 -36
  256. package/src/layer/VideoOverlay.js +12 -15
  257. package/src/layer/marker/DefaultIcon.js +40 -58
  258. package/src/layer/marker/DivIcon.js +9 -11
  259. package/src/layer/marker/Icon.js +9 -10
  260. package/src/layer/marker/Marker.Drag.js +54 -6
  261. package/src/layer/marker/Marker.Move.js +4 -6
  262. package/src/layer/marker/Marker.js +145 -52
  263. package/src/layer/marker/MarkerClusterGroup.js +370 -0
  264. package/src/layer/marker/SvgIcon.js +7 -9
  265. package/src/layer/marker/index.js +1 -0
  266. package/src/layer/tile/GridLayer.js +108 -135
  267. package/src/layer/tile/TileLayer.js +44 -49
  268. package/src/layer/tile/WMSTileLayer.js +31 -26
  269. package/src/layer/vector/Canvas.js +13 -19
  270. package/src/layer/vector/Circle.js +9 -3
  271. package/src/layer/vector/CircleMarker.js +19 -7
  272. package/src/layer/vector/Path.DashAnimation.js +1 -2
  273. package/src/layer/vector/Path.js +30 -21
  274. package/src/layer/vector/Polygon.js +29 -6
  275. package/src/layer/vector/Polyline.js +26 -7
  276. package/src/layer/vector/Renderer.getRenderer.js +20 -19
  277. package/src/layer/vector/SVG.js +17 -7
  278. package/src/map/Map.Rotation.js +40 -8
  279. package/src/map/Map.js +158 -153
  280. package/src/map/handler/BoxZoomHandler.js +30 -50
  281. package/src/map/handler/DisplaceHandler.js +6 -8
  282. package/src/map/handler/DragHandler.js +25 -28
  283. package/src/map/handler/KeyboardHandler.js +65 -90
  284. package/src/map/handler/PinchZoomHandler.js +16 -5
  285. package/src/map/handler/ScrollWheelZoomHandler.js +6 -4
  286. package/src/map/handler/TapHoldHandler.js +15 -4
  287. package/src/map/index.js +1 -1
  288. package/src/maplair.css +153 -98
  289. package/dist/esm/core/Browser.js +0 -100
  290. package/dist/esm/core/Browser.js.map +0 -1
  291. package/dist/esm/geo/projection/Projection.LonLat.js.map +0 -1
  292. package/dist/esm/geo/projection/Projection.Mercator.js.map +0 -1
  293. package/dist/esm/geo/projection/Projection.SphericalMercator.js.map +0 -1
  294. package/dist/esm/geo/projection/index.js +0 -14
  295. package/dist/esm/geo/projection/index.js.map +0 -1
  296. package/dist/esm/layer/marker/Marker.Rotation.js +0 -70
  297. package/dist/esm/layer/marker/Marker.Rotation.js.map +0 -1
  298. package/dist/images/layers.svg +0 -1
  299. package/dist/images/marker-icon.svg +0 -1
  300. package/dist/images/marker-shadow.svg +0 -1
  301. package/src/core/Browser.js +0 -110
  302. package/src/images/layers.svg +0 -1
  303. package/src/images/marker-icon.svg +0 -1
  304. package/src/images/marker-shadow.svg +0 -1
  305. package/src/layer/marker/Marker.Rotation.js +0 -103
@@ -43,11 +43,6 @@ export class BoxZoomHandler extends Handler {
43
43
  */
44
44
  constructor(map) {
45
45
  super(map);
46
- this._container = map._container;
47
- this._pane = map._panes.overlayPane;
48
- this._resetStateTimeout = 0;
49
- map.on('unload', this._destroy, this);
50
-
51
46
  this.callInitHooks(BoxZoomHandler);
52
47
  }
53
48
 
@@ -55,14 +50,14 @@ export class BoxZoomHandler extends Handler {
55
50
  * Called when the handler is enabled, adds the event hooks.
56
51
  */
57
52
  addHooks() {
58
- DomEvent.on(this._container, 'pointerdown', this._onPointerDown, this);
53
+ DomEvent.on(this._map._container, 'pointerdown', this._onPointerDown, this);
59
54
  }
60
55
 
61
56
  /**
62
57
  * Called when the handler is disabled, removes the event hooks.
63
58
  */
64
59
  removeHooks() {
65
- DomEvent.off(this._container, 'pointerdown', this._onPointerDown, this);
60
+ DomEvent.off(this._map._container, 'pointerdown', this._onPointerDown, this);
66
61
  }
67
62
 
68
63
  /**
@@ -73,56 +68,48 @@ export class BoxZoomHandler extends Handler {
73
68
  return this._moved;
74
69
  }
75
70
 
76
- _destroy() {
77
- this._pane.remove();
78
- delete this._pane;
79
- }
80
-
81
71
  _resetState() {
82
- this._resetStateTimeout = 0;
72
+ clearTimeout(this._resetStateTimeout);
83
73
  this._moved = false;
84
74
  }
85
75
 
86
- _clearDeferredResetState() {
87
- if (this._resetStateTimeout !== 0) {
88
- clearTimeout(this._resetStateTimeout);
89
- this._resetStateTimeout = 0;
90
- }
76
+ _toggleListeners(onOff) {
77
+ onOff(this._map._container, {
78
+ contextmenu: DomEvent.stop,
79
+ pointermove: this._onPointerMove,
80
+ pointerup: this._onPointerUp
81
+ }, this);
82
+ onOff(document, 'keydown', this._onKeyDown, this);
91
83
  }
92
84
 
93
85
  _onPointerDown(e) {
94
86
  if (!e.shiftKey || (e.button !== 0)) { return false; }
95
87
 
96
- // Clear the deferred resetState if it hasn't executed yet, otherwise it
97
- // will interrupt the interaction and orphan a box element in the container.
98
- this._clearDeferredResetState();
88
+ // also cancels a deferred reset that hasn't run yet, which would interrupt the interaction and orphan a box
99
89
  this._resetState();
100
90
 
101
- DomUtil.disableTextSelection();
102
- DomUtil.disableImageDrag();
91
+ // stops both text selection and native image drag in every engine without restyling the page; it also
92
+ // suppresses compatibility mouse events, which is fine for a press that is already a box zoom gesture
93
+ DomEvent.preventDefault(e);
103
94
 
104
95
  this._startPoint = this._map.pointerEventToContainerPoint(e);
105
96
 
106
- DomEvent.on(this._container, {
107
- contextmenu: DomEvent.stop,
108
- pointermove: this._onPointerMove,
109
- pointerup: this._onPointerUp,
110
- keydown: this._onKeyDown
111
- }, this);
112
- DomEvent.on(document, 'keydown', this._onKeyDown, this);
97
+ this._toggleListeners(DomEvent.on);
113
98
  }
114
99
 
115
100
  _onPointerMove(e) {
101
+ const map = this._map;
102
+
116
103
  if (!this._moved) {
117
104
  this._moved = true;
118
105
 
119
- this._box = DomUtil.create('div', 'maplair-zoom-box', this._container);
120
- this._container.classList.add('maplair-crosshair');
106
+ this._box = DomUtil.create('div', 'maplair-zoom-box', map._container);
107
+ map._container.classList.add('maplair-crosshair');
121
108
 
122
- this._map.fire('boxzoomstart');
109
+ map.fire('boxzoomstart');
123
110
  }
124
111
 
125
- this._point = this._map.pointerEventToContainerPoint(e);
112
+ this._point = map.pointerEventToContainerPoint(e);
126
113
 
127
114
  const bounds = new Bounds(this._point, this._startPoint),
128
115
  size = bounds.getSize();
@@ -136,18 +123,10 @@ export class BoxZoomHandler extends Handler {
136
123
  _finish() {
137
124
  if (this._moved) {
138
125
  this._box.remove();
139
- this._container.classList.remove('maplair-crosshair');
126
+ this._map._container.classList.remove('maplair-crosshair');
140
127
  }
141
128
 
142
- DomUtil.enableTextSelection();
143
- DomUtil.enableImageDrag();
144
-
145
- DomEvent.off(this._container, {
146
- contextmenu: DomEvent.stop,
147
- pointermove: this._onPointerMove,
148
- pointerup: this._onPointerUp,
149
- }, this);
150
- DomEvent.off(document, 'keydown', this._onKeyDown, this);
129
+ this._toggleListeners(DomEvent.off);
151
130
  }
152
131
 
153
132
  _onPointerUp(e) {
@@ -158,23 +137,24 @@ export class BoxZoomHandler extends Handler {
158
137
  if (!this._moved) { return; }
159
138
  // Postpone to next JS tick so internal click event handling
160
139
  // still see it as "moved".
161
- this._clearDeferredResetState();
162
- this._resetStateTimeout = setTimeout(this._resetState.bind(this), 0);
140
+ this._resetStateTimeout = setTimeout(() => this._resetState(), 0);
163
141
 
164
142
  const bounds = new LatLngBounds(
165
143
  this._map.containerPointToLatLng(this._startPoint),
166
144
  this._map.containerPointToLatLng(this._point));
167
145
 
168
146
  this._map._setUserEvent(e);
169
- this._map
170
- .fitBounds(bounds)
171
- .fire('boxzoomend', {boxZoomBounds: bounds});
147
+ // a tiny box can collapse to a single LatLng at very high zoom, which fits at an Infinity zoom when no layer
148
+ // limits it; unlike fitBounds before a tile layer is added, no layer will come along to clamp it (#6709)
149
+ if (this._map.getBoundsZoom(bounds) !== Infinity) {
150
+ this._map.fitBounds(bounds);
151
+ }
152
+ this._map.fire('boxzoomend', {boxZoomBounds: bounds});
172
153
  }
173
154
 
174
155
  _onKeyDown(e) {
175
156
  if (e.code === 'Escape') {
176
157
  this._finish();
177
- this._clearDeferredResetState();
178
158
  this._resetState();
179
159
  }
180
160
  }
@@ -93,13 +93,11 @@ function displaceable(layer) {
93
93
  * ```
94
94
  */
95
95
  export class DisplaceHandler extends Handler {
96
- static {
97
- this.setDefaultOptions({
98
- gap: 2,
99
- iterations: 80,
100
- maxDistance: Infinity
101
- });
102
- }
96
+ static defaultOptions = {
97
+ gap: 2,
98
+ iterations: 80,
99
+ maxDistance: Infinity
100
+ };
103
101
 
104
102
  /**
105
103
  * @param {...MaplairMap} args The map.
@@ -317,7 +315,7 @@ export class DisplaceHandler extends Handler {
317
315
  export function displace(
318
316
  points,
319
317
  minSeparation,
320
- {iterations = DisplaceHandler.prototype.options.iterations, maxDisplacement = Infinity} = {},
318
+ {iterations = DisplaceHandler.defaultOptions.iterations, maxDisplacement = Infinity} = {},
321
319
  ) {
322
320
  const n = points.length;
323
321
  if (n < 2) { return points; }
@@ -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
  /**
@@ -51,10 +57,6 @@ export class KeyboardHandler extends Handler {
51
57
  */
52
58
  constructor(map) {
53
59
  super(map);
54
-
55
- this._setPanDelta(map.options.keyboardPanDelta);
56
- this._setZoomDelta(map.options.zoomDelta);
57
-
58
60
  this.callInitHooks(KeyboardHandler);
59
61
  }
60
62
 
@@ -66,21 +68,21 @@ export class KeyboardHandler extends Handler {
66
68
 
67
69
  // make the container focusable by tabbing
68
70
  if (container.tabIndex <= 0) {
69
- container.tabIndex = '0';
71
+ container.tabIndex = 0;
70
72
  }
71
73
 
72
- // add aria-attribute for keyboard shortcuts to the container
73
- container.ariaKeyShortcuts = Object.values(KeyboardHandler.keyCodes).flat().join(' ');
74
+ const shortcuts = this._map.options.ariaKeyShortcuts;
75
+ if (shortcuts) {
76
+ // ARIA names physical keys by their unshifted character, so the default is for a US layout
77
+ container.ariaKeyShortcuts = shortcuts === true ?
78
+ 'ArrowLeft ArrowRight ArrowUp ArrowDown = Plus -' : shortcuts;
79
+ }
74
80
 
75
81
  on(container, {
76
82
  focus: this._onFocus,
77
83
  blur: this._onBlur,
78
- pointerdown: this._onPointerDown
79
- }, this);
80
-
81
- this._map.on({
82
- focus: this._addHooks,
83
- blur: this._removeHooks
84
+ pointerdown: this._onPointerDown,
85
+ keydown: this._onContainerKeyDown
84
86
  }, this);
85
87
  }
86
88
 
@@ -88,17 +90,17 @@ export class KeyboardHandler extends Handler {
88
90
  * Called when the handler is disabled, removes the event hooks.
89
91
  */
90
92
  removeHooks() {
91
- this._removeHooks();
93
+ off(document, 'keydown', this._onKeyDown, this);
94
+
95
+ if (this._map.options.ariaKeyShortcuts) {
96
+ this._map._container.removeAttribute('aria-keyshortcuts');
97
+ }
92
98
 
93
99
  off(this._map._container, {
94
100
  focus: this._onFocus,
95
101
  blur: this._onBlur,
96
- pointerdown: this._onPointerDown
97
- }, this);
98
-
99
- this._map.off({
100
- focus: this._addHooks,
101
- blur: this._removeHooks
102
+ pointerdown: this._onPointerDown,
103
+ keydown: this._onContainerKeyDown
102
104
  }, this);
103
105
 
104
106
  this._help?.remove();
@@ -146,62 +148,40 @@ export class KeyboardHandler extends Handler {
146
148
  _onPointerDown() {
147
149
  if (this._focused) { return; }
148
150
 
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);
151
+ // script focus matches :focus-visible by default, which would show a focus ring on every click
152
+ this._map._container.focus({preventScroll: true, focusVisible: false});
157
153
  }
158
154
 
159
155
  _onFocus() {
160
156
  this._focused = true;
157
+ on(document, 'keydown', this._onKeyDown, this);
161
158
  this._map.fire('focus');
162
159
  }
163
160
 
164
161
  _onBlur() {
165
162
  this._focused = false;
163
+ off(document, 'keydown', this._onKeyDown, this);
166
164
  this._map.fire('blur');
167
165
  }
168
166
 
169
- _setPanDelta(panDelta) {
170
- const keys = this._panKeys = {},
171
- codes = KeyboardHandler.keyCodes;
167
+ // on the container rather than the document, so that Escape also works when focus is on a marker or
168
+ // inside the popup, which blurs the container and removes the document listener; controls are left
169
+ // out so that e.g. Escape in a geocoder input doesn't close an unrelated popup
170
+ _onContainerKeyDown(e) {
171
+ const map = this._map,
172
+ popup = map._popup;
172
173
 
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
- }
185
- }
174
+ if (e.key !== 'Escape' || e.defaultPrevented || !popup?.options.closeOnEscapeKey ||
175
+ map._controlContainer?.contains(e.target)) { return; }
186
176
 
187
- _setZoomDelta(zoomDelta) {
188
- const keys = this._zoomKeys = {},
189
- codes = KeyboardHandler.keyCodes;
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
- }
197
- }
177
+ const inPopup = popup._container.contains(e.target),
178
+ icon = popup._source?._icon;
198
179
 
199
- _addHooks() {
200
- on(document, 'keydown', this._onKeyDown, this);
201
- }
180
+ map.closePopup();
181
+ e.preventDefault();
202
182
 
203
- _removeHooks() {
204
- off(document, 'keydown', this._onKeyDown, this);
183
+ // closing removes the focused element, which would send focus back to the start of the page
184
+ if (inPopup) { (icon?.tabIndex >= 0 ? icon : map._container).focus(); }
205
185
  }
206
186
 
207
187
  _onKeyDown(e) {
@@ -213,35 +193,29 @@ export class KeyboardHandler extends Handler {
213
193
  return;
214
194
  }
215
195
 
216
- const key = e.code,
217
- map = this._map;
218
- let offset;
219
-
220
- if (key in this._panKeys) {
221
- if (!map._panAnim || !map._panAnim._inProgress) {
222
- offset = this._panKeys[key];
223
- if (e.shiftKey) {
224
- offset = Point.from(offset).multiplyBy(3);
225
- }
226
-
196
+ const key = e.key,
197
+ map = this._map,
198
+ {left, right, down, up, zoomIn, zoomOut} = KeyboardHandler.keys,
199
+ x = +right.includes(key) - +left.includes(key),
200
+ y = +down.includes(key) - +up.includes(key),
201
+ dz = +zoomIn.includes(key) - +zoomOut.includes(key),
202
+ k = e.shiftKey ? 3 : 1;
203
+
204
+ if (x || y) {
205
+ if (!map._panAnim?._inProgress) {
206
+ let offset = new Point(x, y).multiplyBy(k * map.options.keyboardPanDelta);
227
207
  if (map.options.maxBounds) {
228
- offset = map._limitOffset(Point.from(offset), map.options.maxBounds);
208
+ offset = map._limitOffset(offset, map.options.maxBounds);
229
209
  }
230
210
 
231
211
  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
- }
212
+ map.panBy(offset);
213
+ }
214
+ } else if (dz) {
215
+ if (!map._zoomInputBlocked()) {
216
+ map._setUserEvent(e);
217
+ map.setZoom(map.getZoom() + k * dz * map.options.zoomDelta);
238
218
  }
239
- } else if (key in this._zoomKeys) {
240
- map._setUserEvent(e);
241
- map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);
242
-
243
- } else if (key === 'Escape' && map._popup && map._popup.options.closeOnEscapeKey) {
244
- map.closePopup();
245
219
 
246
220
  } else {
247
221
  return;
@@ -258,7 +232,8 @@ export class KeyboardHandler extends Handler {
258
232
  static register(MaplairMap) {
259
233
  MaplairMap.mergeOptions({
260
234
  keyboard: true,
261
- keyboardPanDelta: 80
235
+ keyboardPanDelta: 80,
236
+ ariaKeyShortcuts: false
262
237
  });
263
238
 
264
239
  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