mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Do not rerun entwine point cloud on merge if dir already exists 

Former-commit-id: 4d82367f54
pull/1161/head
Piero Toffanin 2019-09-12 10:32:15 -04:00
rodzic 21b092786d
commit 866d6ceb20
1 zmienionych plików z 7 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
stages/splitmerge.py
Wyświetl plik

@ -175,20 +175,24 @@ class ODMMergeStage(types.ODM_Stage):
# Merge point clouds
if args.merge in ['all', 'pointcloud']:
if not io.file_exists(tree.odm_georeferencing_model_laz) or self.rerun():
if not io.dir_exists(tree.entwine_pointcloud) or self.rerun():
all_point_clouds = get_submodel_paths(tree.submodels_path, "odm_georeferencing", "odm_georeferenced_model.laz")
try:
# pdal.merge_point_clouds(all_point_clouds, tree.odm_georeferencing_model_laz, args.verbose)
entwine.build(all_point_clouds, tree.entwine_pointcloud, max_concurrency=args.max_concurrency, rerun=self.rerun())
except Exception as e:
log.ODM_WARNING("Could not merge point cloud: %s (skipping)" % str(e))
log.ODM_WARNING("Could not merge EPT point cloud: %s (skipping)" % str(e))
else:
log.ODM_WARNING("Found merged EPT point cloud in %s" % tree.entwine_pointcloud)
if not io.file_exists(tree.odm_georeferencing_model_laz) or self.rerun():
if io.dir_exists(tree.entwine_pointcloud):
try:
system.run('pdal translate "ept://{}" "{}"'.format(tree.entwine_pointcloud, tree.odm_georeferencing_model_laz))
except Exception as e:
log.ODM_WARNING("Cannot export EPT dataset to LAZ: %s" % str(e))
else:
log.ODM_WARNING("No EPT point cloud found (%s), skipping LAZ conversion)" % tree.entwine_pointcloud)
else:
log.ODM_WARNING("Found merged point cloud in %s" % tree.odm_georeferencing_model_laz)