maplair 4.3.0 → 4.4.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 +89 -8
- package/dist/esm/control/AttributionControl.js +10 -10
- 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 +13 -9
- 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 +4 -5
- 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 +13 -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 +16 -4
- package/dist/esm/core/Util.js.map +1 -1
- package/dist/esm/dom/DomEvent.PointerEvents.js +55 -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 +4 -6
- package/dist/esm/dom/Draggable.js.map +1 -1
- package/dist/esm/geo/LatLng.js +23 -34
- 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 +12 -17
- package/dist/esm/geometry/Point.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 +1 -1
- package/dist/esm/layer/BlanketOverlay.js.map +1 -1
- package/dist/esm/layer/DivOverlay.js +23 -23
- package/dist/esm/layer/DivOverlay.js.map +1 -1
- package/dist/esm/layer/ImageOverlay.js +7 -4
- package/dist/esm/layer/ImageOverlay.js.map +1 -1
- package/dist/esm/layer/Layer.js +11 -6
- package/dist/esm/layer/Layer.js.map +1 -1
- package/dist/esm/layer/Popup.js +30 -11
- package/dist/esm/layer/Popup.js.map +1 -1
- package/dist/esm/layer/Tooltip.js +18 -35
- 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 +16 -15
- package/dist/esm/layer/marker/Icon.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Drag.js +6 -7
- package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
- package/dist/esm/layer/marker/Marker.js +49 -48
- 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 +18 -16
- package/dist/esm/layer/tile/GridLayer.js.map +1 -1
- package/dist/esm/layer/tile/TileLayer.js +9 -9
- package/dist/esm/layer/tile/TileLayer.js.map +1 -1
- package/dist/esm/layer/vector/Canvas.js +44 -93
- package/dist/esm/layer/vector/Canvas.js.map +1 -1
- package/dist/esm/layer/vector/Circle.js +7 -7
- package/dist/esm/layer/vector/Circle.js.map +1 -1
- package/dist/esm/layer/vector/CircleMarker.js +9 -1
- package/dist/esm/layer/vector/CircleMarker.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 +6 -9
- package/dist/esm/map/Map.Rotation.js.map +1 -1
- package/dist/esm/map/Map.js +104 -49
- package/dist/esm/map/Map.js.map +1 -1
- package/dist/esm/map/MapSync.js +1 -4
- package/dist/esm/map/MapSync.js.map +1 -1
- package/dist/esm/map/handler/BoxZoomHandler.js +2 -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/KeyboardHandler.js +3 -5
- package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
- package/dist/esm/map/handler/PinchZoomHandler.js +3 -6
- package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js +3 -6
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/TapDragZoomHandler.js +1 -4
- 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 +698 -687
- 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 +698 -687
- 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 +9 -9
- 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 +14 -10
- package/src/control/RotateControl.js +0 -1
- package/src/control/ScaleControl.js +4 -5
- package/src/control/SideBySideControl.js +4 -2
- package/src/control/ZoomControl.js +10 -13
- package/src/core/Events.js +6 -2
- package/src/core/Util.js +16 -3
- package/src/dom/DomEvent.PointerEvents.js +47 -1
- package/src/dom/DomEvent.js +5 -17
- package/src/dom/DomUtil.js +5 -5
- package/src/dom/Draggable.js +5 -6
- package/src/geo/LatLng.js +22 -36
- package/src/geo/LatLngBounds.js +10 -4
- package/src/geometry/Bounds.js +3 -3
- package/src/geometry/Point.js +18 -26
- package/src/geometry/Transformation.js +1 -8
- package/src/layer/BlanketOverlay.js +1 -1
- package/src/layer/DivOverlay.js +28 -30
- package/src/layer/ImageOverlay.js +9 -7
- package/src/layer/Layer.js +18 -6
- package/src/layer/Popup.js +38 -17
- package/src/layer/Tooltip.js +17 -44
- package/src/layer/VideoOverlay.js +2 -2
- package/src/layer/marker/DivIcon.js +3 -6
- package/src/layer/marker/Icon.js +19 -18
- package/src/layer/marker/Marker.Drag.js +16 -18
- package/src/layer/marker/Marker.js +66 -59
- package/src/layer/marker/SvgIcon.js +1 -1
- package/src/layer/tile/GridLayer.js +21 -23
- package/src/layer/tile/TileLayer.js +17 -14
- package/src/layer/vector/Canvas.js +52 -148
- package/src/layer/vector/Circle.js +11 -9
- package/src/layer/vector/CircleMarker.js +11 -1
- 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 +7 -6
- package/src/map/Map.js +135 -54
- package/src/map/MapSync.js +1 -1
- package/src/map/handler/BoxZoomHandler.js +2 -0
- package/src/map/handler/DisplaceHandler.js +53 -7
- package/src/map/handler/KeyboardHandler.js +5 -10
- package/src/map/handler/PinchZoomHandler.js +3 -3
- package/src/map/handler/ScrollWheelZoomHandler.js +3 -3
- package/src/map/handler/TapDragZoomHandler.js +1 -1
- package/src/map/handler/TapHoldHandler.js +13 -25
- package/src/maplair.css +38 -9
- 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
|
@@ -157,19 +157,21 @@ export class TileLayer extends GridLayer {
|
|
|
157
157
|
if (!this.options.zoomReverse) {
|
|
158
158
|
this.options.zoomOffset++;
|
|
159
159
|
this.options.maxZoom = Math.max(this.options.minZoom, this.options.maxZoom - 1);
|
|
160
|
-
// do not request tiles beyond the native zoom levels
|
|
161
|
-
if (this.options.maxNativeZoom !== undefined) {
|
|
162
|
-
this.options.maxNativeZoom = Math.max(0, this.options.maxNativeZoom - 1);
|
|
163
|
-
}
|
|
164
|
-
if (this.options.minNativeZoom !== undefined) {
|
|
165
|
-
this.options.minNativeZoom = Math.max(0, this.options.minNativeZoom - 1);
|
|
166
|
-
}
|
|
167
160
|
} else {
|
|
168
161
|
this.options.zoomOffset--;
|
|
169
162
|
this.options.minZoom = Math.min(this.options.maxZoom, this.options.minZoom + 1);
|
|
170
163
|
}
|
|
171
164
|
|
|
172
165
|
this.options.minZoom = Math.max(0, this.options.minZoom);
|
|
166
|
+
|
|
167
|
+
// either way, the tile at zoom z is now the server's z + 1 tile, so native zooms shift down by one, so
|
|
168
|
+
// that no tiles beyond the native zoom levels are requested
|
|
169
|
+
if (this.options.maxNativeZoom !== undefined) {
|
|
170
|
+
this.options.maxNativeZoom = Math.max(0, this.options.maxNativeZoom - 1);
|
|
171
|
+
}
|
|
172
|
+
if (this.options.minNativeZoom !== undefined) {
|
|
173
|
+
this.options.minNativeZoom = Math.max(0, this.options.minNativeZoom - 1);
|
|
174
|
+
}
|
|
173
175
|
} else if (!this.options.zoomReverse) {
|
|
174
176
|
// make sure maxZoom is gte minZoom
|
|
175
177
|
this.options.maxZoom = Math.max(this.options.minZoom, this.options.maxZoom);
|
|
@@ -317,16 +319,18 @@ export class TileLayer extends GridLayer {
|
|
|
317
319
|
* @returns {string}
|
|
318
320
|
*/
|
|
319
321
|
getTileUrl(coords) {
|
|
320
|
-
const
|
|
322
|
+
const z = coords.z ?? this._tileZoom,
|
|
323
|
+
data = Object.create(this.options);
|
|
321
324
|
Object.assign(data, {
|
|
322
325
|
r: window.devicePixelRatio > 1 ? '@2x' : '',
|
|
323
326
|
s: this._getSubdomain(coords),
|
|
324
327
|
x: coords.x,
|
|
325
328
|
y: coords.y,
|
|
326
|
-
z: this._getZoomForUrl()
|
|
329
|
+
z: this._getZoomForUrl(z)
|
|
327
330
|
});
|
|
328
|
-
|
|
329
|
-
|
|
331
|
+
const worldBounds = this._map?.getPixelWorldBounds(z);
|
|
332
|
+
if (worldBounds) {
|
|
333
|
+
const invertedY = this._pxBoundsToTileRange(worldBounds).max.y - coords.y;
|
|
330
334
|
if (this.options.tms) {
|
|
331
335
|
data['y'] = invertedY;
|
|
332
336
|
}
|
|
@@ -354,8 +358,7 @@ export class TileLayer extends GridLayer {
|
|
|
354
358
|
done(e, tile);
|
|
355
359
|
}
|
|
356
360
|
|
|
357
|
-
_getZoomForUrl() {
|
|
358
|
-
let zoom = this._tileZoom;
|
|
361
|
+
_getZoomForUrl(zoom) {
|
|
359
362
|
const maxZoom = this.options.maxZoom,
|
|
360
363
|
zoomReverse = this.options.zoomReverse,
|
|
361
364
|
zoomOffset = this.options.zoomOffset;
|
|
@@ -405,7 +408,7 @@ export class TileLayer extends GridLayer {
|
|
|
405
408
|
}
|
|
406
409
|
|
|
407
410
|
_tileReady(coords, err, tile) {
|
|
408
|
-
if (!this._map ||
|
|
411
|
+
if (!this._map || tile?.getAttribute('src') === '') {
|
|
409
412
|
return;
|
|
410
413
|
}
|
|
411
414
|
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {Renderer} from './Renderer.js';
|
|
2
|
-
import * as DomEvent from '../../dom/DomEvent.js';
|
|
3
2
|
import * as Util from '../../core/Util.js';
|
|
4
3
|
import {Bounds} from '../../geometry/Bounds.js';
|
|
5
4
|
/** @import {MaplairMap} from '../../map/Map.js' */
|
|
@@ -86,29 +85,28 @@ export class Canvas extends Renderer {
|
|
|
86
85
|
onAdd(map) {
|
|
87
86
|
super.onAdd(map);
|
|
88
87
|
|
|
88
|
+
// the map hit-tests canvas renderers topmost first: by pane z-index, then DOM order
|
|
89
|
+
const z = r => +getComputedStyle(r._container.parentNode).zIndex || 0;
|
|
90
|
+
map._canvases.push(this);
|
|
91
|
+
map._canvases.sort((a, b) => z(b) - z(a) || (a._container.compareDocumentPosition(b._container) & 2) - 1);
|
|
92
|
+
|
|
89
93
|
// Redraw vectors since canvas is cleared upon removal,
|
|
90
94
|
// in case of removing the renderer itself from the map.
|
|
91
95
|
this._draw();
|
|
92
96
|
}
|
|
93
97
|
|
|
98
|
+
_initContainer() {
|
|
99
|
+
const container = this._container = document.createElement('canvas');
|
|
100
|
+
|
|
101
|
+
this._ctx = container.getContext('2d');
|
|
102
|
+
}
|
|
103
|
+
|
|
94
104
|
/**
|
|
95
105
|
* Removes the canvas from the map.
|
|
96
106
|
*/
|
|
97
107
|
onRemove() {
|
|
108
|
+
this._map._canvases = this._map._canvases.filter(r => r !== this);
|
|
98
109
|
super.onRemove();
|
|
99
|
-
|
|
100
|
-
clearTimeout(this._pointerHoverThrottleTimeout);
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
_initContainer() {
|
|
104
|
-
const container = this._container = document.createElement('canvas');
|
|
105
|
-
|
|
106
|
-
DomEvent.on(container, 'pointermove', this._onPointerMove, this);
|
|
107
|
-
DomEvent.on(container, 'click dblclick pointerdown pointerup contextmenu', this._onClick, this);
|
|
108
|
-
DomEvent.on(container, 'pointerout', this._handlePointerOut, this);
|
|
109
|
-
container['_maplair_disable_events'] = true;
|
|
110
|
-
|
|
111
|
-
this._ctx = container.getContext('2d');
|
|
112
110
|
}
|
|
113
111
|
|
|
114
112
|
_destroyContainer() {
|
|
@@ -166,14 +164,7 @@ export class Canvas extends Renderer {
|
|
|
166
164
|
this._updateDashArray(layer);
|
|
167
165
|
this._layers[Util.stamp(layer)] = layer;
|
|
168
166
|
|
|
169
|
-
|
|
170
|
-
layer,
|
|
171
|
-
prev: this._drawLast,
|
|
172
|
-
next: null
|
|
173
|
-
};
|
|
174
|
-
if (this._drawLast) { this._drawLast.next = order; }
|
|
175
|
-
this._drawLast = order;
|
|
176
|
-
this._drawFirst ??= this._drawLast;
|
|
167
|
+
this._append(layer._order = {layer});
|
|
177
168
|
}
|
|
178
169
|
|
|
179
170
|
_addPath(layer) {
|
|
@@ -181,21 +172,7 @@ export class Canvas extends Renderer {
|
|
|
181
172
|
}
|
|
182
173
|
|
|
183
174
|
_removePath(layer) {
|
|
184
|
-
|
|
185
|
-
const next = order.next;
|
|
186
|
-
const prev = order.prev;
|
|
187
|
-
|
|
188
|
-
if (next) {
|
|
189
|
-
next.prev = prev;
|
|
190
|
-
} else {
|
|
191
|
-
this._drawLast = prev;
|
|
192
|
-
}
|
|
193
|
-
if (prev) {
|
|
194
|
-
prev.next = next;
|
|
195
|
-
} else {
|
|
196
|
-
this._drawFirst = next;
|
|
197
|
-
}
|
|
198
|
-
|
|
175
|
+
this._unlink(layer._order);
|
|
199
176
|
delete layer._order;
|
|
200
177
|
|
|
201
178
|
delete this._layers[Util.stamp(layer)];
|
|
@@ -238,7 +215,7 @@ export class Canvas extends Renderer {
|
|
|
238
215
|
|
|
239
216
|
_extendRedrawBounds(layer) {
|
|
240
217
|
if (layer._pxBounds) {
|
|
241
|
-
const padding = (layer.options.weight
|
|
218
|
+
const padding = (+layer.options.weight || 0) + 1;
|
|
242
219
|
this._redrawBounds ??= new Bounds();
|
|
243
220
|
this._redrawBounds.extend(layer._pxBounds.min.subtract([padding, padding]));
|
|
244
221
|
this._redrawBounds.extend(layer._pxBounds.max.add([padding, padding]));
|
|
@@ -289,7 +266,7 @@ export class Canvas extends Renderer {
|
|
|
289
266
|
|
|
290
267
|
for (let order = this._drawFirst; order; order = order.next) {
|
|
291
268
|
layer = order.layer;
|
|
292
|
-
if (!bounds ||
|
|
269
|
+
if (!bounds || layer._pxBounds?.intersects(bounds)) {
|
|
293
270
|
layer._updatePath();
|
|
294
271
|
}
|
|
295
272
|
}
|
|
@@ -369,137 +346,64 @@ export class Canvas extends Renderer {
|
|
|
369
346
|
_updateInteractive() {}
|
|
370
347
|
|
|
371
348
|
// Canvas obviously doesn't have pointer events for individual drawn objects,
|
|
372
|
-
// so
|
|
349
|
+
// so the map calls this on its own pointer events to find what's under the pointer
|
|
373
350
|
|
|
374
|
-
|
|
351
|
+
/**
|
|
352
|
+
* Returns the topmost interactive layer under the pointer.
|
|
353
|
+
* @param {MouseEvent} e
|
|
354
|
+
* @param {boolean} [click] Skip layers that were just dragged, so the drag doesn't end with a click.
|
|
355
|
+
* @returns {Path|undefined}
|
|
356
|
+
*/
|
|
357
|
+
_layerAt(e, click) {
|
|
375
358
|
const point = this._map.pointerEventToLayerPoint(e);
|
|
376
|
-
let layer, clickedLayer;
|
|
377
359
|
|
|
378
|
-
for (let order = this.
|
|
379
|
-
layer = order.layer;
|
|
380
|
-
if (layer.options.interactive && layer._containsPoint(point)) {
|
|
381
|
-
|
|
382
|
-
clickedLayer = layer;
|
|
383
|
-
}
|
|
360
|
+
for (let order = this._drawLast; order; order = order.prev) {
|
|
361
|
+
const layer = order.layer;
|
|
362
|
+
if (layer.options.interactive && layer._containsPoint(point) && !(click && this._map._draggableMoved(layer))) {
|
|
363
|
+
return layer;
|
|
384
364
|
}
|
|
385
365
|
}
|
|
386
|
-
this._fireEvent(clickedLayer ? [clickedLayer] : false, e);
|
|
387
366
|
}
|
|
388
367
|
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
_handlePointerOut(e) {
|
|
398
|
-
const layer = this._hoveredLayer;
|
|
399
|
-
if (layer) {
|
|
400
|
-
// if we're leaving the layer, fire pointerout
|
|
401
|
-
this._container.classList.remove('maplair-interactive');
|
|
402
|
-
this._fireEvent([layer], e, 'pointerout');
|
|
403
|
-
this._hoveredLayer = null;
|
|
404
|
-
this._pointerHoverThrottled = false;
|
|
368
|
+
_bringToFront(layer) {
|
|
369
|
+
const order = layer._order;
|
|
370
|
+
if (order?.next) { // unless already last
|
|
371
|
+
this._unlink(order);
|
|
372
|
+
this._append(order);
|
|
373
|
+
this._requestRedraw(layer);
|
|
405
374
|
}
|
|
406
375
|
}
|
|
407
376
|
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
if (layer.options.interactive && layer._containsPoint(point)) {
|
|
418
|
-
candidateHoveredLayer = layer;
|
|
419
|
-
}
|
|
420
|
-
}
|
|
421
|
-
|
|
422
|
-
if (candidateHoveredLayer !== this._hoveredLayer) {
|
|
423
|
-
this._handlePointerOut(e);
|
|
424
|
-
|
|
425
|
-
if (candidateHoveredLayer) {
|
|
426
|
-
this._container.classList.add('maplair-interactive'); // change cursor
|
|
427
|
-
this._fireEvent([candidateHoveredLayer], e, 'pointerover');
|
|
428
|
-
this._hoveredLayer = candidateHoveredLayer;
|
|
429
|
-
}
|
|
377
|
+
_bringToBack(layer) {
|
|
378
|
+
const order = layer._order;
|
|
379
|
+
if (order?.prev) { // unless already first
|
|
380
|
+
this._unlink(order);
|
|
381
|
+
order.prev = null;
|
|
382
|
+
order.next = this._drawFirst;
|
|
383
|
+
this._drawFirst.prev = order;
|
|
384
|
+
this._drawFirst = order;
|
|
385
|
+
this._requestRedraw(layer);
|
|
430
386
|
}
|
|
431
|
-
|
|
432
|
-
this._fireEvent(this._hoveredLayer ? [this._hoveredLayer] : false, e);
|
|
433
|
-
|
|
434
|
-
this._pointerHoverThrottled = true;
|
|
435
|
-
this._pointerHoverThrottleTimeout = setTimeout((() => {
|
|
436
|
-
this._pointerHoverThrottled = false;
|
|
437
|
-
}), 32);
|
|
438
387
|
}
|
|
439
388
|
|
|
440
|
-
|
|
441
|
-
|
|
389
|
+
_append(order) {
|
|
390
|
+
order.prev = this._drawLast;
|
|
391
|
+
order.next = null;
|
|
392
|
+
if (this._drawLast) { this._drawLast.next = order; }
|
|
393
|
+
this._drawLast = order;
|
|
394
|
+
this._drawFirst ??= order;
|
|
442
395
|
}
|
|
443
396
|
|
|
444
|
-
|
|
445
|
-
const order = layer._order;
|
|
446
|
-
|
|
447
|
-
if (!order) { return; }
|
|
448
|
-
|
|
449
|
-
const next = order.next;
|
|
450
|
-
const prev = order.prev;
|
|
451
|
-
|
|
397
|
+
_unlink({prev, next}) {
|
|
452
398
|
if (next) {
|
|
453
399
|
next.prev = prev;
|
|
454
400
|
} else {
|
|
455
|
-
|
|
456
|
-
return;
|
|
457
|
-
}
|
|
458
|
-
if (prev) {
|
|
459
|
-
prev.next = next;
|
|
460
|
-
} else if (next) {
|
|
461
|
-
// Update first entry unless this is the
|
|
462
|
-
// single entry
|
|
463
|
-
this._drawFirst = next;
|
|
401
|
+
this._drawLast = prev;
|
|
464
402
|
}
|
|
465
|
-
|
|
466
|
-
order.prev = this._drawLast;
|
|
467
|
-
this._drawLast.next = order;
|
|
468
|
-
|
|
469
|
-
order.next = null;
|
|
470
|
-
this._drawLast = order;
|
|
471
|
-
|
|
472
|
-
this._requestRedraw(layer);
|
|
473
|
-
}
|
|
474
|
-
|
|
475
|
-
_bringToBack(layer) {
|
|
476
|
-
const order = layer._order;
|
|
477
|
-
|
|
478
|
-
if (!order) { return; }
|
|
479
|
-
|
|
480
|
-
const next = order.next;
|
|
481
|
-
const prev = order.prev;
|
|
482
|
-
|
|
483
403
|
if (prev) {
|
|
484
404
|
prev.next = next;
|
|
485
405
|
} else {
|
|
486
|
-
|
|
487
|
-
return;
|
|
488
|
-
}
|
|
489
|
-
if (next) {
|
|
490
|
-
next.prev = prev;
|
|
491
|
-
} else if (prev) {
|
|
492
|
-
// Update last entry unless this is the
|
|
493
|
-
// single entry
|
|
494
|
-
this._drawLast = prev;
|
|
406
|
+
this._drawFirst = next;
|
|
495
407
|
}
|
|
496
|
-
|
|
497
|
-
order.prev = null;
|
|
498
|
-
|
|
499
|
-
order.next = this._drawFirst;
|
|
500
|
-
this._drawFirst.prev = order;
|
|
501
|
-
this._drawFirst = order;
|
|
502
|
-
|
|
503
|
-
this._requestRedraw(layer);
|
|
504
408
|
}
|
|
505
409
|
}
|
|
@@ -63,15 +63,17 @@ export class Circle extends CircleMarker {
|
|
|
63
63
|
const lng = this._latlng.lng,
|
|
64
64
|
lat = this._latlng.lat,
|
|
65
65
|
map = this._map,
|
|
66
|
-
crs = map.options.crs
|
|
66
|
+
crs = map.options.crs,
|
|
67
|
+
renderer = this._renderer,
|
|
68
|
+
zoom = renderer._pathZoom;
|
|
67
69
|
|
|
68
70
|
if (crs.distance === EarthCRS.distance) {
|
|
69
71
|
const d = Math.PI / 180,
|
|
70
72
|
latR = (this._radius / EarthCRS.R) / d,
|
|
71
|
-
top = map.project([lat + latR, lng]),
|
|
72
|
-
bottom = map.project([lat - latR, lng]),
|
|
73
|
+
top = map.project([lat + latR, lng], zoom),
|
|
74
|
+
bottom = map.project([lat - latR, lng], zoom),
|
|
73
75
|
p = top.add(bottom).divideBy(2),
|
|
74
|
-
lat2 = map.unproject(p).lat;
|
|
76
|
+
lat2 = map.unproject(p, zoom).lat;
|
|
75
77
|
// Longitude span from the haversine form of the spherical law of cosines. The plain acos() form
|
|
76
78
|
// loses precision for radii of about a metre and less, where cos(latR) is too close to 1 (#6120).
|
|
77
79
|
let lngR = 2 * Math.asin(Math.sqrt(
|
|
@@ -79,18 +81,18 @@ export class Circle extends CircleMarker {
|
|
|
79
81
|
(Math.cos(lat * d) * Math.cos(lat2 * d)))) / d;
|
|
80
82
|
|
|
81
83
|
if (isNaN(lngR) || lngR === 0) {
|
|
82
|
-
lngR = latR / Math.cos(
|
|
84
|
+
lngR = latR / Math.cos(lat * d); // Fallback for edge case, #2425
|
|
83
85
|
}
|
|
84
86
|
|
|
85
|
-
this._point = p.subtract(
|
|
86
|
-
this._pxRadius = isNaN(lngR) ? 0 : p.x - map.project([lat2, lng - lngR]).x;
|
|
87
|
+
this._point = p.subtract(renderer._pathOrigin);
|
|
88
|
+
this._pxRadius = isNaN(lngR) ? 0 : p.x - map.project([lat2, lng - lngR], zoom).x;
|
|
87
89
|
this._pxRadiusY = p.y - top.y;
|
|
88
90
|
|
|
89
91
|
} else {
|
|
90
92
|
const latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._radius, 0]));
|
|
91
93
|
|
|
92
|
-
this._point =
|
|
93
|
-
this._pxRadius = Math.abs(this._point.x -
|
|
94
|
+
this._point = renderer._latLngToLayerPoint(this._latlng);
|
|
95
|
+
this._pxRadius = Math.abs(this._point.x - renderer._latLngToLayerPoint(latlng2).x);
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
this._updateBounds();
|
|
@@ -3,6 +3,7 @@ import * as Util from '../../core/Util.js';
|
|
|
3
3
|
import {LatLng} from '../../geo/LatLng.js';
|
|
4
4
|
import {Bounds} from '../../geometry/Bounds.js';
|
|
5
5
|
import {pointToGeoJSON} from '../GeoJSONUtil.js';
|
|
6
|
+
/** @import {MaplairMap} from '../../map/Map.js' */
|
|
6
7
|
/** @import {Feature} from 'geojson' */
|
|
7
8
|
/** @import {LatLngExpression} from '../../geo/LatLng.js' */
|
|
8
9
|
/** @import {MaplairEvent} from '../../core/Events.js' */
|
|
@@ -54,6 +55,15 @@ export class CircleMarker extends Path {
|
|
|
54
55
|
this.callInitHooks(CircleMarker);
|
|
55
56
|
}
|
|
56
57
|
|
|
58
|
+
/**
|
|
59
|
+
* @param {MaplairMap} map
|
|
60
|
+
*/
|
|
61
|
+
beforeAdd(map) {
|
|
62
|
+
super.beforeAdd(map);
|
|
63
|
+
// before the marker is drawn, see `DisplaceHandler`
|
|
64
|
+
map._displaceHandler?._beforeMarkerAdd(this);
|
|
65
|
+
}
|
|
66
|
+
|
|
57
67
|
/**
|
|
58
68
|
* Sets the position of a circle marker to a new location.
|
|
59
69
|
* @param {LatLngExpression} latlng
|
|
@@ -108,7 +118,7 @@ export class CircleMarker extends Path {
|
|
|
108
118
|
|
|
109
119
|
_project() {
|
|
110
120
|
// snapped to whole pixels: subpixel precision is invisible on markers but slows down rendering many of them
|
|
111
|
-
this._point = this.
|
|
121
|
+
this._point = this._renderer._latLngToLayerPoint(this._latlng)._round();
|
|
112
122
|
this._pxRadius = this._radius;
|
|
113
123
|
this._updateBounds();
|
|
114
124
|
}
|
package/src/layer/vector/Path.js
CHANGED
|
@@ -36,14 +36,16 @@ import * as Util from '../../core/Util.js';
|
|
|
36
36
|
* Applied when the element is created; [`setStyle`](#path-setstyle) does not update it
|
|
37
37
|
* afterwards.
|
|
38
38
|
* @property {Renderer} [renderer] Use this specific instance of `Renderer` for this
|
|
39
|
-
* path. If not set, the path uses the map's [renderer](#maplairmapoptions-renderer)
|
|
40
|
-
*
|
|
39
|
+
* path. If not set, the path uses the map's [renderer](#maplairmapoptions-renderer)
|
|
40
|
+
* (`SVG` by default), or in a custom pane, a renderer of the same kind created for
|
|
41
|
+
* that pane. If set, it overrides the `pane` option.
|
|
41
42
|
* @extends InteractiveLayerOptions
|
|
42
43
|
*/
|
|
43
44
|
|
|
44
45
|
/**
|
|
45
|
-
* An abstract class that contains options and
|
|
46
|
-
*
|
|
46
|
+
* An abstract class that contains options and methods shared between vector overlays
|
|
47
|
+
* (`Polyline`, `Polygon`, `Rectangle`, `Circle`, `CircleMarker`). Do not use it
|
|
48
|
+
* directly. Extends `Layer`.
|
|
47
49
|
*/
|
|
48
50
|
export class Path extends Layer {
|
|
49
51
|
|
|
@@ -162,9 +164,13 @@ export class Path extends Layer {
|
|
|
162
164
|
this._update();
|
|
163
165
|
}
|
|
164
166
|
|
|
167
|
+
_togglesPopupOnClick() {
|
|
168
|
+
return false;
|
|
169
|
+
}
|
|
170
|
+
|
|
165
171
|
_clickTolerance() {
|
|
166
172
|
// used when doing hit detection for Canvas layers
|
|
167
|
-
return (this.options.stroke ? this.options.weight / 2 : 0) +
|
|
173
|
+
return (this.options.stroke ? this.options.weight / 2 || 0 : 0) +
|
|
168
174
|
(this._renderer.options.tolerance || 0);
|
|
169
175
|
}
|
|
170
176
|
}
|
|
@@ -124,14 +124,14 @@ export class Polygon extends Polyline {
|
|
|
124
124
|
// polygons need a different clipping algorithm so we redefine that
|
|
125
125
|
|
|
126
126
|
let bounds = this._renderer._bounds;
|
|
127
|
-
const w = this.options.weight,
|
|
127
|
+
const w = +this.options.weight || 0,
|
|
128
128
|
p = new Point(w, w);
|
|
129
129
|
|
|
130
130
|
// increase clip padding by stroke width to avoid stroke on clip edges
|
|
131
131
|
bounds = new Bounds(bounds.min.subtract(p), bounds.max.add(p));
|
|
132
132
|
|
|
133
133
|
this._parts = [];
|
|
134
|
-
if (!this._pxBounds
|
|
134
|
+
if (!this._pxBounds?.intersects(bounds)) {
|
|
135
135
|
return;
|
|
136
136
|
}
|
|
137
137
|
|
|
@@ -152,19 +152,20 @@ export class Polygon extends Polyline {
|
|
|
152
152
|
this._renderer._updatePoly(this, true);
|
|
153
153
|
}
|
|
154
154
|
|
|
155
|
+
_isClosed() {
|
|
156
|
+
return true;
|
|
157
|
+
}
|
|
158
|
+
|
|
155
159
|
// Needed by the `Canvas` renderer for interactivity
|
|
156
160
|
_containsPoint(p) {
|
|
157
|
-
let inside = false
|
|
158
|
-
part, p1, p2, i, j, k, len, len2;
|
|
161
|
+
let inside = false;
|
|
159
162
|
|
|
160
|
-
if (!this._pxBounds
|
|
163
|
+
if (!this._pxBounds?.contains(p)) { return false; }
|
|
161
164
|
|
|
162
165
|
// ray casting algorithm for detecting if point is in polygon
|
|
163
|
-
for (
|
|
164
|
-
part =
|
|
165
|
-
|
|
166
|
-
for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
|
|
167
|
-
p1 = part[j];
|
|
166
|
+
for (const part of this._parts) {
|
|
167
|
+
for (let j = 0, len = part.length, k = len - 1; j < len; k = j++) {
|
|
168
|
+
const p1 = part[j],
|
|
168
169
|
p2 = part[k];
|
|
169
170
|
|
|
170
171
|
if (((p1.y > p.y) !== (p2.y > p.y)) && (p.x < (p2.x - p1.x) * (p.y - p1.y) / (p2.y - p1.y) + p1.x)) {
|
|
@@ -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
|
}
|