maplair 4.3.0 → 4.5.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 +151 -8
- package/dist/esm/control/AttributionControl.js +30 -13
- package/dist/esm/control/AttributionControl.js.map +1 -1
- package/dist/esm/control/ButtonControl.js +0 -1
- package/dist/esm/control/ButtonControl.js.map +1 -1
- package/dist/esm/control/ContextMenu.js +1 -1
- package/dist/esm/control/ContextMenu.js.map +1 -1
- package/dist/esm/control/Control.js +16 -11
- package/dist/esm/control/Control.js.map +1 -1
- package/dist/esm/control/FullscreenControl.js +0 -1
- package/dist/esm/control/FullscreenControl.js.map +1 -1
- package/dist/esm/control/LayersControl.js +46 -27
- package/dist/esm/control/LayersControl.js.map +1 -1
- package/dist/esm/control/RotateControl.js +0 -1
- package/dist/esm/control/RotateControl.js.map +1 -1
- package/dist/esm/control/ScaleControl.js +7 -8
- package/dist/esm/control/ScaleControl.js.map +1 -1
- package/dist/esm/control/SideBySideControl.js +3 -2
- package/dist/esm/control/SideBySideControl.js.map +1 -1
- package/dist/esm/control/ZoomControl.js +14 -13
- package/dist/esm/control/ZoomControl.js.map +1 -1
- package/dist/esm/core/Events.js +3 -2
- package/dist/esm/core/Events.js.map +1 -1
- package/dist/esm/core/Util.js +17 -5
- package/dist/esm/core/Util.js.map +1 -1
- package/dist/esm/dom/DomEvent.PointerEvents.js +72 -2
- package/dist/esm/dom/DomEvent.PointerEvents.js.map +1 -1
- package/dist/esm/dom/DomEvent.js +4 -7
- package/dist/esm/dom/DomEvent.js.map +1 -1
- package/dist/esm/dom/DomUtil.js +5 -5
- package/dist/esm/dom/DomUtil.js.map +1 -1
- package/dist/esm/dom/Draggable.js +10 -8
- package/dist/esm/dom/Draggable.js.map +1 -1
- package/dist/esm/geo/LatLng.js +24 -35
- package/dist/esm/geo/LatLng.js.map +1 -1
- package/dist/esm/geo/LatLngBounds.js +6 -3
- package/dist/esm/geo/LatLngBounds.js.map +1 -1
- package/dist/esm/geometry/Bounds.js +2 -2
- package/dist/esm/geometry/Bounds.js.map +1 -1
- package/dist/esm/geometry/Point.js +16 -19
- package/dist/esm/geometry/Point.js.map +1 -1
- package/dist/esm/geometry/PolyUtil.js +10 -3
- package/dist/esm/geometry/PolyUtil.js.map +1 -1
- package/dist/esm/geometry/Transformation.js +1 -7
- package/dist/esm/geometry/Transformation.js.map +1 -1
- package/dist/esm/layer/BlanketOverlay.js +3 -2
- package/dist/esm/layer/BlanketOverlay.js.map +1 -1
- package/dist/esm/layer/DivOverlay.js +25 -25
- package/dist/esm/layer/DivOverlay.js.map +1 -1
- package/dist/esm/layer/ImageOverlay.js +8 -5
- package/dist/esm/layer/ImageOverlay.js.map +1 -1
- package/dist/esm/layer/Layer.js +12 -7
- package/dist/esm/layer/Layer.js.map +1 -1
- package/dist/esm/layer/Popup.js +33 -15
- package/dist/esm/layer/Popup.js.map +1 -1
- package/dist/esm/layer/Tooltip.js +48 -56
- package/dist/esm/layer/Tooltip.js.map +1 -1
- package/dist/esm/layer/VideoOverlay.js +2 -2
- package/dist/esm/layer/VideoOverlay.js.map +1 -1
- package/dist/esm/layer/marker/DivIcon.js +4 -8
- package/dist/esm/layer/marker/DivIcon.js.map +1 -1
- package/dist/esm/layer/marker/Icon.js +37 -17
- package/dist/esm/layer/marker/Icon.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Drag.js +11 -12
- package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
- package/dist/esm/layer/marker/Marker.js +54 -53
- package/dist/esm/layer/marker/Marker.js.map +1 -1
- package/dist/esm/layer/marker/SvgIcon.js +1 -1
- package/dist/esm/layer/marker/SvgIcon.js.map +1 -1
- package/dist/esm/layer/tile/GridLayer.js +29 -21
- package/dist/esm/layer/tile/GridLayer.js.map +1 -1
- package/dist/esm/layer/tile/TileLayer.js +19 -15
- package/dist/esm/layer/tile/TileLayer.js.map +1 -1
- package/dist/esm/layer/tile/WMSTileLayer.js +7 -3
- package/dist/esm/layer/tile/WMSTileLayer.js.map +1 -1
- package/dist/esm/layer/vector/Canvas.js +45 -94
- package/dist/esm/layer/vector/Canvas.js.map +1 -1
- package/dist/esm/layer/vector/Circle.js +8 -9
- package/dist/esm/layer/vector/Circle.js.map +1 -1
- package/dist/esm/layer/vector/CircleMarker.js +15 -4
- package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
- package/dist/esm/layer/vector/Path.ZoomStyles.js +4 -1
- package/dist/esm/layer/vector/Path.ZoomStyles.js.map +1 -1
- package/dist/esm/layer/vector/Path.js +10 -5
- package/dist/esm/layer/vector/Path.js.map +1 -1
- package/dist/esm/layer/vector/Polygon.js +10 -11
- package/dist/esm/layer/vector/Polygon.js.map +1 -1
- package/dist/esm/layer/vector/Polyline.js +19 -26
- package/dist/esm/layer/vector/Polyline.js.map +1 -1
- package/dist/esm/layer/vector/Renderer.getRenderer.js +2 -1
- package/dist/esm/layer/vector/Renderer.getRenderer.js.map +1 -1
- package/dist/esm/layer/vector/Renderer.js +16 -0
- package/dist/esm/layer/vector/Renderer.js.map +1 -1
- package/dist/esm/layer/vector/SVG.js +3 -3
- package/dist/esm/layer/vector/SVG.js.map +1 -1
- package/dist/esm/map/Map.Rotation.js +9 -11
- package/dist/esm/map/Map.Rotation.js.map +1 -1
- package/dist/esm/map/Map.js +158 -71
- package/dist/esm/map/Map.js.map +1 -1
- package/dist/esm/map/MapSync.js +2 -5
- package/dist/esm/map/MapSync.js.map +1 -1
- package/dist/esm/map/handler/BoxZoomHandler.js +4 -0
- package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/DisplaceHandler.js +68 -30
- package/dist/esm/map/handler/DisplaceHandler.js.map +1 -1
- package/dist/esm/map/handler/DragHandler.js +7 -2
- package/dist/esm/map/handler/DragHandler.js.map +1 -1
- package/dist/esm/map/handler/KeyboardHandler.js +3 -5
- package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
- package/dist/esm/map/handler/PinchZoomHandler.js +4 -7
- package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js +4 -7
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/TapDragZoomHandler.js +2 -5
- package/dist/esm/map/handler/TapDragZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/TapHoldHandler.js +8 -20
- package/dist/esm/map/handler/TapHoldHandler.js.map +1 -1
- package/dist/esm/package.js +1 -1
- package/dist/maplair-global-src.js +970 -810
- 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 +970 -810
- package/dist/maplair-src.js.map +1 -1
- package/dist/maplair.css +1 -1
- package/dist/maplair.js +2 -2
- package/dist/maplair.js.map +1 -1
- package/i18n/en.json +1 -0
- package/package.json +1 -1
- package/src/control/AttributionControl.js +37 -11
- package/src/control/ButtonControl.js +0 -1
- package/src/control/ContextMenu.js +1 -1
- package/src/control/Control.js +13 -16
- package/src/control/FullscreenControl.js +0 -1
- package/src/control/LayersControl.js +61 -37
- package/src/control/RotateControl.js +0 -1
- package/src/control/ScaleControl.js +10 -8
- package/src/control/SideBySideControl.js +4 -2
- package/src/control/ZoomControl.js +11 -13
- package/src/core/Events.js +6 -2
- package/src/core/Util.js +17 -4
- package/src/dom/DomEvent.PointerEvents.js +68 -2
- package/src/dom/DomEvent.js +5 -17
- package/src/dom/DomUtil.js +5 -5
- package/src/dom/Draggable.js +11 -8
- package/src/geo/LatLng.js +24 -37
- package/src/geo/LatLngBounds.js +10 -4
- package/src/geometry/Bounds.js +3 -3
- package/src/geometry/Point.js +22 -28
- package/src/geometry/PolyUtil.js +12 -3
- package/src/geometry/Transformation.js +1 -8
- package/src/layer/BlanketOverlay.js +6 -3
- package/src/layer/DivOverlay.js +30 -32
- package/src/layer/ImageOverlay.js +12 -9
- package/src/layer/Layer.js +19 -7
- package/src/layer/Popup.js +41 -21
- package/src/layer/Tooltip.js +50 -70
- package/src/layer/VideoOverlay.js +2 -2
- package/src/layer/marker/DivIcon.js +3 -6
- package/src/layer/marker/Icon.js +41 -20
- package/src/layer/marker/Marker.Drag.js +22 -24
- package/src/layer/marker/Marker.js +71 -64
- package/src/layer/marker/SvgIcon.js +1 -1
- package/src/layer/tile/GridLayer.js +41 -30
- package/src/layer/tile/TileLayer.js +31 -21
- package/src/layer/tile/WMSTileLayer.js +4 -2
- package/src/layer/vector/Canvas.js +53 -149
- package/src/layer/vector/Circle.js +13 -13
- package/src/layer/vector/CircleMarker.js +16 -3
- package/src/layer/vector/Path.ZoomStyles.js +5 -3
- package/src/layer/vector/Path.js +11 -5
- package/src/layer/vector/Polygon.js +11 -10
- package/src/layer/vector/Polyline.js +20 -21
- package/src/layer/vector/Renderer.getRenderer.js +2 -1
- package/src/layer/vector/Renderer.js +21 -3
- package/src/layer/vector/SVG.js +3 -3
- package/src/map/Map.Rotation.js +13 -9
- package/src/map/Map.js +195 -83
- package/src/map/MapSync.js +2 -2
- package/src/map/handler/BoxZoomHandler.js +5 -0
- package/src/map/handler/DisplaceHandler.js +53 -7
- package/src/map/handler/DragHandler.js +5 -5
- package/src/map/handler/KeyboardHandler.js +5 -10
- package/src/map/handler/PinchZoomHandler.js +4 -4
- package/src/map/handler/ScrollWheelZoomHandler.js +4 -4
- package/src/map/handler/TapDragZoomHandler.js +2 -2
- package/src/map/handler/TapHoldHandler.js +13 -25
- package/src/maplair.css +50 -10
- package/dist/esm/dom/DomEvent.DoubleTap.js +0 -90
- package/dist/esm/dom/DomEvent.DoubleTap.js.map +0 -1
- package/src/dom/DomEvent.DoubleTap.js +0 -143
package/dist/esm/map/Map.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { setOptions, stamp } from "../core/Util.js";
|
|
2
2
|
import { Point } from "../geometry/Point.js";
|
|
3
|
-
import { disablePointerDetection, enablePointerDetection } from "../dom/DomEvent.PointerEvents.js";
|
|
3
|
+
import { disablePointerDetection, enablePointerDetection, isClickDisabled, simulateDblclick } from "../dom/DomEvent.PointerEvents.js";
|
|
4
4
|
import { getPointerPosition, isExternalTarget, off, on } from "../dom/DomEvent.js";
|
|
5
|
-
import { create, get, getPosition, setPosition, setTransform } from "../dom/DomUtil.js";
|
|
5
|
+
import { create, get, getPosition, getScale, setPosition, setTransform } from "../dom/DomUtil.js";
|
|
6
6
|
import { Control } from "../control/Control.js";
|
|
7
7
|
import { I18n } from "../core/I18n.js";
|
|
8
8
|
import { AttributionControl } from "../control/AttributionControl.js";
|
|
@@ -58,7 +58,9 @@ const zoomAnimDuration = 250;
|
|
|
58
58
|
* user tries to pan outside the view. To set the restriction dynamically, use
|
|
59
59
|
* [`setMaxBounds`](#map-setmaxbounds) method.
|
|
60
60
|
* @property {Renderer} [renderer] The default method for drawing vector layers on the
|
|
61
|
-
* map. `SVG`
|
|
61
|
+
* map. A new `SVG` renderer by default; pass `new Canvas()` to draw them on a canvas
|
|
62
|
+
* instead. Paths in custom panes get their own renderer for that pane, of the same
|
|
63
|
+
* class and with the same options as this one.
|
|
62
64
|
* @property {boolean} [zoomAnimation=true] Whether the map zoom animation is enabled.
|
|
63
65
|
* @property {number} [zoomAnimationThreshold=4] Won't animate zoom if the zoom
|
|
64
66
|
* difference exceeds this value (or 1 if the user prefers
|
|
@@ -142,15 +144,25 @@ const zoomAnimDuration = 250;
|
|
|
142
144
|
/**
|
|
143
145
|
* Options of the `MaplairMap` methods which modify the zoom level and the center.
|
|
144
146
|
* @typedef {object} ZoomPanOptions
|
|
147
|
+
* @property {boolean} [animate] Whether to animate the change: like `ZoomOptions.animate`
|
|
148
|
+
* if the zoom level changes, and like `PanOptions.animate` otherwise. The `zoom` and
|
|
149
|
+
* `pan` options can set it for each case separately.
|
|
150
|
+
* @property {boolean} [reset] If `true`, the view is reset without animation.
|
|
151
|
+
* @property {ZoomOptions} [zoom] Options for the zoom part of the change, taking
|
|
152
|
+
* precedence over `animate`.
|
|
153
|
+
* @property {PanOptions} [pan] Options for the pan part of the change, taking
|
|
154
|
+
* precedence over `animate`.
|
|
145
155
|
* @extends ZoomOptions, PanOptions
|
|
146
156
|
*/
|
|
147
157
|
/**
|
|
148
158
|
* Options of `MaplairMap.invalidateSize()`.
|
|
149
159
|
* @typedef {object} InvalidateSizeOptions
|
|
160
|
+
* @property {boolean} [animate=false] If `true`, the map pans to its new center with
|
|
161
|
+
* animation.
|
|
150
162
|
* @property {boolean} [pan=true] If `false`, panning will not occur.
|
|
151
163
|
* @property {boolean} [debounceMoveend=false] If `true`, it will delay `moveend` event
|
|
152
164
|
* so that it doesn't happen often even if the method is called many times in a row.
|
|
153
|
-
* @extends
|
|
165
|
+
* @extends PanOptions
|
|
154
166
|
*/
|
|
155
167
|
/**
|
|
156
168
|
* Padding options of `MaplairMap` methods, e.g. `panInside()`.
|
|
@@ -198,7 +210,9 @@ const zoomAnimDuration = 250;
|
|
|
198
210
|
* pressing a key or clicking a zoom button) have an `originalEvent` property with the
|
|
199
211
|
* DOM event that started the change. It is `undefined` for changes made by code (e.g.
|
|
200
212
|
* `setView()`), which allows to tell them apart, e.g. to avoid feedback loops when
|
|
201
|
-
* synchronizing the view.
|
|
213
|
+
* synchronizing the view. The `move` and `zoom` events also have `flyTo: true` on each
|
|
214
|
+
* [`flyTo`](#map-flyto) animation frame, and `pinch: true` while the user pinch-zooms
|
|
215
|
+
* the map.
|
|
202
216
|
*
|
|
203
217
|
* @example
|
|
204
218
|
* ```js
|
|
@@ -298,6 +312,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
298
312
|
this._handlers = [];
|
|
299
313
|
this._layers = {};
|
|
300
314
|
this._zoomBoundLayers = {};
|
|
315
|
+
this._canvases = [];
|
|
301
316
|
this._sizeChanged = true;
|
|
302
317
|
this._initContainer(id);
|
|
303
318
|
this._initLayout();
|
|
@@ -328,10 +343,23 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
328
343
|
* @returns {this}
|
|
329
344
|
*/
|
|
330
345
|
setView(center, zoom, options) {
|
|
331
|
-
zoom = zoom === void 0 ? this.
|
|
346
|
+
zoom = zoom === void 0 ? this._targetZoom() : this._limitZoom(zoom);
|
|
347
|
+
const targetCenter = center;
|
|
332
348
|
center = this._limitCenter(new LatLng(center), zoom, this.options.maxBounds);
|
|
333
349
|
options ??= {};
|
|
334
350
|
this._stop();
|
|
351
|
+
this._targetView = {
|
|
352
|
+
center: targetCenter,
|
|
353
|
+
zoom
|
|
354
|
+
};
|
|
355
|
+
if (this._animatingZoom) {
|
|
356
|
+
this._pendingView = {
|
|
357
|
+
center,
|
|
358
|
+
zoom,
|
|
359
|
+
options
|
|
360
|
+
};
|
|
361
|
+
return this;
|
|
362
|
+
}
|
|
335
363
|
if (this._loaded && !options.reset && options !== true) {
|
|
336
364
|
if (options.animate !== void 0) {
|
|
337
365
|
options.zoom = {
|
|
@@ -344,12 +372,12 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
344
372
|
...options.pan
|
|
345
373
|
};
|
|
346
374
|
}
|
|
347
|
-
if (this._zoom !== zoom ? this._tryAnimatedZoom
|
|
375
|
+
if (this._zoom !== zoom ? this._tryAnimatedZoom?.(center, zoom, options.zoom) : this._tryAnimatedPan(center, options.pan)) {
|
|
348
376
|
clearTimeout(this._sizeTimer);
|
|
349
377
|
return this;
|
|
350
378
|
}
|
|
351
379
|
}
|
|
352
|
-
this._resetView(center, zoom, options.pan?.noMoveStart);
|
|
380
|
+
this._resetView(this.options.worldCopyJump ? this.wrapLatLng(center) : center, zoom, options.pan?.noMoveStart);
|
|
353
381
|
return this;
|
|
354
382
|
}
|
|
355
383
|
/**
|
|
@@ -364,7 +392,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
364
392
|
this._zoom = zoom;
|
|
365
393
|
return this;
|
|
366
394
|
}
|
|
367
|
-
return this.setView(this.getCenter(), zoom, { zoom: options });
|
|
395
|
+
return this.setView(this._targetView?.center ?? this.getCenter(), zoom, { zoom: options });
|
|
368
396
|
}
|
|
369
397
|
/**
|
|
370
398
|
* Increases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default).
|
|
@@ -375,7 +403,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
375
403
|
*/
|
|
376
404
|
zoomIn(delta, options) {
|
|
377
405
|
delta ??= this.options.zoomDelta;
|
|
378
|
-
return this.setZoom(this.
|
|
406
|
+
return this.setZoom(this._targetZoom() + delta, options);
|
|
379
407
|
}
|
|
380
408
|
/**
|
|
381
409
|
* Decreases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default).
|
|
@@ -386,7 +414,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
386
414
|
*/
|
|
387
415
|
zoomOut(delta, options) {
|
|
388
416
|
delta ??= this.options.zoomDelta;
|
|
389
|
-
return this.setZoom(this.
|
|
417
|
+
return this.setZoom(this._targetZoom() - delta, options);
|
|
390
418
|
}
|
|
391
419
|
/**
|
|
392
420
|
* Zooms the map while keeping a specified geographical point on the map
|
|
@@ -408,7 +436,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
408
436
|
bounds = bounds.getBounds ? bounds.getBounds() : LatLngBounds.from(bounds);
|
|
409
437
|
const paddingTL = Point.from(options.paddingTopLeft || options.padding || [0, 0]), paddingBR = Point.from(options.paddingBottomRight || options.padding || [0, 0]);
|
|
410
438
|
let zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR));
|
|
411
|
-
zoom =
|
|
439
|
+
zoom = Math.min(options.maxZoom ?? Infinity, zoom);
|
|
412
440
|
if (zoom === Infinity) return {
|
|
413
441
|
center: bounds.getCenter(),
|
|
414
442
|
zoom
|
|
@@ -451,7 +479,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
451
479
|
* @returns {this}
|
|
452
480
|
*/
|
|
453
481
|
panTo(center, options) {
|
|
454
|
-
return this.setView(center,
|
|
482
|
+
return this.setView(center, void 0, { pan: options });
|
|
455
483
|
}
|
|
456
484
|
/**
|
|
457
485
|
* Pans the map by a given number of pixels (animated unless `animate: false` is passed,
|
|
@@ -463,24 +491,18 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
463
491
|
* @returns {this}
|
|
464
492
|
*/
|
|
465
493
|
panBy(offset, options) {
|
|
466
|
-
|
|
494
|
+
const { center = this.getCenter(), zoom = this._zoom } = this._targetView ?? {}, newCenter = this.unproject(this.project(center, zoom).add(Point.from(offset).round()), zoom);
|
|
495
|
+
return this.setView(newCenter, zoom, { pan: options });
|
|
496
|
+
}
|
|
497
|
+
_panBy(offset, options) {
|
|
467
498
|
options ??= {};
|
|
468
|
-
if (!offset.x && !offset.y) return this.
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
return this;
|
|
474
|
-
}
|
|
475
|
-
if (!this._panAnim) {
|
|
476
|
-
this._panAnim = new PosAnimation();
|
|
477
|
-
this._panAnim.on({
|
|
478
|
-
"step": this._onPanTransitionStep,
|
|
479
|
-
"end": this._onPanTransitionEnd
|
|
480
|
-
}, this);
|
|
481
|
-
}
|
|
499
|
+
if (!offset.x && !offset.y) return this._moveStart(false, true)._moveEnd(false);
|
|
500
|
+
if (!this._panAnim) this._panAnim = new PosAnimation().on({
|
|
501
|
+
step: this._onPanTransitionStep,
|
|
502
|
+
end: this._onPanTransitionEnd
|
|
503
|
+
}, this);
|
|
482
504
|
if (!options.noMoveStart) this.fire("movestart");
|
|
483
|
-
const tooFarForReducedMotion = this._prefersReducedMotion() && !
|
|
505
|
+
const tooFarForReducedMotion = this._prefersReducedMotion() && !this.getSize().divideBy(2).contains(offset);
|
|
484
506
|
if (options.animate === true || options.animate !== false && !tooFarForReducedMotion) {
|
|
485
507
|
this._mapPane.classList.add("maplair-pan-anim");
|
|
486
508
|
const newPos = this._getMapPanePos().subtract(offset).round();
|
|
@@ -488,7 +510,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
488
510
|
} else {
|
|
489
511
|
this._rawPanBy(offset);
|
|
490
512
|
this._wrapWorldCopy();
|
|
491
|
-
this.fire("move").
|
|
513
|
+
this.fire("move")._moveEnd(false);
|
|
492
514
|
}
|
|
493
515
|
return this;
|
|
494
516
|
}
|
|
@@ -512,9 +534,15 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
512
534
|
}
|
|
513
535
|
});
|
|
514
536
|
if (options.animate !== true && this._prefersReducedMotion()) return this.setView(targetCenter, targetZoom, options);
|
|
515
|
-
this.
|
|
516
|
-
|
|
537
|
+
targetZoom = targetZoom === void 0 ? this._targetZoom() : this._limitZoom(targetZoom);
|
|
538
|
+
const requestedCenter = targetCenter;
|
|
517
539
|
targetCenter = this._limitCenter(new LatLng(targetCenter), targetZoom, this.options.maxBounds);
|
|
540
|
+
this._stop();
|
|
541
|
+
this._targetView = {
|
|
542
|
+
center: requestedCenter,
|
|
543
|
+
zoom: targetZoom
|
|
544
|
+
};
|
|
545
|
+
this._subpixelOrigin = true;
|
|
518
546
|
const from = this.project(this.getCenter()), to = this.project(targetCenter), size = this.getSize(), startZoom = this._zoom;
|
|
519
547
|
const w0 = Math.max(size.x, size.y), w1 = w0 * this.getZoomScale(startZoom, targetZoom), u1 = to.distanceTo(from) || 1, rho = 1.42, rho2 = rho * rho;
|
|
520
548
|
function r(i) {
|
|
@@ -528,7 +556,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
528
556
|
function easeOut(t) {
|
|
529
557
|
return 1 - (1 - t) ** 1.5;
|
|
530
558
|
}
|
|
531
|
-
const start = Date.now(), S = (r(1) - r0) / rho, duration =
|
|
559
|
+
const start = Date.now(), S = (r(1) - r0) / rho, duration = 1e3 * (options.duration || S * .8);
|
|
532
560
|
const frame = () => {
|
|
533
561
|
const t = (Date.now() - start) / duration, s = easeOut(t) * S;
|
|
534
562
|
if (t <= 1) {
|
|
@@ -536,6 +564,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
536
564
|
this._move(this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom), this.getScaleZoom(Math.cosh(r0 + rho * s) / Math.cosh(r0), startZoom), { flyTo: true });
|
|
537
565
|
} else {
|
|
538
566
|
const zoomChanged = this._zoom !== targetZoom;
|
|
567
|
+
this._subpixelOrigin = false;
|
|
539
568
|
this._move(targetCenter, targetZoom);
|
|
540
569
|
if (!zoomChanged) this.fire("zoom");
|
|
541
570
|
this._moveEnd(true);
|
|
@@ -620,7 +649,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
620
649
|
this.options.minZoom = zoom;
|
|
621
650
|
if (this._loaded && oldZoom !== zoom) {
|
|
622
651
|
this.fire("zoomlevelschange");
|
|
623
|
-
if (this.
|
|
652
|
+
if (this._targetZoom() < this.options.minZoom) return this.setZoom(zoom);
|
|
624
653
|
}
|
|
625
654
|
return this;
|
|
626
655
|
}
|
|
@@ -635,7 +664,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
635
664
|
this.options.maxZoom = zoom;
|
|
636
665
|
if (this._loaded && oldZoom !== zoom) {
|
|
637
666
|
this.fire("zoomlevelschange");
|
|
638
|
-
if (this.
|
|
667
|
+
if (this._targetZoom() > this.options.maxZoom) return this.setZoom(zoom);
|
|
639
668
|
}
|
|
640
669
|
return this;
|
|
641
670
|
}
|
|
@@ -680,8 +709,8 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
680
709
|
}
|
|
681
710
|
/**
|
|
682
711
|
* Checks if the map container size changed and updates the map if so —
|
|
683
|
-
* call it after you've changed the map size dynamically, also
|
|
684
|
-
*
|
|
712
|
+
* call it after you've changed the map size dynamically, also panning to
|
|
713
|
+
* keep the center by default. If `options.pan` is `false`, panning will not occur.
|
|
685
714
|
* If `options.debounceMoveend` is `true`, it will delay `moveend` event so
|
|
686
715
|
* that it doesn't happen often even if the method is called many
|
|
687
716
|
* times in a row. Passing `true` instead of options animates the panning.
|
|
@@ -698,8 +727,9 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
698
727
|
};
|
|
699
728
|
const oldSize = this.getSize();
|
|
700
729
|
this._sizeChanged = true;
|
|
701
|
-
|
|
702
|
-
|
|
730
|
+
const newSize = this.getSize();
|
|
731
|
+
if (!newSize.equals(oldSize)) this._lastCenter = null;
|
|
732
|
+
const oldCenter = oldSize.divideBy(2).round(), newCenter = newSize.divideBy(2).round(), offset = oldCenter.subtract(newCenter);
|
|
703
733
|
if (!offset.x && !offset.y) return this;
|
|
704
734
|
if (options.animate && options.pan) this.panBy(offset);
|
|
705
735
|
else {
|
|
@@ -781,7 +811,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
781
811
|
}
|
|
782
812
|
_handleGeolocationResponse(pos) {
|
|
783
813
|
if (!this._container._maplair_id) return;
|
|
784
|
-
const
|
|
814
|
+
const latlng = new LatLng(pos.coords.latitude, pos.coords.longitude), bounds = latlng.toBounds(pos.coords.accuracy * 2), options = this._locateOptions;
|
|
785
815
|
if (options.setView) {
|
|
786
816
|
const zoom = this.getBoundsZoom(bounds);
|
|
787
817
|
this.setView(latlng, options.maxZoom ? Math.min(zoom, options.maxZoom) : zoom);
|
|
@@ -815,7 +845,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
815
845
|
*/
|
|
816
846
|
remove() {
|
|
817
847
|
this._initEvents(true);
|
|
818
|
-
|
|
848
|
+
this.off("moveend", this._panInsideMaxBounds);
|
|
819
849
|
if (this._containerId !== this._container._maplair_id) throw new Error("Map container is being reused by another instance");
|
|
820
850
|
delete this._container._maplair_id;
|
|
821
851
|
delete this._containerId;
|
|
@@ -914,7 +944,12 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
914
944
|
bounds = LatLngBounds.from(bounds);
|
|
915
945
|
padding = Point.from(padding ?? [0, 0]);
|
|
916
946
|
let zoom = this.getZoom() ?? 0;
|
|
917
|
-
const min = this.getMinZoom(), max = this.getMaxZoom(),
|
|
947
|
+
const min = this.getMinZoom(), max = this.getMaxZoom(), size = this.getSize().subtract(padding), corners = [
|
|
948
|
+
bounds.getNorthWest(),
|
|
949
|
+
bounds.getNorthEast(),
|
|
950
|
+
bounds.getSouthEast(),
|
|
951
|
+
bounds.getSouthWest()
|
|
952
|
+
], boundsSize = new Bounds(corners.map((c) => this.project(c, zoom))).getSize(), snap = this.options.zoomSnap, scalex = Math.max(size.x, 0) / boundsSize.x, scaley = Math.max(size.y, 0) / boundsSize.y, scale = inside ? Math.max(scalex, scaley) : Math.min(scalex, scaley);
|
|
918
953
|
zoom = this.getScaleZoom(scale, zoom);
|
|
919
954
|
if (snap) {
|
|
920
955
|
zoom = Math.round(zoom / (snap / 100)) * (snap / 100);
|
|
@@ -1153,7 +1188,18 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1153
1188
|
* @returns {Point}
|
|
1154
1189
|
*/
|
|
1155
1190
|
pointerEventToContainerPoint(e) {
|
|
1156
|
-
return getPointerPosition(e, this._container);
|
|
1191
|
+
if (!this._animatingZoom) return getPointerPosition(e, this._container);
|
|
1192
|
+
if (!this._containerRect) {
|
|
1193
|
+
const el = this._container, { x, y, boundingClientRect: r } = getScale(el);
|
|
1194
|
+
this._containerRect = {
|
|
1195
|
+
x,
|
|
1196
|
+
y,
|
|
1197
|
+
left: r.left + el.clientLeft * x,
|
|
1198
|
+
top: r.top + el.clientTop * y
|
|
1199
|
+
};
|
|
1200
|
+
}
|
|
1201
|
+
const c = this._containerRect;
|
|
1202
|
+
return new Point((e.clientX - c.left) / c.x, (e.clientY - c.top) / c.y);
|
|
1157
1203
|
}
|
|
1158
1204
|
/**
|
|
1159
1205
|
* Given a PointerEvent object, returns the pixel coordinate relative to
|
|
@@ -1318,18 +1364,25 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1318
1364
|
this._lastCenterPanePos = this._getMapPanePos();
|
|
1319
1365
|
this._pixelOrigin = this._getNewPixelOrigin(center);
|
|
1320
1366
|
if (!suppressEvent) {
|
|
1321
|
-
if (zoomChanged || data?.pinch) this.fire("zoom", data);
|
|
1367
|
+
if (zoomChanged || data?.pinch || data?.flyTo) this.fire("zoom", data);
|
|
1322
1368
|
this.fire("move", data);
|
|
1323
1369
|
} else if (data?.pinch) this.fire("zoom", data);
|
|
1324
1370
|
return this;
|
|
1325
1371
|
}
|
|
1326
1372
|
_moveEnd(zoomChanged) {
|
|
1373
|
+
if (!this._pendingView) this._targetView = null;
|
|
1327
1374
|
if (zoomChanged) this.fire("zoomend");
|
|
1328
1375
|
return this.fire("moveend");
|
|
1329
1376
|
}
|
|
1330
1377
|
_stop() {
|
|
1378
|
+
this._pendingView = null;
|
|
1379
|
+
this._targetView = null;
|
|
1331
1380
|
cancelAnimationFrame(this._flyToFrame);
|
|
1332
1381
|
cancelAnimationFrame(this._zoomAnimFrame);
|
|
1382
|
+
if (this._subpixelOrigin) {
|
|
1383
|
+
this._subpixelOrigin = false;
|
|
1384
|
+
this._move(this._lastCenter, this._zoom, { flyTo: true });
|
|
1385
|
+
}
|
|
1333
1386
|
this._panAnim?.stop();
|
|
1334
1387
|
return this;
|
|
1335
1388
|
}
|
|
@@ -1384,13 +1437,14 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1384
1437
|
_findEventTargets(e, type) {
|
|
1385
1438
|
let targets = [], target, src = e.target, dragging = false;
|
|
1386
1439
|
const isHover = type === "pointerout" || type === "pointerover";
|
|
1440
|
+
const canEndDrag = (type === "click" || type === "preclick") && e.detail > 0;
|
|
1387
1441
|
while (src) {
|
|
1388
1442
|
target = this._targets[stamp(src)];
|
|
1389
|
-
if (target &&
|
|
1443
|
+
if (target && canEndDrag && this._draggableMoved(target)) {
|
|
1390
1444
|
dragging = true;
|
|
1391
1445
|
break;
|
|
1392
1446
|
}
|
|
1393
|
-
if (target
|
|
1447
|
+
if (target?.listens(type, true)) {
|
|
1394
1448
|
if (isHover && !isExternalTarget(src, e)) break;
|
|
1395
1449
|
targets.push(target);
|
|
1396
1450
|
if (isHover) break;
|
|
@@ -1401,16 +1455,31 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1401
1455
|
if (!targets.length && !dragging && !isHover && this.listens(type, true)) targets = [this];
|
|
1402
1456
|
return targets;
|
|
1403
1457
|
}
|
|
1404
|
-
_isClickDisabled(el) {
|
|
1405
|
-
while (el && el !== this._container) {
|
|
1406
|
-
if (el["_maplair_disable_click"] || !el.parentNode) return true;
|
|
1407
|
-
el = el.parentNode;
|
|
1408
|
-
}
|
|
1409
|
-
}
|
|
1410
1458
|
_handleDOMEvent(e) {
|
|
1411
1459
|
const el = e.target;
|
|
1412
|
-
if (
|
|
1413
|
-
this.
|
|
1460
|
+
if (e.type === "click") simulateDblclick(e, this._container);
|
|
1461
|
+
if (!this._loaded || e.type === "click" && isClickDisabled(el, this._container)) return;
|
|
1462
|
+
const type = e.type, move = type === "pointermove", hovered = this._hoveredCanvasLayer, skip = type === "pointerover" || type === "pointerout" || type.startsWith("key") || this._animatingZoom || move && this.dragging?.moving(), leftMap = type === "pointerout" && !this._container.contains(e.relatedTarget);
|
|
1463
|
+
let layer = skip ? void 0 : this._canvasLayerAt(e, type === "click");
|
|
1464
|
+
if (type === "pointerdown") this._pressedCanvasLayer = skip ? void 0 : layer ?? null;
|
|
1465
|
+
else if (type === "click" && e.detail > 0 && this._pressedCanvasLayer !== void 0) {
|
|
1466
|
+
if (layer !== this._pressedCanvasLayer) layer = void 0;
|
|
1467
|
+
this._pressedCanvasLayer = void 0;
|
|
1468
|
+
}
|
|
1469
|
+
if (layer !== hovered && (move && !skip || leftMap)) {
|
|
1470
|
+
if (hovered) this._fireDOMEvent(e, "pointerout", [hovered]);
|
|
1471
|
+
this._container.classList.toggle("maplair-interactive", !!layer);
|
|
1472
|
+
this._hoveredCanvasLayer = layer;
|
|
1473
|
+
if (layer) this._fireDOMEvent(e, "pointerover", [layer]);
|
|
1474
|
+
}
|
|
1475
|
+
this._fireDOMEvent(e, type, layer && [layer]);
|
|
1476
|
+
}
|
|
1477
|
+
_canvasLayerAt(e, click) {
|
|
1478
|
+
for (let el = e.target; el !== this._container; el = el.parentNode) if (!el || el === this._controlContainer || this._targets[stamp(el)]) return;
|
|
1479
|
+
for (const renderer of this._canvases) {
|
|
1480
|
+
const layer = renderer._layerAt(e, click);
|
|
1481
|
+
if (layer) return layer;
|
|
1482
|
+
}
|
|
1414
1483
|
}
|
|
1415
1484
|
static _pointerEvents = [
|
|
1416
1485
|
"click",
|
|
@@ -1421,7 +1490,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1421
1490
|
];
|
|
1422
1491
|
_fireDOMEvent(e, type, canvasTargets) {
|
|
1423
1492
|
if (type === "click") this._fireDOMEvent(e, "preclick", canvasTargets);
|
|
1424
|
-
let targets = this._findEventTargets(e, type);
|
|
1493
|
+
let targets = canvasTargets && (type === "pointerover" || type === "pointerout") ? [] : this._findEventTargets(e, type);
|
|
1425
1494
|
if (canvasTargets) targets = [...canvasTargets.filter((t) => t.listens(type, true)), ...targets];
|
|
1426
1495
|
if (!targets.length) return;
|
|
1427
1496
|
if (type === "contextmenu") e.preventDefault();
|
|
@@ -1465,7 +1534,11 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1465
1534
|
}
|
|
1466
1535
|
_getNewPixelOrigin(center, zoom) {
|
|
1467
1536
|
const viewHalf = this.getSize()._divideBy(2);
|
|
1468
|
-
|
|
1537
|
+
const origin = this.project(center, zoom)._subtract(viewHalf)._add(this._getMapPanePos());
|
|
1538
|
+
return this._subpixelOrigin ? origin : origin._round();
|
|
1539
|
+
}
|
|
1540
|
+
_snapLayerPoint(point) {
|
|
1541
|
+
return this._subpixelOrigin ? point : point._round();
|
|
1469
1542
|
}
|
|
1470
1543
|
_latLngToNewLayerPoint(latlng, zoom, center) {
|
|
1471
1544
|
const topLeft = this._getNewPixelOrigin(center, zoom);
|
|
@@ -1492,7 +1565,12 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1492
1565
|
return offset.add(this._getBoundsOffset(newBounds, bounds));
|
|
1493
1566
|
}
|
|
1494
1567
|
_getBoundsOffset(pxBounds, maxBounds, zoom) {
|
|
1495
|
-
const
|
|
1568
|
+
const corners = [
|
|
1569
|
+
maxBounds.getNorthWest(),
|
|
1570
|
+
maxBounds.getNorthEast(),
|
|
1571
|
+
maxBounds.getSouthEast(),
|
|
1572
|
+
maxBounds.getSouthWest()
|
|
1573
|
+
], projectedMaxBounds = new Bounds(corners.map((c) => this.project(c, zoom))), minOffset = projectedMaxBounds.min.subtract(pxBounds.min), maxOffset = projectedMaxBounds.max.subtract(pxBounds.max), dx = this._rebound(minOffset.x, -maxOffset.x), dy = this._rebound(minOffset.y, -maxOffset.y);
|
|
1496
1574
|
return new Point(dx, dy);
|
|
1497
1575
|
}
|
|
1498
1576
|
_rebound(left, right) {
|
|
@@ -1509,17 +1587,17 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1509
1587
|
_onPanTransitionEnd() {
|
|
1510
1588
|
this._mapPane.classList.remove("maplair-pan-anim");
|
|
1511
1589
|
this._wrapWorldCopy();
|
|
1512
|
-
this.
|
|
1590
|
+
this._moveEnd(false);
|
|
1513
1591
|
}
|
|
1514
1592
|
_tryAnimatedPan(center, options) {
|
|
1515
|
-
const offset = this.
|
|
1593
|
+
const offset = this.latLngToLayerPoint(center)._subtract(this._getCenterLayerPoint())._round();
|
|
1516
1594
|
if (options?.animate !== true && !this.getSize().contains(offset)) return false;
|
|
1517
|
-
this.
|
|
1595
|
+
this._panBy(offset, options);
|
|
1518
1596
|
return true;
|
|
1519
1597
|
}
|
|
1520
1598
|
_createAnimProxy() {
|
|
1521
1599
|
this._proxy = create("div", "maplair-proxy maplair-zoom-animated");
|
|
1522
|
-
this._panes.mapPane.
|
|
1600
|
+
this._panes.mapPane.append(this._proxy);
|
|
1523
1601
|
this.on("zoomanim", this._animateProxyZoom, this);
|
|
1524
1602
|
this.on("load moveend", this._animMoveEnd, this);
|
|
1525
1603
|
on(this._proxy, "transitionend", this._catchTransitionEnd, this);
|
|
@@ -1553,6 +1631,9 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1553
1631
|
};
|
|
1554
1632
|
this._flyToFrame = requestAnimationFrame(frame);
|
|
1555
1633
|
}
|
|
1634
|
+
_targetZoom() {
|
|
1635
|
+
return this._targetView?.zoom ?? this._zoom;
|
|
1636
|
+
}
|
|
1556
1637
|
_zoomInputBlocked() {
|
|
1557
1638
|
return this._animatingZoom || Date.now() < this._instantZoomEnd;
|
|
1558
1639
|
}
|
|
@@ -1571,18 +1652,16 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1571
1652
|
this._zoomAnimFrame = requestAnimationFrame(() => {
|
|
1572
1653
|
this._zoomAnimFrame = null;
|
|
1573
1654
|
if (userEvent) this._setUserEvent(userEvent);
|
|
1574
|
-
this._moveStart(true, options.noMoveStart ?? false)._animateZoom(center, zoom
|
|
1655
|
+
this._moveStart(true, options.noMoveStart ?? false)._animateZoom(center, zoom);
|
|
1575
1656
|
});
|
|
1576
1657
|
return true;
|
|
1577
1658
|
}
|
|
1578
|
-
_animateZoom(center, zoom,
|
|
1659
|
+
_animateZoom(center, zoom, noUpdate) {
|
|
1579
1660
|
if (!this._mapPane) return;
|
|
1580
|
-
|
|
1581
|
-
|
|
1582
|
-
|
|
1583
|
-
|
|
1584
|
-
this._mapPane.classList.add("maplair-zoom-anim");
|
|
1585
|
-
}
|
|
1661
|
+
this._animatingZoom = true;
|
|
1662
|
+
this._animateToCenter = center;
|
|
1663
|
+
this._animateToZoom = zoom;
|
|
1664
|
+
this._mapPane.classList.add("maplair-zoom-anim");
|
|
1586
1665
|
this.fire("zoomanim", {
|
|
1587
1666
|
center,
|
|
1588
1667
|
zoom,
|
|
@@ -1590,17 +1669,25 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1590
1669
|
});
|
|
1591
1670
|
if (!this._tempFireZoomEvent) this._tempFireZoomEvent = this._zoom !== this._animateToZoom;
|
|
1592
1671
|
this._move(this._animateToCenter, this._animateToZoom, void 0, true);
|
|
1593
|
-
this._transitionEndTimer
|
|
1672
|
+
clearTimeout(this._transitionEndTimer);
|
|
1673
|
+
this._transitionEndTimer = setTimeout(this._onZoomTransitionEnd.bind(this), 1e3);
|
|
1594
1674
|
}
|
|
1595
1675
|
_onZoomTransitionEnd() {
|
|
1596
1676
|
if (!this._animatingZoom) return;
|
|
1677
|
+
clearTimeout(this._transitionEndTimer);
|
|
1678
|
+
this._containerRect = null;
|
|
1597
1679
|
this._mapPane?.classList.remove("maplair-zoom-anim");
|
|
1598
1680
|
this._animatingZoom = false;
|
|
1599
|
-
this._move(this.
|
|
1681
|
+
this._move(this.getCenter(), this._animateToZoom, void 0, true);
|
|
1600
1682
|
if (this._tempFireZoomEvent) this.fire("zoom");
|
|
1601
1683
|
delete this._tempFireZoomEvent;
|
|
1602
1684
|
this.fire("move");
|
|
1603
1685
|
this._moveEnd(true);
|
|
1686
|
+
const view = this._pendingView;
|
|
1687
|
+
if (view) {
|
|
1688
|
+
this._pendingView = null;
|
|
1689
|
+
this.setView(view.center, view.zoom, view.options);
|
|
1690
|
+
}
|
|
1604
1691
|
}
|
|
1605
1692
|
};
|
|
1606
1693
|
for (const feature of [
|