maplair 4.0.0-alpha.2 → 4.1.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 +140 -38
- package/LICENSE +1 -1
- package/README.md +10 -9
- package/dist/esm/Maplair.js +14 -14
- package/dist/esm/control/AttributionControl.js +24 -14
- package/dist/esm/control/AttributionControl.js.map +1 -1
- package/dist/esm/control/ButtonControl.js +9 -11
- package/dist/esm/control/ButtonControl.js.map +1 -1
- package/dist/esm/control/ContextMenu.js +1 -3
- package/dist/esm/control/ContextMenu.js.map +1 -1
- package/dist/esm/control/Control.js +9 -16
- package/dist/esm/control/Control.js.map +1 -1
- package/dist/esm/control/FullscreenControl.js +5 -7
- package/dist/esm/control/FullscreenControl.js.map +1 -1
- package/dist/esm/control/LayersControl.js +144 -35
- package/dist/esm/control/LayersControl.js.map +1 -1
- package/dist/esm/control/LegendControl.js +7 -9
- package/dist/esm/control/LegendControl.js.map +1 -1
- package/dist/esm/control/MiniMapControl.js +14 -16
- package/dist/esm/control/MiniMapControl.js.map +1 -1
- package/dist/esm/control/RotateControl.js +1 -3
- package/dist/esm/control/RotateControl.js.map +1 -1
- package/dist/esm/control/ScaleControl.js +7 -9
- package/dist/esm/control/ScaleControl.js.map +1 -1
- package/dist/esm/control/SearchControl.js +100 -18
- package/dist/esm/control/SearchControl.js.map +1 -1
- package/dist/esm/control/SideBySideControl.js +1 -3
- package/dist/esm/control/SideBySideControl.js.map +1 -1
- package/dist/esm/control/TextControl.js +5 -7
- package/dist/esm/control/TextControl.js.map +1 -1
- package/dist/esm/control/TimeControl.js +408 -0
- package/dist/esm/control/TimeControl.js.map +1 -0
- package/dist/esm/control/ZoomControl.js +5 -7
- package/dist/esm/control/ZoomControl.js.map +1 -1
- package/dist/esm/core/Class.js +28 -37
- package/dist/esm/core/Class.js.map +1 -1
- package/dist/esm/core/Events.js +21 -8
- package/dist/esm/core/Events.js.map +1 -1
- package/dist/esm/core/Handler.js +13 -11
- package/dist/esm/core/Handler.js.map +1 -1
- package/dist/esm/core/Util.js +13 -1
- package/dist/esm/core/Util.js.map +1 -1
- package/dist/esm/dom/DomEvent.DoubleTap.js +25 -22
- package/dist/esm/dom/DomEvent.DoubleTap.js.map +1 -1
- package/dist/esm/dom/DomEvent.PointerEvents.js +2 -16
- package/dist/esm/dom/DomEvent.PointerEvents.js.map +1 -1
- package/dist/esm/dom/DomEvent.js +8 -42
- package/dist/esm/dom/DomEvent.js.map +1 -1
- package/dist/esm/dom/DomUtil.js +14 -68
- package/dist/esm/dom/DomUtil.js.map +1 -1
- package/dist/esm/dom/Draggable.js +17 -18
- package/dist/esm/dom/Draggable.js.map +1 -1
- package/dist/esm/dom/PosAnimation.js +3 -25
- package/dist/esm/dom/PosAnimation.js.map +1 -1
- package/dist/esm/geo/LatLng.js +34 -6
- package/dist/esm/geo/LatLng.js.map +1 -1
- package/dist/esm/geo/LatLngBounds.js +19 -7
- package/dist/esm/geo/LatLngBounds.js.map +1 -1
- package/dist/esm/geo/crs/CRS.js +4 -3
- package/dist/esm/geo/crs/CRS.js.map +1 -1
- package/dist/esm/geo/crs/EPSG3395.js +1 -1
- package/dist/esm/geo/crs/EPSG3395.js.map +1 -1
- package/dist/esm/geo/crs/EPSG3857.js +1 -1
- package/dist/esm/geo/crs/EPSG3857.js.map +1 -1
- package/dist/esm/geo/crs/EPSG4326.js +1 -1
- package/dist/esm/geo/crs/EPSG4326.js.map +1 -1
- package/dist/esm/geo/crs/EarthCRS.js +2 -2
- package/dist/esm/geo/crs/EarthCRS.js.map +1 -1
- package/dist/esm/geo/crs/SimpleCRS.js +1 -1
- package/dist/esm/geo/crs/SimpleCRS.js.map +1 -1
- package/dist/esm/geo/projection/Projection.LonLat.js +3 -3
- package/dist/esm/geo/projection/Projection.LonLat.js.map +1 -1
- package/dist/esm/geo/projection/Projection.Mercator.js +3 -3
- package/dist/esm/geo/projection/Projection.Mercator.js.map +1 -1
- package/dist/esm/geo/projection/Projection.SphericalMercator.js +3 -3
- package/dist/esm/geo/projection/Projection.SphericalMercator.js.map +1 -1
- package/dist/esm/geometry/Bounds.js +19 -7
- package/dist/esm/geometry/Bounds.js.map +1 -1
- package/dist/esm/geometry/LineUtil.js +36 -30
- package/dist/esm/geometry/LineUtil.js.map +1 -1
- package/dist/esm/geometry/Point.js +23 -5
- package/dist/esm/geometry/Point.js.map +1 -1
- package/dist/esm/geometry/PolyUtil.js +9 -28
- package/dist/esm/geometry/PolyUtil.js.map +1 -1
- package/dist/esm/layer/BlanketOverlay.js +6 -8
- package/dist/esm/layer/BlanketOverlay.js.map +1 -1
- package/dist/esm/layer/DivOverlay.js +15 -20
- package/dist/esm/layer/DivOverlay.js.map +1 -1
- package/dist/esm/layer/GeoJSON.js +9 -145
- package/dist/esm/layer/GeoJSON.js.map +1 -1
- package/dist/esm/layer/GeoJSONUtil.js +75 -0
- package/dist/esm/layer/GeoJSONUtil.js.map +1 -0
- package/dist/esm/layer/HeatLayer.js +15 -17
- package/dist/esm/layer/HeatLayer.js.map +1 -1
- package/dist/esm/layer/ImageOverlay.js +20 -26
- package/dist/esm/layer/ImageOverlay.js.map +1 -1
- package/dist/esm/layer/Layer.js +8 -10
- package/dist/esm/layer/Layer.js.map +1 -1
- package/dist/esm/layer/LayerGroup.js +51 -0
- package/dist/esm/layer/LayerGroup.js.map +1 -1
- package/dist/esm/layer/Popup.js +27 -43
- package/dist/esm/layer/Popup.js.map +1 -1
- package/dist/esm/layer/SVGOverlay.js +2 -5
- package/dist/esm/layer/SVGOverlay.js.map +1 -1
- package/dist/esm/layer/Tooltip.js +15 -17
- package/dist/esm/layer/Tooltip.js.map +1 -1
- package/dist/esm/layer/VideoOverlay.js +12 -15
- package/dist/esm/layer/VideoOverlay.js.map +1 -1
- package/dist/esm/layer/marker/DefaultIcon.js +15 -48
- package/dist/esm/layer/marker/DefaultIcon.js.map +1 -1
- package/dist/esm/layer/marker/DivIcon.js +8 -10
- package/dist/esm/layer/marker/DivIcon.js.map +1 -1
- package/dist/esm/layer/marker/Icon.js +9 -12
- package/dist/esm/layer/marker/Icon.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Drag.js +1 -1
- package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Move.js +2 -3
- package/dist/esm/layer/marker/Marker.Move.js.map +1 -1
- package/dist/esm/layer/marker/Marker.js +63 -35
- package/dist/esm/layer/marker/Marker.js.map +1 -1
- package/dist/esm/layer/marker/MarkerClusterGroup.js +302 -0
- package/dist/esm/layer/marker/MarkerClusterGroup.js.map +1 -0
- package/dist/esm/layer/marker/SvgIcon.js +6 -8
- package/dist/esm/layer/marker/SvgIcon.js.map +1 -1
- package/dist/esm/layer/tile/GridLayer.js +86 -98
- package/dist/esm/layer/tile/GridLayer.js.map +1 -1
- package/dist/esm/layer/tile/TileLayer.js +28 -36
- package/dist/esm/layer/tile/TileLayer.js.map +1 -1
- package/dist/esm/layer/tile/WMSTileLayer.js +28 -23
- package/dist/esm/layer/tile/WMSTileLayer.js.map +1 -1
- package/dist/esm/layer/vector/Canvas.js +1 -3
- package/dist/esm/layer/vector/Canvas.js.map +1 -1
- package/dist/esm/layer/vector/Circle.js +2 -2
- package/dist/esm/layer/vector/Circle.js.map +1 -1
- package/dist/esm/layer/vector/CircleMarker.js +17 -7
- package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
- package/dist/esm/layer/vector/Path.DashAnimation.js +2 -3
- package/dist/esm/layer/vector/Path.DashAnimation.js.map +1 -1
- package/dist/esm/layer/vector/Path.js +27 -20
- package/dist/esm/layer/vector/Path.js.map +1 -1
- package/dist/esm/layer/vector/Polygon.js +20 -4
- package/dist/esm/layer/vector/Polygon.js.map +1 -1
- package/dist/esm/layer/vector/Polyline.Decorations.js +2 -2
- package/dist/esm/layer/vector/Polyline.js +24 -8
- package/dist/esm/layer/vector/Polyline.js.map +1 -1
- package/dist/esm/layer/vector/Renderer.getRenderer.js +14 -13
- package/dist/esm/layer/vector/Renderer.getRenderer.js.map +1 -1
- package/dist/esm/layer/vector/SVG.js +5 -5
- package/dist/esm/layer/vector/SVG.js.map +1 -1
- package/dist/esm/map/Map.Rotation.js +15 -11
- package/dist/esm/map/Map.Rotation.js.map +1 -1
- package/dist/esm/map/Map.js +135 -129
- package/dist/esm/map/Map.js.map +1 -1
- package/dist/esm/map/handler/BoxZoomHandler.js +5 -7
- package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/DisplaceHandler.js +6 -8
- package/dist/esm/map/handler/DisplaceHandler.js.map +1 -1
- package/dist/esm/map/handler/DragHandler.js +20 -20
- package/dist/esm/map/handler/DragHandler.js.map +1 -1
- package/dist/esm/map/handler/KeyboardHandler.js +37 -37
- package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
- package/dist/esm/map/handler/PinchZoomHandler.js +12 -3
- package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js +3 -4
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/TapHoldHandler.js +12 -5
- package/dist/esm/map/handler/TapHoldHandler.js.map +1 -1
- package/dist/esm/package.js +1 -1
- package/dist/maplair-global-src.js +6326 -5625
- package/dist/maplair-global-src.js.map +1 -1
- package/dist/maplair-global.js +3 -3
- package/dist/maplair-global.js.map +1 -1
- package/dist/maplair-src.js +9010 -8290
- package/dist/maplair-src.js.map +1 -1
- package/dist/maplair.css +148 -98
- package/dist/maplair.js +3 -3
- package/dist/maplair.js.map +1 -1
- package/i18n/cs.json +6 -0
- package/i18n/de.json +6 -0
- package/i18n/en.json +6 -0
- package/i18n/es.json +6 -0
- package/i18n/fr.json +6 -0
- package/i18n/hu.json +6 -0
- package/i18n/it.json +6 -0
- package/i18n/rm.json +6 -0
- package/i18n/sk.json +6 -0
- package/i18n/sl.json +6 -0
- package/package.json +12 -14
- package/src/control/AttributionControl.js +25 -18
- package/src/control/ButtonControl.js +9 -11
- package/src/control/ContextMenu.js +3 -5
- package/src/control/Control.js +9 -19
- package/src/control/FullscreenControl.js +5 -7
- package/src/control/LayersControl.js +159 -36
- package/src/control/LegendControl.js +7 -9
- package/src/control/MiniMapControl.js +9 -11
- package/src/control/RotateControl.js +3 -5
- package/src/control/ScaleControl.js +7 -9
- package/src/control/SearchControl.js +104 -21
- package/src/control/SideBySideControl.js +3 -5
- package/src/control/TextControl.js +5 -7
- package/src/control/TimeControl.js +471 -0
- package/src/control/ZoomControl.js +5 -7
- package/src/control/index.js +1 -0
- package/src/core/Class.js +35 -34
- package/src/core/Events.js +22 -3
- package/src/core/Handler.js +14 -12
- package/src/core/Util.js +19 -1
- package/src/core/index.js +0 -1
- package/src/dom/DomEvent.DoubleTap.js +18 -10
- package/src/dom/DomEvent.PointerEvents.js +3 -26
- package/src/dom/DomEvent.js +8 -66
- package/src/dom/DomUtil.js +22 -78
- package/src/dom/Draggable.js +27 -22
- package/src/dom/PosAnimation.js +3 -25
- package/src/dom/index.js +0 -1
- package/src/geo/LatLng.js +40 -4
- package/src/geo/LatLngBounds.js +20 -7
- package/src/geo/crs/CRS.js +4 -3
- package/src/geo/crs/EPSG3395.js +1 -1
- package/src/geo/crs/EPSG3857.js +1 -1
- package/src/geo/crs/EPSG4326.js +1 -1
- package/src/geo/crs/EarthCRS.js +2 -8
- package/src/geo/crs/SimpleCRS.js +1 -1
- package/src/geo/projection/Projection.LonLat.js +3 -3
- package/src/geo/projection/Projection.Mercator.js +3 -3
- package/src/geo/projection/Projection.SphericalMercator.js +3 -3
- package/src/geometry/Bounds.js +20 -7
- package/src/geometry/LineUtil.js +47 -48
- package/src/geometry/Point.js +24 -5
- package/src/geometry/PolyUtil.js +15 -44
- package/src/layer/BlanketOverlay.js +6 -10
- package/src/layer/DivOverlay.js +15 -26
- package/src/layer/GeoJSON.js +7 -205
- package/src/layer/GeoJSONUtil.js +85 -0
- package/src/layer/HeatLayer.js +9 -11
- package/src/layer/ImageOverlay.js +19 -30
- package/src/layer/Layer.js +8 -10
- package/src/layer/LayerGroup.js +71 -0
- package/src/layer/Popup.js +31 -46
- package/src/layer/SVGOverlay.js +1 -5
- package/src/layer/Tooltip.js +15 -19
- package/src/layer/VideoOverlay.js +12 -15
- package/src/layer/marker/DefaultIcon.js +15 -61
- package/src/layer/marker/DivIcon.js +10 -12
- package/src/layer/marker/Icon.js +9 -12
- package/src/layer/marker/Marker.Drag.js +1 -1
- package/src/layer/marker/Marker.Move.js +2 -3
- package/src/layer/marker/Marker.js +83 -41
- package/src/layer/marker/MarkerClusterGroup.js +370 -0
- package/src/layer/marker/SvgIcon.js +7 -9
- package/src/layer/marker/index.js +1 -0
- package/src/layer/tile/GridLayer.js +104 -134
- package/src/layer/tile/TileLayer.js +35 -43
- package/src/layer/tile/WMSTileLayer.js +26 -24
- package/src/layer/vector/Canvas.js +3 -5
- package/src/layer/vector/Circle.js +5 -2
- package/src/layer/vector/CircleMarker.js +17 -6
- package/src/layer/vector/Path.DashAnimation.js +1 -2
- package/src/layer/vector/Path.js +30 -21
- package/src/layer/vector/Polygon.js +28 -5
- package/src/layer/vector/Polyline.js +26 -7
- package/src/layer/vector/Renderer.getRenderer.js +17 -17
- package/src/layer/vector/SVG.js +5 -5
- package/src/map/Map.Rotation.js +19 -11
- package/src/map/Map.js +163 -154
- package/src/map/handler/BoxZoomHandler.js +9 -8
- package/src/map/handler/DisplaceHandler.js +6 -8
- package/src/map/handler/DragHandler.js +26 -29
- package/src/map/handler/KeyboardHandler.js +44 -50
- package/src/map/handler/PinchZoomHandler.js +16 -5
- package/src/map/handler/ScrollWheelZoomHandler.js +6 -4
- package/src/map/handler/TapHoldHandler.js +15 -4
- package/src/map/index.js +1 -1
- package/src/maplair.css +148 -98
- package/dist/esm/core/Browser.js +0 -100
- package/dist/esm/core/Browser.js.map +0 -1
- package/dist/images/layers.svg +0 -1
- package/dist/images/marker-icon.svg +0 -1
- package/dist/images/marker-shadow.svg +0 -1
- package/src/core/Browser.js +0 -110
- package/src/images/layers.svg +0 -1
- package/src/images/marker-icon.svg +0 -1
- package/src/images/marker-shadow.svg +0 -1
|
@@ -66,8 +66,11 @@ export class Circle extends CircleMarker {
|
|
|
66
66
|
bottom = map.project([lat - latR, lng]),
|
|
67
67
|
p = top.add(bottom).divideBy(2),
|
|
68
68
|
lat2 = map.unproject(p).lat;
|
|
69
|
-
|
|
70
|
-
|
|
69
|
+
// Longitude span from the haversine form of the spherical law of cosines. The plain acos() form
|
|
70
|
+
// loses precision for radii of about a metre and less, where cos(latR) is too close to 1 (#6120).
|
|
71
|
+
let lngR = 2 * Math.asin(Math.sqrt(
|
|
72
|
+
(Math.sin(latR * d / 2) ** 2 - Math.sin((lat2 - lat) * d / 2) ** 2) /
|
|
73
|
+
(Math.cos(lat * d) * Math.cos(lat2 * d)))) / d;
|
|
71
74
|
|
|
72
75
|
if (isNaN(lngR) || lngR === 0) {
|
|
73
76
|
lngR = latR / Math.cos(Math.PI / 180 * lat); // Fallback for edge case, #2425
|
|
@@ -2,6 +2,8 @@ import {Path} from './Path.js';
|
|
|
2
2
|
import * as Util from '../../core/Util.js';
|
|
3
3
|
import {LatLng} from '../../geo/LatLng.js';
|
|
4
4
|
import {Bounds} from '../../geometry/Bounds.js';
|
|
5
|
+
import {pointToGeoJSON} from '../GeoJSONUtil.js';
|
|
6
|
+
/** @import {Feature} from 'geojson' */
|
|
5
7
|
/** @import {LatLngExpression} from '../../geo/LatLng.js' */
|
|
6
8
|
/** @import {MaplairEvent} from '../../core/Events.js' */
|
|
7
9
|
/** @import {PathOptions} from './Path.js' */
|
|
@@ -32,12 +34,10 @@ import {Bounds} from '../../geometry/Bounds.js';
|
|
|
32
34
|
*/
|
|
33
35
|
export class CircleMarker extends Path {
|
|
34
36
|
|
|
35
|
-
static {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
});
|
|
40
|
-
}
|
|
37
|
+
static defaultOptions = {
|
|
38
|
+
fill: true,
|
|
39
|
+
radius: 10
|
|
40
|
+
};
|
|
41
41
|
|
|
42
42
|
/**
|
|
43
43
|
* Instantiates a circle marker object given a geographical point, and an optional
|
|
@@ -138,4 +138,15 @@ export class CircleMarker extends Path {
|
|
|
138
138
|
_containsPoint(p) {
|
|
139
139
|
return p.distanceTo(this._point) <= this._pxRadius + this._clickTolerance();
|
|
140
140
|
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* Coordinates values are rounded with [`formatNum`](#util-formatnum) to the
|
|
144
|
+
* given `precision`. Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON)
|
|
145
|
+
* representation of the circle marker (as a GeoJSON `Point` Feature).
|
|
146
|
+
* @param {number|false} [precision]
|
|
147
|
+
* @returns {Feature}
|
|
148
|
+
*/
|
|
149
|
+
toGeoJSON(precision) {
|
|
150
|
+
return pointToGeoJSON(this, precision);
|
|
151
|
+
}
|
|
141
152
|
}
|
|
@@ -2,7 +2,6 @@ import {Path} from './Path.js';
|
|
|
2
2
|
import {SVG} from './SVG.js';
|
|
3
3
|
import {Canvas} from './Canvas.js';
|
|
4
4
|
import * as Util from '../../core/Util.js';
|
|
5
|
-
import Browser from '../../core/Browser.js';
|
|
6
5
|
|
|
7
6
|
const DASH_SEPARATOR_RE = /[ ,]+/;
|
|
8
7
|
|
|
@@ -89,7 +88,7 @@ Canvas.include({
|
|
|
89
88
|
// The shift of the dashes of an animated path, and keeps redrawing it
|
|
90
89
|
_getDashShift(layer) {
|
|
91
90
|
const speed = layer.options.dashSpeed,
|
|
92
|
-
length = speed && !
|
|
91
|
+
length = speed && !this._map._prefersReducedMotion() && layer._getDashLength();
|
|
93
92
|
if (!length) { return 0; }
|
|
94
93
|
|
|
95
94
|
this._animatedDashes ??= new Set();
|
package/src/layer/vector/Path.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {Layer} from '../Layer.js';
|
|
2
|
+
import {SVG} from './SVG.js';
|
|
2
3
|
import * as Util from '../../core/Util.js';
|
|
3
4
|
/** @import {InteractiveLayerOptions} from '../Layer.js' */
|
|
4
5
|
/** @import {MaplairMap} from '../../map/Map.js' */
|
|
@@ -32,9 +33,11 @@ import * as Util from '../../core/Util.js';
|
|
|
32
33
|
* [how the inside of a shape](https://developer.mozilla.org/docs/Web/SVG/Attribute/fill-rule)
|
|
33
34
|
* is determined.
|
|
34
35
|
* @property {string} [className] Custom class name set on an element. Only for SVG renderer.
|
|
36
|
+
* Applied when the element is created; [`setStyle`](#path-setstyle) does not update it
|
|
37
|
+
* afterwards.
|
|
35
38
|
* @property {Renderer} [renderer] Use this specific instance of `Renderer` for this
|
|
36
|
-
* path.
|
|
37
|
-
* If set, it
|
|
39
|
+
* path. If not set, the path uses the map's [renderer](#maplairmapoptions-renderer),
|
|
40
|
+
* which is `SVG` by default. If set, it overrides the `pane` option.
|
|
38
41
|
* @extends InteractiveLayerOptions
|
|
39
42
|
*/
|
|
40
43
|
|
|
@@ -44,25 +47,23 @@ import * as Util from '../../core/Util.js';
|
|
|
44
47
|
*/
|
|
45
48
|
export class Path extends Layer {
|
|
46
49
|
|
|
47
|
-
static {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
});
|
|
65
|
-
}
|
|
50
|
+
static defaultOptions = {
|
|
51
|
+
stroke: true,
|
|
52
|
+
color: '#3388ff',
|
|
53
|
+
weight: 3,
|
|
54
|
+
opacity: 1,
|
|
55
|
+
lineCap: 'round',
|
|
56
|
+
lineJoin: 'round',
|
|
57
|
+
dashArray: null,
|
|
58
|
+
dashOffset: null,
|
|
59
|
+
fill: false,
|
|
60
|
+
fillColor: null,
|
|
61
|
+
fillOpacity: 0.2,
|
|
62
|
+
fillRule: 'evenodd',
|
|
63
|
+
// className: '',
|
|
64
|
+
interactive: true,
|
|
65
|
+
bubblingPointerEvents: true
|
|
66
|
+
};
|
|
66
67
|
|
|
67
68
|
/**
|
|
68
69
|
* Gets the renderer of the path from the map, before it is added.
|
|
@@ -107,6 +108,9 @@ export class Path extends Layer {
|
|
|
107
108
|
|
|
108
109
|
/**
|
|
109
110
|
* Changes the appearance of a Path based on the options in the `PathOptions` object.
|
|
111
|
+
* Note that [`className`](#pathoptions-classname) is an exception: it is applied only
|
|
112
|
+
* when the path element is created, so passing it here updates the option but leaves
|
|
113
|
+
* the element's class unchanged.
|
|
110
114
|
* @param {PathOptions} style
|
|
111
115
|
* @returns {this}
|
|
112
116
|
*/
|
|
@@ -147,6 +151,11 @@ export class Path extends Layer {
|
|
|
147
151
|
return this._path;
|
|
148
152
|
}
|
|
149
153
|
|
|
154
|
+
// the renderer of the path if neither the path nor the map has one
|
|
155
|
+
_createRenderer(options) {
|
|
156
|
+
return new SVG(options);
|
|
157
|
+
}
|
|
158
|
+
|
|
150
159
|
_reset() {
|
|
151
160
|
// defined in child classes
|
|
152
161
|
this._project();
|
|
@@ -4,6 +4,8 @@ import * as LineUtil from '../../geometry/LineUtil.js';
|
|
|
4
4
|
import {Point} from '../../geometry/Point.js';
|
|
5
5
|
import {Bounds} from '../../geometry/Bounds.js';
|
|
6
6
|
import * as PolyUtil from '../../geometry/PolyUtil.js';
|
|
7
|
+
import {latLngsToCoords, getFeature} from '../GeoJSONUtil.js';
|
|
8
|
+
/** @import {Feature} from 'geojson' */
|
|
7
9
|
/** @import {LatLngExpression} from '../../geo/LatLng.js' */
|
|
8
10
|
/** @import {PolylineOptions} from './Polyline.js' */
|
|
9
11
|
|
|
@@ -57,11 +59,9 @@ import * as PolyUtil from '../../geometry/PolyUtil.js';
|
|
|
57
59
|
*/
|
|
58
60
|
export class Polygon extends Polyline {
|
|
59
61
|
|
|
60
|
-
static {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
});
|
|
64
|
-
}
|
|
62
|
+
static defaultOptions = {
|
|
63
|
+
fill: true
|
|
64
|
+
};
|
|
65
65
|
|
|
66
66
|
/**
|
|
67
67
|
* Instantiates a polygon object given an array of geographical points (or arrays
|
|
@@ -177,4 +177,27 @@ export class Polygon extends Polyline {
|
|
|
177
177
|
return inside || super._containsPoint(p, true);
|
|
178
178
|
}
|
|
179
179
|
|
|
180
|
+
|
|
181
|
+
/**
|
|
182
|
+
* Coordinates values are rounded with [`formatNum`](#util-formatnum) to the
|
|
183
|
+
* given `precision`. Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON)
|
|
184
|
+
* representation of the polygon (as a GeoJSON `Polygon` or `MultiPolygon` Feature).
|
|
185
|
+
* @param {number|false} [precision]
|
|
186
|
+
* @returns {Feature}
|
|
187
|
+
*/
|
|
188
|
+
toGeoJSON(precision) {
|
|
189
|
+
const holes = !LineUtil.isFlat(this._latlngs),
|
|
190
|
+
multi = holes && !LineUtil.isFlat(this._latlngs[0]);
|
|
191
|
+
|
|
192
|
+
let coords = latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true, precision);
|
|
193
|
+
|
|
194
|
+
if (!holes) {
|
|
195
|
+
coords = [coords];
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
return getFeature(this, {
|
|
199
|
+
type: `${multi ? 'Multi' : ''}Polygon`,
|
|
200
|
+
coordinates: coords
|
|
201
|
+
});
|
|
202
|
+
}
|
|
180
203
|
}
|
|
@@ -5,6 +5,8 @@ import {LatLng} from '../../geo/LatLng.js';
|
|
|
5
5
|
import {LatLngBounds} from '../../geo/LatLngBounds.js';
|
|
6
6
|
import {Bounds} from '../../geometry/Bounds.js';
|
|
7
7
|
import {Point} from '../../geometry/Point.js';
|
|
8
|
+
import {latLngsToCoords, getFeature} from '../GeoJSONUtil.js';
|
|
9
|
+
/** @import {Feature} from 'geojson' */
|
|
8
10
|
/** @import {LatLngExpression} from '../../geo/LatLng.js' */
|
|
9
11
|
/** @import {PointExpression} from '../../geometry/Point.js' */
|
|
10
12
|
/** @import {PathOptions} from './Path.js' */
|
|
@@ -53,12 +55,10 @@ import {Point} from '../../geometry/Point.js';
|
|
|
53
55
|
*/
|
|
54
56
|
export class Polyline extends Path {
|
|
55
57
|
|
|
56
|
-
static {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
});
|
|
61
|
-
}
|
|
58
|
+
static defaultOptions = {
|
|
59
|
+
smoothFactor: 0.5,
|
|
60
|
+
noClip: false
|
|
61
|
+
};
|
|
62
62
|
|
|
63
63
|
/**
|
|
64
64
|
* Instantiates a polyline object given an array of geographical points and
|
|
@@ -110,7 +110,7 @@ export class Polyline extends Path {
|
|
|
110
110
|
* @returns {(Point & {distance: number})|null}
|
|
111
111
|
*/
|
|
112
112
|
closestLayerPoint(p) {
|
|
113
|
-
p =
|
|
113
|
+
p = Point.from(p);
|
|
114
114
|
let minDistance = Infinity,
|
|
115
115
|
minPoint = null,
|
|
116
116
|
p1, p2;
|
|
@@ -316,4 +316,23 @@ export class Polyline extends Path {
|
|
|
316
316
|
}
|
|
317
317
|
return false;
|
|
318
318
|
}
|
|
319
|
+
|
|
320
|
+
/**
|
|
321
|
+
* Coordinates values are rounded with [`formatNum`](#util-formatnum) to the
|
|
322
|
+
* given `precision`. Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON)
|
|
323
|
+
* representation of the polyline (as a GeoJSON `LineString` or `MultiLineString`
|
|
324
|
+
* Feature).
|
|
325
|
+
* @param {number|false} [precision]
|
|
326
|
+
* @returns {Feature}
|
|
327
|
+
*/
|
|
328
|
+
toGeoJSON(precision) {
|
|
329
|
+
const multi = !LineUtil.isFlat(this._latlngs);
|
|
330
|
+
|
|
331
|
+
const coords = latLngsToCoords(this._latlngs, multi ? 1 : 0, false, precision);
|
|
332
|
+
|
|
333
|
+
return getFeature(this, {
|
|
334
|
+
type: `${multi ? 'Multi' : ''}LineString`,
|
|
335
|
+
coordinates: coords
|
|
336
|
+
});
|
|
337
|
+
}
|
|
319
338
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import {Canvas} from './Canvas.js';
|
|
2
|
-
import {SVG} from './SVG.js';
|
|
3
1
|
/** @import {MaplairMap} from '../../map/Map.js' */
|
|
4
2
|
/** @import {Path} from './Path.js' */
|
|
5
3
|
/** @import {Renderer} from './Renderer.js' */
|
|
@@ -18,11 +16,8 @@ const mapRendererMethods = {
|
|
|
18
16
|
* @returns {Renderer}
|
|
19
17
|
*/
|
|
20
18
|
getRenderer(layer) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (!renderer) {
|
|
24
|
-
renderer = this._renderer = this._createRenderer();
|
|
25
|
-
}
|
|
19
|
+
const renderer = layer.options.renderer ?? this._getPaneRenderer(layer) ?? this.options.renderer ??
|
|
20
|
+
(this._renderer ??= layer._createRenderer());
|
|
26
21
|
|
|
27
22
|
if (!this.hasLayer(renderer)) {
|
|
28
23
|
this.addLayer(renderer);
|
|
@@ -30,21 +25,22 @@ const mapRendererMethods = {
|
|
|
30
25
|
return renderer;
|
|
31
26
|
},
|
|
32
27
|
|
|
33
|
-
_getPaneRenderer(
|
|
28
|
+
_getPaneRenderer(layer) {
|
|
29
|
+
const name = layer.options.pane;
|
|
34
30
|
if (name === 'overlayPane' || name === undefined) {
|
|
35
31
|
return;
|
|
36
32
|
}
|
|
37
33
|
|
|
38
34
|
let renderer = this._paneRenderers[name];
|
|
39
|
-
if (renderer
|
|
40
|
-
renderer
|
|
35
|
+
if (!renderer) {
|
|
36
|
+
// custom panes get a renderer of the same kind as the map's default one, so Canvas maps stay Canvas
|
|
37
|
+
const Renderer = this.options.renderer?.constructor;
|
|
38
|
+
renderer = Renderer ?
|
|
39
|
+
new Renderer({...this.options.renderer.options, pane: name}) :
|
|
40
|
+
layer._createRenderer({pane: name});
|
|
41
41
|
this._paneRenderers[name] = renderer;
|
|
42
42
|
}
|
|
43
43
|
return renderer;
|
|
44
|
-
},
|
|
45
|
-
|
|
46
|
-
_createRenderer(options) {
|
|
47
|
-
return (this.options.preferCanvas && new Canvas(options)) || new SVG(options);
|
|
48
44
|
}
|
|
49
45
|
};
|
|
50
46
|
/** @typedef {typeof mapRendererMethods} MapRendererMethods */
|
|
@@ -53,10 +49,9 @@ const mapRendererMethods = {
|
|
|
53
49
|
* Map options of the vector renderers.
|
|
54
50
|
* @typedef {object} RendererMapOptions
|
|
55
51
|
* @lends MaplairMapOptions
|
|
56
|
-
* @property {boolean} [preferCanvas=false] Whether `Path`s should be rendered on a
|
|
57
|
-
* `Canvas` renderer. By default, all `Path`s are rendered in a `SVG` renderer.
|
|
58
52
|
* @property {Renderer} [renderer] The default method for drawing vector layers on the
|
|
59
|
-
* map. `SVG`
|
|
53
|
+
* map. A new `SVG` renderer by default; pass `new Canvas()` to draw them on a canvas
|
|
54
|
+
* instead.
|
|
60
55
|
*/
|
|
61
56
|
|
|
62
57
|
/**
|
|
@@ -67,4 +62,9 @@ const mapRendererMethods = {
|
|
|
67
62
|
*/
|
|
68
63
|
export function register(MaplairMap) {
|
|
69
64
|
MaplairMap.include(mapRendererMethods);
|
|
65
|
+
MaplairMap.addInitHook(function () {
|
|
66
|
+
if (this.options.preferCanvas !== undefined) {
|
|
67
|
+
console.error('MaplairMap: preferCanvas option has been removed. Use renderer: new Canvas() instead.');
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
70
|
}
|
package/src/layer/vector/SVG.js
CHANGED
|
@@ -63,8 +63,8 @@ export class SVG extends Renderer {
|
|
|
63
63
|
// set size of svg-container if changed
|
|
64
64
|
if (!this._svgSize || !this._svgSize.equals(size)) {
|
|
65
65
|
this._svgSize = size;
|
|
66
|
-
this._container.setAttribute('width', size.x);
|
|
67
|
-
this._container.setAttribute('height', size.y);
|
|
66
|
+
this._container.setAttribute('width', `${size.x}`);
|
|
67
|
+
this._container.setAttribute('height', `${size.y}`);
|
|
68
68
|
}
|
|
69
69
|
|
|
70
70
|
// Reset the <SVG>'s viewBox as per _update, but skip redrawing paths.
|
|
@@ -133,8 +133,8 @@ export class SVG extends Renderer {
|
|
|
133
133
|
|
|
134
134
|
if (options.stroke) {
|
|
135
135
|
path.setAttribute('stroke', options.color);
|
|
136
|
-
path.setAttribute('stroke-opacity', options.opacity);
|
|
137
|
-
path.setAttribute('stroke-width', options.weight);
|
|
136
|
+
path.setAttribute('stroke-opacity', `${options.opacity}`);
|
|
137
|
+
path.setAttribute('stroke-width', `${options.weight}`);
|
|
138
138
|
path.setAttribute('stroke-linecap', options.lineCap);
|
|
139
139
|
path.setAttribute('stroke-linejoin', options.lineJoin);
|
|
140
140
|
|
|
@@ -155,7 +155,7 @@ export class SVG extends Renderer {
|
|
|
155
155
|
|
|
156
156
|
if (options.fill) {
|
|
157
157
|
path.setAttribute('fill', options.fillColor || options.color);
|
|
158
|
-
path.setAttribute('fill-opacity', options.fillOpacity);
|
|
158
|
+
path.setAttribute('fill-opacity', `${options.fillOpacity}`);
|
|
159
159
|
path.setAttribute('fill-rule', options.fillRule || 'evenodd');
|
|
160
160
|
} else {
|
|
161
161
|
path.setAttribute('fill', 'none');
|
package/src/map/Map.Rotation.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {MaplairMap} from './Map.js';
|
|
2
|
-
import Browser from '../core/Browser.js';
|
|
3
2
|
import * as DomUtil from '../dom/DomUtil.js';
|
|
4
3
|
import * as DomEvent from '../dom/DomEvent.js';
|
|
5
4
|
import * as PointerEvents from '../dom/DomEvent.PointerEvents.js';
|
|
@@ -143,7 +142,7 @@ const mapRotationMethods = {
|
|
|
143
142
|
if (bearing === from) { return this; }
|
|
144
143
|
|
|
145
144
|
this._stop();
|
|
146
|
-
if (!options?.animate || !this._loaded ||
|
|
145
|
+
if (!options?.animate || !this._loaded || this._prefersReducedMotion()) {
|
|
147
146
|
this._rotate(bearing);
|
|
148
147
|
return this._loaded ? this.fire('movestart').fire('move').fire('moveend') : this;
|
|
149
148
|
}
|
|
@@ -236,7 +235,7 @@ const mapRotationMethods = {
|
|
|
236
235
|
* @returns {Point}
|
|
237
236
|
*/
|
|
238
237
|
containerPointToLayerPoint(point) { // (Point)
|
|
239
|
-
point =
|
|
238
|
+
point = Point.from(point);
|
|
240
239
|
if (this._bearing) {
|
|
241
240
|
// the map pane is rotated around the center of the container
|
|
242
241
|
const center = this.getSize()._divideBy(2);
|
|
@@ -253,7 +252,7 @@ const mapRotationMethods = {
|
|
|
253
252
|
* @returns {Point}
|
|
254
253
|
*/
|
|
255
254
|
layerPointToContainerPoint(point) { // (Point)
|
|
256
|
-
point =
|
|
255
|
+
point = Point.from(point).add(this._getMapPanePos());
|
|
257
256
|
if (this._bearing) {
|
|
258
257
|
const center = this.getSize()._divideBy(2);
|
|
259
258
|
point = this._rotateToContainer(point.subtract(center))._add(center);
|
|
@@ -289,7 +288,7 @@ const mapRotationMethods = {
|
|
|
289
288
|
* @returns {this}
|
|
290
289
|
*/
|
|
291
290
|
panBy(offset, options) {
|
|
292
|
-
return panBy.call(this, this._rotateToPane(
|
|
291
|
+
return panBy.call(this, this._rotateToPane(Point.from(offset)), options);
|
|
293
292
|
},
|
|
294
293
|
|
|
295
294
|
_tryAnimatedPan(center, options) {
|
|
@@ -475,7 +474,7 @@ const divOverlayRotationMethods = {
|
|
|
475
474
|
pos = map.latLngToLayerPoint(this._latlng),
|
|
476
475
|
// on a rotated map, the anchor is relative to the upright overlay
|
|
477
476
|
anchor = map._rotateToPane(new Point(this._getAnchor()));
|
|
478
|
-
let offset =
|
|
477
|
+
let offset = Point.from(this.options.offset);
|
|
479
478
|
|
|
480
479
|
const transformed = this._zoomAnimated || this.options.overflow || map._bearing;
|
|
481
480
|
if (!transformed) {
|
|
@@ -553,9 +552,9 @@ const popupRotationMethods = {
|
|
|
553
552
|
topLeft = new Point(this._containerLeft, -containerHeight - this._containerBottom);
|
|
554
553
|
|
|
555
554
|
const containerPos = map.layerPointToContainerPoint(this._getContainerPosition())._add(topLeft),
|
|
556
|
-
padding =
|
|
557
|
-
paddingTL =
|
|
558
|
-
paddingBR =
|
|
555
|
+
padding = Point.from(this.options.autoPanPadding),
|
|
556
|
+
paddingTL = Point.from(this.options.autoPanPaddingTopLeft ?? padding),
|
|
557
|
+
paddingBR = Point.from(this.options.autoPanPaddingBottomRight ?? padding),
|
|
559
558
|
size = map.getSize();
|
|
560
559
|
let dx = 0,
|
|
561
560
|
dy = 0;
|
|
@@ -746,8 +745,17 @@ const dragHandlerRotationMethods = {
|
|
|
746
745
|
limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
|
|
747
746
|
limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
|
|
748
747
|
|
|
749
|
-
|
|
750
|
-
|
|
748
|
+
maxOffset = map.getSize().divideBy(2);
|
|
749
|
+
|
|
750
|
+
let decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
|
|
751
|
+
offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
|
|
752
|
+
|
|
753
|
+
// with reduced motion, shorten the coast to fit within half the map size, see DragHandler
|
|
754
|
+
if (map._prefersReducedMotion() && !maxOffset.contains(offset)) {
|
|
755
|
+
const k = Math.min(maxOffset.x / Math.abs(offset.x), maxOffset.y / Math.abs(offset.y));
|
|
756
|
+
offset = offset.multiplyBy(k).round();
|
|
757
|
+
decelerationDuration *= Math.sqrt(k);
|
|
758
|
+
}
|
|
751
759
|
|
|
752
760
|
if (!offset.x && !offset.y) {
|
|
753
761
|
map.fire('moveend');
|