support output directory

hobuinc · Mar 30, 2023 · da425dc · da425dc
1 parent 933cb47
commit da425dc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/trenchrun/__init__.py b/src/trenchrun/__init__.py
@@ -1 +1 @@
-__version__='0.0.5'
+__version__='0.0.6'
diff --git a/src/trenchrun/argparser.py b/src/trenchrun/argparser.py
@@ -10,6 +10,8 @@ def get_parser(args):
                         help='PDAL-readable lidar content as a file or a pipeline', type=pathlib.Path)
     parser.add_argument('--output',
                         help='Output filename', type=str, default='exposure')
+    parser.add_argument('--output-path',
+                        help='Path to write output data', type=pathlib.Path, default=pathlib.Path.cwd())
     parser.add_argument('--resolution',
                         help='Raster output resolution', type =float, default=1.0)
     parser.add_argument('--alpha',

diff --git a/src/trenchrun/blend.py b/src/trenchrun/blend.py
@@ -98,10 +98,13 @@ def do(self):
         title = 'Absorptive Daylight Exposure'
 
         if self.data.args.full_output:
-            png.CreateCopy( f"{self.data.args.output}-trenchrun.png", rast, 0,
+            output = str(self.data.args.output_path / f"{self.data.args.output}-trenchrun.png")
+            png.CreateCopy( output, rast, 0,
                 [ f'TITLE={title}', f'COMMENT={description}' ] )
 
-        ds = gtif.CreateCopy( f"{self.data.args.output}-trenchrun.tif", rast, 0,
+        output = str(self.data.args.output_path / f"{self.data.args.output}-trenchrun.tif")
+        logs.logger.info(f'writing trenchrun to {output}')
+        ds = gtif.CreateCopy( output, rast, 0,
             [ 'COMPRESS=Deflate', 'TILED=YES','PREDICTOR=2' ] )
 
         if 'AREA_OR_POINT' in info['metadata']:
@@ -113,13 +116,19 @@ def do(self):
 
         if self.data.args.full_output:
             ao = gdal.Open(str(self.data.args.aoPath))
-            ds = gtif.CreateCopy( f"{self.data.args.output}-occlusion.tif", ao, 0,
+            output = str(self.data.args.output_path / f"{self.data.args.output}-occlusion.tif")
+            logs.logger.info(f'writing ambient occlusion to {output}')
+            ds = gtif.CreateCopy( output, ao, 0,
                 [ 'COMPRESS=Deflate', 'TILED=YES','PREDICTOR=2' ] )
 
             ao = gdal.Open(str(self.data.args.dsmPath))
-            ds = gtif.CreateCopy( f"{self.data.args.output}-dsm.tif", ao, 0,
+            output = str(self.data.args.output_path / f"{self.data.args.output}-dsm.tif")
+            logs.logger.info(f'writing dsm to {output}')
+            ds = gtif.CreateCopy( output, ao, 0,
                 [ 'COMPRESS=LZW', 'TILED=YES','PREDICTOR=3' ] )
 
             ao = gdal.Open(str(self.data.args.intensityPath))
-            ds = gtif.CreateCopy( f"{self.data.args.output}-intensity.tif", ao, 0,
+            output = str(self.data.args.output_path / f"{self.data.args.output}-intensity.tif")
+            logs.logger.info(f'writing intensity to {output}')
+            ds = gtif.CreateCopy( output, ao, 0,
                 [ 'COMPRESS=LZW', 'TILED=YES','PREDICTOR=2' ] )