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.
- package/CHANGELOG.md +178 -0
- package/dist/esm/Maplair.js +18 -17
- package/dist/esm/Maplair.js.map +1 -1
- package/dist/esm/_virtual/_rolldown/runtime.js +1 -2
- package/dist/esm/control/AttributionControl.js +25 -16
- package/dist/esm/control/AttributionControl.js.map +1 -1
- package/dist/esm/control/ButtonControl.js +10 -13
- package/dist/esm/control/ButtonControl.js.map +1 -1
- package/dist/esm/control/ContextMenu.js +2 -5
- package/dist/esm/control/ContextMenu.js.map +1 -1
- package/dist/esm/control/Control.js +10 -18
- package/dist/esm/control/Control.js.map +1 -1
- package/dist/esm/control/FullscreenControl.js +6 -9
- package/dist/esm/control/FullscreenControl.js.map +1 -1
- package/dist/esm/control/LayersControl.js +170 -65
- package/dist/esm/control/LayersControl.js.map +1 -1
- package/dist/esm/control/LegendControl.js +8 -11
- package/dist/esm/control/LegendControl.js.map +1 -1
- package/dist/esm/control/MiniMapControl.js +15 -18
- package/dist/esm/control/MiniMapControl.js.map +1 -1
- package/dist/esm/control/RotateControl.js +2 -5
- package/dist/esm/control/RotateControl.js.map +1 -1
- package/dist/esm/control/ScaleControl.js +8 -11
- package/dist/esm/control/ScaleControl.js.map +1 -1
- package/dist/esm/control/SearchControl.js +100 -19
- package/dist/esm/control/SearchControl.js.map +1 -1
- package/dist/esm/control/SideBySideControl.js +2 -5
- package/dist/esm/control/SideBySideControl.js.map +1 -1
- package/dist/esm/control/TextControl.js +6 -9
- package/dist/esm/control/TextControl.js.map +1 -1
- package/dist/esm/control/TimeControl.js +407 -0
- package/dist/esm/control/TimeControl.js.map +1 -0
- package/dist/esm/control/ZoomControl.js +23 -36
- package/dist/esm/control/ZoomControl.js.map +1 -1
- package/dist/esm/core/Class.js +28 -44
- package/dist/esm/core/Class.js.map +1 -1
- package/dist/esm/core/Events.js +22 -10
- package/dist/esm/core/Events.js.map +1 -1
- package/dist/esm/core/Handler.js +23 -14
- package/dist/esm/core/Handler.js.map +1 -1
- package/dist/esm/core/I18n.js +1 -2
- package/dist/esm/core/Util.js +15 -4
- package/dist/esm/core/Util.js.map +1 -1
- package/dist/esm/dom/DomEvent.DoubleTap.js +26 -24
- package/dist/esm/dom/DomEvent.DoubleTap.js.map +1 -1
- package/dist/esm/dom/DomEvent.PointerEvents.js +3 -18
- package/dist/esm/dom/DomEvent.PointerEvents.js.map +1 -1
- package/dist/esm/dom/DomEvent.js +18 -60
- package/dist/esm/dom/DomEvent.js.map +1 -1
- package/dist/esm/dom/DomUtil.js +15 -70
- package/dist/esm/dom/DomUtil.js.map +1 -1
- package/dist/esm/dom/Draggable.js +21 -21
- package/dist/esm/dom/Draggable.js.map +1 -1
- package/dist/esm/dom/PosAnimation.js +4 -27
- package/dist/esm/dom/PosAnimation.js.map +1 -1
- package/dist/esm/geo/LatLng.js +16 -7
- package/dist/esm/geo/LatLng.js.map +1 -1
- package/dist/esm/geo/LatLngBounds.js +9 -15
- package/dist/esm/geo/LatLngBounds.js.map +1 -1
- package/dist/esm/geo/crs/CRS.js +1 -2
- package/dist/esm/geo/crs/EPSG3395.js +5 -6
- package/dist/esm/geo/crs/EPSG3395.js.map +1 -1
- package/dist/esm/geo/crs/EPSG3857.js +5 -6
- package/dist/esm/geo/crs/EPSG3857.js.map +1 -1
- package/dist/esm/geo/crs/EPSG4326.js +4 -5
- package/dist/esm/geo/crs/EPSG4326.js.map +1 -1
- package/dist/esm/geo/crs/EarthCRS.js +3 -4
- package/dist/esm/geo/crs/EarthCRS.js.map +1 -1
- package/dist/esm/geo/crs/SimpleCRS.js +4 -5
- package/dist/esm/geo/crs/SimpleCRS.js.map +1 -1
- package/dist/esm/geo/projection/{Projection.LonLat.js → LonLatProjection.js} +5 -6
- package/dist/esm/geo/projection/LonLatProjection.js.map +1 -0
- package/dist/esm/geo/projection/{Projection.Mercator.js → MercatorProjection.js} +4 -5
- package/dist/esm/geo/projection/MercatorProjection.js.map +1 -0
- package/dist/esm/geo/projection/{Projection.SphericalMercator.js → SphericalMercatorProjection.js} +5 -6
- package/dist/esm/geo/projection/SphericalMercatorProjection.js.map +1 -0
- package/dist/esm/geometry/Bounds.js +10 -14
- package/dist/esm/geometry/Bounds.js.map +1 -1
- package/dist/esm/geometry/LineUtil.js +37 -32
- package/dist/esm/geometry/LineUtil.js.map +1 -1
- package/dist/esm/geometry/Point.js +1 -2
- package/dist/esm/geometry/PolyUtil.js +24 -51
- package/dist/esm/geometry/PolyUtil.js.map +1 -1
- package/dist/esm/geometry/Transformation.js +1 -2
- package/dist/esm/layer/BlanketOverlay.js +7 -10
- package/dist/esm/layer/BlanketOverlay.js.map +1 -1
- package/dist/esm/layer/Classification.js +1 -2
- package/dist/esm/layer/DivOverlay.js +16 -22
- package/dist/esm/layer/DivOverlay.js.map +1 -1
- package/dist/esm/layer/FeatureGroup.js +5 -4
- package/dist/esm/layer/FeatureGroup.js.map +1 -1
- package/dist/esm/layer/GeoJSON.Load.js +1 -2
- package/dist/esm/layer/GeoJSON.js +17 -155
- package/dist/esm/layer/GeoJSON.js.map +1 -1
- package/dist/esm/layer/GeoJSONUtil.js +74 -0
- package/dist/esm/layer/GeoJSONUtil.js.map +1 -0
- package/dist/esm/layer/HeatLayer.js +17 -20
- package/dist/esm/layer/HeatLayer.js.map +1 -1
- package/dist/esm/layer/ImageOverlay.js +22 -29
- package/dist/esm/layer/ImageOverlay.js.map +1 -1
- package/dist/esm/layer/Layer.js +9 -12
- package/dist/esm/layer/Layer.js.map +1 -1
- package/dist/esm/layer/LayerGroup.js +53 -3
- package/dist/esm/layer/LayerGroup.js.map +1 -1
- package/dist/esm/layer/Popup.js +35 -58
- package/dist/esm/layer/Popup.js.map +1 -1
- package/dist/esm/layer/SVGOverlay.js +3 -7
- package/dist/esm/layer/SVGOverlay.js.map +1 -1
- package/dist/esm/layer/Tooltip.js +31 -34
- package/dist/esm/layer/Tooltip.js.map +1 -1
- package/dist/esm/layer/VideoOverlay.js +13 -17
- package/dist/esm/layer/VideoOverlay.js.map +1 -1
- package/dist/esm/layer/marker/DefaultIcon.js +38 -49
- package/dist/esm/layer/marker/DefaultIcon.js.map +1 -1
- package/dist/esm/layer/marker/DivIcon.js +8 -11
- package/dist/esm/layer/marker/DivIcon.js.map +1 -1
- package/dist/esm/layer/marker/Icon.js +9 -12
- package/dist/esm/layer/marker/Icon.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Drag.js +44 -5
- package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Move.js +5 -8
- package/dist/esm/layer/marker/Marker.Move.js.map +1 -1
- package/dist/esm/layer/marker/Marker.js +115 -47
- package/dist/esm/layer/marker/Marker.js.map +1 -1
- package/dist/esm/layer/marker/MarkerClusterGroup.js +301 -0
- package/dist/esm/layer/marker/MarkerClusterGroup.js.map +1 -0
- package/dist/esm/layer/marker/SvgIcon.js +7 -10
- package/dist/esm/layer/marker/SvgIcon.js.map +1 -1
- package/dist/esm/layer/tile/GridLayer.js +89 -101
- package/dist/esm/layer/tile/GridLayer.js.map +1 -1
- package/dist/esm/layer/tile/TileLayer.js +36 -44
- package/dist/esm/layer/tile/TileLayer.js.map +1 -1
- package/dist/esm/layer/tile/WMSTileLayer.js +33 -27
- package/dist/esm/layer/tile/WMSTileLayer.js.map +1 -1
- package/dist/esm/layer/vector/Canvas.js +8 -17
- package/dist/esm/layer/vector/Canvas.js.map +1 -1
- package/dist/esm/layer/vector/Circle.js +6 -5
- package/dist/esm/layer/vector/Circle.js.map +1 -1
- package/dist/esm/layer/vector/CircleMarker.js +19 -10
- package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
- package/dist/esm/layer/vector/Path.DashAnimation.js +3 -5
- package/dist/esm/layer/vector/Path.DashAnimation.js.map +1 -1
- package/dist/esm/layer/vector/Path.ZoomStyles.js +1 -2
- package/dist/esm/layer/vector/Path.js +28 -22
- package/dist/esm/layer/vector/Path.js.map +1 -1
- package/dist/esm/layer/vector/Polygon.js +22 -7
- package/dist/esm/layer/vector/Polygon.js.map +1 -1
- package/dist/esm/layer/vector/Polyline.Decorations.js +3 -4
- package/dist/esm/layer/vector/Polyline.js +25 -10
- package/dist/esm/layer/vector/Polyline.js.map +1 -1
- package/dist/esm/layer/vector/Rectangle.js +1 -2
- package/dist/esm/layer/vector/Renderer.getRenderer.js +17 -17
- package/dist/esm/layer/vector/Renderer.getRenderer.js.map +1 -1
- package/dist/esm/layer/vector/Renderer.js +1 -2
- package/dist/esm/layer/vector/SVG.js +12 -9
- package/dist/esm/layer/vector/SVG.js.map +1 -1
- package/dist/esm/map/Hash.js +1 -2
- package/dist/esm/map/Map.Rotation.js +41 -22
- package/dist/esm/map/Map.Rotation.js.map +1 -1
- package/dist/esm/map/Map.js +125 -126
- package/dist/esm/map/Map.js.map +1 -1
- package/dist/esm/map/MapSync.js +1 -2
- package/dist/esm/map/handler/BoxZoomHandler.js +25 -47
- package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/DisplaceHandler.js +7 -10
- package/dist/esm/map/handler/DisplaceHandler.js.map +1 -1
- package/dist/esm/map/handler/DoubleClickZoomHandler.js +1 -2
- package/dist/esm/map/handler/DragHandler.js +20 -21
- package/dist/esm/map/handler/DragHandler.js.map +1 -1
- package/dist/esm/map/handler/KeyboardHandler.js +48 -68
- package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
- package/dist/esm/map/handler/PinchZoomHandler.js +13 -5
- package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js +4 -6
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/TapDragZoomHandler.js +1 -2
- package/dist/esm/map/handler/TapHoldHandler.js +13 -7
- package/dist/esm/map/handler/TapHoldHandler.js.map +1 -1
- package/dist/esm/package.js +2 -3
- package/dist/maplair-global-src.js +6495 -5981
- package/dist/maplair-global-src.js.map +1 -1
- package/dist/maplair-global.js +2 -2
- package/dist/maplair-global.js.map +1 -1
- package/dist/maplair-src.js +6206 -5673
- package/dist/maplair-src.js.map +1 -1
- package/dist/maplair.css +1 -1213
- package/dist/maplair.js +2 -2
- package/dist/maplair.js.map +1 -1
- package/i18n/cs.json +6 -0
- package/i18n/de.json +6 -0
- package/i18n/en.json +6 -0
- package/i18n/es.json +6 -0
- package/i18n/fr.json +6 -0
- package/i18n/hu.json +6 -0
- package/i18n/it.json +6 -0
- package/i18n/rm.json +6 -0
- package/i18n/sk.json +6 -0
- package/i18n/sl.json +6 -0
- package/package.json +11 -18
- package/src/Maplair.all.js +0 -1
- package/src/control/AttributionControl.js +25 -18
- package/src/control/ButtonControl.js +9 -11
- package/src/control/ContextMenu.js +3 -5
- package/src/control/Control.js +9 -19
- package/src/control/FullscreenControl.js +5 -7
- package/src/control/LayersControl.js +196 -86
- package/src/control/LegendControl.js +7 -9
- package/src/control/MiniMapControl.js +9 -11
- package/src/control/RotateControl.js +3 -5
- package/src/control/ScaleControl.js +7 -9
- package/src/control/SearchControl.js +102 -19
- package/src/control/SideBySideControl.js +3 -5
- package/src/control/TextControl.js +5 -7
- package/src/control/TimeControl.js +471 -0
- package/src/control/ZoomControl.js +22 -38
- package/src/control/index.js +1 -0
- package/src/core/Class.js +37 -45
- package/src/core/Events.js +22 -3
- package/src/core/Handler.js +25 -13
- package/src/core/Util.js +20 -2
- package/src/core/index.js +0 -1
- package/src/dom/DomEvent.DoubleTap.js +18 -10
- package/src/dom/DomEvent.PointerEvents.js +3 -26
- package/src/dom/DomEvent.js +17 -85
- package/src/dom/DomUtil.js +22 -78
- package/src/dom/Draggable.js +32 -23
- package/src/dom/PosAnimation.js +3 -25
- package/src/dom/index.js +0 -1
- package/src/geo/LatLng.js +20 -3
- package/src/geo/LatLngBounds.js +8 -15
- package/src/geo/crs/EPSG3395.js +4 -4
- package/src/geo/crs/EPSG3857.js +4 -4
- package/src/geo/crs/EPSG4326.js +3 -3
- package/src/geo/crs/EarthCRS.js +2 -8
- package/src/geo/crs/SimpleCRS.js +3 -3
- package/src/geo/index.js +1 -2
- package/src/geo/projection/{Projection.LonLat.js → LonLatProjection.js} +2 -2
- package/src/geo/projection/{Projection.Mercator.js → MercatorProjection.js} +2 -2
- package/src/geo/projection/{Projection.SphericalMercator.js → SphericalMercatorProjection.js} +2 -2
- package/src/geo/projection/index.js +5 -5
- package/src/geometry/Bounds.js +12 -17
- package/src/geometry/LineUtil.js +48 -49
- package/src/geometry/PolyUtil.js +39 -76
- package/src/layer/BlanketOverlay.js +6 -10
- package/src/layer/DivOverlay.js +16 -27
- package/src/layer/FeatureGroup.js +8 -2
- package/src/layer/GeoJSON.js +17 -218
- package/src/layer/GeoJSONUtil.js +85 -0
- package/src/layer/HeatLayer.js +10 -12
- package/src/layer/ImageOverlay.js +21 -32
- package/src/layer/Layer.js +8 -10
- package/src/layer/LayerGroup.js +72 -1
- package/src/layer/Popup.js +37 -62
- package/src/layer/SVGOverlay.js +1 -5
- package/src/layer/Tooltip.js +34 -36
- package/src/layer/VideoOverlay.js +12 -15
- package/src/layer/marker/DefaultIcon.js +40 -58
- package/src/layer/marker/DivIcon.js +9 -11
- package/src/layer/marker/Icon.js +9 -10
- package/src/layer/marker/Marker.Drag.js +54 -6
- package/src/layer/marker/Marker.Move.js +4 -6
- package/src/layer/marker/Marker.js +145 -52
- package/src/layer/marker/MarkerClusterGroup.js +370 -0
- package/src/layer/marker/SvgIcon.js +7 -9
- package/src/layer/marker/index.js +1 -0
- package/src/layer/tile/GridLayer.js +108 -135
- package/src/layer/tile/TileLayer.js +44 -49
- package/src/layer/tile/WMSTileLayer.js +31 -26
- package/src/layer/vector/Canvas.js +13 -19
- package/src/layer/vector/Circle.js +9 -3
- package/src/layer/vector/CircleMarker.js +19 -7
- package/src/layer/vector/Path.DashAnimation.js +1 -2
- package/src/layer/vector/Path.js +30 -21
- package/src/layer/vector/Polygon.js +29 -6
- package/src/layer/vector/Polyline.js +26 -7
- package/src/layer/vector/Renderer.getRenderer.js +20 -19
- package/src/layer/vector/SVG.js +17 -7
- package/src/map/Map.Rotation.js +40 -8
- package/src/map/Map.js +158 -153
- package/src/map/handler/BoxZoomHandler.js +30 -50
- package/src/map/handler/DisplaceHandler.js +6 -8
- package/src/map/handler/DragHandler.js +25 -28
- package/src/map/handler/KeyboardHandler.js +65 -90
- package/src/map/handler/PinchZoomHandler.js +16 -5
- package/src/map/handler/ScrollWheelZoomHandler.js +6 -4
- package/src/map/handler/TapHoldHandler.js +15 -4
- package/src/map/index.js +1 -1
- package/src/maplair.css +153 -98
- package/dist/esm/core/Browser.js +0 -100
- package/dist/esm/core/Browser.js.map +0 -1
- package/dist/esm/geo/projection/Projection.LonLat.js.map +0 -1
- package/dist/esm/geo/projection/Projection.Mercator.js.map +0 -1
- package/dist/esm/geo/projection/Projection.SphericalMercator.js.map +0 -1
- package/dist/esm/geo/projection/index.js +0 -14
- package/dist/esm/geo/projection/index.js.map +0 -1
- package/dist/esm/layer/marker/Marker.Rotation.js +0 -70
- package/dist/esm/layer/marker/Marker.Rotation.js.map +0 -1
- package/dist/images/layers.svg +0 -1
- package/dist/images/marker-icon.svg +0 -1
- package/dist/images/marker-shadow.svg +0 -1
- package/src/core/Browser.js +0 -110
- package/src/images/layers.svg +0 -1
- package/src/images/marker-icon.svg +0 -1
- package/src/images/marker-shadow.svg +0 -1
- package/src/layer/marker/Marker.Rotation.js +0 -103
|
@@ -3,7 +3,7 @@ import { disableClickPropagation, disableScrollPropagation, off, on, stop } from
|
|
|
3
3
|
import { create } from "../../dom/DomUtil.js";
|
|
4
4
|
import { I18n } from "../../core/I18n.js";
|
|
5
5
|
import { Handler } from "../../core/Handler.js";
|
|
6
|
-
|
|
6
|
+
// src/map/handler/KeyboardHandler.js
|
|
7
7
|
/** @import {MaplairMap} from '../Map.js' */
|
|
8
8
|
/** @import {MaplairEvent} from '../../core/Events.js' */
|
|
9
9
|
/**
|
|
@@ -14,6 +14,10 @@ import { Handler } from "../../core/Handler.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
|
* Handler of `MaplairMap` for keyboard navigation.
|
|
@@ -30,34 +34,25 @@ import { Handler } from "../../core/Handler.js";
|
|
|
30
34
|
*/
|
|
31
35
|
var KeyboardHandler = class KeyboardHandler extends Handler {
|
|
32
36
|
/**
|
|
33
|
-
* The [
|
|
34
|
-
* of the keys for panning and zooming the map
|
|
37
|
+
* The [values](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key)
|
|
38
|
+
* of the keys for panning and zooming the map, so zoom keys follow the keyboard
|
|
39
|
+
* layout and cover the numpad too; `=` and `_` keep the US `+` and `-` keys working
|
|
40
|
+
* both with and without Shift.
|
|
35
41
|
* @type {Record<'left'|'right'|'down'|'up'|'zoomIn'|'zoomOut', string[]>}
|
|
36
42
|
*/
|
|
37
|
-
static
|
|
43
|
+
static keys = {
|
|
38
44
|
left: ["ArrowLeft"],
|
|
39
45
|
right: ["ArrowRight"],
|
|
40
46
|
down: ["ArrowDown"],
|
|
41
47
|
up: ["ArrowUp"],
|
|
42
|
-
zoomIn: [
|
|
43
|
-
|
|
44
|
-
"NumpadAdd",
|
|
45
|
-
"BracketRight"
|
|
46
|
-
],
|
|
47
|
-
zoomOut: [
|
|
48
|
-
"Minus",
|
|
49
|
-
"NumpadSubtract",
|
|
50
|
-
"Digit6",
|
|
51
|
-
"Slash"
|
|
52
|
-
]
|
|
48
|
+
zoomIn: ["+", "="],
|
|
49
|
+
zoomOut: ["-", "_"]
|
|
53
50
|
};
|
|
54
51
|
/**
|
|
55
52
|
* @param {MaplairMap} map
|
|
56
53
|
*/
|
|
57
54
|
constructor(map) {
|
|
58
55
|
super(map);
|
|
59
|
-
this._setPanDelta(map.options.keyboardPanDelta);
|
|
60
|
-
this._setZoomDelta(map.options.zoomDelta);
|
|
61
56
|
this.callInitHooks(KeyboardHandler);
|
|
62
57
|
}
|
|
63
58
|
/**
|
|
@@ -65,31 +60,27 @@ var KeyboardHandler = class KeyboardHandler extends Handler {
|
|
|
65
60
|
*/
|
|
66
61
|
addHooks() {
|
|
67
62
|
const container = this._map._container;
|
|
68
|
-
if (container.tabIndex <= 0) container.tabIndex =
|
|
69
|
-
|
|
63
|
+
if (container.tabIndex <= 0) container.tabIndex = 0;
|
|
64
|
+
const shortcuts = this._map.options.ariaKeyShortcuts;
|
|
65
|
+
if (shortcuts) container.ariaKeyShortcuts = shortcuts === true ? "ArrowLeft ArrowRight ArrowUp ArrowDown = Plus -" : shortcuts;
|
|
70
66
|
on(container, {
|
|
71
67
|
focus: this._onFocus,
|
|
72
68
|
blur: this._onBlur,
|
|
73
|
-
pointerdown: this._onPointerDown
|
|
74
|
-
|
|
75
|
-
this._map.on({
|
|
76
|
-
focus: this._addHooks,
|
|
77
|
-
blur: this._removeHooks
|
|
69
|
+
pointerdown: this._onPointerDown,
|
|
70
|
+
keydown: this._onContainerKeyDown
|
|
78
71
|
}, this);
|
|
79
72
|
}
|
|
80
73
|
/**
|
|
81
74
|
* Called when the handler is disabled, removes the event hooks.
|
|
82
75
|
*/
|
|
83
76
|
removeHooks() {
|
|
84
|
-
this.
|
|
77
|
+
off(document, "keydown", this._onKeyDown, this);
|
|
78
|
+
if (this._map.options.ariaKeyShortcuts) this._map._container.removeAttribute("aria-keyshortcuts");
|
|
85
79
|
off(this._map._container, {
|
|
86
80
|
focus: this._onFocus,
|
|
87
81
|
blur: this._onBlur,
|
|
88
|
-
pointerdown: this._onPointerDown
|
|
89
|
-
|
|
90
|
-
this._map.off({
|
|
91
|
-
focus: this._addHooks,
|
|
92
|
-
blur: this._removeHooks
|
|
82
|
+
pointerdown: this._onPointerDown,
|
|
83
|
+
keydown: this._onContainerKeyDown
|
|
93
84
|
}, this);
|
|
94
85
|
this._help?.remove();
|
|
95
86
|
this._help = null;
|
|
@@ -128,35 +119,28 @@ var KeyboardHandler = class KeyboardHandler extends Handler {
|
|
|
128
119
|
}
|
|
129
120
|
_onPointerDown() {
|
|
130
121
|
if (this._focused) return;
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
122
|
+
this._map._container.focus({
|
|
123
|
+
preventScroll: true,
|
|
124
|
+
focusVisible: false
|
|
125
|
+
});
|
|
134
126
|
}
|
|
135
127
|
_onFocus() {
|
|
136
128
|
this._focused = true;
|
|
129
|
+
on(document, "keydown", this._onKeyDown, this);
|
|
137
130
|
this._map.fire("focus");
|
|
138
131
|
}
|
|
139
132
|
_onBlur() {
|
|
140
133
|
this._focused = false;
|
|
134
|
+
off(document, "keydown", this._onKeyDown, this);
|
|
141
135
|
this._map.fire("blur");
|
|
142
136
|
}
|
|
143
|
-
|
|
144
|
-
const
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
_setZoomDelta(zoomDelta) {
|
|
151
|
-
const keys = this._zoomKeys = {}, codes = KeyboardHandler.keyCodes;
|
|
152
|
-
for (const code of codes.zoomIn) keys[code] = zoomDelta;
|
|
153
|
-
for (const code of codes.zoomOut) keys[code] = -zoomDelta;
|
|
154
|
-
}
|
|
155
|
-
_addHooks() {
|
|
156
|
-
on(document, "keydown", this._onKeyDown, this);
|
|
157
|
-
}
|
|
158
|
-
_removeHooks() {
|
|
159
|
-
off(document, "keydown", this._onKeyDown, this);
|
|
137
|
+
_onContainerKeyDown(e) {
|
|
138
|
+
const map = this._map, popup = map._popup;
|
|
139
|
+
if (e.key !== "Escape" || e.defaultPrevented || !popup?.options.closeOnEscapeKey || map._controlContainer?.contains(e.target)) return;
|
|
140
|
+
const inPopup = popup._container.contains(e.target), icon = popup._source?._icon;
|
|
141
|
+
map.closePopup();
|
|
142
|
+
e.preventDefault();
|
|
143
|
+
if (inPopup) (icon?.tabIndex >= 0 ? icon : map._container).focus();
|
|
160
144
|
}
|
|
161
145
|
_onKeyDown(e) {
|
|
162
146
|
if (e.altKey || e.ctrlKey || e.metaKey) return;
|
|
@@ -165,24 +149,20 @@ var KeyboardHandler = class KeyboardHandler extends Handler {
|
|
|
165
149
|
stop(e);
|
|
166
150
|
return;
|
|
167
151
|
}
|
|
168
|
-
const key = e.
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
offset =
|
|
173
|
-
|
|
174
|
-
|
|
152
|
+
const key = e.key, map = this._map, { left, right, down, up, zoomIn, zoomOut } = KeyboardHandler.keys, x = +right.includes(key) - +left.includes(key), y = +down.includes(key) - +up.includes(key), dz = +zoomIn.includes(key) - +zoomOut.includes(key), k = e.shiftKey ? 3 : 1;
|
|
153
|
+
if (x || y) {
|
|
154
|
+
if (!map._panAnim?._inProgress) {
|
|
155
|
+
let offset = new Point(x, y).multiplyBy(k * map.options.keyboardPanDelta);
|
|
156
|
+
if (map.options.maxBounds) offset = map._limitOffset(offset, map.options.maxBounds);
|
|
157
|
+
map._setUserEvent(e);
|
|
158
|
+
map.panBy(offset);
|
|
159
|
+
}
|
|
160
|
+
} else if (dz) {
|
|
161
|
+
if (!map._zoomInputBlocked()) {
|
|
175
162
|
map._setUserEvent(e);
|
|
176
|
-
|
|
177
|
-
const newLatLng = map.wrapLatLng(map.unproject(map.project(map.getCenter()).add(offset)));
|
|
178
|
-
map.panTo(newLatLng);
|
|
179
|
-
} else map.panBy(offset);
|
|
163
|
+
map.setZoom(map.getZoom() + k * dz * map.options.zoomDelta);
|
|
180
164
|
}
|
|
181
|
-
} else
|
|
182
|
-
map._setUserEvent(e);
|
|
183
|
-
map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);
|
|
184
|
-
} else if (key === "Escape" && map._popup && map._popup.options.closeOnEscapeKey) map.closePopup();
|
|
185
|
-
else return;
|
|
165
|
+
} else return;
|
|
186
166
|
stop(e);
|
|
187
167
|
}
|
|
188
168
|
/**
|
|
@@ -193,12 +173,12 @@ var KeyboardHandler = class KeyboardHandler extends Handler {
|
|
|
193
173
|
static register(MaplairMap) {
|
|
194
174
|
MaplairMap.mergeOptions({
|
|
195
175
|
keyboard: true,
|
|
196
|
-
keyboardPanDelta: 80
|
|
176
|
+
keyboardPanDelta: 80,
|
|
177
|
+
ariaKeyShortcuts: false
|
|
197
178
|
});
|
|
198
179
|
MaplairMap.addInitHook("addHandler", "keyboard", KeyboardHandler);
|
|
199
180
|
}
|
|
200
181
|
};
|
|
201
|
-
//#endregion
|
|
202
182
|
export { KeyboardHandler };
|
|
203
183
|
|
|
204
184
|
//# sourceMappingURL=KeyboardHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeyboardHandler.js","names":["DomUtil.create"],"sources":["../../../../src/map/handler/KeyboardHandler.js"],"sourcesContent":["import {Handler} from '../../core/Handler.js';\nimport {on, off, stop, disableClickPropagation, disableScrollPropagation} from '../../dom/DomEvent.js';\nimport * as DomUtil from '../../dom/DomUtil.js';\nimport {Point} from '../../geometry/Point.js';\nimport {I18n} from '../../core/I18n.js';\n/** @import {MaplairMap} from '../Map.js' */\n/** @import {MaplairEvent} from '../../core/Events.js' */\n\n/**\n * Map options of `KeyboardHandler`, the keyboard navigation options.\n * @typedef {object} KeyboardHandlerMapOptions\n * @lends MaplairMapOptions\n * @property {boolean} [keyboard=true] Makes the map focusable and allows users to\n * navigate the map with keyboard arrows and `+`/`-` keys.\n * @property {number} [keyboardPanDelta=80] Amount of pixels to pan when pressing an\n * arrow key.\n */\n\n/**\n * Handler of `MaplairMap` for keyboard navigation.\n * @typedef {object} KeyboardHandlerMapProperties\n * @lends MaplairMap\n * @property {KeyboardHandler} keyboard Keyboard navigation handler.\n */\n\n/**\n * Handles keyboard interaction with the map, enabled by default, see the map option\n * `keyboard`. The `?` key shows a list of the keyboard shortcuts.\n *\n * @fires MaplairMap#focus {MaplairEvent} Fired when the map gains focus.\n * @fires MaplairMap#blur {MaplairEvent} Fired when the map loses focus.\n */\nexport class KeyboardHandler extends Handler {\n\n\t/**\n\t * The [codes](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/code)\n\t * of the keys for panning and zooming the map.\n\t * @type {Record<'left'|'right'|'down'|'up'|'zoomIn'|'zoomOut', string[]>}\n\t */\n\tstatic keyCodes = {\n\t\tleft: ['ArrowLeft'],\n\t\tright: ['ArrowRight'],\n\t\tdown: ['ArrowDown'],\n\t\tup: ['ArrowUp'],\n\t\tzoomIn: ['Equal', 'NumpadAdd', 'BracketRight'],\n\t\tzoomOut: ['Minus', 'NumpadSubtract', 'Digit6', 'Slash']\n\t};\n\n\t/**\n\t * @param {MaplairMap} map\n\t */\n\tconstructor(map) {\n\t\tsuper(map);\n\n\t\tthis._setPanDelta(map.options.keyboardPanDelta);\n\t\tthis._setZoomDelta(map.options.zoomDelta);\n\n\t\tthis.callInitHooks(KeyboardHandler);\n\t}\n\n\t/**\n\t * Called when the handler is enabled, adds the event hooks.\n\t */\n\taddHooks() {\n\t\tconst container = this._map._container;\n\n\t\t// make the container focusable by tabbing\n\t\tif (container.tabIndex <= 0) {\n\t\t\tcontainer.tabIndex = '0';\n\t\t}\n\n\t\t// add aria-attribute for keyboard shortcuts to the container\n\t\tcontainer.ariaKeyShortcuts = Object.values(KeyboardHandler.keyCodes).flat().join(' ');\n\n\t\ton(container, {\n\t\t\tfocus: this._onFocus,\n\t\t\tblur: this._onBlur,\n\t\t\tpointerdown: this._onPointerDown\n\t\t}, this);\n\n\t\tthis._map.on({\n\t\t\tfocus: this._addHooks,\n\t\t\tblur: this._removeHooks\n\t\t}, this);\n\t}\n\n\t/**\n\t * Called when the handler is disabled, removes the event hooks.\n\t */\n\tremoveHooks() {\n\t\tthis._removeHooks();\n\n\t\toff(this._map._container, {\n\t\t\tfocus: this._onFocus,\n\t\t\tblur: this._onBlur,\n\t\t\tpointerdown: this._onPointerDown\n\t\t}, this);\n\n\t\tthis._map.off({\n\t\t\tfocus: this._addHooks,\n\t\t\tblur: this._removeHooks\n\t\t}, this);\n\n\t\tthis._help?.remove();\n\t\tthis._help = null;\n\t}\n\n\t// Shows or hides a list of the keyboard shortcuts (on the `?` key), as popover\n\t// closed by pressing `Escape` or clicking outside of it.\n\t_toggleHelp() {\n\t\tthis._help ??= this._createHelp();\n\t\tthis._help.togglePopover();\n\t}\n\n\t_createHelp() {\n\t\tconst help = DomUtil.create('div', 'maplair-keyboard-help', this._map._container),\n\t\ttitle = I18n.translate('Keyboard shortcuts');\n\t\thelp.popover = 'auto';\n\t\thelp.setAttribute('role', 'dialog');\n\t\thelp.setAttribute('aria-label', title);\n\n\t\tDomUtil.create('h2', '', help).textContent = title;\n\t\tconst list = DomUtil.create('dl', '', help);\n\t\tfor (const [keys, description] of [\n\t\t\t[['←', '→', '↑', '↓'], I18n.translate('Pan the map')],\n\t\t\t[['+'], I18n.translate('Zoom in')],\n\t\t\t[['−'], I18n.translate('Zoom out')],\n\t\t\t[['Shift'], I18n.translate('Pan or zoom further, together with the keys above')],\n\t\t\t[['Esc'], I18n.translate('Close popup')],\n\t\t\t[['?'], I18n.translate('Show or hide the keyboard shortcuts')]\n\t\t]) {\n\t\t\tconst row = DomUtil.create('div', '', list),\n\t\t\tdt = DomUtil.create('dt', '', row);\n\t\t\tfor (const key of keys) {\n\t\t\t\tDomUtil.create('kbd', '', dt).textContent = key;\n\t\t\t}\n\t\t\tDomUtil.create('dd', '', row).textContent = description;\n\t\t}\n\n\t\tdisableClickPropagation(help);\n\t\tdisableScrollPropagation(help);\n\t\treturn help;\n\t}\n\n\t// acquire/lose focus #594, #1228, #1540\n\t_onPointerDown() {\n\t\tif (this._focused) { return; }\n\n\t\tconst body = document.body,\n\t\tdocEl = document.documentElement,\n\t\ttop = body.scrollTop || docEl.scrollTop,\n\t\tleft = body.scrollLeft || docEl.scrollLeft;\n\n\t\tthis._map._container.focus();\n\n\t\twindow.scrollTo(left, top);\n\t}\n\n\t_onFocus() {\n\t\tthis._focused = true;\n\t\tthis._map.fire('focus');\n\t}\n\n\t_onBlur() {\n\t\tthis._focused = false;\n\t\tthis._map.fire('blur');\n\t}\n\n\t_setPanDelta(panDelta) {\n\t\tconst keys = this._panKeys = {},\n\t\tcodes = KeyboardHandler.keyCodes;\n\n\t\tfor (const code of codes.left) {\n\t\t\tkeys[code] = [-1 * panDelta, 0];\n\t\t}\n\t\tfor (const code of codes.right) {\n\t\t\tkeys[code] = [panDelta, 0];\n\t\t}\n\t\tfor (const code of codes.down) {\n\t\t\tkeys[code] = [0, panDelta];\n\t\t}\n\t\tfor (const code of codes.up) {\n\t\t\tkeys[code] = [0, -1 * panDelta];\n\t\t}\n\t}\n\n\t_setZoomDelta(zoomDelta) {\n\t\tconst keys = this._zoomKeys = {},\n\t\tcodes = KeyboardHandler.keyCodes;\n\n\t\tfor (const code of codes.zoomIn) {\n\t\t\tkeys[code] = zoomDelta;\n\t\t}\n\t\tfor (const code of codes.zoomOut) {\n\t\t\tkeys[code] = -zoomDelta;\n\t\t}\n\t}\n\n\t_addHooks() {\n\t\ton(document, 'keydown', this._onKeyDown, this);\n\t}\n\n\t_removeHooks() {\n\t\toff(document, 'keydown', this._onKeyDown, this);\n\t}\n\n\t_onKeyDown(e) {\n\t\tif (e.altKey || e.ctrlKey || e.metaKey) { return; }\n\n\t\tif (e.key === '?') {\n\t\t\tthis._toggleHelp();\n\t\t\tstop(e);\n\t\t\treturn;\n\t\t}\n\n\t\tconst key = e.code,\n\t\tmap = this._map;\n\t\tlet offset;\n\n\t\tif (key in this._panKeys) {\n\t\t\tif (!map._panAnim || !map._panAnim._inProgress) {\n\t\t\t\toffset = this._panKeys[key];\n\t\t\t\tif (e.shiftKey) {\n\t\t\t\t\toffset = Point.from(offset).multiplyBy(3);\n\t\t\t\t}\n\n\t\t\t\tif (map.options.maxBounds) {\n\t\t\t\t\toffset = map._limitOffset(Point.from(offset), map.options.maxBounds);\n\t\t\t\t}\n\n\t\t\t\tmap._setUserEvent(e);\n\t\t\t\tif (map.options.worldCopyJump) {\n\t\t\t\t\tconst newLatLng = map.wrapLatLng(map.unproject(map.project(map.getCenter()).add(offset)));\n\t\t\t\t\tmap.panTo(newLatLng);\n\t\t\t\t} else {\n\t\t\t\t\tmap.panBy(offset);\n\t\t\t\t}\n\t\t\t}\n\t\t} else if (key in this._zoomKeys) {\n\t\t\tmap._setUserEvent(e);\n\t\t\tmap.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);\n\n\t\t} else if (key === 'Escape' && map._popup && map._popup.options.closeOnEscapeKey) {\n\t\t\tmap.closePopup();\n\n\t\t} else {\n\t\t\treturn;\n\t\t}\n\n\t\tstop(e);\n\t}\n\n\t/**\n\t * Registers this default feature on the map class, called by `MaplairMap` itself.\n\t * @internal\n\t * @param {typeof MaplairMap} MaplairMap\n\t */\n\tstatic register(MaplairMap) {\n\t\tMaplairMap.mergeOptions({\n\t\t\tkeyboard: true,\n\t\t\tkeyboardPanDelta: 80\n\t\t});\n\n\t\tMaplairMap.addInitHook('addHandler', 'keyboard', KeyboardHandler);\n\t}\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"KeyboardHandler.js","names":["DomUtil.create"],"sources":["../../../../src/map/handler/KeyboardHandler.js"],"sourcesContent":["import {Handler} from '../../core/Handler.js';\nimport {on, off, stop, disableClickPropagation, disableScrollPropagation} from '../../dom/DomEvent.js';\nimport * as DomUtil from '../../dom/DomUtil.js';\nimport {Point} from '../../geometry/Point.js';\nimport {I18n} from '../../core/I18n.js';\n/** @import {MaplairMap} from '../Map.js' */\n/** @import {MaplairEvent} from '../../core/Events.js' */\n\n/**\n * Map options of `KeyboardHandler`, the keyboard navigation options.\n * @typedef {object} KeyboardHandlerMapOptions\n * @lends MaplairMapOptions\n * @property {boolean} [keyboard=true] Makes the map focusable and allows users to\n * navigate the map with keyboard arrows and `+`/`-` keys.\n * @property {number} [keyboardPanDelta=80] Amount of pixels to pan when pressing an\n * arrow key.\n * @property {boolean|string} [ariaKeyShortcuts=false] Sets the `aria-keyshortcuts`\n * attribute of the map container. ARIA names keys by what they type on a given layout,\n * so `true` uses the names for a US English layout, which can be wrong for pages in\n * other languages; pass a string to set the value for your audience's layout instead.\n */\n\n/**\n * Handler of `MaplairMap` for keyboard navigation.\n * @typedef {object} KeyboardHandlerMapProperties\n * @lends MaplairMap\n * @property {KeyboardHandler} keyboard Keyboard navigation handler.\n */\n\n/**\n * Handles keyboard interaction with the map, enabled by default, see the map option\n * `keyboard`. The `?` key shows a list of the keyboard shortcuts.\n *\n * @fires MaplairMap#focus {MaplairEvent} Fired when the map gains focus.\n * @fires MaplairMap#blur {MaplairEvent} Fired when the map loses focus.\n */\nexport class KeyboardHandler extends Handler {\n\n\t/**\n\t * The [values](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key)\n\t * of the keys for panning and zooming the map, so zoom keys follow the keyboard\n\t * layout and cover the numpad too; `=` and `_` keep the US `+` and `-` keys working\n\t * both with and without Shift.\n\t * @type {Record<'left'|'right'|'down'|'up'|'zoomIn'|'zoomOut', string[]>}\n\t */\n\tstatic keys = {\n\t\tleft: ['ArrowLeft'],\n\t\tright: ['ArrowRight'],\n\t\tdown: ['ArrowDown'],\n\t\tup: ['ArrowUp'],\n\t\tzoomIn: ['+', '='],\n\t\tzoomOut: ['-', '_']\n\t};\n\n\t/**\n\t * @param {MaplairMap} map\n\t */\n\tconstructor(map) {\n\t\tsuper(map);\n\t\tthis.callInitHooks(KeyboardHandler);\n\t}\n\n\t/**\n\t * Called when the handler is enabled, adds the event hooks.\n\t */\n\taddHooks() {\n\t\tconst container = this._map._container;\n\n\t\t// make the container focusable by tabbing\n\t\tif (container.tabIndex <= 0) {\n\t\t\tcontainer.tabIndex = 0;\n\t\t}\n\n\t\tconst shortcuts = this._map.options.ariaKeyShortcuts;\n\t\tif (shortcuts) {\n\t\t\t// ARIA names physical keys by their unshifted character, so the default is for a US layout\n\t\t\tcontainer.ariaKeyShortcuts = shortcuts === true ?\n\t\t\t\t'ArrowLeft ArrowRight ArrowUp ArrowDown = Plus -' : shortcuts;\n\t\t}\n\n\t\ton(container, {\n\t\t\tfocus: this._onFocus,\n\t\t\tblur: this._onBlur,\n\t\t\tpointerdown: this._onPointerDown,\n\t\t\tkeydown: this._onContainerKeyDown\n\t\t}, this);\n\t}\n\n\t/**\n\t * Called when the handler is disabled, removes the event hooks.\n\t */\n\tremoveHooks() {\n\t\toff(document, 'keydown', this._onKeyDown, this);\n\n\t\tif (this._map.options.ariaKeyShortcuts) {\n\t\t\tthis._map._container.removeAttribute('aria-keyshortcuts');\n\t\t}\n\n\t\toff(this._map._container, {\n\t\t\tfocus: this._onFocus,\n\t\t\tblur: this._onBlur,\n\t\t\tpointerdown: this._onPointerDown,\n\t\t\tkeydown: this._onContainerKeyDown\n\t\t}, this);\n\n\t\tthis._help?.remove();\n\t\tthis._help = null;\n\t}\n\n\t// Shows or hides a list of the keyboard shortcuts (on the `?` key), as popover\n\t// closed by pressing `Escape` or clicking outside of it.\n\t_toggleHelp() {\n\t\tthis._help ??= this._createHelp();\n\t\tthis._help.togglePopover();\n\t}\n\n\t_createHelp() {\n\t\tconst help = DomUtil.create('div', 'maplair-keyboard-help', this._map._container),\n\t\ttitle = I18n.translate('Keyboard shortcuts');\n\t\thelp.popover = 'auto';\n\t\thelp.setAttribute('role', 'dialog');\n\t\thelp.setAttribute('aria-label', title);\n\n\t\tDomUtil.create('h2', '', help).textContent = title;\n\t\tconst list = DomUtil.create('dl', '', help);\n\t\tfor (const [keys, description] of [\n\t\t\t[['←', '→', '↑', '↓'], I18n.translate('Pan the map')],\n\t\t\t[['+'], I18n.translate('Zoom in')],\n\t\t\t[['−'], I18n.translate('Zoom out')],\n\t\t\t[['Shift'], I18n.translate('Pan or zoom further, together with the keys above')],\n\t\t\t[['Esc'], I18n.translate('Close popup')],\n\t\t\t[['?'], I18n.translate('Show or hide the keyboard shortcuts')]\n\t\t]) {\n\t\t\tconst row = DomUtil.create('div', '', list),\n\t\t\tdt = DomUtil.create('dt', '', row);\n\t\t\tfor (const key of keys) {\n\t\t\t\tDomUtil.create('kbd', '', dt).textContent = key;\n\t\t\t}\n\t\t\tDomUtil.create('dd', '', row).textContent = description;\n\t\t}\n\n\t\tdisableClickPropagation(help);\n\t\tdisableScrollPropagation(help);\n\t\treturn help;\n\t}\n\n\t// acquire/lose focus #594, #1228, #1540\n\t_onPointerDown() {\n\t\tif (this._focused) { return; }\n\n\t\t// script focus matches :focus-visible by default, which would show a focus ring on every click\n\t\tthis._map._container.focus({preventScroll: true, focusVisible: false});\n\t}\n\n\t_onFocus() {\n\t\tthis._focused = true;\n\t\ton(document, 'keydown', this._onKeyDown, this);\n\t\tthis._map.fire('focus');\n\t}\n\n\t_onBlur() {\n\t\tthis._focused = false;\n\t\toff(document, 'keydown', this._onKeyDown, this);\n\t\tthis._map.fire('blur');\n\t}\n\n\t// on the container rather than the document, so that Escape also works when focus is on a marker or\n\t// inside the popup, which blurs the container and removes the document listener; controls are left\n\t// out so that e.g. Escape in a geocoder input doesn't close an unrelated popup\n\t_onContainerKeyDown(e) {\n\t\tconst map = this._map,\n\t\tpopup = map._popup;\n\n\t\tif (e.key !== 'Escape' || e.defaultPrevented || !popup?.options.closeOnEscapeKey ||\n\t\t\tmap._controlContainer?.contains(e.target)) { return; }\n\n\t\tconst inPopup = popup._container.contains(e.target),\n\t\ticon = popup._source?._icon;\n\n\t\tmap.closePopup();\n\t\te.preventDefault();\n\n\t\t// closing removes the focused element, which would send focus back to the start of the page\n\t\tif (inPopup) { (icon?.tabIndex >= 0 ? icon : map._container).focus(); }\n\t}\n\n\t_onKeyDown(e) {\n\t\tif (e.altKey || e.ctrlKey || e.metaKey) { return; }\n\n\t\tif (e.key === '?') {\n\t\t\tthis._toggleHelp();\n\t\t\tstop(e);\n\t\t\treturn;\n\t\t}\n\n\t\tconst key = e.key,\n\t\tmap = this._map,\n\t\t{left, right, down, up, zoomIn, zoomOut} = KeyboardHandler.keys,\n\t\tx = +right.includes(key) - +left.includes(key),\n\t\ty = +down.includes(key) - +up.includes(key),\n\t\tdz = +zoomIn.includes(key) - +zoomOut.includes(key),\n\t\tk = e.shiftKey ? 3 : 1;\n\n\t\tif (x || y) {\n\t\t\tif (!map._panAnim?._inProgress) {\n\t\t\t\tlet offset = new Point(x, y).multiplyBy(k * map.options.keyboardPanDelta);\n\t\t\t\tif (map.options.maxBounds) {\n\t\t\t\t\toffset = map._limitOffset(offset, map.options.maxBounds);\n\t\t\t\t}\n\n\t\t\t\tmap._setUserEvent(e);\n\t\t\t\tmap.panBy(offset);\n\t\t\t}\n\t\t} else if (dz) {\n\t\t\tif (!map._zoomInputBlocked()) {\n\t\t\t\tmap._setUserEvent(e);\n\t\t\t\tmap.setZoom(map.getZoom() + k * dz * map.options.zoomDelta);\n\t\t\t}\n\n\t\t} else {\n\t\t\treturn;\n\t\t}\n\n\t\tstop(e);\n\t}\n\n\t/**\n\t * Registers this default feature on the map class, called by `MaplairMap` itself.\n\t * @internal\n\t * @param {typeof MaplairMap} MaplairMap\n\t */\n\tstatic register(MaplairMap) {\n\t\tMaplairMap.mergeOptions({\n\t\t\tkeyboard: true,\n\t\t\tkeyboardPanDelta: 80,\n\t\t\tariaKeyShortcuts: false\n\t\t});\n\n\t\tMaplairMap.addInitHook('addHandler', 'keyboard', KeyboardHandler);\n\t}\n}\n"],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { Point } from "../../geometry/Point.js";
|
|
1
2
|
import { getPointers } from "../../dom/DomEvent.PointerEvents.js";
|
|
2
3
|
import { off, on } from "../../dom/DomEvent.js";
|
|
4
|
+
import { getScale } from "../../dom/DomUtil.js";
|
|
3
5
|
import { Handler } from "../../core/Handler.js";
|
|
4
|
-
|
|
6
|
+
// src/map/handler/PinchZoomHandler.js
|
|
5
7
|
/** @import {MaplairMap} from '../Map.js' */
|
|
6
8
|
/**
|
|
7
9
|
* Map options of `PinchZoomHandler`, touch interaction options.
|
|
@@ -54,7 +56,11 @@ var PinchZoomHandler = class PinchZoomHandler extends Handler {
|
|
|
54
56
|
const map = this._map;
|
|
55
57
|
const pointers = getPointers();
|
|
56
58
|
if (pointers.length !== 2 || map._animatingZoom || this._zooming) return;
|
|
57
|
-
const p1 = map.pointerEventToContainerPoint(pointers[0])
|
|
59
|
+
const p1 = map.pointerEventToContainerPoint(pointers[0]);
|
|
60
|
+
const p2 = map.pointerEventToContainerPoint(pointers[1]);
|
|
61
|
+
const { x, y } = getScale(map._container);
|
|
62
|
+
this._containerScale = new Point(x, y);
|
|
63
|
+
this._containerOrigin = new Point(pointers[0].clientX, pointers[0].clientY)._subtract(p1.scaleBy(this._containerScale));
|
|
58
64
|
this._centerPoint = map.getSize()._divideBy(2);
|
|
59
65
|
this._startLatLng = map.containerPointToLatLng(this._centerPoint);
|
|
60
66
|
if (map.options.pinchZoom !== "center") this._pinchStartLatLng = map.containerPointToLatLng(p1.add(p2)._divideBy(2));
|
|
@@ -70,7 +76,7 @@ var PinchZoomHandler = class PinchZoomHandler extends Handler {
|
|
|
70
76
|
_onPointerMove(e) {
|
|
71
77
|
const pointers = getPointers();
|
|
72
78
|
if (pointers.length !== 2 || !this._zooming) return;
|
|
73
|
-
const map = this._map, p1 =
|
|
79
|
+
const map = this._map, p1 = this._toContainerPoint(pointers[0]), p2 = this._toContainerPoint(pointers[1]), scale = p1.distanceTo(p2) / this._startDist;
|
|
74
80
|
this._zoom = map.getScaleZoom(scale, this._startZoom);
|
|
75
81
|
if (!map.options.bounceAtZoomLimits && (this._zoom < map.getMinZoom() && scale < 1 || this._zoom > map.getMaxZoom() && scale > 1)) this._zoom = map._limitZoom(this._zoom);
|
|
76
82
|
if (map.options.pinchZoom === "center") {
|
|
@@ -94,6 +100,9 @@ var PinchZoomHandler = class PinchZoomHandler extends Handler {
|
|
|
94
100
|
this._animRequest = requestAnimationFrame(moveFn.bind(this));
|
|
95
101
|
e.preventDefault();
|
|
96
102
|
}
|
|
103
|
+
_toContainerPoint(e) {
|
|
104
|
+
return new Point(e.clientX, e.clientY)._subtract(this._containerOrigin).unscaleBy(this._containerScale);
|
|
105
|
+
}
|
|
97
106
|
_onPointerEnd() {
|
|
98
107
|
off(this._map._container, "pointermove", this._onPointerMove, this);
|
|
99
108
|
off(this._map._container, "pointerup pointercancel", this._onPointerEnd, this);
|
|
@@ -103,7 +112,7 @@ var PinchZoomHandler = class PinchZoomHandler extends Handler {
|
|
|
103
112
|
}
|
|
104
113
|
this._zooming = false;
|
|
105
114
|
cancelAnimationFrame(this._animRequest);
|
|
106
|
-
if (this._map.
|
|
115
|
+
if (this._map._zoomAnimated) this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);
|
|
107
116
|
else this._map._resetView(this._center, this._map._limitZoom(this._zoom));
|
|
108
117
|
}
|
|
109
118
|
/**
|
|
@@ -129,7 +138,6 @@ var PinchZoomHandler = class PinchZoomHandler extends Handler {
|
|
|
129
138
|
});
|
|
130
139
|
}
|
|
131
140
|
};
|
|
132
|
-
//#endregion
|
|
133
141
|
export { PinchZoomHandler };
|
|
134
142
|
|
|
135
143
|
//# sourceMappingURL=PinchZoomHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PinchZoomHandler.js","names":["PointerEvents.getPointers"],"sources":["../../../../src/map/handler/PinchZoomHandler.js"],"sourcesContent":["import {Handler} from '../../core/Handler.js';\nimport * as DomEvent from '../../dom/DomEvent.js';\nimport * as PointerEvents from '../../dom/DomEvent.PointerEvents.js';\n/** @import {MaplairMap} from '../Map.js' */\n\n/**\n * Map options of `PinchZoomHandler`, touch interaction options.\n * @typedef {object} PinchZoomHandlerMapOptions\n * @lends MaplairMapOptions\n * @property {boolean|'center'} [pinchZoom=true] Whether the map can be zoomed by\n * touch-dragging with two fingers. If passed `'center'`, it will zoom to the center of\n * the view regardless of where the touch events (fingers) were. Enabled for\n * touch-capable web browsers.\n * @property {boolean} [bounceAtZoomLimits=true] Set it to false if you don't want the\n * map to zoom beyond min/max zoom and then bounce back when pinch-zooming.\n * @property {boolean|'center'} [touchZoom] Deprecated, use `pinchZoom` instead.\n */\n\n/**\n * Handler of `MaplairMap` for pinch zoom.\n * @typedef {object} PinchZoomHandlerMapProperties\n * @lends MaplairMap\n * @property {PinchZoomHandler} pinchZoom Pinch zoom handler.\n * @property {PinchZoomHandler} touchZoom Deprecated, the same as `pinchZoom`.\n */\n\n/**\n * Adds pinch zoom to the map on supported mobile browsers, enabled by default, see the\n * map option `pinchZoom`.\n */\nexport class PinchZoomHandler extends Handler {\n\t/**\n\t * @param {...MaplairMap} args The map.\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(PinchZoomHandler);\n\t}\n\n\t/**\n\t * Called when the handler is enabled, adds the event hooks.\n\t */\n\taddHooks() {\n\t\tthis._map._container.classList.add('maplair-touch-zoom');\n\t\tDomEvent.on(this._map._container, 'pointerdown', this._onPointerStart, this);\n\t}\n\n\t/**\n\t * Called when the handler is disabled, removes the event hooks.\n\t */\n\tremoveHooks() {\n\t\tthis._map._container.classList.remove('maplair-touch-zoom');\n\t\tDomEvent.off(this._map._container, 'pointerdown', this._onPointerStart, this);\n\t\tDomEvent.off(this._map._container, 'pointermove', this._onPointerMove, this);\n\t\tDomEvent.off(this._map._container, 'pointerup pointercancel', this._onPointerEnd, this);\n\t}\n\n\t_onPointerStart(e) {\n\t\tconst map = this._map;\n\n\t\tconst pointers = PointerEvents.getPointers();\n\t\tif (pointers.length !== 2 || map._animatingZoom || this._zooming) { return; }\n\n\t\tconst p1 = map.pointerEventToContainerPoint(pointers[0]),\n\t\tp2 = map.pointerEventToContainerPoint(pointers[1]);\n\n\t\tthis._centerPoint = map.getSize()._divideBy(2);\n\t\tthis._startLatLng = map.containerPointToLatLng(this._centerPoint);\n\t\tif (map.options.pinchZoom !== 'center') {\n\t\t\tthis._pinchStartLatLng = map.containerPointToLatLng(p1.add(p2)._divideBy(2));\n\t\t}\n\n\t\tthis._startDist = p1.distanceTo(p2);\n\t\tthis._startZoom = map.getZoom();\n\n\t\tthis._moved = false;\n\t\tthis._zooming = true;\n\n\t\tmap._stop();\n\n\t\tDomEvent.on(this._map._container, 'pointermove', this._onPointerMove, this);\n\t\tDomEvent.on(this._map._container, 'pointerup pointercancel', this._onPointerEnd, this);\n\n\t\te.preventDefault();\n\t}\n\n\t_onPointerMove(e) {\n\t\tconst pointers = PointerEvents.getPointers();\n\t\tif (pointers.length !== 2 || !this._zooming) { return; }\n\n\t\tconst map = this._map,\n\t\tp1 = map.pointerEventToContainerPoint(pointers[0]),\n\t\tp2 = map.pointerEventToContainerPoint(pointers[1]),\n\t\tscale = p1.distanceTo(p2) / this._startDist;\n\n\t\tthis._zoom = map.getScaleZoom(scale, this._startZoom);\n\n\t\tif (!map.options.bounceAtZoomLimits && (\n\t\t\t(this._zoom < map.getMinZoom() && scale < 1) ||\n\t\t\t(this._zoom > map.getMaxZoom() && scale > 1))) {\n\t\t\tthis._zoom = map._limitZoom(this._zoom);\n\t\t}\n\n\t\tif (map.options.pinchZoom === 'center') {\n\t\t\tthis._center = this._startLatLng;\n\t\t\tif (scale === 1) { return; }\n\t\t} else {\n\t\t\t// Get delta from pinch to center, so centerLatLng is delta applied to initial pinchLatLng\n\t\t\tconst delta = p1._add(p2)._divideBy(2)._subtract(this._centerPoint);\n\t\t\tif (scale === 1 && delta.x === 0 && delta.y === 0) { return; }\n\t\t\tthis._center = map.unproject(map.project(this._pinchStartLatLng, this._zoom).subtract(delta), this._zoom);\n\t\t}\n\n\t\tif (!this._moved) {\n\t\t\tmap._setUserEvent(e);\n\t\t\tmap._moveStart(true, false);\n\t\t\tthis._moved = true;\n\t\t}\n\n\t\tcancelAnimationFrame(this._animRequest);\n\n\t\tconst moveFn = map._move.bind(map, this._center, this._zoom, {pinch: true, round: false}, undefined);\n\t\tthis._animRequest = requestAnimationFrame(moveFn.bind(this));\n\n\t\te.preventDefault();\n\t}\n\n\t_onPointerEnd() {\n\t\tDomEvent.off(this._map._container, 'pointermove', this._onPointerMove, this);\n\t\tDomEvent.off(this._map._container, 'pointerup pointercancel', this._onPointerEnd, this);\n\n\t\tif (!this._moved || !this._zooming) {\n\t\t\tthis._zooming = false;\n\t\t\treturn;\n\t\t}\n\n\t\tthis._zooming = false;\n\t\tcancelAnimationFrame(this._animRequest);\n\n\t\t// Pinch updates GridLayers' levels only when zoomSnap is off, so zoomSnap becomes noUpdate.\n\t\tif (this._map.options.zoomAnimation) {\n\t\t\tthis._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);\n\t\t} else {\n\t\t\tthis._map._resetView(this._center, this._map._limitZoom(this._zoom));\n\t\t}\n\t}\n\n\t/**\n\t * Registers this default feature on the map class, called by `MaplairMap` itself.\n\t * @internal\n\t * @param {typeof MaplairMap} MaplairMap\n\t */\n\tstatic register(MaplairMap) {\n\t\tMaplairMap.mergeOptions({\n\t\t\tpinchZoom: true,\n\t\t\tbounceAtZoomLimits: true\n\t\t});\n\n\t\tMaplairMap.addInitHook('addHandler', 'pinchZoom', PinchZoomHandler);\n\n\t\t// Deprecated - Backward compatibility touchZoom\n\t\tMaplairMap.addInitHook(function () {\n\t\t\tthis.touchZoom = this.pinchZoom;\n\n\t\t\tif (this.options.touchZoom !== undefined) {\n\t\t\t\t// To be removed in maplair 3\n\t\t\t\tconsole.warn('Map: touchZoom option is deprecated and will be removed in future versions. Use pinchZoom instead.');\n\t\t\t\tthis.options.pinchZoom = this.options.touchZoom;\n\t\t\t\tdelete this.options.touchZoom;\n\t\t\t}\n\t\t\tif (this.options.pinchZoom) {\n\t\t\t\tthis.pinchZoom.enable();\n\t\t\t} else {\n\t\t\t\tthis.pinchZoom.disable();\n\t\t\t}\n\t\t});\n\t}\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PinchZoomHandler.js","names":["PointerEvents.getPointers","DomUtil.getScale"],"sources":["../../../../src/map/handler/PinchZoomHandler.js"],"sourcesContent":["import {Handler} from '../../core/Handler.js';\nimport * as DomEvent from '../../dom/DomEvent.js';\nimport * as DomUtil from '../../dom/DomUtil.js';\nimport {Point} from '../../geometry/Point.js';\nimport * as PointerEvents from '../../dom/DomEvent.PointerEvents.js';\n/** @import {MaplairMap} from '../Map.js' */\n\n/**\n * Map options of `PinchZoomHandler`, touch interaction options.\n * @typedef {object} PinchZoomHandlerMapOptions\n * @lends MaplairMapOptions\n * @property {boolean|'center'} [pinchZoom=true] Whether the map can be zoomed by\n * touch-dragging with two fingers. If passed `'center'`, it will zoom to the center of\n * the view regardless of where the touch events (fingers) were. Enabled for\n * touch-capable web browsers.\n * @property {boolean} [bounceAtZoomLimits=true] Set it to false if you don't want the\n * map to zoom beyond min/max zoom and then bounce back when pinch-zooming.\n * @property {boolean|'center'} [touchZoom] Deprecated, use `pinchZoom` instead.\n */\n\n/**\n * Handler of `MaplairMap` for pinch zoom.\n * @typedef {object} PinchZoomHandlerMapProperties\n * @lends MaplairMap\n * @property {PinchZoomHandler} pinchZoom Pinch zoom handler.\n * @property {PinchZoomHandler} touchZoom Deprecated, the same as `pinchZoom`.\n */\n\n/**\n * Adds pinch zoom to the map on supported mobile browsers, enabled by default, see the\n * map option `pinchZoom`.\n */\nexport class PinchZoomHandler extends Handler {\n\t/**\n\t * @param {...MaplairMap} args The map.\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(PinchZoomHandler);\n\t}\n\n\t/**\n\t * Called when the handler is enabled, adds the event hooks.\n\t */\n\taddHooks() {\n\t\tthis._map._container.classList.add('maplair-touch-zoom');\n\t\tDomEvent.on(this._map._container, 'pointerdown', this._onPointerStart, this);\n\t}\n\n\t/**\n\t * Called when the handler is disabled, removes the event hooks.\n\t */\n\tremoveHooks() {\n\t\tthis._map._container.classList.remove('maplair-touch-zoom');\n\t\tDomEvent.off(this._map._container, 'pointerdown', this._onPointerStart, this);\n\t\tDomEvent.off(this._map._container, 'pointermove', this._onPointerMove, this);\n\t\tDomEvent.off(this._map._container, 'pointerup pointercancel', this._onPointerEnd, this);\n\t}\n\n\t_onPointerStart(e) {\n\t\tconst map = this._map;\n\n\t\tconst pointers = PointerEvents.getPointers();\n\t\tif (pointers.length !== 2 || map._animatingZoom || this._zooming) { return; }\n\n\t\tconst p1 = map.pointerEventToContainerPoint(pointers[0]);\n\t\tconst p2 = map.pointerEventToContainerPoint(pointers[1]);\n\t\tconst {x, y} = DomUtil.getScale(map._container);\n\n\t\t// the container doesn't move during a pinch, so keep its client offset and CSS scale to avoid reading layout on every move\n\t\tthis._containerScale = new Point(x, y);\n\t\tthis._containerOrigin = new Point(pointers[0].clientX, pointers[0].clientY)._subtract(p1.scaleBy(this._containerScale));\n\n\t\tthis._centerPoint = map.getSize()._divideBy(2);\n\t\tthis._startLatLng = map.containerPointToLatLng(this._centerPoint);\n\t\tif (map.options.pinchZoom !== 'center') {\n\t\t\tthis._pinchStartLatLng = map.containerPointToLatLng(p1.add(p2)._divideBy(2));\n\t\t}\n\n\t\tthis._startDist = p1.distanceTo(p2);\n\t\tthis._startZoom = map.getZoom();\n\n\t\tthis._moved = false;\n\t\tthis._zooming = true;\n\n\t\tmap._stop();\n\n\t\tDomEvent.on(this._map._container, 'pointermove', this._onPointerMove, this);\n\t\tDomEvent.on(this._map._container, 'pointerup pointercancel', this._onPointerEnd, this);\n\n\t\te.preventDefault();\n\t}\n\n\t_onPointerMove(e) {\n\t\tconst pointers = PointerEvents.getPointers();\n\t\tif (pointers.length !== 2 || !this._zooming) { return; }\n\n\t\tconst map = this._map,\n\t\tp1 = this._toContainerPoint(pointers[0]),\n\t\tp2 = this._toContainerPoint(pointers[1]),\n\t\tscale = p1.distanceTo(p2) / this._startDist;\n\n\t\tthis._zoom = map.getScaleZoom(scale, this._startZoom);\n\n\t\tif (!map.options.bounceAtZoomLimits && (\n\t\t\t(this._zoom < map.getMinZoom() && scale < 1) ||\n\t\t\t(this._zoom > map.getMaxZoom() && scale > 1))) {\n\t\t\tthis._zoom = map._limitZoom(this._zoom);\n\t\t}\n\n\t\tif (map.options.pinchZoom === 'center') {\n\t\t\tthis._center = this._startLatLng;\n\t\t\tif (scale === 1) { return; }\n\t\t} else {\n\t\t\t// Get delta from pinch to center, so centerLatLng is delta applied to initial pinchLatLng\n\t\t\tconst delta = p1._add(p2)._divideBy(2)._subtract(this._centerPoint);\n\t\t\tif (scale === 1 && delta.x === 0 && delta.y === 0) { return; }\n\t\t\tthis._center = map.unproject(map.project(this._pinchStartLatLng, this._zoom).subtract(delta), this._zoom);\n\t\t}\n\n\t\tif (!this._moved) {\n\t\t\tmap._setUserEvent(e);\n\t\t\tmap._moveStart(true, false);\n\t\t\tthis._moved = true;\n\t\t}\n\n\t\tcancelAnimationFrame(this._animRequest);\n\n\t\tconst moveFn = map._move.bind(map, this._center, this._zoom, {pinch: true, round: false}, undefined);\n\t\tthis._animRequest = requestAnimationFrame(moveFn.bind(this));\n\n\t\te.preventDefault();\n\t}\n\n\t_toContainerPoint(e) {\n\t\treturn new Point(e.clientX, e.clientY)._subtract(this._containerOrigin).unscaleBy(this._containerScale);\n\t}\n\n\t_onPointerEnd() {\n\t\tDomEvent.off(this._map._container, 'pointermove', this._onPointerMove, this);\n\t\tDomEvent.off(this._map._container, 'pointerup pointercancel', this._onPointerEnd, this);\n\n\t\tif (!this._moved || !this._zooming) {\n\t\t\tthis._zooming = false;\n\t\t\treturn;\n\t\t}\n\n\t\tthis._zooming = false;\n\t\tcancelAnimationFrame(this._animRequest);\n\n\t\t// Pinch updates GridLayers' levels only when zoomSnap is off, so zoomSnap becomes noUpdate.\n\t\tif (this._map._zoomAnimated) {\n\t\t\tthis._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);\n\t\t} else {\n\t\t\tthis._map._resetView(this._center, this._map._limitZoom(this._zoom));\n\t\t}\n\t}\n\n\t/**\n\t * Registers this default feature on the map class, called by `MaplairMap` itself.\n\t * @internal\n\t * @param {typeof MaplairMap} MaplairMap\n\t */\n\tstatic register(MaplairMap) {\n\t\tMaplairMap.mergeOptions({\n\t\t\tpinchZoom: true,\n\t\t\tbounceAtZoomLimits: true\n\t\t});\n\n\t\tMaplairMap.addInitHook('addHandler', 'pinchZoom', PinchZoomHandler);\n\n\t\t// Deprecated - Backward compatibility touchZoom\n\t\tMaplairMap.addInitHook(function () {\n\t\t\tthis.touchZoom = this.pinchZoom;\n\n\t\t\tif (this.options.touchZoom !== undefined) {\n\t\t\t\t// To be removed in maplair 3\n\t\t\t\tconsole.warn('Map: touchZoom option is deprecated and will be removed in future versions. Use pinchZoom instead.');\n\t\t\t\tthis.options.pinchZoom = this.options.touchZoom;\n\t\t\t\tdelete this.options.touchZoom;\n\t\t\t}\n\t\t\tif (this.options.pinchZoom) {\n\t\t\t\tthis.pinchZoom.enable();\n\t\t\t} else {\n\t\t\t\tthis.pinchZoom.disable();\n\t\t\t}\n\t\t});\n\t}\n}\n"],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Point } from "../../geometry/Point.js";
|
|
|
2
2
|
import { getPointers } from "../../dom/DomEvent.PointerEvents.js";
|
|
3
3
|
import { getWheelDelta, off, on, stop } from "../../dom/DomEvent.js";
|
|
4
4
|
import { Handler } from "../../core/Handler.js";
|
|
5
|
-
|
|
5
|
+
// src/map/handler/ScrollWheelZoomHandler.js
|
|
6
6
|
/** @import {MaplairMap} from '../Map.js' */
|
|
7
7
|
const pinchPxPerZoomLevel = 100;
|
|
8
8
|
const gestureEndDelay = 150;
|
|
@@ -172,7 +172,6 @@ var ScrollWheelZoomHandler = class ScrollWheelZoomHandler extends Handler {
|
|
|
172
172
|
const delta = getWheelDelta(e);
|
|
173
173
|
const debounce = this._map.options.wheelDebounceTime;
|
|
174
174
|
this._delta += delta;
|
|
175
|
-
this._lastMousePos = this._map.pointerEventToContainerPoint(e);
|
|
176
175
|
this._lastEvent = e;
|
|
177
176
|
if (!this._startTime) this._startTime = Date.now();
|
|
178
177
|
const left = Math.max(debounce - (Date.now() - this._startTime), 0);
|
|
@@ -183,13 +182,13 @@ var ScrollWheelZoomHandler = class ScrollWheelZoomHandler extends Handler {
|
|
|
183
182
|
_performZoom() {
|
|
184
183
|
const map = this._map, zoom = map.getZoom(), snap = this._map.options.zoomSnap ?? 0;
|
|
185
184
|
map._stop();
|
|
186
|
-
const d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4), d3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2, d4 = snap ? Math.ceil(d3 / snap) * snap : d3, delta = map._limitZoom(zoom + (this._delta > 0 ?
|
|
185
|
+
const d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4), d3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2, d4 = snap ? Math.ceil(d3 / snap) * snap : d3, d5 = map._prefersReducedMotion() ? Math.min(d4, 1) : d4, delta = map._limitZoom(zoom + (this._delta > 0 ? d5 : -d5)) - zoom;
|
|
187
186
|
this._delta = 0;
|
|
188
187
|
this._startTime = null;
|
|
189
|
-
if (!delta) return;
|
|
188
|
+
if (!delta || map._zoomInputBlocked()) return;
|
|
190
189
|
map._setUserEvent(this._lastEvent);
|
|
191
190
|
if (map.options.scrollWheelZoom === "center") map.setZoom(zoom + delta);
|
|
192
|
-
else map.setZoomAround(this.
|
|
191
|
+
else map.setZoomAround(map.pointerEventToContainerPoint(this._lastEvent), zoom + delta);
|
|
193
192
|
}
|
|
194
193
|
/**
|
|
195
194
|
* Registers this default feature on the map class, called by `MaplairMap` itself.
|
|
@@ -205,7 +204,6 @@ var ScrollWheelZoomHandler = class ScrollWheelZoomHandler extends Handler {
|
|
|
205
204
|
MaplairMap.addInitHook("addHandler", "scrollWheelZoom", ScrollWheelZoomHandler);
|
|
206
205
|
}
|
|
207
206
|
};
|
|
208
|
-
//#endregion
|
|
209
207
|
export { ScrollWheelZoomHandler };
|
|
210
208
|
|
|
211
209
|
//# sourceMappingURL=ScrollWheelZoomHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScrollWheelZoomHandler.js","names":["PointerEvents.getPointers","DomEvent.getWheelDelta"],"sources":["../../../../src/map/handler/ScrollWheelZoomHandler.js"],"sourcesContent":["import {Handler} from '../../core/Handler.js';\nimport * as DomEvent from '../../dom/DomEvent.js';\nimport * as PointerEvents from '../../dom/DomEvent.PointerEvents.js';\nimport {Point} from '../../geometry/Point.js';\n/** @import {MaplairMap} from '../Map.js' */\n\n// The number of pixels of a touchpad pinch (wheel event with `ctrlKey`) for zooming by one zoom level.\nconst pinchPxPerZoomLevel = 100;\n\n// The time (ms) without further wheel events after which a touchpad pinch or pan ends.\nconst gestureEndDelay = 150;\n\n/**\n * Map options of `ScrollWheelZoomHandler`, the mouse wheel options.\n * @typedef {object} ScrollWheelZoomHandlerMapOptions\n * @lends MaplairMapOptions\n * @property {boolean|'center'|'trackpad'} [scrollWheelZoom=true] Whether the map can\n * be zoomed by using the mouse wheel and by pinching on a touchpad (or using the mouse\n * wheel with the Ctrl key). If passed `'center'`, it will zoom to the center of the\n * view regardless of where the pointer was. If passed `'trackpad'`, scrolling (e.g.\n * with two fingers on a touchpad) pans the map instead, while pinching still zooms.\n * @property {number} [wheelDebounceTime=40] Limits the rate at which a wheel can fire\n * (in milliseconds). By default, the user can't zoom via wheel more often than once\n * per 40 ms.\n * @property {number} [wheelPxPerZoomLevel=60] How many scroll pixels (as reported by\n * [DomEvent.getWheelDelta](#domevent-getwheeldelta)) mean a change of one full zoom\n * level. Smaller values will make wheel-zooming faster (and vice versa).\n */\n\n/**\n * Handler of `MaplairMap` for scroll wheel zoom.\n * @typedef {object} ScrollWheelZoomHandlerMapProperties\n * @lends MaplairMap\n * @property {ScrollWheelZoomHandler} scrollWheelZoom Scroll wheel zoom handler.\n */\n\n/**\n * Enables mouse scroll wheel zoom on the map, as well as touchpad gestures: pinching\n * zooms, and with `scrollWheelZoom: 'trackpad'` scrolling with two fingers pans.\n * Enabled by default, see the map option `scrollWheelZoom`.\n */\nexport class ScrollWheelZoomHandler extends Handler {\n\t/**\n\t * @param {...MaplairMap} args The map.\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(ScrollWheelZoomHandler);\n\t}\n\n\t/**\n\t * Called when the handler is enabled, adds the event hooks.\n\t */\n\taddHooks() {\n\t\tDomEvent.on(this._map._container, 'wheel', this._onWheelScroll, this);\n\t\t// Touchpad pinch in Safari (macOS)\n\t\tDomEvent.on(this._map._container, 'gesturestart', this._onGestureStart, this);\n\t\tDomEvent.on(this._map._container, 'gesturechange', this._onGestureChange, this);\n\t\tDomEvent.on(this._map._container, 'gestureend', this._onGestureEnd, this);\n\n\t\tthis._delta = 0;\n\t}\n\n\t/**\n\t * Called when the handler is disabled, removes the event hooks.\n\t */\n\tremoveHooks() {\n\t\tDomEvent.off(this._map._container, 'wheel', this._onWheelScroll, this);\n\t\tDomEvent.off(this._map._container, 'gesturestart', this._onGestureStart, this);\n\t\tDomEvent.off(this._map._container, 'gesturechange', this._onGestureChange, this);\n\t\tDomEvent.off(this._map._container, 'gestureend', this._onGestureEnd, this);\n\t\tclearTimeout(this._timer);\n\t\tthis._endPinch();\n\t\tthis._endPan();\n\t}\n\n\t_onWheelScroll(e) {\n\t\tif (e.ctrlKey) {\n\t\t\t// A touchpad pinch, or the wheel with the Ctrl key pressed\n\t\t\tDomEvent.stop(e);\n\t\t\tconst delta = -e.deltaY * (e.deltaMode === 1 ? 20 : e.deltaMode === 2 ? 60 : 1);\n\t\t\tthis._pinchTo(e, (this._pinch?.zoom ?? this._map.getZoom()) + delta / pinchPxPerZoomLevel);\n\t\t\tclearTimeout(this._pinchTimer);\n\t\t\tthis._pinchTimer = setTimeout(this._endPinch.bind(this), gestureEndDelay);\n\t\t\treturn;\n\t\t}\n\t\tif (this._map.options.scrollWheelZoom === 'trackpad') {\n\t\t\tthis._panBy(e);\n\t\t\treturn;\n\t\t}\n\t\tthis._onWheelZoom(e);\n\t}\n\n\t_onGestureStart(e) {\n\t\t// On touch screens, pinching is handled by `PinchZoomHandler`\n\t\tif (PointerEvents.getPointers().length) { return; }\n\t\tDomEvent.stop(e);\n\t\tthis._gestureStartZoom = this._map.getZoom();\n\t}\n\n\t_onGestureChange(e) {\n\t\tif (this._gestureStartZoom === undefined) { return; }\n\t\tDomEvent.stop(e);\n\t\tthis._pinchTo(e, this._gestureStartZoom + Math.log2(e.scale));\n\t}\n\n\t_onGestureEnd(e) {\n\t\tif (this._gestureStartZoom === undefined) { return; }\n\t\tDomEvent.stop(e);\n\t\tthis._gestureStartZoom = undefined;\n\t\tthis._endPinch();\n\t}\n\n\t// Zooms continuously like `PinchZoomHandler`, around the pointer position of `e`.\n\t// If `eased`, the zoom approaches `zoom` over a few frames (for mouse wheels with steps).\n\t_pinchTo(e, zoom, eased) {\n\t\tconst map = this._map;\n\n\t\tif (!this._pinch) {\n\t\t\tif (map._animatingZoom) { return; }\n\t\t\tmap._stop();\n\t\t\tconst point = map.pointerEventToContainerPoint(e),\n\t\t\toffset = point.subtract(map.getSize()._divideBy(2));\n\t\t\tthis._pinch = {\n\t\t\t\taroundLatLng: map.options.scrollWheelZoom === 'center' ? map.getCenter() : map.containerPointToLatLng(point),\n\t\t\t\toffset: map.options.scrollWheelZoom === 'center' ? new Point(0, 0) : offset\n\t\t\t};\n\t\t\tmap._setUserEvent(e);\n\t\t\tmap._moveStart(true, false);\n\t\t}\n\n\t\tif (!map.options.bounceAtZoomLimits || eased) {\n\t\t\tzoom = Math.max(map.getMinZoom(), Math.min(map.getMaxZoom(), zoom));\n\t\t}\n\t\tthis._pinch.zoom = zoom;\n\t\tthis._pinch.shown ??= map.getZoom();\n\n\t\tconst frame = () => {\n\t\t\tconst pinch = this._pinch,\n\t\t\tdelta = pinch.zoom - pinch.shown;\n\t\t\tpinch.shown = eased && Math.abs(delta) > 0.01 ? pinch.shown + delta * 0.3 : pinch.zoom;\n\t\t\tmap._move(this._getPinchCenter(pinch.shown), pinch.shown, {pinch: true, round: false});\n\t\t\tif (pinch.shown !== pinch.zoom) {\n\t\t\t\tthis._pinchFrame = requestAnimationFrame(frame);\n\t\t\t}\n\t\t};\n\t\tcancelAnimationFrame(this._pinchFrame);\n\t\tthis._pinchFrame = requestAnimationFrame(frame);\n\t}\n\n\t_getPinchCenter(zoom) {\n\t\tconst {aroundLatLng, offset} = this._pinch,\n\t\tmap = this._map;\n\t\treturn map.unproject(map.project(aroundLatLng, zoom).subtract(offset), zoom);\n\t}\n\n\t_endPinch() {\n\t\tclearTimeout(this._pinchTimer);\n\t\tif (!this._pinch) { return; }\n\t\tcancelAnimationFrame(this._pinchFrame);\n\n\t\tconst map = this._map,\n\t\tzoom = map._limitZoom(this._pinch.zoom),\n\t\tcenter = this._getPinchCenter(zoom);\n\t\tthis._pinch = null;\n\n\t\tif (map.options.zoomAnimation && Math.abs(zoom - map.getZoom()) > 1e-9) {\n\t\t\tmap._animateZoom(center, zoom, true, map.options.zoomSnap);\n\t\t} else {\n\t\t\t// `_moveStart()` has already been called on the first event\n\t\t\tmap._move(center, zoom)._moveEnd(true);\n\t\t}\n\t}\n\n\t// Pans the map by the wheel deltas, as by scrolling with two fingers on a touchpad.\n\t_panBy(e) {\n\t\tDomEvent.stop(e);\n\t\tconst map = this._map;\n\t\tif (map._animatingZoom) { return; }\n\n\t\tconst factor = e.deltaMode === 1 ? 20 : e.deltaMode === 2 ? 60 : 1;\n\t\tlet offset = new Point(e.deltaX * factor, e.deltaY * factor);\n\t\tif (e.shiftKey && !e.deltaX) {\n\t\t\t// Shift with a mouse wheel scrolls horizontally\n\t\t\toffset = new Point(offset.y, 0);\n\t\t}\n\t\tif (map.options.maxBounds) {\n\t\t\toffset = map._limitOffset(offset, map.options.maxBounds);\n\t\t}\n\n\t\tif (!this._panning) {\n\t\t\tmap._stop();\n\t\t\tthis._panning = true;\n\t\t\tmap._setUserEvent(e);\n\t\t\tmap.fire('movestart');\n\t\t}\n\t\tmap._rawPanBy(offset.round());\n\t\tmap.fire('move');\n\n\t\tclearTimeout(this._panTimer);\n\t\tthis._panTimer = setTimeout(this._endPan.bind(this), gestureEndDelay);\n\t}\n\n\t_endPan() {\n\t\tclearTimeout(this._panTimer);\n\t\tif (!this._panning) { return; }\n\t\tthis._panning = false;\n\t\tthis._map.fire('moveend');\n\t}\n\n\t_onWheelZoom(e) {\n\t\tif (this._map.options.continuousZoom) {\n\t\t\t// zoom with each wheel event, see the `continuousZoom` option\n\t\t\tDomEvent.stop(e);\n\t\t\tconst delta = DomEvent.getWheelDelta(e) / this._map.options.wheelPxPerZoomLevel;\n\t\t\tthis._pinchTo(e, (this._pinch?.zoom ?? this._map.getZoom()) + delta, true);\n\t\t\tclearTimeout(this._pinchTimer);\n\t\t\tthis._pinchTimer = setTimeout(this._endPinch.bind(this), gestureEndDelay);\n\t\t\treturn;\n\t\t}\n\t\tconst delta = DomEvent.getWheelDelta(e);\n\n\t\tconst debounce = this._map.options.wheelDebounceTime;\n\n\t\tthis._delta += delta;\n\t\tthis._lastMousePos = this._map.pointerEventToContainerPoint(e);\n\t\tthis._lastEvent = e;\n\n\t\tif (!this._startTime) {\n\t\t\tthis._startTime = Date.now();\n\t\t}\n\n\t\tconst left = Math.max(debounce - (Date.now() - this._startTime), 0);\n\n\t\tclearTimeout(this._timer);\n\t\tthis._timer = setTimeout(this._performZoom.bind(this), left);\n\n\t\tDomEvent.stop(e);\n\t}\n\n\t_performZoom() {\n\t\tconst map = this._map,\n\t\tzoom = map.getZoom(),\n\t\tsnap = this._map.options.zoomSnap ?? 0;\n\n\t\tmap._stop(); // stop panning and fly animations if any\n\n\t\t// map the delta with a sigmoid function to -4..4 range leaning on -1..1\n\t\tconst d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4),\n\t\td3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2,\n\t\td4 = snap ? Math.ceil(d3 / snap) * snap : d3,\n\t\tdelta = map._limitZoom(zoom + (this._delta > 0 ? d4 : -d4)) - zoom;\n\n\t\tthis._delta = 0;\n\t\tthis._startTime = null;\n\n\t\tif (!delta) { return; }\n\n\t\tmap._setUserEvent(this._lastEvent);\n\t\tif (map.options.scrollWheelZoom === 'center') {\n\t\t\tmap.setZoom(zoom + delta);\n\t\t} else {\n\t\t\tmap.setZoomAround(this._lastMousePos, zoom + delta);\n\t\t}\n\t}\n\n\t/**\n\t * Registers this default feature on the map class, called by `MaplairMap` itself.\n\t * @internal\n\t * @param {typeof MaplairMap} MaplairMap\n\t */\n\tstatic register(MaplairMap) {\n\t\tMaplairMap.mergeOptions({\n\t\t\tscrollWheelZoom: true,\n\t\t\twheelDebounceTime: 40,\n\t\t\twheelPxPerZoomLevel: 60\n\t\t});\n\n\t\tMaplairMap.addInitHook('addHandler', 'scrollWheelZoom', ScrollWheelZoomHandler);\n\t}\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ScrollWheelZoomHandler.js","names":["PointerEvents.getPointers","DomEvent.getWheelDelta"],"sources":["../../../../src/map/handler/ScrollWheelZoomHandler.js"],"sourcesContent":["import {Handler} from '../../core/Handler.js';\nimport * as DomEvent from '../../dom/DomEvent.js';\nimport * as PointerEvents from '../../dom/DomEvent.PointerEvents.js';\nimport {Point} from '../../geometry/Point.js';\n/** @import {MaplairMap} from '../Map.js' */\n\n// The number of pixels of a touchpad pinch (wheel event with `ctrlKey`) for zooming by one zoom level.\nconst pinchPxPerZoomLevel = 100;\n\n// The time (ms) without further wheel events after which a touchpad pinch or pan ends.\nconst gestureEndDelay = 150;\n\n/**\n * Map options of `ScrollWheelZoomHandler`, the mouse wheel options.\n * @typedef {object} ScrollWheelZoomHandlerMapOptions\n * @lends MaplairMapOptions\n * @property {boolean|'center'|'trackpad'} [scrollWheelZoom=true] Whether the map can\n * be zoomed by using the mouse wheel and by pinching on a touchpad (or using the mouse\n * wheel with the Ctrl key). If passed `'center'`, it will zoom to the center of the\n * view regardless of where the pointer was. If passed `'trackpad'`, scrolling (e.g.\n * with two fingers on a touchpad) pans the map instead, while pinching still zooms.\n * @property {number} [wheelDebounceTime=40] Limits the rate at which a wheel can fire\n * (in milliseconds). By default, the user can't zoom via wheel more often than once\n * per 40 ms.\n * @property {number} [wheelPxPerZoomLevel=60] How many scroll pixels (as reported by\n * [DomEvent.getWheelDelta](#domevent-getwheeldelta)) mean a change of one full zoom\n * level. Smaller values will make wheel-zooming faster (and vice versa).\n */\n\n/**\n * Handler of `MaplairMap` for scroll wheel zoom.\n * @typedef {object} ScrollWheelZoomHandlerMapProperties\n * @lends MaplairMap\n * @property {ScrollWheelZoomHandler} scrollWheelZoom Scroll wheel zoom handler.\n */\n\n/**\n * Enables mouse scroll wheel zoom on the map, as well as touchpad gestures: pinching\n * zooms, and with `scrollWheelZoom: 'trackpad'` scrolling with two fingers pans.\n * Enabled by default, see the map option `scrollWheelZoom`.\n */\nexport class ScrollWheelZoomHandler extends Handler {\n\t/**\n\t * @param {...MaplairMap} args The map.\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(ScrollWheelZoomHandler);\n\t}\n\n\t/**\n\t * Called when the handler is enabled, adds the event hooks.\n\t */\n\taddHooks() {\n\t\tDomEvent.on(this._map._container, 'wheel', this._onWheelScroll, this);\n\t\t// Touchpad pinch in Safari (macOS)\n\t\tDomEvent.on(this._map._container, 'gesturestart', this._onGestureStart, this);\n\t\tDomEvent.on(this._map._container, 'gesturechange', this._onGestureChange, this);\n\t\tDomEvent.on(this._map._container, 'gestureend', this._onGestureEnd, this);\n\n\t\tthis._delta = 0;\n\t}\n\n\t/**\n\t * Called when the handler is disabled, removes the event hooks.\n\t */\n\tremoveHooks() {\n\t\tDomEvent.off(this._map._container, 'wheel', this._onWheelScroll, this);\n\t\tDomEvent.off(this._map._container, 'gesturestart', this._onGestureStart, this);\n\t\tDomEvent.off(this._map._container, 'gesturechange', this._onGestureChange, this);\n\t\tDomEvent.off(this._map._container, 'gestureend', this._onGestureEnd, this);\n\t\tclearTimeout(this._timer);\n\t\tthis._endPinch();\n\t\tthis._endPan();\n\t}\n\n\t_onWheelScroll(e) {\n\t\tif (e.ctrlKey) {\n\t\t\t// A touchpad pinch, or the wheel with the Ctrl key pressed\n\t\t\tDomEvent.stop(e);\n\t\t\tconst delta = -e.deltaY * (e.deltaMode === 1 ? 20 : e.deltaMode === 2 ? 60 : 1);\n\t\t\tthis._pinchTo(e, (this._pinch?.zoom ?? this._map.getZoom()) + delta / pinchPxPerZoomLevel);\n\t\t\tclearTimeout(this._pinchTimer);\n\t\t\tthis._pinchTimer = setTimeout(this._endPinch.bind(this), gestureEndDelay);\n\t\t\treturn;\n\t\t}\n\t\tif (this._map.options.scrollWheelZoom === 'trackpad') {\n\t\t\tthis._panBy(e);\n\t\t\treturn;\n\t\t}\n\t\tthis._onWheelZoom(e);\n\t}\n\n\t_onGestureStart(e) {\n\t\t// On touch screens, pinching is handled by `PinchZoomHandler`\n\t\tif (PointerEvents.getPointers().length) { return; }\n\t\tDomEvent.stop(e);\n\t\tthis._gestureStartZoom = this._map.getZoom();\n\t}\n\n\t_onGestureChange(e) {\n\t\tif (this._gestureStartZoom === undefined) { return; }\n\t\tDomEvent.stop(e);\n\t\tthis._pinchTo(e, this._gestureStartZoom + Math.log2(e.scale));\n\t}\n\n\t_onGestureEnd(e) {\n\t\tif (this._gestureStartZoom === undefined) { return; }\n\t\tDomEvent.stop(e);\n\t\tthis._gestureStartZoom = undefined;\n\t\tthis._endPinch();\n\t}\n\n\t// Zooms continuously like `PinchZoomHandler`, around the pointer position of `e`.\n\t// If `eased`, the zoom approaches `zoom` over a few frames (for mouse wheels with steps).\n\t_pinchTo(e, zoom, eased) {\n\t\tconst map = this._map;\n\n\t\tif (!this._pinch) {\n\t\t\tif (map._animatingZoom) { return; }\n\t\t\tmap._stop();\n\t\t\tconst point = map.pointerEventToContainerPoint(e),\n\t\t\toffset = point.subtract(map.getSize()._divideBy(2));\n\t\t\tthis._pinch = {\n\t\t\t\taroundLatLng: map.options.scrollWheelZoom === 'center' ? map.getCenter() : map.containerPointToLatLng(point),\n\t\t\t\toffset: map.options.scrollWheelZoom === 'center' ? new Point(0, 0) : offset\n\t\t\t};\n\t\t\tmap._setUserEvent(e);\n\t\t\tmap._moveStart(true, false);\n\t\t}\n\n\t\tif (!map.options.bounceAtZoomLimits || eased) {\n\t\t\tzoom = Math.max(map.getMinZoom(), Math.min(map.getMaxZoom(), zoom));\n\t\t}\n\t\tthis._pinch.zoom = zoom;\n\t\tthis._pinch.shown ??= map.getZoom();\n\n\t\tconst frame = () => {\n\t\t\tconst pinch = this._pinch,\n\t\t\tdelta = pinch.zoom - pinch.shown;\n\t\t\tpinch.shown = eased && Math.abs(delta) > 0.01 ? pinch.shown + delta * 0.3 : pinch.zoom;\n\t\t\tmap._move(this._getPinchCenter(pinch.shown), pinch.shown, {pinch: true, round: false});\n\t\t\tif (pinch.shown !== pinch.zoom) {\n\t\t\t\tthis._pinchFrame = requestAnimationFrame(frame);\n\t\t\t}\n\t\t};\n\t\tcancelAnimationFrame(this._pinchFrame);\n\t\tthis._pinchFrame = requestAnimationFrame(frame);\n\t}\n\n\t_getPinchCenter(zoom) {\n\t\tconst {aroundLatLng, offset} = this._pinch,\n\t\tmap = this._map;\n\t\treturn map.unproject(map.project(aroundLatLng, zoom).subtract(offset), zoom);\n\t}\n\n\t_endPinch() {\n\t\tclearTimeout(this._pinchTimer);\n\t\tif (!this._pinch) { return; }\n\t\tcancelAnimationFrame(this._pinchFrame);\n\n\t\tconst map = this._map,\n\t\tzoom = map._limitZoom(this._pinch.zoom),\n\t\tcenter = this._getPinchCenter(zoom);\n\t\tthis._pinch = null;\n\n\t\tif (map.options.zoomAnimation && Math.abs(zoom - map.getZoom()) > 1e-9) {\n\t\t\tmap._animateZoom(center, zoom, true, map.options.zoomSnap);\n\t\t} else {\n\t\t\t// `_moveStart()` has already been called on the first event\n\t\t\tmap._move(center, zoom)._moveEnd(true);\n\t\t}\n\t}\n\n\t// Pans the map by the wheel deltas, as by scrolling with two fingers on a touchpad.\n\t_panBy(e) {\n\t\tDomEvent.stop(e);\n\t\tconst map = this._map;\n\t\tif (map._animatingZoom) { return; }\n\n\t\tconst factor = e.deltaMode === 1 ? 20 : e.deltaMode === 2 ? 60 : 1;\n\t\tlet offset = new Point(e.deltaX * factor, e.deltaY * factor);\n\t\tif (e.shiftKey && !e.deltaX) {\n\t\t\t// Shift with a mouse wheel scrolls horizontally\n\t\t\toffset = new Point(offset.y, 0);\n\t\t}\n\t\tif (map.options.maxBounds) {\n\t\t\toffset = map._limitOffset(offset, map.options.maxBounds);\n\t\t}\n\n\t\tif (!this._panning) {\n\t\t\tmap._stop();\n\t\t\tthis._panning = true;\n\t\t\tmap._setUserEvent(e);\n\t\t\tmap.fire('movestart');\n\t\t}\n\t\tmap._rawPanBy(offset.round());\n\t\tmap.fire('move');\n\n\t\tclearTimeout(this._panTimer);\n\t\tthis._panTimer = setTimeout(this._endPan.bind(this), gestureEndDelay);\n\t}\n\n\t_endPan() {\n\t\tclearTimeout(this._panTimer);\n\t\tif (!this._panning) { return; }\n\t\tthis._panning = false;\n\t\tthis._map.fire('moveend');\n\t}\n\n\t_onWheelZoom(e) {\n\t\tif (this._map.options.continuousZoom) {\n\t\t\t// zoom with each wheel event, see the `continuousZoom` option\n\t\t\tDomEvent.stop(e);\n\t\t\tconst delta = DomEvent.getWheelDelta(e) / this._map.options.wheelPxPerZoomLevel;\n\t\t\tthis._pinchTo(e, (this._pinch?.zoom ?? this._map.getZoom()) + delta, true);\n\t\t\tclearTimeout(this._pinchTimer);\n\t\t\tthis._pinchTimer = setTimeout(this._endPinch.bind(this), gestureEndDelay);\n\t\t\treturn;\n\t\t}\n\t\tconst delta = DomEvent.getWheelDelta(e);\n\n\t\tconst debounce = this._map.options.wheelDebounceTime;\n\n\t\tthis._delta += delta;\n\t\t// resolving the container point reads layout, so defer it to _performZoom\n\t\tthis._lastEvent = e;\n\n\t\tif (!this._startTime) {\n\t\t\tthis._startTime = Date.now();\n\t\t}\n\n\t\tconst left = Math.max(debounce - (Date.now() - this._startTime), 0);\n\n\t\tclearTimeout(this._timer);\n\t\tthis._timer = setTimeout(this._performZoom.bind(this), left);\n\n\t\tDomEvent.stop(e);\n\t}\n\n\t_performZoom() {\n\t\tconst map = this._map,\n\t\tzoom = map.getZoom(),\n\t\tsnap = this._map.options.zoomSnap ?? 0;\n\n\t\tmap._stop(); // stop panning and fly animations if any\n\n\t\t// map the delta with a sigmoid function to -4..4 range leaning on -1..1\n\t\tconst d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4),\n\t\td3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2,\n\t\td4 = snap ? Math.ceil(d3 / snap) * snap : d3,\n\t\t// with reduced motion, only zooms by up to one level are animated, so a hard scroll is capped to that\n\t\td5 = map._prefersReducedMotion() ? Math.min(d4, 1) : d4,\n\t\tdelta = map._limitZoom(zoom + (this._delta > 0 ? d5 : -d5)) - zoom;\n\n\t\tthis._delta = 0;\n\t\tthis._startTime = null;\n\n\t\tif (!delta || map._zoomInputBlocked()) { return; }\n\n\t\tmap._setUserEvent(this._lastEvent);\n\t\tif (map.options.scrollWheelZoom === 'center') {\n\t\t\tmap.setZoom(zoom + delta);\n\t\t} else {\n\t\t\tmap.setZoomAround(map.pointerEventToContainerPoint(this._lastEvent), zoom + delta);\n\t\t}\n\t}\n\n\t/**\n\t * Registers this default feature on the map class, called by `MaplairMap` itself.\n\t * @internal\n\t * @param {typeof MaplairMap} MaplairMap\n\t */\n\tstatic register(MaplairMap) {\n\t\tMaplairMap.mergeOptions({\n\t\t\tscrollWheelZoom: true,\n\t\t\twheelDebounceTime: 40,\n\t\t\twheelPxPerZoomLevel: 60\n\t\t});\n\n\t\tMaplairMap.addInitHook('addHandler', 'scrollWheelZoom', ScrollWheelZoomHandler);\n\t}\n}\n"],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { getPointers } from "../../dom/DomEvent.PointerEvents.js";
|
|
|
3
3
|
import { off, on } from "../../dom/DomEvent.js";
|
|
4
4
|
import { Handler } from "../../core/Handler.js";
|
|
5
5
|
import { Draggable } from "../../dom/Draggable.js";
|
|
6
|
-
|
|
6
|
+
// src/map/handler/TapDragZoomHandler.js
|
|
7
7
|
/** @import {MaplairMap} from '../Map.js' */
|
|
8
8
|
const maxTapInterval = 500;
|
|
9
9
|
const maxTapDistance = 30;
|
|
@@ -144,7 +144,6 @@ var TapDragZoomHandler = class TapDragZoomHandler extends Handler {
|
|
|
144
144
|
MaplairMap.addInitHook("addHandler", "tapDragZoom", TapDragZoomHandler);
|
|
145
145
|
}
|
|
146
146
|
};
|
|
147
|
-
//#endregion
|
|
148
147
|
export { TapDragZoomHandler };
|
|
149
148
|
|
|
150
149
|
//# sourceMappingURL=TapDragZoomHandler.js.map
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import { Point } from "../../geometry/Point.js";
|
|
2
|
-
import Browser_default from "../../core/Browser.js";
|
|
3
2
|
import { getPointers } from "../../dom/DomEvent.PointerEvents.js";
|
|
4
|
-
import { off, on, preventDefault } from "../../dom/DomEvent.js";
|
|
3
|
+
import { off, on, preventDefault, stop } from "../../dom/DomEvent.js";
|
|
5
4
|
import { Handler } from "../../core/Handler.js";
|
|
6
|
-
|
|
5
|
+
// src/map/handler/TapHoldHandler.js
|
|
7
6
|
/** @import {MaplairMap} from '../Map.js' */
|
|
8
7
|
const tapHoldDelay = 600;
|
|
9
8
|
/**
|
|
10
9
|
* Map options of `TapHoldHandler`, touch interaction options.
|
|
11
10
|
* @typedef {object} TapHoldHandlerMapOptions
|
|
12
11
|
* @lends MaplairMapOptions
|
|
13
|
-
* @property {boolean} [tapHold] Enables simulation of `contextmenu` event
|
|
14
|
-
*
|
|
12
|
+
* @property {boolean} [tapHold=true] Enables simulation of `contextmenu` event on touch
|
|
13
|
+
* and hold.
|
|
15
14
|
* @property {number} [tapTolerance=15] The max number of pixels a user can shift his
|
|
16
15
|
* finger during touch for it to be considered a valid tap.
|
|
17
16
|
*/
|
|
@@ -47,6 +46,7 @@ var TapHoldHandler = class TapHoldHandler extends Handler {
|
|
|
47
46
|
off(this._map._container, "pointerdown", this._onDown, this);
|
|
48
47
|
this._cancel();
|
|
49
48
|
this._cancelClickPrevent();
|
|
49
|
+
this._stopPreventingNative();
|
|
50
50
|
}
|
|
51
51
|
_onDown(e) {
|
|
52
52
|
clearTimeout(this._holdTimeout);
|
|
@@ -59,6 +59,8 @@ var TapHoldHandler = class TapHoldHandler extends Handler {
|
|
|
59
59
|
on(el, "pointerup", preventDefault);
|
|
60
60
|
on(el, "pointerup pointercancel", this._cancelClickPrevent, this);
|
|
61
61
|
this._simulateEvent("contextmenu", e);
|
|
62
|
+
el.addEventListener("contextmenu", stop, true);
|
|
63
|
+
el.addEventListener("pointerdown", this._stopPreventingNative, true);
|
|
62
64
|
}), tapHoldDelay);
|
|
63
65
|
on(el, "pointerup pointercancel contextmenu", this._cancel, this);
|
|
64
66
|
on(el, "pointermove", this._onMove, this);
|
|
@@ -68,6 +70,11 @@ var TapHoldHandler = class TapHoldHandler extends Handler {
|
|
|
68
70
|
off(el, "pointerup", preventDefault);
|
|
69
71
|
off(el, "pointerup pointercancel", this._cancelClickPrevent, this);
|
|
70
72
|
}
|
|
73
|
+
_stopPreventingNative = () => {
|
|
74
|
+
const el = this._map._container;
|
|
75
|
+
el.removeEventListener("contextmenu", stop, true);
|
|
76
|
+
el.removeEventListener("pointerdown", this._stopPreventingNative, true);
|
|
77
|
+
};
|
|
71
78
|
_cancel() {
|
|
72
79
|
clearTimeout(this._holdTimeout);
|
|
73
80
|
const el = this._map._container;
|
|
@@ -100,13 +107,12 @@ var TapHoldHandler = class TapHoldHandler extends Handler {
|
|
|
100
107
|
*/
|
|
101
108
|
static register(MaplairMap) {
|
|
102
109
|
MaplairMap.mergeOptions({
|
|
103
|
-
tapHold:
|
|
110
|
+
tapHold: true,
|
|
104
111
|
tapTolerance: 15
|
|
105
112
|
});
|
|
106
113
|
MaplairMap.addInitHook("addHandler", "tapHold", TapHoldHandler);
|
|
107
114
|
}
|
|
108
115
|
};
|
|
109
|
-
//#endregion
|
|
110
116
|
export { TapHoldHandler };
|
|
111
117
|
|
|
112
118
|
//# sourceMappingURL=TapHoldHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TapHoldHandler.js","names":["PointerEvents.getPointers","DomEvent.preventDefault","
|
|
1
|
+
{"version":3,"file":"TapHoldHandler.js","names":["PointerEvents.getPointers","DomEvent.preventDefault","DomEvent.stop"],"sources":["../../../../src/map/handler/TapHoldHandler.js"],"sourcesContent":["import {Handler} from '../../core/Handler.js';\nimport * as DomEvent from '../../dom/DomEvent.js';\nimport {Point} from '../../geometry/Point.js';\nimport * as PointerEvents from '../../dom/DomEvent.PointerEvents.js';\n/** @import {MaplairMap} from '../Map.js' */\n\nconst tapHoldDelay = 600;\n\n/**\n * Map options of `TapHoldHandler`, touch interaction options.\n * @typedef {object} TapHoldHandlerMapOptions\n * @lends MaplairMapOptions\n * @property {boolean} [tapHold=true] Enables simulation of `contextmenu` event on touch\n * and hold.\n * @property {number} [tapTolerance=15] The max number of pixels a user can shift his\n * finger during touch for it to be considered a valid tap.\n */\n\n/**\n * Handler of `MaplairMap` for long taps.\n * @typedef {object} TapHoldHandlerMapProperties\n * @lends MaplairMap\n * @property {TapHoldHandler} tapHold Long tap handler to simulate `contextmenu` event\n * (useful in mobile Safari).\n */\n\n/**\n * Simulates the `contextmenu` event on long hold, which otherwise is not fired by\n * mobile Safari, see the map option `tapHold`.\n */\nexport class TapHoldHandler extends Handler {\n\t/**\n\t * @param {...MaplairMap} args The map.\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(TapHoldHandler);\n\t}\n\n\t/**\n\t * Called when the handler is enabled, adds the event hooks.\n\t */\n\taddHooks() {\n\t\tDomEvent.on(this._map._container, 'pointerdown', this._onDown, this);\n\t}\n\n\t/**\n\t * Called when the handler is disabled, removes the event hooks.\n\t */\n\tremoveHooks() {\n\t\tDomEvent.off(this._map._container, 'pointerdown', this._onDown, this);\n\t\tthis._cancel();\n\t\tthis._cancelClickPrevent();\n\t\tthis._stopPreventingNative();\n\t}\n\n\t_onDown(e) {\n\t\tclearTimeout(this._holdTimeout);\n\t\tif (PointerEvents.getPointers().length !== 1 || e.pointerType === 'mouse') { return; }\n\t\tconst el = this._map._container;\n\t\tthis._startPos = this._newPos = new Point(e.clientX, e.clientY);\n\n\t\tthis._holdTimeout = setTimeout((() => {\n\t\t\tthis._cancel();\n\t\t\tif (!this._isTapValid()) { return; }\n\n\t\t\t// prevent simulated mouse events https://w3c.github.io/touch-events/#mouse-events\n\t\t\tDomEvent.on(el, 'pointerup', DomEvent.preventDefault);\n\t\t\tDomEvent.on(el, 'pointerup pointercancel', this._cancelClickPrevent, this);\n\t\t\tthis._simulateEvent('contextmenu', e);\n\n\t\t\t// browsers that fire a native contextmenu on touch may do it later than us (e.g. Android with a longer\n\t\t\t// touch & hold delay, or Windows on release), so swallow it until the next press\n\t\t\tel.addEventListener('contextmenu', DomEvent.stop, true);\n\t\t\tel.addEventListener('pointerdown', this._stopPreventingNative, true);\n\t\t}), tapHoldDelay);\n\n\t\tDomEvent.on(el, 'pointerup pointercancel contextmenu', this._cancel, this);\n\t\tDomEvent.on(el, 'pointermove', this._onMove, this);\n\t}\n\n\t_cancelClickPrevent() {\n\t\tconst el = this._map._container;\n\t\tDomEvent.off(el, 'pointerup', DomEvent.preventDefault);\n\t\tDomEvent.off(el, 'pointerup pointercancel', this._cancelClickPrevent, this);\n\t};\n\n\t_stopPreventingNative = () => {\n\t\tconst el = this._map._container;\n\t\tel.removeEventListener('contextmenu', DomEvent.stop, true);\n\t\tel.removeEventListener('pointerdown', this._stopPreventingNative, true);\n\t};\n\n\t_cancel() {\n\t\tclearTimeout(this._holdTimeout);\n\t\tconst el = this._map._container;\n\t\tDomEvent.off(el, 'pointerup pointercancel contextmenu', this._cancel, this);\n\t\tDomEvent.off(el, 'pointermove', this._onMove, this);\n\t}\n\n\t_onMove(e) {\n\t\tthis._newPos = new Point(e.clientX, e.clientY);\n\t}\n\n\t_isTapValid() {\n\t\treturn this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance;\n\t}\n\n\t_simulateEvent(type, e) {\n\t\tconst simulatedEvent = new MouseEvent(type, {\n\t\t\tbubbles: true,\n\t\t\tcancelable: true,\n\t\t\tview: window,\n\t\t\t// detail: 1,\n\t\t\tscreenX: e.screenX,\n\t\t\tscreenY: e.screenY,\n\t\t\tclientX: e.clientX,\n\t\t\tclientY: e.clientY,\n\t\t\t// button: 2,\n\t\t\t// buttons: 2\n\t\t});\n\n\t\tsimulatedEvent._simulated = true;\n\n\t\te.target.dispatchEvent(simulatedEvent);\n\t}\n\n\t/**\n\t * Registers this default feature on the map class, called by `MaplairMap` itself.\n\t * @internal\n\t * @param {typeof MaplairMap} MaplairMap\n\t */\n\tstatic register(MaplairMap) {\n\t\tMaplairMap.mergeOptions({\n\t\t\ttapHold: true,\n\t\t\ttapTolerance: 15\n\t\t});\n\n\t\tMaplairMap.addInitHook('addHandler', 'tapHold', TapHoldHandler);\n\t}\n}\n"],"mappings":";;;;;;AAMA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;AAwBrB,IAAa,iBAAb,MAAa,uBAAuB,QAAQ;;;;CAI3C,YAAY,GAAG,MAAM;EACpB,MAAM,GAAG,IAAI;EACb,KAAK,cAAc,cAAc;CAClC;;;;CAKA,WAAW;EACV,GAAY,KAAK,KAAK,YAAY,eAAe,KAAK,SAAS,IAAI;CACpE;;;;CAKA,cAAc;EACb,IAAa,KAAK,KAAK,YAAY,eAAe,KAAK,SAAS,IAAI;EACpE,KAAK,QAAQ;EACb,KAAK,oBAAoB;EACzB,KAAK,sBAAsB;CAC5B;CAEA,QAAQ,GAAG;EACV,aAAa,KAAK,YAAY;EAC9B,IAAIA,YAA0B,CAAC,CAAC,WAAW,KAAK,EAAE,gBAAgB,SAAW;EAC7E,MAAM,KAAK,KAAK,KAAK;EACrB,KAAK,YAAY,KAAK,UAAU,IAAI,MAAM,EAAE,SAAS,EAAE,OAAO;EAE9D,KAAK,eAAe,kBAAkB;GACrC,KAAK,QAAQ;GACb,IAAI,CAAC,KAAK,YAAY,GAAK;GAG3B,GAAY,IAAI,aAAaC,cAAuB;GACpD,GAAY,IAAI,2BAA2B,KAAK,qBAAqB,IAAI;GACzE,KAAK,eAAe,eAAe,CAAC;GAIpC,GAAG,iBAAiB,eAAeC,MAAe,IAAI;GACtD,GAAG,iBAAiB,eAAe,KAAK,uBAAuB,IAAI;EACpE,IAAI,YAAY;EAEhB,GAAY,IAAI,uCAAuC,KAAK,SAAS,IAAI;EACzE,GAAY,IAAI,eAAe,KAAK,SAAS,IAAI;CAClD;CAEA,sBAAsB;EACrB,MAAM,KAAK,KAAK,KAAK;EACrB,IAAa,IAAI,aAAaD,cAAuB;EACrD,IAAa,IAAI,2BAA2B,KAAK,qBAAqB,IAAI;CAC3E;CAEA,8BAA8B;EAC7B,MAAM,KAAK,KAAK,KAAK;EACrB,GAAG,oBAAoB,eAAeC,MAAe,IAAI;EACzD,GAAG,oBAAoB,eAAe,KAAK,uBAAuB,IAAI;CACvE;CAEA,UAAU;EACT,aAAa,KAAK,YAAY;EAC9B,MAAM,KAAK,KAAK,KAAK;EACrB,IAAa,IAAI,uCAAuC,KAAK,SAAS,IAAI;EAC1E,IAAa,IAAI,eAAe,KAAK,SAAS,IAAI;CACnD;CAEA,QAAQ,GAAG;EACV,KAAK,UAAU,IAAI,MAAM,EAAE,SAAS,EAAE,OAAO;CAC9C;CAEA,cAAc;EACb,OAAO,KAAK,QAAQ,WAAW,KAAK,SAAS,KAAK,KAAK,KAAK,QAAQ;CACrE;CAEA,eAAe,MAAM,GAAG;EACvB,MAAM,iBAAiB,IAAI,WAAW,MAAM;GAC3C,SAAS;GACT,YAAY;GACZ,MAAM;GAEN,SAAS,EAAE;GACX,SAAS,EAAE;GACX,SAAS,EAAE;GACX,SAAS,EAAE;EAGZ,CAAC;EAED,eAAe,aAAa;EAE5B,EAAE,OAAO,cAAc,cAAc;CACtC;;;;;;CAOA,OAAO,SAAS,YAAY;EAC3B,WAAW,aAAa;GACvB,SAAS;GACT,cAAc;EACf,CAAC;EAED,WAAW,YAAY,cAAc,WAAW,cAAc;CAC/D;AACD"}
|
package/dist/esm/package.js
CHANGED