@summeruse/ol 0.5.1 → 0.6.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { computed, createElementBlock, defineComponent, inject, onBeforeUnmount, onMounted, onUnmounted, openBlock, provide, ref, render, renderSlot, toValue, unref, watch } from "vue";
+import { computed, createElementBlock, defineComponent, inject, onBeforeUnmount, onMounted, onUnmounted, openBlock, provide, ref, render, renderSlot, shallowRef, toValue, unref, watch } from "vue";
 import { Feature, Map as Map$1, Overlay, View } from "ol";
 import { Attribution, FullScreen, OverviewMap, Rotate, ScaleLine, Zoom } from "ol/control";
 import { DoubleClickZoom, DragPan, DragRotate, Draw, KeyboardPan, KeyboardZoom, Modify, MouseWheelZoom, PinchRotate, PinchZoom } from "ol/interaction";
@@ -9986,6 +9986,101 @@ function useGraticule(options) {
 	return { showGraticule };
 }
 
+//#endregion
+//#region composables/useMapClick/index.ts
+/**
+* 通用的点击处理 Hook
+*/
+function useMapClickHandler(options) {
+	const { mapRef, items } = options;
+	let currentMap;
+	/** 按优先级和 hitTolerance 分组 */
+	function groupConfigsByPriority(configs) {
+		const sorted = [...configs].sort((a, b$1) => (b$1.priority ?? 0) - (a.priority ?? 0));
+		const groups = [];
+		let currentGroup = null;
+		sorted.forEach((item) => {
+			const tolerance = item.hitTolerance ?? 0;
+			if (!currentGroup || currentGroup.tolerance !== tolerance) {
+				currentGroup = {
+					tolerance,
+					items: [item]
+				};
+				groups.push(currentGroup);
+			} else currentGroup.items.push(item);
+		});
+		return groups;
+	}
+	/** 创建点击事件处理器 */
+	function handler(evt) {
+		const map = evt.map;
+		if (!map) return;
+		const grouped = groupConfigsByPriority(toValue(items));
+		let foundFeature;
+		let foundLayer;
+		for (const group of grouped) {
+			map.forEachFeatureAtPixel(evt.pixel, (feature, layer) => {
+				foundFeature = feature;
+				foundLayer = layer;
+				return true;
+			}, { hitTolerance: group.tolerance });
+			if (!foundFeature) continue;
+			const context = {
+				map,
+				coordinate: evt.coordinate,
+				pixel: evt.pixel,
+				feature: foundFeature,
+				layer: foundLayer
+			};
+			for (const config of group.items) {
+				const visible = config.visible;
+				if (typeof visible === "function" ? visible(context) : true) return {
+					config,
+					feature: foundFeature,
+					layer: foundLayer
+				};
+			}
+		}
+	}
+	/** 绑定事件 */
+	function bindMapEvents(map) {
+		map.on(options.type, handler);
+	}
+	/** 解绑事件 */
+	function unbindMapEvents(map) {
+		map.un(options.type, handler);
+	}
+	/** 监听 mapRef 变化 */
+	watch(() => toValue(mapRef), (newMap, oldMap) => {
+		if (oldMap) unbindMapEvents(oldMap);
+		if (oldMap !== newMap) {
+			currentMap = newMap;
+			if (newMap) bindMapEvents(newMap);
+		}
+	}, { immediate: true });
+	onBeforeUnmount(() => {
+		if (currentMap) unbindMapEvents(currentMap);
+	});
+}
+function useMapClick(mapRef, type) {
+	const itemMap = shallowRef({});
+	useMapClickHandler({
+		mapRef,
+		items: computed(() => Object.values(itemMap.value).flat()),
+		type
+	});
+	const add$1 = (key$1, items) => {
+		itemMap.value[key$1] = items;
+	};
+	const remove = (key$1) => {
+		delete itemMap.value[key$1];
+	};
+	return {
+		add: add$1,
+		remove
+	};
+}
+
 //#endregion
 //#region composables/usePointermove/index.ts
 function usePointermove({ mapRef, items, forceUpdate = false }) {
@@ -10010,15 +10105,22 @@ function usePointermove({ mapRef, items, forceUpdate = false }) {
 	let currentMap;
 	let viewport;
 	let originalCursor = "";
-	/** 查找匹配的 tooltip 配置 */
-	function findMatchingPointermove(params$1) {
-		const tooltips = toValue(items);
-		tooltips.sort((a, b$1) => (b$1.priority ?? 0) - (a.priority ?? 0));
-		return tooltips.find((item) => {
-			const shouldShow = item.visible;
-			if (typeof shouldShow === "function") return shouldShow(params$1);
-			return shouldShow ?? true;
+	/** 按优先级排序，然后按相邻相同 tolerance 分组 */
+	function groupItemsByPriorityWithToleranceMerge(tooltips) {
+		const sortedByPriority = [...tooltips].sort((a, b$1) => (b$1.priority ?? 0) - (a.priority ?? 0));
+		const groups = [];
+		let currentGroup = null;
+		sortedByPriority.forEach((item) => {
+			const tolerance = item.hitTolerance ?? 0;
+			if (!currentGroup || currentGroup.tolerance !== tolerance) {
+				currentGroup = {
+					tolerance,
+					items: [item]
+				};
+				groups.push(currentGroup);
+			} else currentGroup.items.push(item);
 		});
+		return groups;
 	}
 	/** 显示提示 */
 	function show(evt) {
@@ -10028,39 +10130,51 @@ function usePointermove({ mapRef, items, forceUpdate = false }) {
 		originalCoordinate.value = _coordinate;
 		coordinate.value = _coordinate;
 		let pixel = evt.pixel;
+		const groupedItems = groupItemsByPriorityWithToleranceMerge(toValue(items));
+		const { top, left } = viewport.getBoundingClientRect();
+		let matchedPointermove;
 		let foundFeature;
 		let foundLayer;
-		currentMap.forEachFeatureAtPixel(pixel, (feature$1, layer) => {
-			foundFeature = feature$1;
-			foundLayer = layer;
-			return true;
-		});
-		if (!foundFeature) {
+		for (const group of groupedItems) {
+			currentMap.forEachFeatureAtPixel(pixel, (feature$1, layer) => {
+				foundFeature = feature$1;
+				foundLayer = layer;
+				return true;
+			}, { hitTolerance: group.tolerance });
+			if (!foundFeature) {
+				foundFeature = void 0;
+				foundLayer = void 0;
+				continue;
+			}
+			const params$1 = {
+				map: currentMap,
+				position: {
+					x: pixel[0] + left,
+					y: pixel[1] + top
+				},
+				coordinate: _coordinate,
+				feature: foundFeature,
+				layer: foundLayer
+			};
+			for (const item of group.items) {
+				const shouldShow = item.visible;
+				if (typeof shouldShow === "function" ? shouldShow(params$1) : shouldShow ?? true) {
+					matchedPointermove = item;
+					break;
+				}
+			}
+			if (matchedPointermove) break;
+			foundFeature = void 0;
+			foundLayer = void 0;
+		}
+		if (!foundFeature || !matchedPointermove) {
 			hide();
 			return;
 		}
 		if (!forceUpdate && feature.value && feature.value.getId() === foundFeature.getId()) return;
 		feature.value = foundFeature;
-		const { top, left } = viewport.getBoundingClientRect();
-		const params$1 = {
-			map: currentMap,
-			position: {
-				x: pixel[0] + left,
-				y: pixel[1] + top
-			},
-			coordinate: _coordinate,
-			feature: foundFeature,
-			layer: foundLayer
-		};
-		const matchedPointermove = findMatchingPointermove(params$1);
-		if (matchedPointermove) {
-			const { content: _content, cursor: _cursor, visible: _visible, fixedFeatureCenter: _fixedFeatureCenter, offset: _offset, priority: _priority, ...rest } = matchedPointermove;
-			option.value = { ...rest };
-		}
-		if (!matchedPointermove) {
-			hide();
-			return;
-		}
+		const { content: _content, cursor: _cursor, visible: _visible, fixedFeatureCenter: _fixedFeatureCenter, offset: _offset, priority: _priority, hitTolerance: _hitTolerance, originalIndex, ...rest } = matchedPointermove;
+		option.value = { ...rest };
 		offset.value = {
 			x: matchedPointermove.offset?.x ?? 0,
 			y: matchedPointermove.offset?.y ?? 0
@@ -10075,9 +10189,21 @@ function usePointermove({ mapRef, items, forceUpdate = false }) {
 		originalPosition.value.x = pixel[0] + left;
 		originalPosition.value.y = pixel[1] + top;
 		const tooltipContent = matchedPointermove.content;
-		content.value = typeof tooltipContent === "function" ? () => tooltipContent(params$1) : tooltipContent;
+		content.value = typeof tooltipContent === "function" ? () => tooltipContent({
+			map: currentMap,
+			coordinate: coordinate.value,
+			position: position.value,
+			feature: foundFeature,
+			layer: foundLayer
+		}) : tooltipContent;
 		const cursor = matchedPointermove.cursor;
-		const cursorStyle = typeof cursor === "function" ? cursor(params$1) : cursor;
+		const cursorStyle = typeof cursor === "function" ? cursor({
+			map: currentMap,
+			coordinate: coordinate.value,
+			position: position.value,
+			feature: foundFeature,
+			layer: foundLayer
+		}) : cursor;
 		if (cursorStyle !== void 0 && cursorStyle !== viewport.style.cursor) viewport.style.cursor = cursorStyle;
 		visible.value = true;
 	}
@@ -10145,4 +10271,4 @@ function useSwitchBaseLayer(data) {
 }
 
 //#endregion
-export { EPSG_3395, EPSG_3857, EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, ONE_NM, ol_map_default as OlMap, angleToRotation, createBingLayer, createCanvasLayer, createCircle, createCircleFeature, createCircleStyle, createFeature, createHeatmapLayer, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createOpenStreetMapLayer, createPMTilesLayer, createPoint, createPointFeature, createPolygon, createPolygonFeature, createStyle, createTextStyle, createTianDiTuLayer, createTianDiTuUrl, createTileGrid, createVectorLayer, createVectorSource, createWebGLVectorLayer, createXYZLayer, formatAngle, formatRotation, kmToNauticalMiles, nauticalMilesToKm, olMapInjectionKey, lib_default as proj4, registerEPSG_3395, rotationToAngle, useContextmenu, useDrawLineString, useDrawPolygon, useGraticule, useOlMap, usePointermove, useSwitchBaseLayer };
+export { EPSG_3395, EPSG_3857, EPSG_3857ExtentToEPSG_4326, EPSG_3857ToEPSG_4326, EPSG_4326, EPSG_4326ExtentToEPSG_3857, EPSG_4326ToEPSG_3857, ONE_NM, ol_map_default as OlMap, angleToRotation, createBingLayer, createCanvasLayer, createCircle, createCircleFeature, createCircleStyle, createFeature, createHeatmapLayer, createLineString, createLineStringFeature, createMultiLineString, createMultiLineStringFeature, createMultiPoint, createMultiPointFeature, createMultiPolygon, createMultiPolygonFeature, createOpenStreetMapLayer, createPMTilesLayer, createPoint, createPointFeature, createPolygon, createPolygonFeature, createStyle, createTextStyle, createTianDiTuLayer, createTianDiTuUrl, createTileGrid, createVectorLayer, createVectorSource, createWebGLVectorLayer, createXYZLayer, formatAngle, formatRotation, kmToNauticalMiles, nauticalMilesToKm, olMapInjectionKey, lib_default as proj4, registerEPSG_3395, rotationToAngle, useContextmenu, useDrawLineString, useDrawPolygon, useGraticule, useMapClick, useMapClickHandler, useOlMap, usePointermove, useSwitchBaseLayer };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@summeruse/ol",
   "type": "module",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "",
   "author": "finalsummer",
   "license": "ISC",