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
|
@@ -114,11 +114,12 @@ export class Polyline extends Path {
|
|
|
114
114
|
let minDistance = Infinity,
|
|
115
115
|
minPoint = null,
|
|
116
116
|
p1, p2;
|
|
117
|
-
const closest = LineUtil._sqClosestPointOnSegment
|
|
117
|
+
const closest = LineUtil._sqClosestPointOnSegment,
|
|
118
|
+
closed = this._isClosed();
|
|
118
119
|
|
|
119
120
|
for (const points of this._parts) {
|
|
120
|
-
for (let i = 1, len = points.length; i < len; i++) {
|
|
121
|
-
p1 = points[i - 1];
|
|
121
|
+
for (let i = closed ? 0 : 1, len = points.length; i < len; i++) {
|
|
122
|
+
p1 = points[(i || len) - 1];
|
|
122
123
|
p2 = points[i];
|
|
123
124
|
|
|
124
125
|
const sqDist = closest(p, p1, p2, true);
|
|
@@ -228,7 +229,7 @@ export class Polyline extends Path {
|
|
|
228
229
|
const flat = latlngs[0] instanceof LatLng;
|
|
229
230
|
|
|
230
231
|
if (flat) {
|
|
231
|
-
const ring = latlngs.map(latlng => this.
|
|
232
|
+
const ring = latlngs.map(latlng => this._renderer._latLngToLayerPoint(latlng));
|
|
232
233
|
ring.forEach(r => projectedBounds.extend(r));
|
|
233
234
|
result.push(ring);
|
|
234
235
|
} else {
|
|
@@ -241,7 +242,7 @@ export class Polyline extends Path {
|
|
|
241
242
|
const bounds = this._renderer._bounds;
|
|
242
243
|
|
|
243
244
|
this._parts = [];
|
|
244
|
-
if (!this._pxBounds
|
|
245
|
+
if (!this._pxBounds?.intersects(bounds)) {
|
|
245
246
|
return;
|
|
246
247
|
}
|
|
247
248
|
|
|
@@ -251,13 +252,11 @@ export class Polyline extends Path {
|
|
|
251
252
|
}
|
|
252
253
|
|
|
253
254
|
const parts = this._parts;
|
|
254
|
-
let
|
|
255
|
+
let k = 0;
|
|
255
256
|
|
|
256
|
-
for (
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
for (j = 0, len2 = points.length; j < len2 - 1; j++) {
|
|
260
|
-
segment = LineUtil.clipSegment(points[j], points[j + 1], bounds, j);
|
|
257
|
+
for (const points of this._rings) {
|
|
258
|
+
for (let j = 0, len = points.length; j < len - 1; j++) {
|
|
259
|
+
const segment = LineUtil.clipSegment(points[j], points[j + 1], bounds, j);
|
|
261
260
|
|
|
262
261
|
if (!segment) { continue; }
|
|
263
262
|
|
|
@@ -265,7 +264,7 @@ export class Polyline extends Path {
|
|
|
265
264
|
parts[k].push(segment[0]);
|
|
266
265
|
|
|
267
266
|
// if segment goes out of screen, or it's the last one, it's the end of the line part
|
|
268
|
-
if ((segment[1] !== points[j + 1]) || (j ===
|
|
267
|
+
if ((segment[1] !== points[j + 1]) || (j === len - 2)) {
|
|
269
268
|
parts[k].push(segment[1]);
|
|
270
269
|
k++;
|
|
271
270
|
}
|
|
@@ -295,21 +294,21 @@ export class Polyline extends Path {
|
|
|
295
294
|
this._renderer._updatePoly(this);
|
|
296
295
|
}
|
|
297
296
|
|
|
297
|
+
// polygon rings also have a segment from the last point back to the first
|
|
298
|
+
_isClosed() {
|
|
299
|
+
return false;
|
|
300
|
+
}
|
|
301
|
+
|
|
298
302
|
// Needed by the `Canvas` renderer for interactivity
|
|
299
303
|
_containsPoint(p, closed) {
|
|
300
|
-
let i, j, k, len, len2, part;
|
|
301
304
|
const w = this._clickTolerance();
|
|
302
305
|
|
|
303
|
-
if (!this._pxBounds
|
|
306
|
+
if (!this._pxBounds?.contains(p)) { return false; }
|
|
304
307
|
|
|
305
308
|
// hit detection for polylines
|
|
306
|
-
for (
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
|
|
310
|
-
if (!closed && (j === 0)) { continue; }
|
|
311
|
-
|
|
312
|
-
if (LineUtil.pointToSegmentDistance(p, part[k], part[j]) <= w) {
|
|
309
|
+
for (const part of this._parts) {
|
|
310
|
+
for (let j = closed ? 0 : 1, len = part.length; j < len; j++) {
|
|
311
|
+
if (LineUtil.pointToSegmentDistance(p, part[(j || len) - 1], part[j]) <= w) {
|
|
313
312
|
return true;
|
|
314
313
|
}
|
|
315
314
|
}
|
|
@@ -52,7 +52,8 @@ const mapRendererMethods = {
|
|
|
52
52
|
* @lends MaplairMapOptions
|
|
53
53
|
* @property {Renderer} [renderer] The default method for drawing vector layers on the
|
|
54
54
|
* map. A new `SVG` renderer by default; pass `new Canvas()` to draw them on a canvas
|
|
55
|
-
* instead.
|
|
55
|
+
* instead. Paths in custom panes get their own renderer for that pane, of the same
|
|
56
|
+
* class and with the same options as this one.
|
|
56
57
|
*/
|
|
57
58
|
|
|
58
59
|
/**
|
|
@@ -3,6 +3,8 @@ import * as Util from '../../core/Util.js';
|
|
|
3
3
|
/** @import {BlanketOverlayOptions} from '../BlanketOverlay.js' */
|
|
4
4
|
/** @import {MaplairEvent} from '../../core/Events.js' */
|
|
5
5
|
/** @import {MaplairMap} from '../../map/Map.js' */
|
|
6
|
+
/** @import {LatLngExpression} from '../../geo/LatLng.js' */
|
|
7
|
+
/** @import {Point} from '../../geometry/Point.js' */
|
|
6
8
|
|
|
7
9
|
/**
|
|
8
10
|
* Options of `Renderer`, `SVG` and `Canvas`. The `continuous` option inherited from
|
|
@@ -46,6 +48,7 @@ export class Renderer extends BlanketOverlay {
|
|
|
46
48
|
* @param {MaplairMap} map
|
|
47
49
|
*/
|
|
48
50
|
onAdd(map) {
|
|
51
|
+
this._setPathView();
|
|
49
52
|
super.onAdd(map);
|
|
50
53
|
this.on('update', this._updatePaths, this);
|
|
51
54
|
}
|
|
@@ -59,14 +62,28 @@ export class Renderer extends BlanketOverlay {
|
|
|
59
62
|
}
|
|
60
63
|
|
|
61
64
|
_onZoomEnd() {
|
|
62
|
-
|
|
63
|
-
// of paths are relative to the origin pixel and therefore need to
|
|
64
|
-
// be recalculated.
|
|
65
|
+
this._setPathView();
|
|
65
66
|
for (const layer of Object.values(this._layers)) {
|
|
66
67
|
layer._project();
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
70
|
|
|
71
|
+
// Paths are projected with the zoom and pixel origin the renderer was last drawn
|
|
72
|
+
// at, which lag behind the map's during zoom animation and pinch, so that paths
|
|
73
|
+
// changed or added meanwhile line up with the rest.
|
|
74
|
+
_setPathView() {
|
|
75
|
+
this._pathZoom = this._map.getZoom();
|
|
76
|
+
this._pathOrigin = this._map.getPixelOrigin();
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* @param {LatLngExpression} latlng
|
|
81
|
+
* @returns {Point}
|
|
82
|
+
*/
|
|
83
|
+
_latLngToLayerPoint(latlng) {
|
|
84
|
+
return this._map.project(latlng, this._pathZoom)._subtract(this._pathOrigin);
|
|
85
|
+
}
|
|
86
|
+
|
|
70
87
|
_updatePaths() {
|
|
71
88
|
for (const layer of Object.values(this._layers)) {
|
|
72
89
|
layer._update();
|
|
@@ -74,6 +91,7 @@ export class Renderer extends BlanketOverlay {
|
|
|
74
91
|
}
|
|
75
92
|
|
|
76
93
|
_onViewReset() {
|
|
94
|
+
this._setPathView();
|
|
77
95
|
for (const layer of Object.values(this._layers)) {
|
|
78
96
|
layer._reset();
|
|
79
97
|
}
|
package/src/layer/vector/SVG.js
CHANGED
|
@@ -48,7 +48,7 @@ export class SVG extends Renderer {
|
|
|
48
48
|
this._container.setAttribute('pointer-events', 'none');
|
|
49
49
|
|
|
50
50
|
this._rootGroup = SVG.create('g');
|
|
51
|
-
this._container.
|
|
51
|
+
this._container.append(this._rootGroup);
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
_destroyContainer() {
|
|
@@ -61,7 +61,7 @@ export class SVG extends Renderer {
|
|
|
61
61
|
const size = super._resizeContainer();
|
|
62
62
|
|
|
63
63
|
// set size of svg-container if changed
|
|
64
|
-
if (!this._svgSize
|
|
64
|
+
if (!this._svgSize?.equals(size)) {
|
|
65
65
|
this._svgSize = size;
|
|
66
66
|
this._container.setAttribute('width', `${size.x}`);
|
|
67
67
|
this._container.setAttribute('height', `${size.y}`);
|
|
@@ -110,7 +110,7 @@ export class SVG extends Renderer {
|
|
|
110
110
|
|
|
111
111
|
_addPath(layer) {
|
|
112
112
|
if (!this._rootGroup) { this._initContainer(); }
|
|
113
|
-
this._rootGroup.
|
|
113
|
+
this._rootGroup.append(layer._path);
|
|
114
114
|
layer.addInteractiveTarget(layer._path);
|
|
115
115
|
}
|
|
116
116
|
|
package/src/map/Map.Rotation.js
CHANGED
|
@@ -173,8 +173,8 @@ const mapRotationMethods = {
|
|
|
173
173
|
// the map pane is wrapped in a pane rotated around the center of the container
|
|
174
174
|
const rotatePane = this._rotatePane = DomUtil.create('div', 'maplair-rotate-pane');
|
|
175
175
|
rotatedMaps.set(rotatePane, this);
|
|
176
|
-
this.
|
|
177
|
-
rotatePane.
|
|
176
|
+
this._mapPane.before(rotatePane);
|
|
177
|
+
rotatePane.append(this._mapPane);
|
|
178
178
|
}
|
|
179
179
|
if (bearing === this.getBearing()) { return; }
|
|
180
180
|
|
|
@@ -292,12 +292,13 @@ const mapRotationMethods = {
|
|
|
292
292
|
|
|
293
293
|
_tryAnimatedPan(center, options) {
|
|
294
294
|
// difference between the new and current centers in pixels
|
|
295
|
-
|
|
295
|
+
// difference in the frame of the map pane, which `_panBy()` moves
|
|
296
|
+
const offset = this.latLngToLayerPoint(center)._subtract(this._getCenterLayerPoint())._round();
|
|
296
297
|
|
|
297
298
|
// don't animate too far unless animate: true specified in options
|
|
298
|
-
if (options?.animate !== true && !this.getSize().contains(offset)) { return false; }
|
|
299
|
+
if (options?.animate !== true && !this.getSize().contains(this._rotateToContainer(offset))) { return false; }
|
|
299
300
|
|
|
300
|
-
this.
|
|
301
|
+
this._panBy(offset, options);
|
|
301
302
|
|
|
302
303
|
return true;
|
|
303
304
|
},
|
|
@@ -414,8 +415,11 @@ const blanketOverlayRotationMethods = {
|
|
|
414
415
|
viewHalf = this._map._getViewSize().multiplyBy(0.5 + this.options.padding),
|
|
415
416
|
currentCenterPoint = this._map.project(this._center, zoom),
|
|
416
417
|
topLeftOffset = viewHalf.multiplyBy(-scale)._add(currentCenterPoint)
|
|
417
|
-
._subtract(this._map._getNewPixelOrigin(center, zoom))
|
|
418
|
-
|
|
418
|
+
._subtract(this._map._getNewPixelOrigin(center, zoom));
|
|
419
|
+
|
|
420
|
+
// a scaled container is resampled anyway, and rounding where its corner lands would make its content away
|
|
421
|
+
// from the corner jitter against the zoom motion
|
|
422
|
+
if (scale === 1) { this._map._snapLayerPoint(topLeftOffset); }
|
|
419
423
|
|
|
420
424
|
DomUtil.setTransform(this._container, topLeftOffset, scale);
|
|
421
425
|
},
|
|
@@ -470,7 +474,7 @@ const divOverlayRotationMethods = {
|
|
|
470
474
|
if (!this._map) { return; }
|
|
471
475
|
|
|
472
476
|
const map = this._map,
|
|
473
|
-
pos = map.latLngToLayerPoint(this._latlng)
|
|
477
|
+
pos = map._snapLayerPoint(map.latLngToLayerPoint(this._latlng)),
|
|
474
478
|
// on a rotated map, the anchor is relative to the upright overlay
|
|
475
479
|
anchor = map._rotateToPane(new Point(this._getAnchor()));
|
|
476
480
|
let offset = Point.from(this.options.offset);
|
|
@@ -880,7 +884,7 @@ const pinchZoomHandlerRotationMethods = {
|
|
|
880
884
|
|
|
881
885
|
cancelAnimationFrame(this._animRequest);
|
|
882
886
|
|
|
883
|
-
const moveFn = map._move.bind(map, this._center, this._zoom, {pinch: true
|
|
887
|
+
const moveFn = map._move.bind(map, this._center, this._zoom, {pinch: true}, undefined);
|
|
884
888
|
this._animRequest = requestAnimationFrame(moveFn.bind(this));
|
|
885
889
|
|
|
886
890
|
e.preventDefault();
|