Better logic, restart handling

Former-commit-id: 80e81e81c0

stages/odm_dem.py

@@ -21,8 +21,8 @@ class ODMDEMStage(types.ODM_Stage):
         ignore_resolution = False
         pseudo_georeference = False
         
-        if not pc_model_found:
-            log.ODM_WARNING("Georeferenced point cloud not found, trying ungeoreferenced...")
+        if not reconstruction.is_georeferenced():
+            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)
             ignore_resolution = True

stages/odm_georeferencing.py

@@ -53,6 +53,10 @@ 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'])