diff --git a/odm_preprocess.py b/odm_preprocess.py index de8b891..a64503a 100644 --- a/odm_preprocess.py +++ b/odm_preprocess.py @@ -211,28 +211,6 @@ class ImagePreprocessor: self.visualizer.visualize_filter_step( self.gps_points, previous_points, "3-Time Group Overlap") - # # TODO 过滤密集点算法还需要更新 - # def filter_points(self): - # """过滤GPS点""" - - # # 过滤密集点 - # previous_points = self.gps_points.copy() - # self.logger.info( - # f"开始过滤密集点(网格大小: {self.config.filter_grid_size}, " - # f"距离阈值: {self.config.filter_dense_distance_threshold})" - # ) - # self.gps_points = filter.filter_dense_points( - # self.gps_points, - # grid_size=self.config.filter_grid_size, - # distance_threshold=self.config.filter_dense_distance_threshold, - # time_threshold=self.config.filter_time_threshold, - # ) - # self.logger.info(f"密集点过滤后剩余 {len(self.gps_points)} 个GPS点") - - # # 可视化密集点过滤结果 - # self.visualizer.visualize_filter_step( - # self.gps_points, previous_points, "4-Dense Points") - def divide_grids(self) -> Tuple[Dict[tuple, pd.DataFrame], Dict[tuple, tuple]]: """划分网格 Returns: diff --git a/requirements.txt b/requirements.txt index c7f738b..b942a34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,5 @@ piexif geopy psutil>=5.8.0 docker>=6.1.3 +tqdm +geopy \ No newline at end of file diff --git a/utils/odm_monitor.py b/utils/odm_monitor.py index 80c2001..3ebad81 100644 --- a/utils/odm_monitor.py +++ b/utils/odm_monitor.py @@ -1,4 +1,5 @@ import os +import time import logging import subprocess from typing import Dict, Tuple @@ -226,9 +227,10 @@ class ODMProcessMonitor: self.logger.error("内存不足,请减少输入图像的数量") return False, "内存不足" except StrangeValuesError: - # TODO 怎么处理异常值 self.logger.error("重建过程中出现异常值") - return False, "检测到异常值,请检查输入图像" + return False, "检测到异常值,请检查输入数据集的采样间隔情况" + + time.sleep(10) return False, f"网格 ({grid_id[0]},{grid_id[1]}) 处理失败"