Merge pull request OpenDroneMap#849 from pierotofy/laslaz

Renamed las-->laz
cdapollo · Jun 18, 2018 · 189b93a · 189b93a
2 parents fe645b8 + 8981618
commit 189b93a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/opendm/types.py b/opendm/types.py
@@ -477,8 +477,8 @@ def __init__(self, root_path, images_path, gcp_file = None):
             self.odm_georeferencing, 'odm_georeferenced_model.csv')
         self.odm_georeferencing_las_json = io.join_paths(
             self.odm_georeferencing, 'las.json')
-        self.odm_georeferencing_model_las = io.join_paths(
-            self.odm_georeferencing, 'odm_georeferenced_model.las')
+        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')
 

diff --git a/scripts/odm_dem.py b/scripts/odm_dem.py
@@ -28,7 +28,7 @@ def process(self, inputs, outputs):
         # 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 @@ def process(self, inputs, outputs):
         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 @@ def process(self, inputs, outputs):
             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 @@ def process(self, inputs, outputs):
 
                 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,

diff --git a/scripts/odm_georeferencing.py b/scripts/odm_georeferencing.py
@@ -138,7 +138,7 @@ def process(self, inputs, outputs):
 
                     # 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 @@ def process(self, inputs, outputs):
                     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