maplair 4.1.0 → 4.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +60 -0
- package/dist/esm/Maplair.js +5 -4
- package/dist/esm/Maplair.js.map +1 -1
- package/dist/esm/_virtual/_rolldown/runtime.js +1 -2
- package/dist/esm/control/AttributionControl.js +1 -2
- package/dist/esm/control/ButtonControl.js +1 -2
- package/dist/esm/control/ContextMenu.js +1 -2
- package/dist/esm/control/Control.js +1 -2
- package/dist/esm/control/FullscreenControl.js +1 -2
- package/dist/esm/control/LayersControl.js +27 -31
- package/dist/esm/control/LayersControl.js.map +1 -1
- package/dist/esm/control/LegendControl.js +1 -2
- package/dist/esm/control/MiniMapControl.js +1 -2
- package/dist/esm/control/RotateControl.js +1 -2
- package/dist/esm/control/ScaleControl.js +1 -2
- package/dist/esm/control/SearchControl.js +1 -2
- package/dist/esm/control/SideBySideControl.js +1 -2
- package/dist/esm/control/TextControl.js +1 -2
- package/dist/esm/control/TimeControl.js +1 -2
- package/dist/esm/control/ZoomControl.js +18 -29
- package/dist/esm/control/ZoomControl.js.map +1 -1
- package/dist/esm/core/Class.js +2 -9
- package/dist/esm/core/Class.js.map +1 -1
- package/dist/esm/core/Events.js +1 -2
- package/dist/esm/core/Handler.js +10 -3
- package/dist/esm/core/Handler.js.map +1 -1
- package/dist/esm/core/I18n.js +1 -2
- package/dist/esm/core/Util.js +2 -3
- package/dist/esm/core/Util.js.map +1 -1
- package/dist/esm/dom/DomEvent.DoubleTap.js +1 -2
- package/dist/esm/dom/DomEvent.PointerEvents.js +1 -2
- package/dist/esm/dom/DomEvent.js +10 -18
- package/dist/esm/dom/DomEvent.js.map +1 -1
- package/dist/esm/dom/DomUtil.js +1 -2
- package/dist/esm/dom/Draggable.js +4 -3
- package/dist/esm/dom/Draggable.js.map +1 -1
- package/dist/esm/dom/PosAnimation.js +1 -2
- package/dist/esm/geo/LatLng.js +1 -2
- package/dist/esm/geo/LatLngBounds.js +9 -15
- package/dist/esm/geo/LatLngBounds.js.map +1 -1
- package/dist/esm/geo/crs/CRS.js +1 -2
- package/dist/esm/geo/crs/EPSG3395.js +4 -5
- package/dist/esm/geo/crs/EPSG3395.js.map +1 -1
- package/dist/esm/geo/crs/EPSG3857.js +4 -5
- package/dist/esm/geo/crs/EPSG3857.js.map +1 -1
- package/dist/esm/geo/crs/EPSG4326.js +3 -4
- package/dist/esm/geo/crs/EPSG4326.js.map +1 -1
- package/dist/esm/geo/crs/EarthCRS.js +1 -2
- package/dist/esm/geo/crs/SimpleCRS.js +3 -4
- package/dist/esm/geo/crs/SimpleCRS.js.map +1 -1
- package/dist/esm/geo/projection/{Projection.LonLat.js → LonLatProjection.js} +4 -5
- package/dist/esm/geo/projection/LonLatProjection.js.map +1 -0
- package/dist/esm/geo/projection/{Projection.Mercator.js → MercatorProjection.js} +3 -4
- package/dist/esm/geo/projection/MercatorProjection.js.map +1 -0
- package/dist/esm/geo/projection/{Projection.SphericalMercator.js → SphericalMercatorProjection.js} +4 -5
- package/dist/esm/geo/projection/SphericalMercatorProjection.js.map +1 -0
- package/dist/esm/geometry/Bounds.js +10 -14
- package/dist/esm/geometry/Bounds.js.map +1 -1
- package/dist/esm/geometry/LineUtil.js +2 -3
- package/dist/esm/geometry/LineUtil.js.map +1 -1
- package/dist/esm/geometry/Point.js +1 -2
- package/dist/esm/geometry/PolyUtil.js +17 -25
- package/dist/esm/geometry/PolyUtil.js.map +1 -1
- package/dist/esm/geometry/Transformation.js +1 -2
- package/dist/esm/layer/BlanketOverlay.js +1 -2
- package/dist/esm/layer/Classification.js +1 -2
- package/dist/esm/layer/DivOverlay.js +2 -3
- package/dist/esm/layer/DivOverlay.js.map +1 -1
- package/dist/esm/layer/FeatureGroup.js +5 -4
- package/dist/esm/layer/FeatureGroup.js.map +1 -1
- package/dist/esm/layer/GeoJSON.Load.js +1 -2
- package/dist/esm/layer/GeoJSON.js +8 -10
- package/dist/esm/layer/GeoJSON.js.map +1 -1
- package/dist/esm/layer/GeoJSONUtil.js +1 -2
- package/dist/esm/layer/HeatLayer.js +2 -3
- package/dist/esm/layer/HeatLayer.js.map +1 -1
- package/dist/esm/layer/ImageOverlay.js +2 -3
- package/dist/esm/layer/ImageOverlay.js.map +1 -1
- package/dist/esm/layer/Layer.js +1 -2
- package/dist/esm/layer/LayerGroup.js +2 -3
- package/dist/esm/layer/LayerGroup.js.map +1 -1
- package/dist/esm/layer/Popup.js +9 -16
- package/dist/esm/layer/Popup.js.map +1 -1
- package/dist/esm/layer/SVGOverlay.js +1 -2
- package/dist/esm/layer/Tooltip.js +16 -17
- package/dist/esm/layer/Tooltip.js.map +1 -1
- package/dist/esm/layer/VideoOverlay.js +1 -2
- package/dist/esm/layer/marker/DefaultIcon.js +29 -7
- package/dist/esm/layer/marker/DefaultIcon.js.map +1 -1
- package/dist/esm/layer/marker/DivIcon.js +1 -2
- package/dist/esm/layer/marker/Icon.js +2 -2
- package/dist/esm/layer/marker/Icon.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Drag.js +43 -4
- package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Move.js +4 -6
- package/dist/esm/layer/marker/Marker.Move.js.map +1 -1
- package/dist/esm/layer/marker/Marker.js +54 -14
- package/dist/esm/layer/marker/Marker.js.map +1 -1
- package/dist/esm/layer/marker/MarkerClusterGroup.js +1 -2
- package/dist/esm/layer/marker/SvgIcon.js +1 -2
- package/dist/esm/layer/tile/GridLayer.js +4 -4
- package/dist/esm/layer/tile/GridLayer.js.map +1 -1
- package/dist/esm/layer/tile/TileLayer.js +8 -8
- package/dist/esm/layer/tile/TileLayer.js.map +1 -1
- package/dist/esm/layer/tile/WMSTileLayer.js +5 -4
- package/dist/esm/layer/tile/WMSTileLayer.js.map +1 -1
- package/dist/esm/layer/vector/Canvas.js +7 -14
- package/dist/esm/layer/vector/Canvas.js.map +1 -1
- package/dist/esm/layer/vector/Circle.js +4 -3
- package/dist/esm/layer/vector/Circle.js.map +1 -1
- package/dist/esm/layer/vector/CircleMarker.js +2 -3
- package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
- package/dist/esm/layer/vector/Path.DashAnimation.js +1 -2
- package/dist/esm/layer/vector/Path.ZoomStyles.js +1 -2
- package/dist/esm/layer/vector/Path.js +1 -2
- package/dist/esm/layer/vector/Polygon.js +2 -3
- package/dist/esm/layer/vector/Polygon.js.map +1 -1
- package/dist/esm/layer/vector/Polyline.Decorations.js +1 -2
- package/dist/esm/layer/vector/Polyline.js +2 -3
- package/dist/esm/layer/vector/Polyline.js.map +1 -1
- package/dist/esm/layer/vector/Rectangle.js +1 -2
- package/dist/esm/layer/vector/Renderer.getRenderer.js +4 -5
- package/dist/esm/layer/vector/Renderer.getRenderer.js.map +1 -1
- package/dist/esm/layer/vector/Renderer.js +1 -2
- package/dist/esm/layer/vector/SVG.js +7 -4
- package/dist/esm/layer/vector/SVG.js.map +1 -1
- package/dist/esm/map/Hash.js +1 -2
- package/dist/esm/map/Map.Rotation.js +31 -16
- package/dist/esm/map/Map.Rotation.js.map +1 -1
- package/dist/esm/map/Map.js +10 -17
- package/dist/esm/map/Map.js.map +1 -1
- package/dist/esm/map/MapSync.js +1 -2
- package/dist/esm/map/handler/BoxZoomHandler.js +20 -40
- package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/DisplaceHandler.js +1 -2
- package/dist/esm/map/handler/DoubleClickZoomHandler.js +1 -2
- package/dist/esm/map/handler/DragHandler.js +1 -2
- package/dist/esm/map/handler/KeyboardHandler.js +23 -43
- package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
- package/dist/esm/map/handler/PinchZoomHandler.js +1 -2
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js +1 -2
- package/dist/esm/map/handler/TapDragZoomHandler.js +1 -2
- package/dist/esm/map/handler/TapHoldHandler.js +1 -2
- package/dist/esm/package.js +2 -3
- package/dist/maplair-global-src.js +487 -613
- 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 +483 -609
- package/dist/maplair-src.js.map +1 -1
- package/dist/maplair.css +1 -1263
- package/dist/maplair.js +2 -2
- package/dist/maplair.js.map +1 -1
- package/package.json +3 -8
- package/src/Maplair.all.js +0 -1
- package/src/control/LayersControl.js +39 -52
- package/src/control/ZoomControl.js +17 -31
- package/src/core/Class.js +5 -14
- package/src/core/Handler.js +11 -1
- package/src/core/Util.js +1 -1
- package/src/dom/DomEvent.js +9 -19
- package/src/dom/Draggable.js +5 -1
- package/src/geo/LatLngBounds.js +8 -15
- package/src/geo/crs/EPSG3395.js +3 -3
- package/src/geo/crs/EPSG3857.js +3 -3
- package/src/geo/crs/EPSG4326.js +2 -2
- package/src/geo/crs/SimpleCRS.js +2 -2
- package/src/geo/index.js +1 -2
- package/src/geo/projection/{Projection.LonLat.js → LonLatProjection.js} +1 -1
- package/src/geo/projection/{Projection.Mercator.js → MercatorProjection.js} +1 -1
- package/src/geo/projection/{Projection.SphericalMercator.js → SphericalMercatorProjection.js} +1 -1
- package/src/geo/projection/index.js +5 -5
- package/src/geometry/Bounds.js +12 -17
- package/src/geometry/LineUtil.js +1 -1
- package/src/geometry/PolyUtil.js +23 -31
- package/src/layer/DivOverlay.js +1 -1
- package/src/layer/FeatureGroup.js +8 -2
- package/src/layer/GeoJSON.js +10 -13
- package/src/layer/HeatLayer.js +1 -1
- package/src/layer/ImageOverlay.js +2 -2
- package/src/layer/LayerGroup.js +1 -1
- package/src/layer/Popup.js +9 -19
- package/src/layer/Tooltip.js +19 -17
- package/src/layer/marker/DefaultIcon.js +33 -5
- package/src/layer/marker/Icon.js +2 -0
- package/src/layer/marker/Marker.Drag.js +53 -5
- package/src/layer/marker/Marker.Move.js +3 -4
- package/src/layer/marker/Marker.js +64 -13
- package/src/layer/tile/GridLayer.js +5 -2
- package/src/layer/tile/TileLayer.js +9 -6
- package/src/layer/tile/WMSTileLayer.js +5 -2
- package/src/layer/vector/Canvas.js +10 -14
- package/src/layer/vector/Circle.js +4 -1
- package/src/layer/vector/CircleMarker.js +2 -1
- package/src/layer/vector/Polygon.js +1 -1
- package/src/layer/vector/Polyline.js +1 -1
- package/src/layer/vector/Renderer.getRenderer.js +4 -3
- package/src/layer/vector/SVG.js +12 -2
- package/src/map/Map.Rotation.js +28 -4
- package/src/map/Map.js +17 -21
- package/src/map/handler/BoxZoomHandler.js +21 -42
- package/src/map/handler/KeyboardHandler.js +34 -53
- package/src/maplair.css +5 -0
- package/dist/esm/geo/projection/Projection.LonLat.js.map +0 -1
- package/dist/esm/geo/projection/Projection.Mercator.js.map +0 -1
- package/dist/esm/geo/projection/Projection.SphericalMercator.js.map +0 -1
- package/dist/esm/geo/projection/index.js +0 -14
- package/dist/esm/geo/projection/index.js.map +0 -1
- package/dist/esm/layer/marker/Marker.Rotation.js +0 -70
- package/dist/esm/layer/marker/Marker.Rotation.js.map +0 -1
- package/src/layer/marker/Marker.Rotation.js +0 -103
package/dist/esm/map/Map.js
CHANGED
|
@@ -27,7 +27,7 @@ import { PinchZoomHandler } from "./handler/PinchZoomHandler.js";
|
|
|
27
27
|
import { ScrollWheelZoomHandler } from "./handler/ScrollWheelZoomHandler.js";
|
|
28
28
|
import { TapHoldHandler } from "./handler/TapHoldHandler.js";
|
|
29
29
|
import { TapDragZoomHandler } from "./handler/TapDragZoomHandler.js";
|
|
30
|
-
|
|
30
|
+
// src/map/Map.js
|
|
31
31
|
/** @import {LatLngExpression} from '../geo/LatLng.js' */
|
|
32
32
|
/** @import {LatLngBoundsExpression} from '../geo/LatLngBounds.js' */
|
|
33
33
|
/** @import {PointExpression} from '../geometry/Point.js' */
|
|
@@ -400,7 +400,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
400
400
|
* @returns {this}
|
|
401
401
|
*/
|
|
402
402
|
setZoomAround(latlng, zoom, options) {
|
|
403
|
-
const
|
|
403
|
+
const center = this.project(this.getCenter()), offset = latlng instanceof Point ? this.containerPointToLayerPoint(latlng).subtract(this.containerPointToLayerPoint(this.getSize().divideBy(2))) : this.project(latlng).subtract(center), newCenter = this.unproject(center.add(offset.multiplyBy(1 - 1 / this.getZoomScale(zoom))));
|
|
404
404
|
return this.setView(newCenter, zoom, { zoom: options });
|
|
405
405
|
}
|
|
406
406
|
_getBoundsCenterZoom(bounds, options) {
|
|
@@ -522,9 +522,6 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
522
522
|
return -Math.asinh(t1 / b1);
|
|
523
523
|
}
|
|
524
524
|
const r0 = r(0);
|
|
525
|
-
function w(s) {
|
|
526
|
-
return w0 * (Math.cosh(r0) / Math.cosh(r0 + rho * s));
|
|
527
|
-
}
|
|
528
525
|
function u(s) {
|
|
529
526
|
return w0 * (Math.cosh(r0) * Math.tanh(r0 + rho * s) - Math.sinh(r0)) / rho2;
|
|
530
527
|
}
|
|
@@ -536,7 +533,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
536
533
|
const t = (Date.now() - start) / duration, s = easeOut(t) * S;
|
|
537
534
|
if (t <= 1) {
|
|
538
535
|
this._flyToFrame = requestAnimationFrame(frame);
|
|
539
|
-
this._move(this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom), this.getScaleZoom(
|
|
536
|
+
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 });
|
|
540
537
|
} else {
|
|
541
538
|
const zoomChanged = this._zoom !== targetZoom;
|
|
542
539
|
this._move(targetCenter, targetZoom);
|
|
@@ -864,7 +861,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
864
861
|
*/
|
|
865
862
|
getCenter() {
|
|
866
863
|
this._checkIfLoaded();
|
|
867
|
-
if (this._lastCenter &&
|
|
864
|
+
if (this._lastCenter && this._getMapPanePos().equals(this._lastCenterPanePos)) return new LatLng(this._lastCenter);
|
|
868
865
|
return this.layerPointToLatLng(this._getCenterLayerPoint());
|
|
869
866
|
}
|
|
870
867
|
/**
|
|
@@ -1068,7 +1065,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1068
1065
|
* @returns {Point}
|
|
1069
1066
|
*/
|
|
1070
1067
|
latLngToLayerPoint(latlng) {
|
|
1071
|
-
return this.project(LatLng.from(latlng)).
|
|
1068
|
+
return this.project(LatLng.from(latlng))._subtract(this.getPixelOrigin());
|
|
1072
1069
|
}
|
|
1073
1070
|
/**
|
|
1074
1071
|
* Returns a `LatLng` where `lat` and `lng` has been wrapped according to the
|
|
@@ -1318,6 +1315,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1318
1315
|
const zoomChanged = this._zoom !== zoom;
|
|
1319
1316
|
this._zoom = zoom;
|
|
1320
1317
|
this._lastCenter = center;
|
|
1318
|
+
this._lastCenterPanePos = this._getMapPanePos();
|
|
1321
1319
|
this._pixelOrigin = this._getNewPixelOrigin(center);
|
|
1322
1320
|
if (!suppressEvent) {
|
|
1323
1321
|
if (zoomChanged || data?.pinch) this.fire("zoom", data);
|
|
@@ -1430,10 +1428,10 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1430
1428
|
const target = targets[0];
|
|
1431
1429
|
const data = { originalEvent: e };
|
|
1432
1430
|
if (e.type !== "keydown" && e.type !== "keyup") {
|
|
1433
|
-
const
|
|
1434
|
-
data.containerPoint =
|
|
1431
|
+
const latlng = (!target._pxRadius || target._pxRadius <= 10) && target.getLatLng?.();
|
|
1432
|
+
data.containerPoint = latlng ? this.latLngToContainerPoint(latlng) : this.pointerEventToContainerPoint(e);
|
|
1435
1433
|
data.layerPoint = this.containerPointToLayerPoint(data.containerPoint);
|
|
1436
|
-
data.latlng =
|
|
1434
|
+
data.latlng = latlng || this.layerPointToLatLng(data.layerPoint);
|
|
1437
1435
|
}
|
|
1438
1436
|
for (const t of targets) {
|
|
1439
1437
|
t.fire(type, data, true);
|
|
@@ -1462,10 +1460,6 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1462
1460
|
_getMapPanePos() {
|
|
1463
1461
|
return getPosition(this._mapPane);
|
|
1464
1462
|
}
|
|
1465
|
-
_moved() {
|
|
1466
|
-
const pos = this._getMapPanePos();
|
|
1467
|
-
return pos && !pos.equals([0, 0]);
|
|
1468
|
-
}
|
|
1469
1463
|
_getTopLeftPoint(center, zoom) {
|
|
1470
1464
|
return (center && zoom !== void 0 ? this._getNewPixelOrigin(center, zoom) : this.getPixelOrigin()).subtract(this._getMapPanePos());
|
|
1471
1465
|
}
|
|
@@ -1481,7 +1475,7 @@ var MaplairMap = class MaplairMap extends Evented {
|
|
|
1481
1475
|
return this.containerPointToLayerPoint(this.getSize()._divideBy(2));
|
|
1482
1476
|
}
|
|
1483
1477
|
_getCenterOffset(latlng) {
|
|
1484
|
-
return this.latLngToLayerPoint(latlng).
|
|
1478
|
+
return this.latLngToLayerPoint(latlng)._round()._subtract(this._getCenterLayerPoint());
|
|
1485
1479
|
}
|
|
1486
1480
|
_limitCenter(center, zoom, bounds) {
|
|
1487
1481
|
if (!bounds) return center;
|
|
@@ -1628,7 +1622,6 @@ for (const feature of [
|
|
|
1628
1622
|
ZoomControl,
|
|
1629
1623
|
FullscreenControl
|
|
1630
1624
|
]) feature.register(MaplairMap);
|
|
1631
|
-
//#endregion
|
|
1632
1625
|
export { MaplairMap as LeafletMap, MaplairMap as Map, MaplairMap };
|
|
1633
1626
|
|
|
1634
1627
|
//# sourceMappingURL=Map.js.map
|