maplair 4.0.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 +178 -0
- package/dist/esm/Maplair.js +18 -17
- package/dist/esm/Maplair.js.map +1 -1
- package/dist/esm/_virtual/_rolldown/runtime.js +1 -2
- package/dist/esm/control/AttributionControl.js +25 -16
- package/dist/esm/control/AttributionControl.js.map +1 -1
- package/dist/esm/control/ButtonControl.js +10 -13
- package/dist/esm/control/ButtonControl.js.map +1 -1
- package/dist/esm/control/ContextMenu.js +2 -5
- package/dist/esm/control/ContextMenu.js.map +1 -1
- package/dist/esm/control/Control.js +10 -18
- package/dist/esm/control/Control.js.map +1 -1
- package/dist/esm/control/FullscreenControl.js +6 -9
- package/dist/esm/control/FullscreenControl.js.map +1 -1
- package/dist/esm/control/LayersControl.js +170 -65
- package/dist/esm/control/LayersControl.js.map +1 -1
- package/dist/esm/control/LegendControl.js +8 -11
- package/dist/esm/control/LegendControl.js.map +1 -1
- package/dist/esm/control/MiniMapControl.js +15 -18
- package/dist/esm/control/MiniMapControl.js.map +1 -1
- package/dist/esm/control/RotateControl.js +2 -5
- package/dist/esm/control/RotateControl.js.map +1 -1
- package/dist/esm/control/ScaleControl.js +8 -11
- package/dist/esm/control/ScaleControl.js.map +1 -1
- package/dist/esm/control/SearchControl.js +100 -19
- package/dist/esm/control/SearchControl.js.map +1 -1
- package/dist/esm/control/SideBySideControl.js +2 -5
- package/dist/esm/control/SideBySideControl.js.map +1 -1
- package/dist/esm/control/TextControl.js +6 -9
- package/dist/esm/control/TextControl.js.map +1 -1
- package/dist/esm/control/TimeControl.js +407 -0
- package/dist/esm/control/TimeControl.js.map +1 -0
- package/dist/esm/control/ZoomControl.js +23 -36
- package/dist/esm/control/ZoomControl.js.map +1 -1
- package/dist/esm/core/Class.js +28 -44
- package/dist/esm/core/Class.js.map +1 -1
- package/dist/esm/core/Events.js +22 -10
- package/dist/esm/core/Events.js.map +1 -1
- package/dist/esm/core/Handler.js +23 -14
- package/dist/esm/core/Handler.js.map +1 -1
- package/dist/esm/core/I18n.js +1 -2
- package/dist/esm/core/Util.js +15 -4
- package/dist/esm/core/Util.js.map +1 -1
- package/dist/esm/dom/DomEvent.DoubleTap.js +26 -24
- package/dist/esm/dom/DomEvent.DoubleTap.js.map +1 -1
- package/dist/esm/dom/DomEvent.PointerEvents.js +3 -18
- package/dist/esm/dom/DomEvent.PointerEvents.js.map +1 -1
- package/dist/esm/dom/DomEvent.js +18 -60
- package/dist/esm/dom/DomEvent.js.map +1 -1
- package/dist/esm/dom/DomUtil.js +15 -70
- package/dist/esm/dom/DomUtil.js.map +1 -1
- package/dist/esm/dom/Draggable.js +21 -21
- package/dist/esm/dom/Draggable.js.map +1 -1
- package/dist/esm/dom/PosAnimation.js +4 -27
- package/dist/esm/dom/PosAnimation.js.map +1 -1
- package/dist/esm/geo/LatLng.js +16 -7
- package/dist/esm/geo/LatLng.js.map +1 -1
- 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 +5 -6
- package/dist/esm/geo/crs/EPSG3395.js.map +1 -1
- package/dist/esm/geo/crs/EPSG3857.js +5 -6
- package/dist/esm/geo/crs/EPSG3857.js.map +1 -1
- package/dist/esm/geo/crs/EPSG4326.js +4 -5
- package/dist/esm/geo/crs/EPSG4326.js.map +1 -1
- package/dist/esm/geo/crs/EarthCRS.js +3 -4
- package/dist/esm/geo/crs/EarthCRS.js.map +1 -1
- package/dist/esm/geo/crs/SimpleCRS.js +4 -5
- package/dist/esm/geo/crs/SimpleCRS.js.map +1 -1
- package/dist/esm/geo/projection/{Projection.LonLat.js → LonLatProjection.js} +5 -6
- package/dist/esm/geo/projection/LonLatProjection.js.map +1 -0
- package/dist/esm/geo/projection/{Projection.Mercator.js → MercatorProjection.js} +4 -5
- package/dist/esm/geo/projection/MercatorProjection.js.map +1 -0
- package/dist/esm/geo/projection/{Projection.SphericalMercator.js → SphericalMercatorProjection.js} +5 -6
- 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 +37 -32
- package/dist/esm/geometry/LineUtil.js.map +1 -1
- package/dist/esm/geometry/Point.js +1 -2
- package/dist/esm/geometry/PolyUtil.js +24 -51
- package/dist/esm/geometry/PolyUtil.js.map +1 -1
- package/dist/esm/geometry/Transformation.js +1 -2
- package/dist/esm/layer/BlanketOverlay.js +7 -10
- package/dist/esm/layer/BlanketOverlay.js.map +1 -1
- package/dist/esm/layer/Classification.js +1 -2
- package/dist/esm/layer/DivOverlay.js +16 -22
- 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 +17 -155
- package/dist/esm/layer/GeoJSON.js.map +1 -1
- package/dist/esm/layer/GeoJSONUtil.js +74 -0
- package/dist/esm/layer/GeoJSONUtil.js.map +1 -0
- package/dist/esm/layer/HeatLayer.js +17 -20
- package/dist/esm/layer/HeatLayer.js.map +1 -1
- package/dist/esm/layer/ImageOverlay.js +22 -29
- package/dist/esm/layer/ImageOverlay.js.map +1 -1
- package/dist/esm/layer/Layer.js +9 -12
- package/dist/esm/layer/Layer.js.map +1 -1
- package/dist/esm/layer/LayerGroup.js +53 -3
- package/dist/esm/layer/LayerGroup.js.map +1 -1
- package/dist/esm/layer/Popup.js +35 -58
- package/dist/esm/layer/Popup.js.map +1 -1
- package/dist/esm/layer/SVGOverlay.js +3 -7
- package/dist/esm/layer/SVGOverlay.js.map +1 -1
- package/dist/esm/layer/Tooltip.js +31 -34
- package/dist/esm/layer/Tooltip.js.map +1 -1
- package/dist/esm/layer/VideoOverlay.js +13 -17
- package/dist/esm/layer/VideoOverlay.js.map +1 -1
- package/dist/esm/layer/marker/DefaultIcon.js +38 -49
- package/dist/esm/layer/marker/DefaultIcon.js.map +1 -1
- package/dist/esm/layer/marker/DivIcon.js +8 -11
- 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 +44 -5
- package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
- package/dist/esm/layer/marker/Marker.Move.js +5 -8
- package/dist/esm/layer/marker/Marker.Move.js.map +1 -1
- package/dist/esm/layer/marker/Marker.js +115 -47
- package/dist/esm/layer/marker/Marker.js.map +1 -1
- package/dist/esm/layer/marker/MarkerClusterGroup.js +301 -0
- package/dist/esm/layer/marker/MarkerClusterGroup.js.map +1 -0
- package/dist/esm/layer/marker/SvgIcon.js +7 -10
- package/dist/esm/layer/marker/SvgIcon.js.map +1 -1
- package/dist/esm/layer/tile/GridLayer.js +89 -101
- package/dist/esm/layer/tile/GridLayer.js.map +1 -1
- package/dist/esm/layer/tile/TileLayer.js +36 -44
- package/dist/esm/layer/tile/TileLayer.js.map +1 -1
- package/dist/esm/layer/tile/WMSTileLayer.js +33 -27
- package/dist/esm/layer/tile/WMSTileLayer.js.map +1 -1
- package/dist/esm/layer/vector/Canvas.js +8 -17
- package/dist/esm/layer/vector/Canvas.js.map +1 -1
- package/dist/esm/layer/vector/Circle.js +6 -5
- package/dist/esm/layer/vector/Circle.js.map +1 -1
- package/dist/esm/layer/vector/CircleMarker.js +19 -10
- package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
- package/dist/esm/layer/vector/Path.DashAnimation.js +3 -5
- package/dist/esm/layer/vector/Path.DashAnimation.js.map +1 -1
- package/dist/esm/layer/vector/Path.ZoomStyles.js +1 -2
- package/dist/esm/layer/vector/Path.js +28 -22
- package/dist/esm/layer/vector/Path.js.map +1 -1
- package/dist/esm/layer/vector/Polygon.js +22 -7
- package/dist/esm/layer/vector/Polygon.js.map +1 -1
- package/dist/esm/layer/vector/Polyline.Decorations.js +3 -4
- package/dist/esm/layer/vector/Polyline.js +25 -10
- 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 +17 -17
- 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 +12 -9
- 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 +41 -22
- package/dist/esm/map/Map.Rotation.js.map +1 -1
- package/dist/esm/map/Map.js +125 -126
- package/dist/esm/map/Map.js.map +1 -1
- package/dist/esm/map/MapSync.js +1 -2
- package/dist/esm/map/handler/BoxZoomHandler.js +25 -47
- package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/DisplaceHandler.js +7 -10
- package/dist/esm/map/handler/DisplaceHandler.js.map +1 -1
- package/dist/esm/map/handler/DoubleClickZoomHandler.js +1 -2
- package/dist/esm/map/handler/DragHandler.js +20 -21
- package/dist/esm/map/handler/DragHandler.js.map +1 -1
- package/dist/esm/map/handler/KeyboardHandler.js +48 -68
- package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
- package/dist/esm/map/handler/PinchZoomHandler.js +13 -5
- package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js +4 -6
- package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
- package/dist/esm/map/handler/TapDragZoomHandler.js +1 -2
- package/dist/esm/map/handler/TapHoldHandler.js +13 -7
- package/dist/esm/map/handler/TapHoldHandler.js.map +1 -1
- package/dist/esm/package.js +2 -3
- package/dist/maplair-global-src.js +6495 -5981
- 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 +6206 -5673
- package/dist/maplair-src.js.map +1 -1
- package/dist/maplair.css +1 -1213
- package/dist/maplair.js +2 -2
- 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 +11 -18
- package/src/Maplair.all.js +0 -1
- 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 +196 -86
- 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 +102 -19
- 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 +22 -38
- package/src/control/index.js +1 -0
- package/src/core/Class.js +37 -45
- package/src/core/Events.js +22 -3
- package/src/core/Handler.js +25 -13
- package/src/core/Util.js +20 -2
- 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 +17 -85
- package/src/dom/DomUtil.js +22 -78
- package/src/dom/Draggable.js +32 -23
- package/src/dom/PosAnimation.js +3 -25
- package/src/dom/index.js +0 -1
- package/src/geo/LatLng.js +20 -3
- package/src/geo/LatLngBounds.js +8 -15
- package/src/geo/crs/EPSG3395.js +4 -4
- package/src/geo/crs/EPSG3857.js +4 -4
- package/src/geo/crs/EPSG4326.js +3 -3
- package/src/geo/crs/EarthCRS.js +2 -8
- package/src/geo/crs/SimpleCRS.js +3 -3
- package/src/geo/index.js +1 -2
- package/src/geo/projection/{Projection.LonLat.js → LonLatProjection.js} +2 -2
- package/src/geo/projection/{Projection.Mercator.js → MercatorProjection.js} +2 -2
- package/src/geo/projection/{Projection.SphericalMercator.js → SphericalMercatorProjection.js} +2 -2
- package/src/geo/projection/index.js +5 -5
- package/src/geometry/Bounds.js +12 -17
- package/src/geometry/LineUtil.js +48 -49
- package/src/geometry/PolyUtil.js +39 -76
- package/src/layer/BlanketOverlay.js +6 -10
- package/src/layer/DivOverlay.js +16 -27
- package/src/layer/FeatureGroup.js +8 -2
- package/src/layer/GeoJSON.js +17 -218
- package/src/layer/GeoJSONUtil.js +85 -0
- package/src/layer/HeatLayer.js +10 -12
- package/src/layer/ImageOverlay.js +21 -32
- package/src/layer/Layer.js +8 -10
- package/src/layer/LayerGroup.js +72 -1
- package/src/layer/Popup.js +37 -62
- package/src/layer/SVGOverlay.js +1 -5
- package/src/layer/Tooltip.js +34 -36
- package/src/layer/VideoOverlay.js +12 -15
- package/src/layer/marker/DefaultIcon.js +40 -58
- package/src/layer/marker/DivIcon.js +9 -11
- package/src/layer/marker/Icon.js +9 -10
- package/src/layer/marker/Marker.Drag.js +54 -6
- package/src/layer/marker/Marker.Move.js +4 -6
- package/src/layer/marker/Marker.js +145 -52
- 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 +108 -135
- package/src/layer/tile/TileLayer.js +44 -49
- package/src/layer/tile/WMSTileLayer.js +31 -26
- package/src/layer/vector/Canvas.js +13 -19
- package/src/layer/vector/Circle.js +9 -3
- package/src/layer/vector/CircleMarker.js +19 -7
- package/src/layer/vector/Path.DashAnimation.js +1 -2
- package/src/layer/vector/Path.js +30 -21
- package/src/layer/vector/Polygon.js +29 -6
- package/src/layer/vector/Polyline.js +26 -7
- package/src/layer/vector/Renderer.getRenderer.js +20 -19
- package/src/layer/vector/SVG.js +17 -7
- package/src/map/Map.Rotation.js +40 -8
- package/src/map/Map.js +158 -153
- package/src/map/handler/BoxZoomHandler.js +30 -50
- package/src/map/handler/DisplaceHandler.js +6 -8
- package/src/map/handler/DragHandler.js +25 -28
- package/src/map/handler/KeyboardHandler.js +65 -90
- 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 +153 -98
- package/dist/esm/core/Browser.js +0 -100
- package/dist/esm/core/Browser.js.map +0 -1
- 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/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
- package/src/layer/marker/Marker.Rotation.js +0 -103
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { LatLngBounds } from "../../geo/LatLngBounds.js";
|
|
2
2
|
import { Polygon } from "./Polygon.js";
|
|
3
|
-
|
|
3
|
+
// src/layer/vector/Rectangle.js
|
|
4
4
|
/** @import {LatLngBoundsExpression} from '../../geo/LatLngBounds.js' */
|
|
5
5
|
/** @import {PolygonOptions} from './Polygon.js' */
|
|
6
6
|
/**
|
|
@@ -47,7 +47,6 @@ var Rectangle = class Rectangle extends Polygon {
|
|
|
47
47
|
];
|
|
48
48
|
}
|
|
49
49
|
};
|
|
50
|
-
//#endregion
|
|
51
50
|
export { Rectangle };
|
|
52
51
|
|
|
53
52
|
//# sourceMappingURL=Rectangle.js.map
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { __exportAll } from "../../_virtual/_rolldown/runtime.js";
|
|
2
|
-
|
|
3
|
-
import { SVG } from "./SVG.js";
|
|
4
|
-
//#region src/layer/vector/Renderer.getRenderer.js
|
|
2
|
+
// src/layer/vector/Renderer.getRenderer.js
|
|
5
3
|
var Renderer_getRenderer_exports = /* @__PURE__ */ __exportAll({ register: () => register });
|
|
6
4
|
/** @import {MaplairMap} from '../../map/Map.js' */
|
|
7
5
|
/** @import {Path} from './Path.js' */
|
|
@@ -17,25 +15,26 @@ const mapRendererMethods = {
|
|
|
17
15
|
* are respected, and that the renderers do exist on the map.
|
|
18
16
|
* @internal
|
|
19
17
|
* @param {Path} layer
|
|
20
|
-
* @returns {Renderer}
|
|
18
|
+
* @returns {Renderer|undefined}
|
|
21
19
|
*/
|
|
22
20
|
getRenderer(layer) {
|
|
23
|
-
|
|
24
|
-
if (
|
|
25
|
-
if (!this.hasLayer(renderer)) this.addLayer(renderer);
|
|
21
|
+
const renderer = layer.options.renderer ?? this._getPaneRenderer(layer) ?? this.options.renderer ?? (this._renderer ??= layer._createRenderer?.());
|
|
22
|
+
if (renderer && !this.hasLayer(renderer)) this.addLayer(renderer);
|
|
26
23
|
return renderer;
|
|
27
24
|
},
|
|
28
|
-
_getPaneRenderer(
|
|
25
|
+
_getPaneRenderer(layer) {
|
|
26
|
+
const name = layer.options.pane;
|
|
29
27
|
if (name === "overlayPane" || name === void 0) return;
|
|
30
28
|
let renderer = this._paneRenderers[name];
|
|
31
|
-
if (renderer
|
|
32
|
-
|
|
29
|
+
if (!renderer) {
|
|
30
|
+
const Renderer = this.options.renderer?.constructor;
|
|
31
|
+
renderer = Renderer ? new Renderer({
|
|
32
|
+
...this.options.renderer.options,
|
|
33
|
+
pane: name
|
|
34
|
+
}) : layer._createRenderer({ pane: name });
|
|
33
35
|
this._paneRenderers[name] = renderer;
|
|
34
36
|
}
|
|
35
37
|
return renderer;
|
|
36
|
-
},
|
|
37
|
-
_createRenderer(options) {
|
|
38
|
-
return this.options.preferCanvas && new Canvas(options) || new SVG(options);
|
|
39
38
|
}
|
|
40
39
|
};
|
|
41
40
|
/** @typedef {typeof mapRendererMethods} MapRendererMethods */
|
|
@@ -43,10 +42,9 @@ const mapRendererMethods = {
|
|
|
43
42
|
* Map options of the vector renderers.
|
|
44
43
|
* @typedef {object} RendererMapOptions
|
|
45
44
|
* @lends MaplairMapOptions
|
|
46
|
-
* @property {boolean} [preferCanvas=false] Whether `Path`s should be rendered on a
|
|
47
|
-
* `Canvas` renderer. By default, all `Path`s are rendered in a `SVG` renderer.
|
|
48
45
|
* @property {Renderer} [renderer] The default method for drawing vector layers on the
|
|
49
|
-
* map. `SVG`
|
|
46
|
+
* map. A new `SVG` renderer by default; pass `new Canvas()` to draw them on a canvas
|
|
47
|
+
* instead.
|
|
50
48
|
*/
|
|
51
49
|
/**
|
|
52
50
|
* Registers `getRenderer()` and related methods on the given map class, called by
|
|
@@ -56,8 +54,10 @@ const mapRendererMethods = {
|
|
|
56
54
|
*/
|
|
57
55
|
function register(MaplairMap) {
|
|
58
56
|
MaplairMap.include(mapRendererMethods);
|
|
57
|
+
MaplairMap.addInitHook(function() {
|
|
58
|
+
if (this.options.preferCanvas !== void 0) console.error("MaplairMap: preferCanvas option has been removed. Use renderer: new Canvas() instead.");
|
|
59
|
+
});
|
|
59
60
|
}
|
|
60
|
-
//#endregion
|
|
61
61
|
export { Renderer_getRenderer_exports, register };
|
|
62
62
|
|
|
63
63
|
//# sourceMappingURL=Renderer.getRenderer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Renderer.getRenderer.js","names":[],"sources":["../../../../src/layer/vector/Renderer.getRenderer.js"],"sourcesContent":["
|
|
1
|
+
{"version":3,"file":"Renderer.getRenderer.js","names":[],"sources":["../../../../src/layer/vector/Renderer.getRenderer.js"],"sourcesContent":["/** @import {MaplairMap} from '../../map/Map.js' */\n/** @import {Path} from './Path.js' */\n/** @import {Renderer} from './Renderer.js' */\n\n/**\n * Methods of `MaplairMap` for the renderers of vector layers.\n * @lends MaplairMap.prototype\n */\nconst mapRendererMethods = {\n\t/**\n\t * Returns the instance of `Renderer` that should be used to render the given\n\t * `Path`. It will ensure that the `renderer` options of the map and paths\n\t * are respected, and that the renderers do exist on the map.\n\t * @internal\n\t * @param {Path} layer\n\t * @returns {Renderer|undefined}\n\t */\n\tgetRenderer(layer) {\n\t\tconst renderer = layer.options.renderer ?? this._getPaneRenderer(layer) ?? this.options.renderer ??\n\t\t\t(this._renderer ??= layer._createRenderer?.());\n\n\t\t// a non-Path layer (e.g. a marker cluster group of a plugin) has no renderer of its own\n\t\tif (renderer && !this.hasLayer(renderer)) {\n\t\t\tthis.addLayer(renderer);\n\t\t}\n\t\treturn renderer;\n\t},\n\n\t_getPaneRenderer(layer) {\n\t\tconst name = layer.options.pane;\n\t\tif (name === 'overlayPane' || name === undefined) {\n\t\t\treturn;\n\t\t}\n\n\t\tlet renderer = this._paneRenderers[name];\n\t\tif (!renderer) {\n\t\t\t// custom panes get a renderer of the same kind as the map's default one, so Canvas maps stay Canvas\n\t\t\tconst Renderer = this.options.renderer?.constructor;\n\t\t\trenderer = Renderer ?\n\t\t\t\tnew Renderer({...this.options.renderer.options, pane: name}) :\n\t\t\t\tlayer._createRenderer({pane: name});\n\t\t\tthis._paneRenderers[name] = renderer;\n\t\t}\n\t\treturn renderer;\n\t}\n};\n/** @typedef {typeof mapRendererMethods} MapRendererMethods */\n\n/**\n * Map options of the vector renderers.\n * @typedef {object} RendererMapOptions\n * @lends MaplairMapOptions\n * @property {Renderer} [renderer] The default method for drawing vector layers on the\n * map. A new `SVG` renderer by default; pass `new Canvas()` to draw them on a canvas\n * instead.\n */\n\n/**\n * Registers `getRenderer()` and related methods on the given map class, called by\n * `MaplairMap` itself.\n * @internal\n * @param {typeof MaplairMap} MaplairMap\n */\nexport function register(MaplairMap) {\n\tMaplairMap.include(mapRendererMethods);\n\tMaplairMap.addInitHook(function () {\n\t\tif (this.options.preferCanvas !== undefined) {\n\t\t\tconsole.error('MaplairMap: preferCanvas option has been removed. Use renderer: new Canvas() instead.');\n\t\t}\n\t});\n}\n"],"mappings":";;;;;;;;;;AAQA,MAAM,qBAAqB;;;;;;;;;CAS1B,YAAY,OAAO;EAClB,MAAM,WAAW,MAAM,QAAQ,YAAY,KAAK,iBAAiB,KAAK,KAAK,KAAK,QAAQ,aACtF,KAAK,cAAc,MAAM,kBAAkB;EAG7C,IAAI,YAAY,CAAC,KAAK,SAAS,QAAQ,GACtC,KAAK,SAAS,QAAQ;EAEvB,OAAO;CACR;CAEA,iBAAiB,OAAO;EACvB,MAAM,OAAO,MAAM,QAAQ;EAC3B,IAAI,SAAS,iBAAiB,SAAS,KAAA,GACtC;EAGD,IAAI,WAAW,KAAK,eAAe;EACnC,IAAI,CAAC,UAAU;GAEd,MAAM,WAAW,KAAK,QAAQ,UAAU;GACxC,WAAW,WACV,IAAI,SAAS;IAAC,GAAG,KAAK,QAAQ,SAAS;IAAS,MAAM;GAAI,CAAC,IAC3D,MAAM,gBAAgB,EAAC,MAAM,KAAI,CAAC;GACnC,KAAK,eAAe,QAAQ;EAC7B;EACA,OAAO;CACR;AACD;;;;;;;;;;;;;;;;AAkBA,SAAgB,SAAS,YAAY;CACpC,WAAW,QAAQ,kBAAkB;CACrC,WAAW,YAAY,WAAY;EAClC,IAAI,KAAK,QAAQ,iBAAiB,KAAA,GACjC,QAAQ,MAAM,uFAAuF;CAEvG,CAAC;AACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { stamp } from "../../core/Util.js";
|
|
2
2
|
import { BlanketOverlay } from "../BlanketOverlay.js";
|
|
3
|
-
|
|
3
|
+
// src/layer/vector/Renderer.js
|
|
4
4
|
/** @import {BlanketOverlayOptions} from '../BlanketOverlay.js' */
|
|
5
5
|
/** @import {MaplairEvent} from '../../core/Events.js' */
|
|
6
6
|
/** @import {MaplairMap} from '../../map/Map.js' */
|
|
@@ -69,7 +69,6 @@ var Renderer = class Renderer extends BlanketOverlay {
|
|
|
69
69
|
}
|
|
70
70
|
_update() {}
|
|
71
71
|
};
|
|
72
|
-
//#endregion
|
|
73
72
|
export { Renderer };
|
|
74
73
|
|
|
75
74
|
//# sourceMappingURL=Renderer.js.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { splitWords, stamp } from "../../core/Util.js";
|
|
2
2
|
import { toBack, toFront } from "../../dom/DomUtil.js";
|
|
3
3
|
import { Renderer } from "./Renderer.js";
|
|
4
|
-
|
|
4
|
+
// src/layer/vector/SVG.js
|
|
5
5
|
/** @import {Point} from '../../geometry/Point.js' */
|
|
6
6
|
/** @import {RendererOptions} from './Renderer.js' */
|
|
7
7
|
/**
|
|
@@ -54,8 +54,8 @@ var SVG = class SVG extends Renderer {
|
|
|
54
54
|
const size = super._resizeContainer();
|
|
55
55
|
if (!this._svgSize || !this._svgSize.equals(size)) {
|
|
56
56
|
this._svgSize = size;
|
|
57
|
-
this._container.setAttribute("width", size.x);
|
|
58
|
-
this._container.setAttribute("height", size.y);
|
|
57
|
+
this._container.setAttribute("width", `${size.x}`);
|
|
58
|
+
this._container.setAttribute("height", `${size.y}`);
|
|
59
59
|
}
|
|
60
60
|
const b = this._bounds;
|
|
61
61
|
if (b) this._container.setAttribute("viewBox", [
|
|
@@ -105,8 +105,8 @@ var SVG = class SVG extends Renderer {
|
|
|
105
105
|
if (!path) return;
|
|
106
106
|
if (options.stroke) {
|
|
107
107
|
path.setAttribute("stroke", options.color);
|
|
108
|
-
path.setAttribute("stroke-opacity", options.opacity);
|
|
109
|
-
path.setAttribute("stroke-width", options.weight);
|
|
108
|
+
path.setAttribute("stroke-opacity", `${options.opacity}`);
|
|
109
|
+
path.setAttribute("stroke-width", `${options.weight}`);
|
|
110
110
|
path.setAttribute("stroke-linecap", options.lineCap);
|
|
111
111
|
path.setAttribute("stroke-linejoin", options.lineJoin);
|
|
112
112
|
if (options.dashArray) path.setAttribute("stroke-dasharray", options.dashArray);
|
|
@@ -116,7 +116,7 @@ var SVG = class SVG extends Renderer {
|
|
|
116
116
|
} else path.setAttribute("stroke", "none");
|
|
117
117
|
if (options.fill) {
|
|
118
118
|
path.setAttribute("fill", options.fillColor || options.color);
|
|
119
|
-
path.setAttribute("fill-opacity", options.fillOpacity);
|
|
119
|
+
path.setAttribute("fill-opacity", `${options.fillOpacity}`);
|
|
120
120
|
path.setAttribute("fill-rule", options.fillRule || "evenodd");
|
|
121
121
|
} else path.setAttribute("fill", "none");
|
|
122
122
|
}
|
|
@@ -125,7 +125,7 @@ var SVG = class SVG extends Renderer {
|
|
|
125
125
|
}
|
|
126
126
|
_updateCircle(layer) {
|
|
127
127
|
const p = layer._point, r = Math.max(Math.round(layer._pxRadius), 1), arc = `a${r},${Math.max(Math.round(layer._pxRadiusY), 1) || r} 0 1,0 `;
|
|
128
|
-
const d = layer._empty() ? "M0 0" : `M${p.x - r},${p.y}${arc}${r * 2},0 ${arc}${-r * 2},0 `;
|
|
128
|
+
const d = layer._empty() ? "M0 0" : `M${num(p.x - r)},${num(p.y)}${arc}${r * 2},0 ${arc}${-r * 2},0 `;
|
|
129
129
|
this._setPath(layer, d);
|
|
130
130
|
}
|
|
131
131
|
_setPath(layer, path) {
|
|
@@ -155,10 +155,13 @@ var SVG = class SVG extends Renderer {
|
|
|
155
155
|
* @returns {string}
|
|
156
156
|
*/
|
|
157
157
|
static pointsToPath(rings, closed) {
|
|
158
|
-
return rings.flatMap((points) => [...points.map((p, j) => `${(j ? "L" : "M") + p.x} ${p.y}`), closed ? "z" : ""]).join("") || "M0 0";
|
|
158
|
+
return rings.flatMap((points) => [...points.map((p, j) => `${(j ? "L" : "M") + num(p.x)} ${num(p.y)}`), closed ? "z" : ""]).join("") || "M0 0";
|
|
159
159
|
}
|
|
160
160
|
};
|
|
161
|
-
|
|
161
|
+
function num(v) {
|
|
162
|
+
const n = Math.round(v * 10), a = n < 0 ? -n : n, i = Math.floor(a / 10), d = a - i * 10;
|
|
163
|
+
return (n < 0 ? "-" : "") + (d ? `${i}.${d}` : i);
|
|
164
|
+
}
|
|
162
165
|
export { SVG };
|
|
163
166
|
|
|
164
167
|
//# sourceMappingURL=SVG.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SVG.js","names":[],"sources":["../../../../src/layer/vector/SVG.js"],"sourcesContent":["import {Renderer} from './Renderer.js';\nimport * as DomUtil from '../../dom/DomUtil.js';\nimport {splitWords, stamp} from '../../core/Util.js';\n/** @import {Point} from '../../geometry/Point.js' */\n/** @import {RendererOptions} from './Renderer.js' */\n\n/**\n * Allows vector layers to be displayed with [SVG](https://developer.mozilla.org/docs/Web/SVG).\n * Inherits `Renderer`.\n *\n * @example\n * Use SVG by default for all paths in the map:\n *\n * ```js\n * const map = new MaplairMap('map', {\n * \trenderer: new SVG()\n * });\n * ```\n *\n * Use a SVG renderer with extra padding for specific vector geometries:\n *\n * ```js\n * const map = new MaplairMap('map');\n * const myRenderer = new SVG({ padding: 0.5 });\n * const line = new Polyline( coordinates, { renderer: myRenderer } );\n * const circle = new Circle( center, { renderer: myRenderer, radius: 100 } );\n * ```\n */\nexport class SVG extends Renderer {\n\t/**\n\t * Creates a SVG renderer with the given options.\n\t * @overload\n\t * @param {RendererOptions} [options]\n\t */\n\t/**\n\t * @param {...any} args\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(SVG);\n\t}\n\n\n\t_initContainer() {\n\t\tthis._container = SVG.create('svg');\n\n\t\t// makes it possible to click through svg root; we'll reset it back in individual paths\n\t\tthis._container.setAttribute('pointer-events', 'none');\n\n\t\tthis._rootGroup = SVG.create('g');\n\t\tthis._container.appendChild(this._rootGroup);\n\t}\n\n\t_destroyContainer() {\n\t\tsuper._destroyContainer();\n\t\tdelete this._rootGroup;\n\t\tdelete this._svgSize;\n\t}\n\n\t_resizeContainer() {\n\t\tconst size = super._resizeContainer();\n\n\t\t// set size of svg-container if changed\n\t\tif (!this._svgSize || !this._svgSize.equals(size)) {\n\t\t\tthis._svgSize = size;\n\t\t\tthis._container.setAttribute('width', size.x);\n\t\t\tthis._container.setAttribute('height', size.y);\n\t\t}\n\n\t\t// Reset the <SVG>'s viewBox as per _update, but skip redrawing paths.\n\t\t// This keeps paths visually aligned when resizing.\n\t\tconst b = this._bounds;\n\t\tif (b) {\n\t\t\tthis._container.setAttribute('viewBox', [b.min.x, b.min.y, size.x, size.y].join(' '));\n\t\t}\n\t}\n\n\t_update() {\n\t\tif (this._map._animatingZoom && this._bounds) { return; }\n\n\t\tconst b = this._bounds,\n\t\tsize = b.getSize();\n\n\t\t// movement: update container viewBox so that we don't have to change coordinates of individual layers\n\t\tthis._container.setAttribute('viewBox', [b.min.x, b.min.y, size.x, size.y].join(' '));\n\n\t\tthis.fire('update');\n\t}\n\n\t// methods below are called by vector layers implementations\n\n\t_initPath(layer) {\n\t\tconst path = layer._path = SVG.create('path');\n\n\t\tif (layer.options.className) {\n\t\t\tpath.classList.add(...splitWords(layer.options.className));\n\t\t}\n\n\t\tif (layer.options.interactive) {\n\t\t\tpath.classList.add('maplair-interactive');\n\t\t}\n\n\t\tthis._updateStyle(layer);\n\t\tthis._layers[stamp(layer)] = layer;\n\t}\n\n\t_updateInteractive(layer) {\n\t\tlayer._path.classList.toggle('maplair-interactive', !!layer.options.interactive);\n\t}\n\n\t_addPath(layer) {\n\t\tif (!this._rootGroup) { this._initContainer(); }\n\t\tthis._rootGroup.appendChild(layer._path);\n\t\tlayer.addInteractiveTarget(layer._path);\n\t}\n\n\t_removePath(layer) {\n\t\tlayer._path.remove();\n\t\tlayer.removeInteractiveTarget(layer._path);\n\t\tdelete this._layers[stamp(layer)];\n\t}\n\n\t_updatePath(layer) {\n\t\tlayer._project();\n\t\tlayer._update();\n\t}\n\n\t_updateStyle(layer) {\n\t\tconst path = layer._path,\n\t\toptions = layer.options;\n\n\t\tif (!path) { return; }\n\n\t\tif (options.stroke) {\n\t\t\tpath.setAttribute('stroke', options.color);\n\t\t\tpath.setAttribute('stroke-opacity', options.opacity);\n\t\t\tpath.setAttribute('stroke-width', options.weight);\n\t\t\tpath.setAttribute('stroke-linecap', options.lineCap);\n\t\t\tpath.setAttribute('stroke-linejoin', options.lineJoin);\n\n\t\t\tif (options.dashArray) {\n\t\t\t\tpath.setAttribute('stroke-dasharray', options.dashArray);\n\t\t\t} else {\n\t\t\t\tpath.removeAttribute('stroke-dasharray');\n\t\t\t}\n\n\t\t\tif (options.dashOffset) {\n\t\t\t\tpath.setAttribute('stroke-dashoffset', options.dashOffset);\n\t\t\t} else {\n\t\t\t\tpath.removeAttribute('stroke-dashoffset');\n\t\t\t}\n\t\t} else {\n\t\t\tpath.setAttribute('stroke', 'none');\n\t\t}\n\n\t\tif (options.fill) {\n\t\t\tpath.setAttribute('fill', options.fillColor || options.color);\n\t\t\tpath.setAttribute('fill-opacity', options.fillOpacity);\n\t\t\tpath.setAttribute('fill-rule', options.fillRule || 'evenodd');\n\t\t} else {\n\t\t\tpath.setAttribute('fill', 'none');\n\t\t}\n\t}\n\n\t_updatePoly(layer, closed) {\n\t\tthis._setPath(layer, SVG.pointsToPath(layer._parts, closed));\n\t}\n\n\t_updateCircle(layer) {\n\t\tconst p = layer._point,\n\t\tr = Math.max(Math.round(layer._pxRadius), 1),\n\t\tr2 = Math.max(Math.round(layer._pxRadiusY), 1) || r,\n\t\tarc = `a${r},${r2} 0 1,0 `;\n\n\t\t// drawing a circle with two half-arcs\n\t\tconst d = layer._empty() ? 'M0 0' :\n\t\t\t`M${p.x - r},${p.y\n\t\t\t}${arc}${r * 2},0 ${\n\t\t\t\tarc}${-r * 2},0 `;\n\n\t\tthis._setPath(layer, d);\n\t}\n\n\t_setPath(layer, path) {\n\t\tlayer._path.setAttribute('d', path);\n\t}\n\n\t// SVG does not have the concept of zIndex so we resort to changing the DOM order of elements\n\t_bringToFront(layer) {\n\t\tDomUtil.toFront(layer._path);\n\t}\n\n\t_bringToBack(layer) {\n\t\tDomUtil.toBack(layer._path);\n\t}\n\n\t/**\n\t * Returns a instance of [SVGElement](https://developer.mozilla.org/docs/Web/API/SVGElement),\n\t * corresponding to the class name passed. For example, using 'line' will return\n\t * an instance of [SVGLineElement](https://developer.mozilla.org/docs/Web/API/SVGLineElement).\n\t * @param {string} name\n\t * @returns {SVGElement}\n\t */\n\tstatic create(name) {\n\t\treturn document.createElementNS('http://www.w3.org/2000/svg', name);\n\t}\n\n\t/**\n\t * Generates a SVG path string for multiple rings, with each ring turning\n\t * into \"M..L..L..\" instructions.\n\t * @param {Point[][]} rings\n\t * @param {boolean} [closed]\n\t * @returns {string}\n\t */\n\tstatic pointsToPath(rings, closed) {\n\t\tconst str = rings.flatMap(points => [\n\t\t\t...points.map((p, j) => `${(j ? 'L' : 'M') + p.x} ${p.y}`),\n\t\t\t// closes the ring for polygons\n\t\t\tclosed ? 'z' : ''\n\t\t]).join('');\n\n\t\t// SVG complains about empty path strings\n\t\treturn str || 'M0 0';\n\t}\n\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,IAAa,MAAb,MAAa,YAAY,SAAS;;;;;;;;;CASjC,YAAY,GAAG,MAAM;EACpB,MAAM,GAAG,IAAI;EACb,KAAK,cAAc,GAAG;CACvB;CAGA,iBAAiB;EAChB,KAAK,aAAa,IAAI,OAAO,KAAK;EAGlC,KAAK,WAAW,aAAa,kBAAkB,MAAM;EAErD,KAAK,aAAa,IAAI,OAAO,GAAG;EAChC,KAAK,WAAW,YAAY,KAAK,UAAU;CAC5C;CAEA,oBAAoB;EACnB,MAAM,kBAAkB;EACxB,OAAO,KAAK;EACZ,OAAO,KAAK;CACb;CAEA,mBAAmB;EAClB,MAAM,OAAO,MAAM,iBAAiB;EAGpC,IAAI,CAAC,KAAK,YAAY,CAAC,KAAK,SAAS,OAAO,IAAI,GAAG;GAClD,KAAK,WAAW;GAChB,KAAK,WAAW,aAAa,SAAS,KAAK,CAAC;GAC5C,KAAK,WAAW,aAAa,UAAU,KAAK,CAAC;EAC9C;EAIA,MAAM,IAAI,KAAK;EACf,IAAI,GACH,KAAK,WAAW,aAAa,WAAW;GAAC,EAAE,IAAI;GAAG,EAAE,IAAI;GAAG,KAAK;GAAG,KAAK;EAAC,CAAC,CAAC,KAAK,GAAG,CAAC;CAEtF;CAEA,UAAU;EACT,IAAI,KAAK,KAAK,kBAAkB,KAAK,SAAW;EAEhD,MAAM,IAAI,KAAK,SACf,OAAO,EAAE,QAAQ;EAGjB,KAAK,WAAW,aAAa,WAAW;GAAC,EAAE,IAAI;GAAG,EAAE,IAAI;GAAG,KAAK;GAAG,KAAK;EAAC,CAAC,CAAC,KAAK,GAAG,CAAC;EAEpF,KAAK,KAAK,QAAQ;CACnB;CAIA,UAAU,OAAO;EAChB,MAAM,OAAO,MAAM,QAAQ,IAAI,OAAO,MAAM;EAE5C,IAAI,MAAM,QAAQ,WACjB,KAAK,UAAU,IAAI,GAAG,WAAW,MAAM,QAAQ,SAAS,CAAC;EAG1D,IAAI,MAAM,QAAQ,aACjB,KAAK,UAAU,IAAI,qBAAqB;EAGzC,KAAK,aAAa,KAAK;EACvB,KAAK,QAAQ,MAAM,KAAK,KAAK;CAC9B;CAEA,mBAAmB,OAAO;EACzB,MAAM,MAAM,UAAU,OAAO,uBAAuB,CAAC,CAAC,MAAM,QAAQ,WAAW;CAChF;CAEA,SAAS,OAAO;EACf,IAAI,CAAC,KAAK,YAAc,KAAK,eAAe;EAC5C,KAAK,WAAW,YAAY,MAAM,KAAK;EACvC,MAAM,qBAAqB,MAAM,KAAK;CACvC;CAEA,YAAY,OAAO;EAClB,MAAM,MAAM,OAAO;EACnB,MAAM,wBAAwB,MAAM,KAAK;EACzC,OAAO,KAAK,QAAQ,MAAM,KAAK;CAChC;CAEA,YAAY,OAAO;EAClB,MAAM,SAAS;EACf,MAAM,QAAQ;CACf;CAEA,aAAa,OAAO;EACnB,MAAM,OAAO,MAAM,OACnB,UAAU,MAAM;EAEhB,IAAI,CAAC,MAAQ;EAEb,IAAI,QAAQ,QAAQ;GACnB,KAAK,aAAa,UAAU,QAAQ,KAAK;GACzC,KAAK,aAAa,kBAAkB,QAAQ,OAAO;GACnD,KAAK,aAAa,gBAAgB,QAAQ,MAAM;GAChD,KAAK,aAAa,kBAAkB,QAAQ,OAAO;GACnD,KAAK,aAAa,mBAAmB,QAAQ,QAAQ;GAErD,IAAI,QAAQ,WACX,KAAK,aAAa,oBAAoB,QAAQ,SAAS;QAEvD,KAAK,gBAAgB,kBAAkB;GAGxC,IAAI,QAAQ,YACX,KAAK,aAAa,qBAAqB,QAAQ,UAAU;QAEzD,KAAK,gBAAgB,mBAAmB;EAE1C,OACC,KAAK,aAAa,UAAU,MAAM;EAGnC,IAAI,QAAQ,MAAM;GACjB,KAAK,aAAa,QAAQ,QAAQ,aAAa,QAAQ,KAAK;GAC5D,KAAK,aAAa,gBAAgB,QAAQ,WAAW;GACrD,KAAK,aAAa,aAAa,QAAQ,YAAY,SAAS;EAC7D,OACC,KAAK,aAAa,QAAQ,MAAM;CAElC;CAEA,YAAY,OAAO,QAAQ;EAC1B,KAAK,SAAS,OAAO,IAAI,aAAa,MAAM,QAAQ,MAAM,CAAC;CAC5D;CAEA,cAAc,OAAO;EACpB,MAAM,IAAI,MAAM,QAChB,IAAI,KAAK,IAAI,KAAK,MAAM,MAAM,SAAS,GAAG,CAAC,GAE3C,MAAM,IAAI,EAAE,GADP,KAAK,IAAI,KAAK,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAChC;EAGlB,MAAM,IAAI,MAAM,OAAO,IAAI,SAC1B,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IACd,MAAM,IAAI,EAAE,KACd,MAAM,CAAC,IAAI,EAAE;EAEf,KAAK,SAAS,OAAO,CAAC;CACvB;CAEA,SAAS,OAAO,MAAM;EACrB,MAAM,MAAM,aAAa,KAAK,IAAI;CACnC;CAGA,cAAc,OAAO;EACpB,QAAgB,MAAM,KAAK;CAC5B;CAEA,aAAa,OAAO;EACnB,OAAe,MAAM,KAAK;CAC3B;;;;;;;;CASA,OAAO,OAAO,MAAM;EACnB,OAAO,SAAS,gBAAgB,8BAA8B,IAAI;CACnE;;;;;;;;CASA,OAAO,aAAa,OAAO,QAAQ;EAQlC,OAPY,MAAM,SAAQ,WAAU,CACnC,GAAG,OAAO,KAAK,GAAG,MAAM,IAAI,IAAI,MAAM,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,GAEzD,SAAS,MAAM,EAChB,CAAC,CAAC,CAAC,KAAK,EAGC,KAAK;CACf;AAED"}
|
|
1
|
+
{"version":3,"file":"SVG.js","names":[],"sources":["../../../../src/layer/vector/SVG.js"],"sourcesContent":["import {Renderer} from './Renderer.js';\nimport * as DomUtil from '../../dom/DomUtil.js';\nimport {splitWords, stamp} from '../../core/Util.js';\n/** @import {Point} from '../../geometry/Point.js' */\n/** @import {RendererOptions} from './Renderer.js' */\n\n/**\n * Allows vector layers to be displayed with [SVG](https://developer.mozilla.org/docs/Web/SVG).\n * Inherits `Renderer`.\n *\n * @example\n * Use SVG by default for all paths in the map:\n *\n * ```js\n * const map = new MaplairMap('map', {\n * \trenderer: new SVG()\n * });\n * ```\n *\n * Use a SVG renderer with extra padding for specific vector geometries:\n *\n * ```js\n * const map = new MaplairMap('map');\n * const myRenderer = new SVG({ padding: 0.5 });\n * const line = new Polyline( coordinates, { renderer: myRenderer } );\n * const circle = new Circle( center, { renderer: myRenderer, radius: 100 } );\n * ```\n */\nexport class SVG extends Renderer {\n\t/**\n\t * Creates a SVG renderer with the given options.\n\t * @overload\n\t * @param {RendererOptions} [options]\n\t */\n\t/**\n\t * @param {...any} args\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(SVG);\n\t}\n\n\n\t_initContainer() {\n\t\tthis._container = SVG.create('svg');\n\n\t\t// makes it possible to click through svg root; we'll reset it back in individual paths\n\t\tthis._container.setAttribute('pointer-events', 'none');\n\n\t\tthis._rootGroup = SVG.create('g');\n\t\tthis._container.appendChild(this._rootGroup);\n\t}\n\n\t_destroyContainer() {\n\t\tsuper._destroyContainer();\n\t\tdelete this._rootGroup;\n\t\tdelete this._svgSize;\n\t}\n\n\t_resizeContainer() {\n\t\tconst size = super._resizeContainer();\n\n\t\t// set size of svg-container if changed\n\t\tif (!this._svgSize || !this._svgSize.equals(size)) {\n\t\t\tthis._svgSize = size;\n\t\t\tthis._container.setAttribute('width', `${size.x}`);\n\t\t\tthis._container.setAttribute('height', `${size.y}`);\n\t\t}\n\n\t\t// Reset the <SVG>'s viewBox as per _update, but skip redrawing paths.\n\t\t// This keeps paths visually aligned when resizing.\n\t\tconst b = this._bounds;\n\t\tif (b) {\n\t\t\tthis._container.setAttribute('viewBox', [b.min.x, b.min.y, size.x, size.y].join(' '));\n\t\t}\n\t}\n\n\t_update() {\n\t\tif (this._map._animatingZoom && this._bounds) { return; }\n\n\t\tconst b = this._bounds,\n\t\tsize = b.getSize();\n\n\t\t// movement: update container viewBox so that we don't have to change coordinates of individual layers\n\t\tthis._container.setAttribute('viewBox', [b.min.x, b.min.y, size.x, size.y].join(' '));\n\n\t\tthis.fire('update');\n\t}\n\n\t// methods below are called by vector layers implementations\n\n\t_initPath(layer) {\n\t\tconst path = layer._path = SVG.create('path');\n\n\t\tif (layer.options.className) {\n\t\t\tpath.classList.add(...splitWords(layer.options.className));\n\t\t}\n\n\t\tif (layer.options.interactive) {\n\t\t\tpath.classList.add('maplair-interactive');\n\t\t}\n\n\t\tthis._updateStyle(layer);\n\t\tthis._layers[stamp(layer)] = layer;\n\t}\n\n\t_updateInteractive(layer) {\n\t\tlayer._path.classList.toggle('maplair-interactive', !!layer.options.interactive);\n\t}\n\n\t_addPath(layer) {\n\t\tif (!this._rootGroup) { this._initContainer(); }\n\t\tthis._rootGroup.appendChild(layer._path);\n\t\tlayer.addInteractiveTarget(layer._path);\n\t}\n\n\t_removePath(layer) {\n\t\tlayer._path.remove();\n\t\tlayer.removeInteractiveTarget(layer._path);\n\t\tdelete this._layers[stamp(layer)];\n\t}\n\n\t_updatePath(layer) {\n\t\tlayer._project();\n\t\tlayer._update();\n\t}\n\n\t_updateStyle(layer) {\n\t\tconst path = layer._path,\n\t\toptions = layer.options;\n\n\t\tif (!path) { return; }\n\n\t\tif (options.stroke) {\n\t\t\tpath.setAttribute('stroke', options.color);\n\t\t\tpath.setAttribute('stroke-opacity', `${options.opacity}`);\n\t\t\tpath.setAttribute('stroke-width', `${options.weight}`);\n\t\t\tpath.setAttribute('stroke-linecap', options.lineCap);\n\t\t\tpath.setAttribute('stroke-linejoin', options.lineJoin);\n\n\t\t\tif (options.dashArray) {\n\t\t\t\tpath.setAttribute('stroke-dasharray', options.dashArray);\n\t\t\t} else {\n\t\t\t\tpath.removeAttribute('stroke-dasharray');\n\t\t\t}\n\n\t\t\tif (options.dashOffset) {\n\t\t\t\tpath.setAttribute('stroke-dashoffset', options.dashOffset);\n\t\t\t} else {\n\t\t\t\tpath.removeAttribute('stroke-dashoffset');\n\t\t\t}\n\t\t} else {\n\t\t\tpath.setAttribute('stroke', 'none');\n\t\t}\n\n\t\tif (options.fill) {\n\t\t\tpath.setAttribute('fill', options.fillColor || options.color);\n\t\t\tpath.setAttribute('fill-opacity', `${options.fillOpacity}`);\n\t\t\tpath.setAttribute('fill-rule', options.fillRule || 'evenodd');\n\t\t} else {\n\t\t\tpath.setAttribute('fill', 'none');\n\t\t}\n\t}\n\n\t_updatePoly(layer, closed) {\n\t\tthis._setPath(layer, SVG.pointsToPath(layer._parts, closed));\n\t}\n\n\t_updateCircle(layer) {\n\t\tconst p = layer._point,\n\t\tr = Math.max(Math.round(layer._pxRadius), 1),\n\t\tr2 = Math.max(Math.round(layer._pxRadiusY), 1) || r,\n\t\tarc = `a${r},${r2} 0 1,0 `;\n\n\t\t// drawing a circle with two half-arcs\n\t\tconst d = layer._empty() ? 'M0 0' :\n\t\t\t`M${num(p.x - r)},${num(p.y)\n\t\t\t}${arc}${r * 2},0 ${\n\t\t\t\tarc}${-r * 2},0 `;\n\n\t\tthis._setPath(layer, d);\n\t}\n\n\t_setPath(layer, path) {\n\t\tlayer._path.setAttribute('d', path);\n\t}\n\n\t// SVG does not have the concept of zIndex so we resort to changing the DOM order of elements\n\t_bringToFront(layer) {\n\t\tDomUtil.toFront(layer._path);\n\t}\n\n\t_bringToBack(layer) {\n\t\tDomUtil.toBack(layer._path);\n\t}\n\n\t/**\n\t * Returns a instance of [SVGElement](https://developer.mozilla.org/docs/Web/API/SVGElement),\n\t * corresponding to the class name passed. For example, using 'line' will return\n\t * an instance of [SVGLineElement](https://developer.mozilla.org/docs/Web/API/SVGLineElement).\n\t * @param {string} name\n\t * @returns {SVGElement}\n\t */\n\tstatic create(name) {\n\t\treturn document.createElementNS('http://www.w3.org/2000/svg', name);\n\t}\n\n\t/**\n\t * Generates a SVG path string for multiple rings, with each ring turning\n\t * into \"M..L..L..\" instructions.\n\t * @param {Point[][]} rings\n\t * @param {boolean} [closed]\n\t * @returns {string}\n\t */\n\tstatic pointsToPath(rings, closed) {\n\t\tconst str = rings.flatMap(points => [\n\t\t\t...points.map((p, j) => `${(j ? 'L' : 'M') + num(p.x)} ${num(p.y)}`),\n\t\t\t// closes the ring for polygons\n\t\t\tclosed ? 'z' : ''\n\t\t]).join('');\n\n\t\t// SVG complains about empty path strings\n\t\treturn str || 'M0 0';\n\t}\n\n}\n\n// Formats a pixel coordinate with 0.1px precision. Built from integer parts because V8 stringifies small integers\n// much faster than fractional numbers, and path strings with many vertices are rebuilt on every redraw.\nfunction num(v) {\n\tconst n = Math.round(v * 10),\n\ta = n < 0 ? -n : n,\n\ti = Math.floor(a / 10),\n\td = a - i * 10;\n\treturn (n < 0 ? '-' : '') + (d ? `${i}.${d}` : i);\n}\n"],"mappings":"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"}
|
package/dist/esm/map/Hash.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { LatLng } from "../geo/LatLng.js";
|
|
2
|
-
|
|
2
|
+
// src/map/Hash.js
|
|
3
3
|
/** @import {MaplairMap} from './Map.js' */
|
|
4
4
|
/** @import {Layer} from '../layer/Layer.js' */
|
|
5
5
|
const leadingHashRe = /^#/;
|
|
@@ -231,7 +231,6 @@ var Hash = class Hash {
|
|
|
231
231
|
].filter(Boolean).join("&")}`;
|
|
232
232
|
}
|
|
233
233
|
};
|
|
234
|
-
//#endregion
|
|
235
234
|
export { Hash };
|
|
236
235
|
|
|
237
236
|
//# sourceMappingURL=Hash.js.map
|
|
@@ -1,25 +1,23 @@
|
|
|
1
1
|
import { Point } from "../geometry/Point.js";
|
|
2
|
-
import Browser_default from "../core/Browser.js";
|
|
3
2
|
import { getPointers } from "../dom/DomEvent.PointerEvents.js";
|
|
4
3
|
import { stop } from "../dom/DomEvent.js";
|
|
5
4
|
import { create, getPosition, getScale, setPosition, setTransform } from "../dom/DomUtil.js";
|
|
6
5
|
import { Bounds } from "../geometry/Bounds.js";
|
|
6
|
+
import { BlanketOverlay } from "../layer/BlanketOverlay.js";
|
|
7
7
|
import { DivOverlay } from "../layer/DivOverlay.js";
|
|
8
8
|
import { Popup } from "../layer/Popup.js";
|
|
9
9
|
import { Tooltip } from "../layer/Tooltip.js";
|
|
10
|
-
import { BlanketOverlay } from "../layer/BlanketOverlay.js";
|
|
11
10
|
import { Draggable } from "../dom/Draggable.js";
|
|
12
11
|
import { DragHandler } from "./handler/DragHandler.js";
|
|
13
12
|
import { PinchZoomHandler } from "./handler/PinchZoomHandler.js";
|
|
14
13
|
import { ScrollWheelZoomHandler } from "./handler/ScrollWheelZoomHandler.js";
|
|
15
14
|
import { TapDragZoomHandler } from "./handler/TapDragZoomHandler.js";
|
|
16
|
-
import { MaplairMap } from "./Map.js";
|
|
15
|
+
import { LeafletMap as MaplairMap } from "./Map.js";
|
|
17
16
|
import { MarkerDrag } from "../layer/marker/Marker.Drag.js";
|
|
18
17
|
import { Marker } from "../layer/marker/Marker.js";
|
|
19
18
|
import { GridLayer } from "../layer/tile/GridLayer.js";
|
|
20
|
-
import "../layer/marker/Marker.Rotation.js";
|
|
21
19
|
import { RotateControl } from "../control/RotateControl.js";
|
|
22
|
-
|
|
20
|
+
// src/map/Map.Rotation.js
|
|
23
21
|
function normalizeBearing(bearing) {
|
|
24
22
|
return (Number(bearing) % 360 + 360) % 360;
|
|
25
23
|
}
|
|
@@ -28,7 +26,7 @@ function rotatePoint(point, degrees) {
|
|
|
28
26
|
return new Point(point.x * cos - point.y * sin, point.x * sin + point.y * cos);
|
|
29
27
|
}
|
|
30
28
|
const rotatedMaps = /* @__PURE__ */ new WeakMap();
|
|
31
|
-
const { panBy } = MaplairMap.prototype, { getEvents: getDivOverlayEvents } = DivOverlay.prototype, { _setPosition: setTooltipPosition } = Tooltip.prototype, { getEvents: getMarkerEvents } = Marker.prototype, { _onDown: onDraggableDown, _updatePosition: updateDraggablePosition } = Draggable.prototype, { _onPointerStart: onPinchStart } = PinchZoomHandler.prototype, { _onDown: onTapDragDown } = TapDragZoomHandler.prototype, { _pinchTo: pinchTo } = ScrollWheelZoomHandler.prototype;
|
|
29
|
+
const { panBy } = MaplairMap.prototype, { getEvents: getDivOverlayEvents } = DivOverlay.prototype, { _setPosition: setTooltipPosition } = Tooltip.prototype, { getEvents: getMarkerEvents, _positionElements: positionMarkerElements } = Marker.prototype, { _onDown: onDraggableDown, _updatePosition: updateDraggablePosition } = Draggable.prototype, { _onPointerStart: onPinchStart } = PinchZoomHandler.prototype, { _onDown: onTapDragDown } = TapDragZoomHandler.prototype, { _pinchTo: pinchTo } = ScrollWheelZoomHandler.prototype;
|
|
32
30
|
/**
|
|
33
31
|
* Map options of the map rotation (`maplair/map-rotation`).
|
|
34
32
|
* @typedef {object} RotationMapOptions
|
|
@@ -68,7 +66,7 @@ MaplairMap.include({
|
|
|
68
66
|
if (!this._rotatePane && !bearing) return this;
|
|
69
67
|
if (bearing === from) return this;
|
|
70
68
|
this._stop();
|
|
71
|
-
if (!options?.animate || !this._loaded ||
|
|
69
|
+
if (!options?.animate || !this._loaded || this._prefersReducedMotion()) {
|
|
72
70
|
this._rotate(bearing);
|
|
73
71
|
return this._loaded ? this.fire("movestart").fire("move").fire("moveend") : this;
|
|
74
72
|
}
|
|
@@ -274,7 +272,7 @@ DivOverlay.include({
|
|
|
274
272
|
},
|
|
275
273
|
_updatePosition() {
|
|
276
274
|
if (!this._map) return;
|
|
277
|
-
const map = this._map, pos = map.latLngToLayerPoint(this._latlng), anchor = map._rotateToPane(new Point(this._getAnchor()));
|
|
275
|
+
const map = this._map, pos = map.latLngToLayerPoint(this._latlng)._round(), anchor = map._rotateToPane(new Point(this._getAnchor()));
|
|
278
276
|
let offset = Point.from(this.options.offset);
|
|
279
277
|
const transformed = this._zoomAnimated || this.options.overflow || map._bearing;
|
|
280
278
|
if (!transformed) offset = offset.add(pos).add(anchor);
|
|
@@ -342,19 +340,36 @@ Tooltip.include({ _setPosition(pos) {
|
|
|
342
340
|
container.style.top = `${delta.y}px`;
|
|
343
341
|
this._setContainerPosition(pos, `${-delta.x - margin[0]}px ${-delta.y - margin[1]}px`);
|
|
344
342
|
} });
|
|
345
|
-
/** @typedef {typeof markerRotationMethods} MarkerMapRotationMethods */
|
|
346
|
-
Marker.include({
|
|
347
343
|
/**
|
|
348
|
-
*
|
|
349
|
-
* @
|
|
350
|
-
* @
|
|
344
|
+
* Options of `Marker` for the map rotation.
|
|
345
|
+
* @typedef {object} MarkerMapRotationOptions
|
|
346
|
+
* @lends MarkerOptions
|
|
347
|
+
* @property {boolean} [rotateWithView=false] On a rotated map (see
|
|
348
|
+
* `MaplairMap.setBearing()`), whether the icon rotates with the map (e.g. for arrows
|
|
349
|
+
* pointing in a geographic direction) instead of staying upright. The `rotation` of
|
|
350
|
+
* the marker is relative to the screen, or to north with `rotateWithView`.
|
|
351
351
|
*/
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
352
|
+
Marker.include({ options: { rotateWithView: false } });
|
|
353
|
+
/** @typedef {typeof markerRotationMethods} MarkerMapRotationMethods */
|
|
354
|
+
Marker.include({
|
|
355
|
+
/**
|
|
356
|
+
* Overrides `getEvents()` of `Marker` to update the marker on rotation.
|
|
357
|
+
* @internal
|
|
358
|
+
* @returns {Record<string, Function>}
|
|
359
|
+
*/
|
|
360
|
+
getEvents() {
|
|
361
|
+
return {
|
|
362
|
+
...getMarkerEvents.call(this),
|
|
363
|
+
rotate: this.update
|
|
364
|
+
};
|
|
365
|
+
},
|
|
366
|
+
_positionElements(pos) {
|
|
367
|
+
positionMarkerElements.call(this, pos);
|
|
368
|
+
const bearing = this.options.rotateWithView ? 0 : this._map?.getBearing() ?? 0;
|
|
369
|
+
if (!bearing) return;
|
|
370
|
+
for (const el of [this._icon, this._shadow]) if (el) el.style.transform += ` rotate(${bearing}deg)`;
|
|
371
|
+
}
|
|
372
|
+
});
|
|
358
373
|
/** @typedef {typeof markerDragRotationMethods} MarkerDragMapRotationMethods */
|
|
359
374
|
MarkerDrag.include({ _adjustPan(e) {
|
|
360
375
|
const marker = this._marker, map = marker._map, speed = this._marker.options.autoPanSpeed, padding = this._marker.options.autoPanPadding, iconPos = getPosition(marker._icon), bounds = map.getPixelBounds(), origin = map.getPixelOrigin();
|
|
@@ -390,8 +405,13 @@ DragHandler.include({ _onDragEnd(e) {
|
|
|
390
405
|
if (noInertia) map.fire("moveend");
|
|
391
406
|
else {
|
|
392
407
|
this._prunePositions(Date.now());
|
|
393
|
-
const direction = this._lastPos.subtract(this._positions[0]), duration = (this._lastTime - this._times[0]) / 1e3, ease = options.easeLinearity, speedVector = direction.multiplyBy(ease / duration), speed = speedVector.distanceTo([0, 0]), limitedSpeed = Math.min(options.inertiaMaxSpeed, speed), limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
|
|
394
|
-
let offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
|
|
408
|
+
const direction = this._lastPos.subtract(this._positions[0]), duration = (this._lastTime - this._times[0]) / 1e3, ease = options.easeLinearity, speedVector = direction.multiplyBy(ease / duration), speed = speedVector.distanceTo([0, 0]), limitedSpeed = Math.min(options.inertiaMaxSpeed, speed), limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed), maxOffset = map.getSize().divideBy(2);
|
|
409
|
+
let decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease), offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
|
|
410
|
+
if (map._prefersReducedMotion() && !maxOffset.contains(offset)) {
|
|
411
|
+
const k = Math.min(maxOffset.x / Math.abs(offset.x), maxOffset.y / Math.abs(offset.y));
|
|
412
|
+
offset = offset.multiplyBy(k).round();
|
|
413
|
+
decelerationDuration *= Math.sqrt(k);
|
|
414
|
+
}
|
|
395
415
|
if (!offset.x && !offset.y) map.fire("moveend");
|
|
396
416
|
else {
|
|
397
417
|
offset = map._limitOffset(offset, map.options.maxBounds);
|
|
@@ -494,7 +514,6 @@ ScrollWheelZoomHandler.include({
|
|
|
494
514
|
this._panTimer = setTimeout(this._endPan.bind(this), gestureEndDelay);
|
|
495
515
|
}
|
|
496
516
|
});
|
|
497
|
-
//#endregion
|
|
498
517
|
export { RotateControl };
|
|
499
518
|
|
|
500
519
|
//# sourceMappingURL=Map.Rotation.js.map
|