Upgraded PDAL to 2.2

Former-commit-id: 196605cd08

SuperBuild/cmake/External-PDAL.cmake

@@ -8,7 +8,7 @@ ExternalProject_Add(${_proj_name}
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  URL               https://github.com/PDAL/PDAL/archive/2.1.0.zip
+  URL               https://github.com/PDAL/PDAL/archive/2.2.0.zip
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------

opendm/grass_engine.py

@@ -101,11 +101,11 @@ class GrassContext:
                                 cwd=self.get_cwd(), stdout=subprocess.PIPE, stderr=writer, env=env)
             
             while p.poll() is None:
-                sys.stdout.write(reader.read())
+                sys.stdout.write(reader.read().decode('utf8'))
                 time.sleep(0.5)
             
             # Read the remaining
-            sys.stdout.write(reader.read())
+            sys.stdout.write(reader.read().decode('utf8'))
 
             out, err = p.communicate()
             out = out.decode('utf-8').strip()

opendm/mesh.py

@@ -26,7 +26,7 @@ def create_25dmesh(inPointCloud, outMesh, dsm_radius=0.07, dsm_resolution=0.05,
             inPointCloud,
             'mesh_dsm',
             output_type='max',
-            radiuses=map(str, radius_steps),
+            radiuses=list(map(str, radius_steps)),
             gapfill=True,
             outdir=tmp_directory,
             resolution=dsm_resolution,

stages/odm_dem.py

@@ -101,7 +101,7 @@ class ODMDEMStage(types.ODM_Stage):
                             dem_input,
                             product,
                             output_type='idw' if product == 'dtm' else 'max',
-                            radiuses=map(str, radius_steps),
+                            radiuses=list(map(str, radius_steps)),
                             gapfill=args.dem_gapfill_steps > 0,
                             outdir=odm_dem_root,
                             resolution=resolution / 100.0,

stages/splitmerge.py

@@ -157,9 +157,9 @@ class ODMSplitStage(types.ODM_Stage):
 
                             #Create image lists
                             with open(path+"/opensfm/image_list.txt", "w") as o:
-                                o.writelines(map(lambda x: "../images/"+x+'\n', v["shots"].keys()))
+                                o.writelines(list(map(lambda x: "../images/"+x+'\n', v["shots"].keys())))
                             with open(path+"/img_list.txt", "w") as o:
-                                o.writelines(map(lambda x: x+'\n', v["shots"].keys()))
+                                o.writelines(list(map(lambda x: x+'\n', v["shots"].keys())))
 
                             i+=1
                     os.rename(octx.path("../submodels"), octx.path("../unaligned_submodels"))