From 89e7085ba8a448318e8559585681dc3b9d233db2 Mon Sep 17 00:00:00 2001 From: Michel Daab Date: Tue, 20 Aug 2024 07:11:18 +0200 Subject: [PATCH] fix a typo --- README.md | 4 ++-- configs/configs_lidro.yaml | 4 ++-- lidro/main_create_skeleton_lines.py | 8 ++++---- scripts/example_create_skeleton_lines.sh | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 4382c68e..f72b5d8b 100644 --- a/README.md +++ b/README.md @@ -115,8 +115,8 @@ python lidro/main_create_skeleton_lines.py [nom_paramètre_1]=[valeur_du_paramè ``` ces paramètres sont : skeleton.file_path.mask_input_path : Le chemin d'entrée des masques des cours d'eau -skeleton.file_path.skeleton_lines_ouput_path : Le chemin de sortie des squelettes uniquement (pas de fichier de sortie si laissé à vide) -skeleton.file_path.gap_lines_ouput_path : Le chemin de sortie des lignes franchissant des ponts uniquement (pas de fichier de sortie si laissé à vide) +skeleton.file_path.skeleton_lines_output_path : Le chemin de sortie des squelettes uniquement (pas de fichier de sortie si laissé à vide) +skeleton.file_path.gap_lines_output_path : Le chemin de sortie des lignes franchissant des ponts uniquement (pas de fichier de sortie si laissé à vide) skeleton.file_path.global_lines_output_path : Le chemin de sortie des lignes et des squelettes ensemble skeleton.max_gap_width : La distance maximale envisagée pour franchir des ponts diff --git a/configs/configs_lidro.yaml b/configs/configs_lidro.yaml index 545beaaa..dc8f5d23 100644 --- a/configs/configs_lidro.yaml +++ b/configs/configs_lidro.yaml @@ -50,8 +50,8 @@ virtual_point: skeleton: file_path: mask_input_path: null - skeleton_lines_ouput_path: null # only branches' skeleton (if empty, no file is created) - gap_lines_ouput_path: null # only new lines to close gaps (if empty, no file is created) + skeleton_lines_output_path: null # only branches' skeleton (if empty, no file is created) + gap_lines_output_path: null # only new lines to close gaps (if empty, no file is created) global_lines_output_path: null # lines from both the skeletons and the gap lines max_gap_width: 200 # distance max in meter of any gap between 2 branches we will try to close with a line diff --git a/lidro/main_create_skeleton_lines.py b/lidro/main_create_skeleton_lines.py index 399c7832..023c4aa3 100644 --- a/lidro/main_create_skeleton_lines.py +++ b/lidro/main_create_skeleton_lines.py @@ -37,8 +37,8 @@ def run(config: DictConfig): # create the gap lines from the selected candidates gap_lines_list = [validated_candidate.line for validated_candidate in validated_candidates] gdf_gap_lines = gpd.GeoDataFrame(geometry=gap_lines_list).set_crs(crs, allow_override=True) - if config.skeleton.file_path.gap_lines_ouput_path and validated_candidates: - gdf_gap_lines.to_file(config.skeleton.file_path.gap_lines_ouput_path, driver='GeoJSON') + if config.skeleton.file_path.gap_lines_output_path and validated_candidates: + gdf_gap_lines.to_file(config.skeleton.file_path.gap_lines_output_path, driver='GeoJSON') # add the extremities used on each branch to close a gap to the list of gap_point of that branch, # to create a new line toward that extremity and know not to remove it during the "simplify" @@ -55,8 +55,8 @@ def run(config: DictConfig): # putting all skeleton lines together, and save them if there is a path branch_lines_list = [branch.gdf_skeleton_lines for branch in branches_list] gdf_branch_lines = gpd.GeoDataFrame(pd.concat(branch_lines_list, ignore_index=True)) - if config.skeleton.file_path.skeleton_lines_ouput_path: - gdf_branch_lines.to_file(config.skeleton.file_path.skeleton_lines_ouput_path, driver='GeoJSON') + if config.skeleton.file_path.skeleton_lines_output_path: + gdf_branch_lines.to_file(config.skeleton.file_path.skeleton_lines_output_path, driver='GeoJSON') # saving all lines gdf_global_lines = gpd.GeoDataFrame(pd.concat([gdf_branch_lines, gdf_gap_lines], ignore_index=True)) diff --git a/scripts/example_create_skeleton_lines.sh b/scripts/example_create_skeleton_lines.sh index 61cd52cb..10fc5848 100644 --- a/scripts/example_create_skeleton_lines.sh +++ b/scripts/example_create_skeleton_lines.sh @@ -4,13 +4,13 @@ skeleton.file_path.mask_input_path=[input_filepath] \ skeleton.file_path.global_lines_output_path=[output_filepath] \ skeleton.db_uni.db_user=[user_name] \ "skeleton.db_uni.db_password=[password]" \ -skeleton.file_path.skeleton_lines_ouput_path=[out_filepath(optional)] \ -skeleton.file_path.gap_lines_ouput_path=[out_filepath(optional)] +skeleton.file_path.skeleton_lines_output_path=[out_filepath(optional)] \ +skeleton.file_path.gap_lines_output_path=[out_filepath(optional)] # skeleton.file_path.mask_input_path : input path to the .geojson with the water masks # skeleton.file_path.global_lines_output_path : output path for all the skeletons # skeleton.db_uni.db_user : username for "bduni_france_consultation" # skeleton.db_uni.db_password : password for "bduni_france_consultation". WARNING ! If there is a special character in the password, # the line must be written like this : "skeleton.db_uni.db_password='$tr@ng€_ch@r@ct€r$'" (note the " and the ') -# skeleton.file_path.skeleton_lines_ouput_path : (optional) output path for only the skeleton inside water beds defined by the input masks -# skeleton.file_path.gap_lines_ouput_path : (optional) output path for only the lines between water beds defined by the input masks \ No newline at end of file +# skeleton.file_path.skeleton_lines_output_path : (optional) output path for only the skeleton inside water beds defined by the input masks +# skeleton.file_path.gap_lines_output_path : (optional) output path for only the lines between water beds defined by the input masks \ No newline at end of file