From f4d9396b491954fc07d9022396f17750cc566562 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 4 Feb 2020 20:21:28 +0000 Subject: [PATCH] Better handling of non-geo restart Former-commit-id: 5f33f2edd7c5077121f55d9f82502d3883d216af --- stages/odm_dem.py | 7 +++++++ stages/odm_georeferencing.py | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/stages/odm_dem.py b/stages/odm_dem.py index ca05b401..ebf25f03 100644 --- a/stages/odm_dem.py +++ b/stages/odm_dem.py @@ -22,6 +22,13 @@ class ODMDEMStage(types.ODM_Stage): pseudo_georeference = False if not reconstruction.is_georeferenced(): + # Special case to clear previous run point cloud + # (NodeODM will generate a fake georeferenced laz during postprocessing + # with non-georeferenced datasets). odm_georeferencing_model_laz should + # not be here! Perhaps we should improve this. + if io.file_exists(tree.odm_georeferencing_model_laz) and self.rerun(): + os.remove(tree.odm_georeferencing_model_laz) + log.ODM_WARNING("Not georeferenced, using ungeoreferenced point cloud...") dem_input = tree.path("odm_filterpoints", "point_cloud.ply") pc_model_found = io.file_exists(dem_input) diff --git a/stages/odm_georeferencing.py b/stages/odm_georeferencing.py index 70f50999..3d0d44c5 100644 --- a/stages/odm_georeferencing.py +++ b/stages/odm_georeferencing.py @@ -53,10 +53,6 @@ class ODMGeoreferencingStage(types.ODM_Stage): progress_per_run = 100.0 / len(nonloc.runs) progress = 0.0 - # Clear previous run point cloud - if io.file_exists(tree.odm_georeferencing_model_laz) and self.rerun(): - os.remove(tree.odm_georeferencing_model_laz) - for r in nonloc.runs: if not io.dir_exists(r['georeferencing_dir']): system.mkdir_p(r['georeferencing_dir'])