Renamed las-->laz

pull/849/head
Piero Toffanin 2018-06-18 09:57:20 -04:00
rodzic 3890daf042
commit 84cfe9026f
3 zmienionych plików z 8 dodań i 8 usunięć

Wyświetl plik

@ -478,7 +478,7 @@ class ODM_Tree(object):
self.odm_georeferencing, 'odm_georeferenced_model.csv')
self.odm_georeferencing_laz_json = io.join_paths(
self.odm_georeferencing, 'las.json')
self.odm_georeferencing_model_las = io.join_paths(
self.odm_georeferencing_model_laz = io.join_paths(
self.odm_georeferencing, 'odm_georeferenced_model.laz')
self.odm_georeferencing_dem = io.join_paths(
self.odm_georeferencing, 'odm_georeferencing_model_dem.tif')

Wyświetl plik

@ -28,7 +28,7 @@ class ODMDEMCell(ecto.Cell):
# get inputs
args = self.inputs.args
tree = self.inputs.tree
las_model_found = io.file_exists(tree.odm_georeferencing_model_las)
las_model_found = io.file_exists(tree.odm_georeferencing_model_laz)
# check if we rerun cell or not
rerun_cell = (args.rerun is not None and
@ -40,7 +40,7 @@ class ODMDEMCell(ecto.Cell):
log.ODM_INFO('Classify: ' + str(args.pc_classify != "none"))
log.ODM_INFO('Create DSM: ' + str(args.dsm))
log.ODM_INFO('Create DTM: ' + str(args.dtm))
log.ODM_INFO('DEM input file {0} found: {1}'.format(tree.odm_georeferencing_model_las, str(las_model_found)))
log.ODM_INFO('DEM input file {0} found: {1}'.format(tree.odm_georeferencing_model_laz, str(las_model_found)))
# Setup terrain parameters
terrain_params_map = {
@ -61,8 +61,8 @@ class ODMDEMCell(ecto.Cell):
pc_classify_marker = os.path.join(odm_dem_root, 'pc_classify_done.txt')
if not io.file_exists(pc_classify_marker) or rerun_cell:
log.ODM_INFO("Classifying {} using {}".format(tree.odm_georeferencing_model_las, args.pc_classify))
commands.classify(tree.odm_georeferencing_model_las,
log.ODM_INFO("Classifying {} using {}".format(tree.odm_georeferencing_model_laz, args.pc_classify))
commands.classify(tree.odm_georeferencing_model_laz,
args.pc_classify == "smrf",
slope,
cellsize,
@ -96,7 +96,7 @@ class ODMDEMCell(ecto.Cell):
for product in products:
commands.create_dems(
[tree.odm_georeferencing_model_las],
[tree.odm_georeferencing_model_laz],
product,
radius=map(str, radius_steps),
gapfill=True,

Wyświetl plik

@ -138,7 +138,7 @@ class ODMGeoreferencingCell(ecto.Cell):
# convert ply model to LAS reference system
geo_ref.convert_to_las(odm_georeferencing_model_ply_geo,
tree.odm_georeferencing_model_las,
tree.odm_georeferencing_model_laz,
tree.odm_georeferencing_las_json)
reconstruction.georef = geo_ref
@ -171,7 +171,7 @@ class ODMGeoreferencingCell(ecto.Cell):
if args.crop > 0:
log.ODM_INFO("Calculating cropping area and generating bounds shapefile from point cloud")
cropper = Cropper(tree.odm_georeferencing, 'odm_georeferenced_model')
cropper.create_bounds_shapefile(tree.odm_georeferencing_model_las, args.crop)
cropper.create_bounds_shapefile(tree.odm_georeferencing_model_laz, args.crop)
# Do not execute a second time, since
# We might be doing georeferencing for