From c19f3340355f094ea1a889c4bd17196498c42f51 Mon Sep 17 00:00:00 2001 From: gis-xh Date: Thu, 4 Sep 2025 14:47:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E8=B7=AF=E5=BE=84=E6=9B=BF=E6=8D=A2=E7=A1=AC=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E8=B7=AF=E5=BE=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DATA_SuPER/DEM_SuPER.py | 4 +++- DATA_SuPER/GPM_SuPER.py | 4 +++- DATA_SuPER/MODIS_SuPER.py | 4 +++- DATA_SuPER/S1_SAR_SuPER.py | 4 +++- DATA_SuPER/SMAP_SuPER.py | 4 +++- DATA_SuPER/insitu_SuPER.py | 4 +++- HLS_SuPER/HLS_SuPER.py | 7 ++++++- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/DATA_SuPER/DEM_SuPER.py b/DATA_SuPER/DEM_SuPER.py index ad54b95..32a2391 100644 --- a/DATA_SuPER/DEM_SuPER.py +++ b/DATA_SuPER/DEM_SuPER.py @@ -39,7 +39,9 @@ import geopandas as gpd import numpy as np from rioxarray import open_rasterio -sys.path.append("D:/NASA_EarthData_Script") +# 动态获取项目根目录路径 +project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.append(project_root) from utils.common_utils import setup_dask_environment, clip_image, mosaic_images from HLS_SuPER.HLS_Su import earthdata_search diff --git a/DATA_SuPER/GPM_SuPER.py b/DATA_SuPER/GPM_SuPER.py index 8b28b6e..7f89528 100644 --- a/DATA_SuPER/GPM_SuPER.py +++ b/DATA_SuPER/GPM_SuPER.py @@ -28,7 +28,9 @@ import logging import earthaccess from xarray import open_dataset -sys.path.append("D:/NASA_EarthData_Script") +# 动态获取项目根目录路径 +project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.append(project_root) from utils.common_utils import setup_dask_environment from HLS_SuPER.HLS_Su import earthdata_search diff --git a/DATA_SuPER/MODIS_SuPER.py b/DATA_SuPER/MODIS_SuPER.py index 30d5891..50a182f 100644 --- a/DATA_SuPER/MODIS_SuPER.py +++ b/DATA_SuPER/MODIS_SuPER.py @@ -20,7 +20,9 @@ import rioxarray as rxr import dask.distributed import geopandas as gpd -sys.path.append("D:/NASA_EarthData_Script") +# 动态获取项目根目录路径 +project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.append(project_root) from utils.common_utils import clip_image, reproject_image, setup_dask_environment from HLS_SuPER.HLS_Su import earthdata_search diff --git a/DATA_SuPER/S1_SAR_SuPER.py b/DATA_SuPER/S1_SAR_SuPER.py index 7748f88..5a69a42 100644 --- a/DATA_SuPER/S1_SAR_SuPER.py +++ b/DATA_SuPER/S1_SAR_SuPER.py @@ -48,7 +48,9 @@ import numpy as np import xarray as xr from rioxarray import open_rasterio -sys.path.append("D:/NASA_EarthData_Script") +# 动态获取项目根目录路径 +project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.append(project_root) from utils.common_utils import setup_dask_environment, clip_image, mosaic_images from HLS_SuPER.HLS_Su import earthdata_search diff --git a/DATA_SuPER/SMAP_SuPER.py b/DATA_SuPER/SMAP_SuPER.py index 95bf2a1..bfe2034 100644 --- a/DATA_SuPER/SMAP_SuPER.py +++ b/DATA_SuPER/SMAP_SuPER.py @@ -28,7 +28,9 @@ import h5py from osgeo import gdal import xarray as xr -sys.path.append("D:/NASA_EarthData_Script") +# 动态获取项目根目录路径 +project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.append(project_root) from utils.common_params import EASE2_GRID_PARAMS, EPSG from utils.common_utils import ( diff --git a/DATA_SuPER/insitu_SuPER.py b/DATA_SuPER/insitu_SuPER.py index d64b9c2..b8e8df4 100644 --- a/DATA_SuPER/insitu_SuPER.py +++ b/DATA_SuPER/insitu_SuPER.py @@ -55,7 +55,9 @@ import logging import time from datetime import datetime, timedelta -sys.path.append("D:\NASA_EarthData_Script") +# 动态获取项目根目录路径 +project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.append(project_root) class getInsituData: diff --git a/HLS_SuPER/HLS_SuPER.py b/HLS_SuPER/HLS_SuPER.py index 43e46ca..b3453ab 100644 --- a/HLS_SuPER/HLS_SuPER.py +++ b/HLS_SuPER/HLS_SuPER.py @@ -28,7 +28,9 @@ import geopandas as gpd from datetime import datetime as dt import dask.distributed -sys.path.append("D:/NASA_EarthData_Script") +# 动态获取项目根目录路径 +project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.append(project_root) from utils.common_utils import setup_dask_environment from HLS_Su import hls_search @@ -248,6 +250,8 @@ def format_tile_id(tile_id): """ (Add) 格式化tile_id参数 """ + if tile_id is None: + return None tile_id = tile_id.strip("'").strip('"') return str(tile_id) @@ -481,6 +485,7 @@ def main(): # Defaults to the current directory output_dir = os.getcwd() + os.sep + os.makedirs(output_dir, exist_ok=True) logging.info(f"Output directory set to: {output_dir}") # Format/Validate Dates