@wenle_2523097/agri-map 2.0.7 → 2.0.9

package/dist/index.js

@@ -14799,6 +14799,73 @@ function parseVirtualizationConfig(virtualization) {
   };
 }
 
+/**
+ * 检测并转换坐标格式
+ * @description 如果第一个坐标值 > 90 且第二个值 <= 90，认为是 [lng, lat] 格式，需要翻转
+ * @param positions 原始坐标数组
+ * @returns 包含坐标顺序和标准化后坐标的结果
+ */
+function detectAndNormalizeCoordinates(positions) {
+  if (!Array.isArray(positions) || positions.length === 0) {
+    return {
+      normalized: positions,
+      order: 'lat-lng'
+    };
+  }
+  // 获取第一个有效坐标进行格式检测
+  var firstItem = positions[0];
+  if (!Array.isArray(firstItem)) {
+    return {
+      normalized: positions,
+      order: 'lat-lng'
+    };
+  }
+  // 获取第一个坐标点
+  var firstCoord = Array.isArray(firstItem[0]) ? firstItem[0] : firstItem;
+  // 检查是否为有效坐标 [lat, lng] 或 [lng, lat]
+  if (firstCoord.length >= 2) {
+    var a = firstCoord[0];
+    var b = firstCoord[1];
+    // 如果 a > 90 && b <= 90，认为是经度值（经度范围 -180~180，纬度 -90~90）
+    if (typeof a === 'number' && a > 90 && typeof b === 'number' && b <= 90) {
+      var flip = function flip(coord) {
+        return [coord[1], coord[0]];
+      };
+      if (Array.isArray(firstItem[0])) {
+        // 三维数组：翻转所有环
+        return {
+          normalized: positions.map(function (inner) {
+            return inner.map(flip);
+          }),
+          order: 'lng-lat'
+        };
+      }
+      // 二维数组
+      return {
+        normalized: positions.map(flip),
+        order: 'lng-lat'
+      };
+    }
+  }
+  return {
+    normalized: positions,
+    order: 'lat-lng'
+  };
+}
+/**
+ * 将坐标转换为原始输入格式
+ * @param coords 内部标准格式坐标 [lat, lng]
+ * @param order 原始输入格式
+ * @returns 原始格式的坐标
+ */
+function convertToOriginalFormat(coords, order) {
+  if (order === 'lng-lat') {
+    return coords.map(function (coord) {
+      return [coord[1], coord[0]];
+    });
+  }
+  return coords;
+}
 function usePlotData(_ref) {
   var fieldNames = _ref.fieldNames,
     dataSource = _ref.dataSource,
@@ -14815,9 +14882,13 @@ function usePlotData(_ref) {
   // 映射原始数据到标准 PlotData 格式
   var mapPlotData = React.useCallback(function (rawItem) {
     var id = rawItem[mergedFieldNames.id];
-    var positions = rawItem[mergedFieldNames.positions];
+    var rawPositions = rawItem[mergedFieldNames.positions];
     var area = rawItem[mergedFieldNames.area];
     var possessor = rawItem[mergedFieldNames.possessor];
+    // 检测并转换坐标格式
+    var detectResult = detectAndNormalizeCoordinates(rawPositions);
+    var positions = detectResult.normalized;
+    var order = detectResult.order;
     // 二维 positions [[lat,lng],...] → 三维 [[[lat,lng],...]]
     if (Array.isArray(positions) && !is3DPositions(positions)) {
       positions = [positions];
@@ -14841,7 +14912,8 @@ function usePlotData(_ref) {
       positions: positions,
       area: area,
       possessor: possessor,
-      customData: Object.keys(customData).length > 0 ? customData : undefined
+      customData: Object.keys(customData).length > 0 ? customData : undefined,
+      _coordinateOrder: order
     }, extensionProps);
   }, [mergedFieldNames]);
   // 标准化数据源
@@ -15485,12 +15557,16 @@ function usePlotEditActions(_ref) {
    * 获取完整的编辑结果数据
    * @param coords - 编辑后的坐标
    * @param area - 编辑后的面积
-   * @returns 完整的地块数据（包含原始属性+新坐标）
+   * @returns 完整的地块数据（包含原始属性+新坐标），坐标格式保持与输入一致
    */
   var getFullPlotData = React.useCallback(function (coords, area) {
     if (!localPlotDataRef.current) return null;
+    // 获取输入坐标格式
+    var order = localPlotDataRef.current._coordinateOrder;
+    // 转换为原始格式
+    var originalCoords = convertToOriginalFormat(coords, order);
     return _objectSpread2(_objectSpread2({}, localPlotDataRef.current), {}, {
-      positions: [coords],
+      positions: [originalCoords],
       area: area
     });
   }, []);
@@ -15554,6 +15630,7 @@ function usePlotEditActions(_ref) {
   }, [cleanupEditEvents, cleanupFragmentLayers, setEditMode, editingLayerRef, drawingCoordinatesRef, preserveTempLayerRef, map]);
   // ========== 操作处理函数 ==========
   var handleSave = React.useCallback(function () {
+    var _localPlotDataRef$cur;
     var currentEditMode = editModeStateRef.current;
     disableDrawMode(map);
     var coords = drawingCoordinatesRef.current;
@@ -15572,12 +15649,16 @@ function usePlotEditActions(_ref) {
       return;
     }
     var areaSquareMeters = calculatePolygonArea(coords);
+    // 获取输入坐标格式并转换为原始格式
+    var order = (_localPlotDataRef$cur = localPlotDataRef.current) === null || _localPlotDataRef$cur === void 0 ? void 0 : _localPlotDataRef$cur._coordinateOrder;
+    var originalCoords = convertToOriginalFormat(coords, order);
     // 获取完整的地块数据（包含原始属性）
     var fullPlotData = getFullPlotData(coords, areaSquareMeters);
     var result = {
       plotId: selectedPlotId,
       mode: currentEditMode,
-      coordinates: coords,
+      coordinates: originalCoords,
+      // 保持与输入一致的坐标格式
       area: areaSquareMeters,
       areaUnit: areaUnit,
       plot: fullPlotData || undefined
@@ -15587,7 +15668,10 @@ function usePlotEditActions(_ref) {
       result.selectedFragment = selectedFragmentRef.current;
     }
     if (currentEditMode === 'clip' && clipHolesRef.current) {
-      result.positions = clipHolesRef.current;
+      // 转换孔洞坐标为原始格式
+      result.positions = clipHolesRef.current.map(function (hole) {
+        return convertToOriginalFormat(hole, order);
+      });
     }
     dispatchEditResult(result);
     cleanupAfterSave(currentEditMode);
@@ -25622,7 +25706,8 @@ var TrackPlayer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     onPause = _ref.onPause,
     onStop = _ref.onStop,
     onProgress = _ref.onProgress,
-    onComplete = _ref.onComplete;
+    onComplete = _ref.onComplete,
+    onTimelineUpdate = _ref.onTimelineUpdate;
   var map = useMap();
   // ==================== 字段名合并 ====================
   var mergedFieldNames = React.useMemo(function () {
@@ -25757,7 +25842,31 @@ var TrackPlayer = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var timestamp = currentPoint[2];
     var formattedTime = timestamp !== null ? formatTime(timestamp) : null;
     onProgress === null || onProgress === void 0 || onProgress(currentIndex, totalPoints, currentPoint, distance, timestamp, formattedTime);
-  }, [map, currentIndex, allPoints, createMarkerIcon, onProgress, totalPoints]);
+    // 时间轴进度详细回调
+    if (onTimelineUpdate) {
+      var _allPoints$, _allPoints$at;
+      var startTime = (_allPoints$ = allPoints[0]) === null || _allPoints$ === void 0 ? void 0 : _allPoints$[2];
+      var endTime = (_allPoints$at = allPoints.at(-1)) === null || _allPoints$at === void 0 ? void 0 : _allPoints$at[2];
+      var progress = totalPoints > 1 ? currentIndex / (totalPoints - 1) : 0;
+      var formatTimeStr = function formatTimeStr(ts) {
+        if (ts === null) return null;
+        var d = new Date(ts);
+        return "".concat(String(d.getHours()).padStart(2, '0'), ":").concat(String(d.getMinutes()).padStart(2, '0'), ":").concat(String(d.getSeconds()).padStart(2, '0'));
+      };
+      onTimelineUpdate({
+        currentIndex: currentIndex,
+        totalPoints: totalPoints,
+        progress: progress,
+        startTime: startTime,
+        endTime: endTime,
+        currentTime: timestamp,
+        startTimeStr: formatTimeStr(startTime),
+        endTimeStr: formatTimeStr(endTime),
+        currentTimeStr: formattedTime,
+        distance: distance
+      });
+    }
+  }, [map, currentIndex, allPoints, createMarkerIcon, onProgress, onTimelineUpdate, totalPoints]);
   // 轨迹线（已走过部分用 playPath，未走到部分用 path）
   React.useEffect(function () {
     if (!map || !showTrack || allPoints.length === 0) return;