@summeruse/ol 0.2.0-alpha.1 → 0.2.0-alpha.3

package/es/components/ol-map/index.vue.d.ts

@@ -1,5 +1,6 @@
+import { MapEvent, Map as OLMap } from 'ol';
+import { ObjectEvent } from 'ol/Object';
 import { OlMapProps } from './props';
-import { Map as OLMap } from 'ol';
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: {
@@ -16,7 +17,21 @@ declare function __VLS_template(): {
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: import('vue').DefineComponent<OlMapProps, {
     olMap: OLMap;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<OlMapProps> & Readonly<{}>, {
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    "update:zoom": (args_0: number) => any;
+    "update:center": (args_0: import('ol/coordinate').Coordinate) => any;
+    changeResolution: (args_0: ObjectEvent) => any;
+    changeCenter: (args_0: ObjectEvent) => any;
+    moveend: (args_0: MapEvent) => any;
+    movestart: (args_0: MapEvent) => any;
+}, string, import('vue').PublicProps, Readonly<OlMapProps> & Readonly<{
+    "onUpdate:zoom"?: ((args_0: number) => any) | undefined;
+    "onUpdate:center"?: ((args_0: import('ol/coordinate').Coordinate) => any) | undefined;
+    onChangeResolution?: ((args_0: ObjectEvent) => any) | undefined;
+    onChangeCenter?: ((args_0: ObjectEvent) => any) | undefined;
+    onMoveend?: ((args_0: MapEvent) => any) | undefined;
+    onMovestart?: ((args_0: MapEvent) => any) | undefined;
+}>, {
     olMap: OLMap;
     center: import('ol/coordinate').Coordinate;
     zoom: number;

package/es/components/ol-map/index.vue_vue_type_script_setup_true_lang.mjs

@@ -1,5 +1,5 @@
 import { olMapInjectionKey } from "./props.mjs";
-import { createElementBlock, defineComponent, openBlock, provide, ref, renderSlot, unref, watch } from "vue";
+import { createElementBlock, defineComponent, onMounted, onUnmounted, openBlock, provide, ref, renderSlot, unref, watch } from "vue";
 import { Map, View } from "ol";
 import { Attribution, FullScreen, OverviewMap, Rotate, ScaleLine, Zoom } from "ol/control";
 import { DoubleClickZoom, DragPan, DragRotate, KeyboardPan, KeyboardZoom, MouseWheelZoom, PinchRotate, PinchZoom } from "ol/interaction";
@@ -57,57 +57,93 @@ var index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 		pinchZoom: { type: Boolean },
 		altShiftDragRotate: { type: Boolean }
 	},
-	setup(C, { expose: w }) {
-		let T = C, E = ref(), D = T.olMap, O = new View({
-			projection: T.projection,
-			extent: T.extent
+	emits: [
+		"update:zoom",
+		"update:center",
+		"changeResolution",
+		"changeCenter",
+		"moveend",
+		"movestart"
+	],
+	setup(T, { expose: E, emit: D }) {
+		let O = T, k = D, A = ref(), j = O.olMap, M = new View({
+			projection: O.projection,
+			extent: O.extent
 		});
-		D.setView(O), watch(() => T.zoom, (e) => {
-			O.setZoom(e);
-		}, { immediate: !0 }), watch(() => T.center, (e) => {
-			O.setCenter(e);
-		}, { immediate: !0 }), watch(() => T.constrainResolution, (e) => {
-			O.setConstrainResolution(e);
-		}, { immediate: !0 }), watch(() => T.minZoom, (e) => {
-			e && O.setMinZoom(e);
-		}, { immediate: !0 }), watch(() => T.maxZoom, (e) => {
-			e && O.setMaxZoom(e);
-		}, { immediate: !0 }), watch(E, (e) => {
-			e && D.setTarget(e);
-		}), w({ olMap: D }), provide(olMapInjectionKey, D);
-		let k = D.getControls().getArray(), A = k.find((e) => e instanceof Zoom) || new Zoom(), j = k.find((e) => e instanceof Attribution) || new Attribution(), M = k.find((e) => e instanceof Rotate) || new Rotate(), N = k.find((e) => e instanceof FullScreen) || new FullScreen(), P = k.find((e) => e instanceof OverviewMap) || new OverviewMap(), F = k.find((e) => e instanceof ScaleLine) || new ScaleLine();
-		watch(() => T.showZoom, (e) => {
-			A.setMap(e ? D : null);
-		}, { immediate: !0 }), watch(() => T.showAttribution, (e) => {
-			j.setMap(e ? D : null);
-		}, { immediate: !0 }), watch(() => T.showRotate, (e) => {
-			M.setMap(e ? D : null);
-		}, { immediate: !0 }), watch(() => T.showFullScreen, (e) => {
-			N.setMap(e ? D : null);
-		}, { immediate: !0 }), watch(() => T.showOverview, (e) => {
-			P.setMap(e ? D : null);
-		}, { immediate: !0 }), watch(() => T.showScale, (e) => {
-			F.setMap(e ? D : null);
+		j.setView(M), M.setZoom(O.zoom), M.setCenter(O.center), watch(() => O.constrainResolution, (e) => {
+			M.setConstrainResolution(e);
+		}, { immediate: !0 }), watch(() => O.minZoom, (e) => {
+			e && M.setMinZoom(e);
+		}, { immediate: !0 }), watch(() => O.maxZoom, (e) => {
+			e && M.setMaxZoom(e);
+		}, { immediate: !0 }), watch(A, (e) => {
+			e && j.setTarget(e);
+		}), E({ olMap: j }), provide(olMapInjectionKey, j);
+		let N = j.getControls().getArray(), P = N.find((e) => e instanceof Zoom) || new Zoom(), F = N.find((e) => e instanceof Attribution) || new Attribution(), I = N.find((e) => e instanceof Rotate) || new Rotate(), L = N.find((e) => e instanceof FullScreen) || new FullScreen(), R = N.find((e) => e instanceof OverviewMap) || new OverviewMap(), z = N.find((e) => e instanceof ScaleLine) || new ScaleLine();
+		watch(() => O.showZoom, (e) => {
+			P.setMap(e ? j : null);
+		}, { immediate: !0 }), watch(() => O.showAttribution, (e) => {
+			F.setMap(e ? j : null);
+		}, { immediate: !0 }), watch(() => O.showRotate, (e) => {
+			I.setMap(e ? j : null);
+		}, { immediate: !0 }), watch(() => O.showFullScreen, (e) => {
+			L.setMap(e ? j : null);
+		}, { immediate: !0 }), watch(() => O.showOverview, (e) => {
+			R.setMap(e ? j : null);
+		}, { immediate: !0 }), watch(() => O.showScale, (e) => {
+			z.setMap(e ? j : null);
 		}, { immediate: !0 });
-		let I = D.getInteractions().getArray(), L = I.find((e) => e instanceof DragPan) || new DragPan(), R = I.find((e) => e instanceof MouseWheelZoom) || new MouseWheelZoom(), z = I.find((e) => e instanceof DoubleClickZoom) || new DoubleClickZoom(), B = I.find((e) => e instanceof PinchRotate) || new PinchRotate(), V = I.find((e) => e instanceof PinchZoom) || new PinchZoom(), H = I.find((e) => e instanceof DragRotate) || new DragRotate(), U = I.find((e) => e instanceof KeyboardPan) || new KeyboardPan(), W = I.find((e) => e instanceof KeyboardZoom) || new KeyboardZoom();
-		return D.removeInteraction(L), D.addInteraction(L), D.removeInteraction(R), D.addInteraction(R), D.removeInteraction(z), D.addInteraction(z), D.removeInteraction(B), D.addInteraction(B), D.removeInteraction(V), D.addInteraction(V), D.removeInteraction(H), D.addInteraction(H), D.removeInteraction(U), D.removeInteraction(W), watch(() => T.dragPan, (e) => {
-			L.setActive(e);
-		}, { immediate: !0 }), watch(() => T.mouseWheelZoom, (e) => {
-			R.setActive(e);
-		}, { immediate: !0 }), watch(() => T.doubleClickZoom, (e) => {
-			z.setActive(e);
-		}, { immediate: !0 }), watch(() => T.pinchRotate, (e) => {
-			B.setActive(e);
-		}, { immediate: !0 }), watch(() => T.pinchZoom, (e) => {
+		let B = j.getInteractions().getArray(), V = B.find((e) => e instanceof DragPan) || new DragPan(), H = B.find((e) => e instanceof MouseWheelZoom) || new MouseWheelZoom(), U = B.find((e) => e instanceof DoubleClickZoom) || new DoubleClickZoom(), W = B.find((e) => e instanceof PinchRotate) || new PinchRotate(), G = B.find((e) => e instanceof PinchZoom) || new PinchZoom(), K = B.find((e) => e instanceof DragRotate) || new DragRotate(), q = B.find((e) => e instanceof KeyboardPan) || new KeyboardPan(), J = B.find((e) => e instanceof KeyboardZoom) || new KeyboardZoom();
+		j.removeInteraction(V), j.addInteraction(V), j.removeInteraction(H), j.addInteraction(H), j.removeInteraction(U), j.addInteraction(U), j.removeInteraction(W), j.addInteraction(W), j.removeInteraction(G), j.addInteraction(G), j.removeInteraction(K), j.addInteraction(K), j.removeInteraction(q), j.removeInteraction(J), watch(() => O.dragPan, (e) => {
 			V.setActive(e);
-		}, { immediate: !0 }), watch(() => T.altShiftDragRotate, (e) => {
+		}, { immediate: !0 }), watch(() => O.mouseWheelZoom, (e) => {
 			H.setActive(e);
-		}, { immediate: !0 }), (e, C) => (openBlock(), createElementBlock("div", {
+		}, { immediate: !0 }), watch(() => O.doubleClickZoom, (e) => {
+			U.setActive(e);
+		}, { immediate: !0 }), watch(() => O.pinchRotate, (e) => {
+			W.setActive(e);
+		}, { immediate: !0 }), watch(() => O.pinchZoom, (e) => {
+			G.setActive(e);
+		}, { immediate: !0 }), watch(() => O.altShiftDragRotate, (e) => {
+			K.setActive(e);
+		}, { immediate: !0 });
+		function Y(e) {
+			k("update:zoom", Math.floor(M.getZoom() || 0)), k("changeResolution", e);
+		}
+		onMounted(() => {
+			M.on("change:resolution", Y);
+		}), onUnmounted(() => {
+			M.un("change:resolution", Y);
+		});
+		function X(e) {
+			k("update:center", M.getCenter() || [0, 0]), k("changeCenter", e);
+		}
+		onMounted(() => {
+			M.on("change:center", X);
+		}), onUnmounted(() => {
+			M.un("change:center", X);
+		});
+		function Z(e) {
+			k("movestart", e);
+		}
+		onMounted(() => {
+			j.on("movestart", Z);
+		}), onUnmounted(() => {
+			j.un("movestart", Z);
+		});
+		function Q(e) {
+			k("moveend", e);
+		}
+		return onMounted(() => {
+			j.on("moveend", Q);
+		}), onUnmounted(() => {
+			j.un("moveend", Q);
+		}), (e, T) => (openBlock(), createElementBlock("div", {
 			ref_key: "mapRef",
-			ref: E
+			ref: A
 		}, [renderSlot(e.$slots, "default", {
-			olMap: unref(D),
-			mapRef: E.value
+			olMap: unref(j),
+			mapRef: A.value
 		})], 512));
 	}
 });

package/es/components/ol-map/props.d.ts

@@ -1,6 +1,7 @@
-import { Map as OLMap } from 'ol';
+import { MapEvent, Map as OLMap } from 'ol';
 import { Coordinate } from 'ol/coordinate';
 import { Extent } from 'ol/extent';
+import { ObjectEvent } from 'ol/Object';
 import { InjectionKey } from 'vue';
 import { ProjectionLike } from '../../constants/projection';
 export interface OlMapProps {
@@ -27,3 +28,11 @@ export interface OlMapProps {
 }
 export declare const olMapInjectionKey: InjectionKey<OLMap>;
 export declare function useOlMap(): OLMap | undefined;
+export interface OlMapEmits {
+    'update:zoom': [number];
+    'update:center': [Coordinate];
+    'changeResolution': [ObjectEvent];
+    'changeCenter': [ObjectEvent];
+    'moveend': [MapEvent];
+    'movestart': [MapEvent];
+}

package/es/composables/usePointermove/index.d.ts

@@ -16,9 +16,9 @@ interface PointermoveContentParams {
 type Cursor = CSSProperties['cursor'];
 export type PointermoveItem<T extends Option = Option> = {
     /** 提示内容，支持函数动态生成 */
-    content: ((params: PointermoveContentParams) => VNodeChild) | string;
+    content?: ((params: PointermoveContentParams) => VNodeChild) | string;
     /** 是否显示提示，可根据 feature 动态判断 */
-    visible?: ((params: PointermoveContentParams) => boolean) | boolean;
+    visible?: ((params: PointermoveContentParams) => boolean | undefined | void) | boolean;
     /** 位置偏移 */
     offset?: {
         x?: number;
@@ -28,14 +28,24 @@ export type PointermoveItem<T extends Option = Option> = {
     priority?: number;
     /** 鼠标样式，如 'pointer', 'crosshair', 'move' 等 */
     cursor?: Cursor | ((params: PointermoveContentParams) => Cursor);
-    /** 固定在feature center  */
+    /** 固定在feature center 默认启用，若要关闭需要同时开启强制更新 */
     fixedFeatureCenter?: boolean;
 } & T;
 export type PointermoveList<T extends Option = Option> = PointermoveItem<T>[];
 export interface Option {
     [key: string]: any;
 }
-export declare function usePointermove<T extends Option>(mapRef: MaybeRefOrGetter<OLMap | undefined>, items: MaybeRefOrGetter<PointermoveList<T>>): {
+export interface UsePointermoveOptions<T extends Option = Option> {
+    /** 地图实例 */
+    mapRef: MaybeRefOrGetter<OLMap | undefined>;
+    /** 提示配置列表 */
+    items: MaybeRefOrGetter<PointermoveList<T>>;
+    /** 前置判断条件 */
+    enabled?: boolean | (() => boolean | undefined | void);
+    /** 强制更新 （开启后，无论 feature 是否变化，都强制更新提示） */
+    forceUpdate?: boolean;
+}
+export declare function usePointermove<T extends Option>({ mapRef, items, enabled, forceUpdate }: UsePointermoveOptions<T>): {
     visible: import('vue').ComputedRef<boolean>;
     position: import('vue').ComputedRef<{
         x: number;

package/es/composables/usePointermove/index.mjs

@@ -1,35 +1,40 @@
 import { computed, onBeforeUnmount, ref, toValue, watch } from "vue";
 import { getCenter } from "ol/extent";
-function usePointermove(o, s) {
-	let c = ref(!1), l = ref({
+function usePointermove({ mapRef: o, items: s, enabled: c = !0, forceUpdate: l = !1 }) {
+	let u = ref(!1), d = ref({
 		x: 0,
 		y: 0
-	}), u = ref(), d = ref(), f = ref({
+	}), f = ref(), p = ref(), m = ref({
 		x: 0,
 		y: 0
-	}), p = ref(), m = ref(), h = computed(() => ({
-		x: l.value.x + f.value.x,
-		y: l.value.y + f.value.y
-	})), g, _ = "";
-	function v(e) {
-		let t = toValue(s).filter((t) => {
+	}), h = ref(), g = ref(), _ = computed(() => ({
+		x: d.value.x + m.value.x,
+		y: d.value.y + m.value.y
+	})), v = () => typeof c == "function" ? c() : c, y, b, x = "";
+	function S(e) {
+		let t = toValue(s);
+		return t.sort((e, t) => (t.priority ?? 0) - (e.priority ?? 0)), t.find((t) => {
 			let n = t.visible;
 			return typeof n == "function" ? n(e) : n ?? !0;
 		});
-		return t.length === 0 ? null : t.sort((e, t) => (t.priority ?? 0) - (e.priority ?? 0))[0];
 	}
-	function y(e) {
-		if (!g) return;
-		let t = g.getEventCoordinate(e);
-		p.value = t;
-		let n = g.getEventPixel(e), r, i;
-		if (g.forEachFeatureAtPixel(n, (e, t) => (r = e, i = t, !0)), !r) {
-			b();
+	function C(e) {
+		if (!v()) {
+			w();
+			return;
+		}
+		if (!y || !b) return;
+		let t = y.getEventCoordinate(e);
+		h.value = t;
+		let n = y.getEventPixel(e), r, i;
+		if (y.forEachFeatureAtPixel(n, (e, t) => (r = e, i = t, !0)), !r) {
+			w();
 			return;
 		}
-		u.value = r;
+		if (!l && f.value && f.value.getId() === r.getId()) return;
+		f.value = r;
 		let o = {
-			map: g,
+			map: y,
 			position: {
 				x: e.clientX,
 				y: e.clientY
@@ -37,65 +42,54 @@ function usePointermove(o, s) {
 			coordinate: t,
 			feature: r,
 			layer: i
-		}, s = v(o);
+		}, s = S(o);
 		if (s) {
 			let { content: e, cursor: t, visible: n, fixedFeatureCenter: r, offset: i, priority: a,...o } = s;
-			m.value = { ...o };
+			g.value = { ...o };
 		}
 		if (!s) {
-			b();
+			w();
 			return;
 		}
-		f.value = {
+		m.value = {
 			x: s.offset?.x ?? 0,
 			y: s.offset?.y ?? 0
 		};
-		let h = s.fixedFeatureCenter ?? !0, y = r.getGeometry();
-		if (h && y) {
-			let e = getCenter(y.getExtent()), t = g.getPixelFromCoordinate(e), { top: n, left: r } = g.getViewport().getBoundingClientRect();
-			l.value.x = t[0] + r, l.value.y = t[1] + n;
-		} else l.value = {
+		let c = l === !1 ? !0 : s.fixedFeatureCenter ?? !0, _ = r.getGeometry();
+		if (c && _) {
+			let e = getCenter(_.getExtent()), t = y.getPixelFromCoordinate(e), { top: n, left: r } = b.getBoundingClientRect();
+			d.value.x = t[0] + r, d.value.y = t[1] + n;
+		} else d.value = {
 			x: e.clientX,
 			y: e.clientY
 		};
 		let x = s.content;
-		d.value = typeof x == "function" ? () => x(o) : x;
-		let S = s.cursor, C = typeof S == "function" ? S(o) : S;
-		if (C && g) {
-			let e = g.getViewport();
-			_ ||= e.style.cursor, e.style.cursor = C;
-		}
-		c.value = !0;
+		p.value = typeof x == "function" ? () => x(o) : x;
+		let C = s.cursor, T = typeof C == "function" ? C(o) : C;
+		T !== void 0 && T !== b.style.cursor && (b.style.cursor = T), u.value = !0;
 	}
-	function b() {
-		if (c.value = !1, u.value = void 0, g && _ !== void 0) {
-			let e = g.getViewport();
-			e.style.cursor = _, _ = "";
-		}
+	function w() {
+		u.value = !1, f.value = void 0, b && b.style.cursor !== x && (b.style.cursor = x);
 	}
-	function x(e) {
-		if (!e) return;
-		let t = e.getViewport();
-		t.addEventListener("pointermove", y), t.addEventListener("pointerout", b);
+	function T(e) {
+		e.addEventListener("pointermove", C);
 	}
-	function S(e) {
-		if (!e) return;
-		let t = e.getViewport();
-		t.removeEventListener("pointermove", y), t.removeEventListener("pointerout", b);
+	function E(e) {
+		e.removeEventListener("pointermove", C);
 	}
 	return watch(() => toValue(o), (e, t) => {
-		t !== e && (S(t), x(e), g = e);
+		t !== e && (y = e, e && (b = e.getViewport(), E(b), T(b), x = b.style.cursor));
 	}, { immediate: !0 }), onBeforeUnmount(() => {
-		S(g);
+		b && E(b);
 	}), {
-		visible: computed(() => c.value),
-		position: computed(() => h.value),
-		originalPosition: computed(() => l.value),
-		feature: computed(() => u.value),
-		content: computed(() => d.value),
-		coordinate: computed(() => p.value),
-		option: computed(() => m.value),
-		hide: b
+		visible: computed(() => u.value),
+		position: computed(() => _.value),
+		originalPosition: computed(() => d.value),
+		feature: computed(() => f.value),
+		content: computed(() => p.value),
+		coordinate: computed(() => h.value),
+		option: computed(() => g.value),
+		hide: w
 	};
 }
 export { usePointermove };

package/es/index.mjs

@@ -4,10 +4,10 @@ import "./components/index.mjs";
 import { useContextmenu } from "./composables/useContextmenu/index.mjs";
 import { ONE_NM } from "./constants/distance.mjs";
 import { EPSG_3857, EPSG_4326, WGS84Projection, WebMercatorProjection } from "./constants/projection.mjs";
-import { kmToNauticalMiles, nauticalMilesToKm } from "./utils/distance/index.mjs";
+import { formatAngle, formatRotation, kmToNauticalMiles, nauticalMilesToKm } from "./utils/distance/index.mjs";
 import { createCircleStyle, createStyle, createTextStyle } from "./utils/style/index.mjs";
 import { createCircle, createCircleFeature, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createPoint, createPointFeature, createPolygon, createPolygonFeature } from "./utils/feature/index.mjs";
-import { createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl } from "./utils/layer/index.mjs";
+import { createBingLayer, createOpenStreetMapLayer, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer } from "./utils/layer/index.mjs";
 import { EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, mercatorExtentToWgs84, mercatorToWgs84, wgs84ExtentToMercator, wgs84ToMercator } from "./utils/projection/index.mjs";
 import "./utils/index.mjs";
 import { useDrawLineString } from "./composables/useDrawLineString/index.mjs";
@@ -16,4 +16,4 @@ import { useGraticule } from "./composables/useGraticule/index.mjs";
 import { usePointermove } from "./composables/usePointermove/index.mjs";
 import { useSwitchBaseLayer } from "./composables/useSwitchBaseLayer/index.mjs";
 import "./composables/index.mjs";
-export { EPSG_3857, EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, ONE_NM, ol_map_default as OlMap, WGS84Projection, WebMercatorProjection, createCircle, createCircleFeature, createCircleStyle, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createPoint, createPointFeature, createPolygon, createPolygonFeature, createStyle, createTextStyle, createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl, kmToNauticalMiles, mercatorExtentToWgs84, mercatorToWgs84, nauticalMilesToKm, olMapInjectionKey, useContextmenu, useDrawLineString, useDrawPolygon, useGraticule, useOlMap, usePointermove, useSwitchBaseLayer, wgs84ExtentToMercator, wgs84ToMercator };
+export { EPSG_3857, EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, ONE_NM, ol_map_default as OlMap, WGS84Projection, WebMercatorProjection, createBingLayer, createCircle, createCircleFeature, createCircleStyle, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createOpenStreetMapLayer, createPoint, createPointFeature, createPolygon, createPolygonFeature, createStyle, createTextStyle, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer, formatAngle, formatRotation, kmToNauticalMiles, mercatorExtentToWgs84, mercatorToWgs84, nauticalMilesToKm, olMapInjectionKey, useContextmenu, useDrawLineString, useDrawPolygon, useGraticule, useOlMap, usePointermove, useSwitchBaseLayer, wgs84ExtentToMercator, wgs84ToMercator };

package/es/utils/distance/index.d.ts

@@ -2,3 +2,7 @@
 export declare function kmToNauticalMiles(km: number): number;
 /** 海里转公里 */
 export declare function nauticalMilesToKm(nauticalMiles: number): number;
+/** 格式化Rotation */
+export declare function formatRotation(rotation: number): number;
+/** 格式化角度 */
+export declare function formatAngle(angle: number): number;

package/es/utils/distance/index.mjs

@@ -1,8 +1,14 @@
 import { ONE_NM } from "../../constants/distance.mjs";
-function kmToNauticalMiles(n) {
-	return n * 1e3 / ONE_NM;
+function kmToNauticalMiles(i) {
+	return i * 1e3 / ONE_NM;
 }
-function nauticalMilesToKm(n) {
-	return n * ONE_NM / 1e3;
+function nauticalMilesToKm(i) {
+	return i * ONE_NM / 1e3;
 }
-export { kmToNauticalMiles, nauticalMilesToKm };
+function formatRotation(e) {
+	return e < 0 ? formatRotation(e + 2 * Math.PI) : e > 2 * Math.PI ? formatRotation(e - 2 * Math.PI) : e;
+}
+function formatAngle(e) {
+	return e < 0 ? formatAngle(e + 360) : e >= 360 ? formatAngle(e - 360) : e;
+}
+export { formatAngle, formatRotation, kmToNauticalMiles, nauticalMilesToKm };

package/es/utils/index.mjs

@@ -1,5 +1,5 @@
-import { kmToNauticalMiles, nauticalMilesToKm } from "./distance/index.mjs";
+import { formatAngle, formatRotation, kmToNauticalMiles, nauticalMilesToKm } from "./distance/index.mjs";
 import { createCircleStyle, createStyle, createTextStyle } from "./style/index.mjs";
 import { createCircle, createCircleFeature, createFeature, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createPoint, createPointFeature, createPolygon, createPolygonFeature } from "./feature/index.mjs";
-import { createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl } from "./layer/index.mjs";
+import { createBingLayer, createOpenStreetMapLayer, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer } from "./layer/index.mjs";
 import { EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, mercatorExtentToWgs84, mercatorToWgs84, wgs84ExtentToMercator, wgs84ToMercator } from "./projection/index.mjs";

package/es/utils/layer/index.d.ts

@@ -1,36 +1,40 @@
+import { StyleOptions } from '../style';
 import { Feature } from 'ol';
 import { Geometry } from 'ol/geom';
 import { ProjectionLike } from 'ol/proj';
-import { StyleOptions } from '../style';
 import { Tile as TileLayer } from 'ol/layer';
 import { default as VectorLayer } from 'ol/layer/Vector';
 import { BingMaps, OSM, XYZ } from 'ol/source';
 import { default as VectorSource } from 'ol/source/Vector';
 export type T_MAP_TYPE = 'vec' | 'cva' | 'img' | 'cia' | 'ter' | 'cta' | 'ibo';
-export declare function getTianDiTuUrl(data: {
-    url?: string;
-    type: T_MAP_TYPE;
-    projection: ProjectionLike;
-    key: string;
-}): string;
-export declare function getTianDiTuLayer(data: {
+export interface CreateTianDiTuUrlOptions {
     url?: string;
-    projection: ProjectionLike;
-    zIndex?: number;
     key: string;
     type: T_MAP_TYPE;
-    className?: string;
-}): TileLayer<XYZ>;
-export declare function getBingLayer({ name, zIndex, key, className, }: {
+    projection?: ProjectionLike;
+}
+export declare function createTianDiTuUrl(data: CreateTianDiTuUrlOptions): string;
+export type TileLayerOptions = Partial<ConstructorParameters<typeof TileLayer>[0]>;
+export type XYZ_SourceOptions = Partial<ConstructorParameters<typeof XYZ>[0]>;
+export type CreateTianDiTuLayerOptions = CreateTianDiTuUrlOptions & {
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: XYZ_SourceOptions;
+};
+export declare function createTianDiTuLayer(data: CreateTianDiTuLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
+export type BingMapsSourceOptions = Partial<ConstructorParameters<typeof BingMaps>[0]>;
+export interface CreateBingLayerOptions {
     name: string;
-    zIndex?: number;
     key: string;
-    className?: string;
-}): TileLayer<BingMaps>;
-export declare function getOSMLayer(data?: {
-    zIndex?: number;
-    className?: string;
-}): TileLayer<OSM>;
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: BingMapsSourceOptions;
+}
+export declare function createBingLayer({ name, key, layerOptions, sourceOptions, }: CreateBingLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
+export type OpenStreetMapSourceOptions = Partial<ConstructorParameters<typeof OSM>[0]>;
+export interface CreateOpenStreetMapLayerOptions {
+    layerOptions?: TileLayerOptions;
+    sourceOptions?: BingMapsSourceOptions;
+}
+export declare function createOpenStreetMapLayer(data?: CreateOpenStreetMapLayerOptions): TileLayer<import('ol/source').Tile<import('ol').Tile>>;
 export type _VectorLayerOptions = ConstructorParameters<typeof VectorLayer>[0];
 export type VectorLayerOptions = _VectorLayerOptions & {
     styleOptions?: StyleOptions;

package/es/utils/layer/index.mjs

@@ -4,38 +4,41 @@ import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
 import { Tile } from "ol/layer";
 import { BingMaps, OSM, XYZ } from "ol/source";
-function getTianDiTuUrl(e) {
+function createTianDiTuUrl(e) {
 	let { type: c = "img", projection: l = WebMercatorProjection, key: u } = e, d = e.url || "https://t{0-4}.tianditu.gov.cn", f = `&tk=${u}&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}`;
 	return `${d}/${c}_${l === "EPSG:4326" ? "c" : l === "EPSG:3857" ? "w" : "c"}/wmts?LAYER=${c}${f}`;
 }
-function getTianDiTuLayer(e) {
-	let { zIndex: s, projection: c, className: l } = e;
+function createTianDiTuLayer(e) {
+	let { layerOptions: s, sourceOptions: c,...l } = e;
 	return new Tile({
-		className: l,
 		source: new XYZ({
-			url: getTianDiTuUrl(e),
-			projection: c,
-			crossOrigin: "Anonymous"
+			url: createTianDiTuUrl(l),
+			projection: l.projection,
+			crossOrigin: "Anonymous",
+			...c
 		}),
-		zIndex: s
+		...s
 	});
 }
-function getBingLayer({ name: e, zIndex: s, key: c, className: l }) {
+function createBingLayer({ name: e, key: s, layerOptions: c, sourceOptions: l }) {
 	return new Tile({
-		className: l,
 		source: new BingMaps({
-			key: c,
+			key: s,
 			imagerySet: e,
-			placeholderTiles: !1
+			placeholderTiles: !1,
+			...l
 		}),
-		zIndex: s
+		...c
 	});
 }
-function getOSMLayer(e) {
+function createOpenStreetMapLayer(e) {
+	let { layerOptions: s, sourceOptions: c } = e || {};
 	return new Tile({
-		className: e?.className,
-		source: new OSM({ crossOrigin: "Anonymous" }),
-		zIndex: e?.zIndex
+		source: new OSM({
+			crossOrigin: "Anonymous",
+			...c
+		}),
+		...s
 	});
 }
 function createVectorLayer(e) {
@@ -49,4 +52,4 @@ function createVectorLayer(e) {
 		})
 	};
 }
-export { createVectorLayer, getBingLayer, getOSMLayer, getTianDiTuLayer, getTianDiTuUrl };
+export { createBingLayer, createOpenStreetMapLayer, createTianDiTuLayer, createTianDiTuUrl, createVectorLayer };

package/lib/components/ol-map/index.vue.d.ts

@@ -1,5 +1,6 @@
+import { MapEvent, Map as OLMap } from 'ol';
+import { ObjectEvent } from 'ol/Object';
 import { OlMapProps } from './props';
-import { Map as OLMap } from 'ol';
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: {
@@ -16,7 +17,21 @@ declare function __VLS_template(): {
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: import('vue').DefineComponent<OlMapProps, {
     olMap: OLMap;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<OlMapProps> & Readonly<{}>, {
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    "update:zoom": (args_0: number) => any;
+    "update:center": (args_0: import('ol/coordinate').Coordinate) => any;
+    changeResolution: (args_0: ObjectEvent) => any;
+    changeCenter: (args_0: ObjectEvent) => any;
+    moveend: (args_0: MapEvent) => any;
+    movestart: (args_0: MapEvent) => any;
+}, string, import('vue').PublicProps, Readonly<OlMapProps> & Readonly<{
+    "onUpdate:zoom"?: ((args_0: number) => any) | undefined;
+    "onUpdate:center"?: ((args_0: import('ol/coordinate').Coordinate) => any) | undefined;
+    onChangeResolution?: ((args_0: ObjectEvent) => any) | undefined;
+    onChangeCenter?: ((args_0: ObjectEvent) => any) | undefined;
+    onMoveend?: ((args_0: MapEvent) => any) | undefined;
+    onMovestart?: ((args_0: MapEvent) => any) | undefined;
+}>, {
     olMap: OLMap;
     center: import('ol/coordinate').Coordinate;
     zoom: number;