diff --git a/app_plugin.py b/app_plugin.py index c7b91a0..5d81657 100644 --- a/app_plugin.py +++ b/app_plugin.py @@ -2,7 +2,6 @@ import os import shutil from dataclasses import dataclass from typing import Dict, Tuple -import psutil import pandas as pd from filter.cluster_filter import GPSCluster diff --git a/post_pro/conv_obj.py b/post_pro/conv_obj.py index 0112790..a7e9975 100644 --- a/post_pro/conv_obj.py +++ b/post_pro/conv_obj.py @@ -69,7 +69,7 @@ class ConvertOBJ: self.logger.info(f"开始切片网格 {grid_id} 的OBJ文件") os.makedirs(split_obj_dir) cmd = ( - f"D:\\software\\Obj2Tiles\\Obj2Tiles.exe --stage Splitting --lods 1 --divisions 3 " + f"D:\\software\\Obj2Tiles\\Obj2Tiles.exe --stage Splitting --lods 1 --divisions 2 " f"{modified_obj} {split_obj_dir}" ) subprocess.run(cmd, check=True) @@ -85,8 +85,7 @@ class ConvertOBJ: osgb_file = os.path.splitext(obj_file)[0] + '.osgb' osgb_path = os.path.join(split_obj_dir, osgb_file) # 执行 osgconv 命令 - subprocess.run(['osgconv', obj_path, osgb_path, '--compressed', - '--smooth', '--fix-transparency'], check=True) + subprocess.run(['osgconv', obj_path, osgb_path], check=True) # 创建OSGB目录结构,复制文件 osgb_base_dir = os.path.join(self.output_dir, "osgb") diff --git a/post_pro/merge_tif.py b/post_pro/merge_tif.py index 6e563ad..d3c23e4 100644 --- a/post_pro/merge_tif.py +++ b/post_pro/merge_tif.py @@ -1,10 +1,6 @@ -from osgeo import gdal import logging import os from typing import Dict -import pandas as pd -import time -import shutil import rasterio from rasterio.mask import mask from rasterio.transform import Affine, rowcol diff --git a/requirements.txt b/requirements.txt index b942a34..d94270d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,3 @@ 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 384fa96..a917828 100644 --- a/utils/odm_monitor.py +++ b/utils/odm_monitor.py @@ -3,8 +3,6 @@ import time import logging from typing import Dict, Tuple import pandas as pd -import numpy as np -from osgeo import gdal import docker