From 4a31ae3f3406c133494cdf0786c062b5d659cc88 Mon Sep 17 00:00:00 2001
From: Dan Howe <d.howe@wrl.unsw.edu.au>
Date: Mon, 17 Feb 2020 14:56:11 +1100
Subject: [PATCH] Add 'heatmap' or 'DEM' suffix to output tif files

---
 generate_heatmaps.py | 6 +++---
 las_outputs.py       | 2 +-
 plot_heatmaps.py     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/generate_heatmaps.py b/generate_heatmaps.py
index 888d794..60f6809 100644
--- a/generate_heatmaps.py
+++ b/generate_heatmaps.py
@@ -72,10 +72,10 @@ def process(yaml_name):
         raise ValueError('No previous survey date provided')
 
     # Set paths for raster files
-    current_raster = os.path.join(input_tif_dir, base_name + '.tif')
+    current_raster = os.path.join(input_tif_dir, base_name + '_DEM.tif')
     previous_base_name = re.sub('\d+', previous_date, base_name)
-    previous_raster = os.path.join(input_tif_dir, previous_base_name + '.tif')
-    heatmap_raster = os.path.join(output_tif_dir, base_name + '.tif')
+    previous_raster = os.path.join(input_tif_dir, previous_base_name + '_DEM.tif')
+    heatmap_raster = os.path.join(output_tif_dir, base_name + '_heatmap.tif')
 
     print('processing {}'.format(beach))
 
diff --git a/las_outputs.py b/las_outputs.py
index fb62c7a..d1d7f8b 100644
--- a/las_outputs.py
+++ b/las_outputs.py
@@ -262,7 +262,7 @@ def process(yaml_file):
 
     # Make a raster from point cloud
     print('Creating heat map raster...')
-    tif_name = os.path.join(output_tif_dir, las_basename + '.tif')
+    tif_name = os.path.join(output_tif_dir, las_basename + '_DEM.tif')
     call_lastools('las2dem', input=las_data, output=tif_name,
                   args=['-step', 1, '-keep_class', 2], verbose=False)
     # IF THIS STEP ISN'T WORKING:
diff --git a/plot_heatmaps.py b/plot_heatmaps.py
index d1c0422..2c89382 100644
--- a/plot_heatmaps.py
+++ b/plot_heatmaps.py
@@ -70,7 +70,7 @@ def process(yaml_name):
         raise ValueError('No previous survey date provided')
 
     # Set paths for raster files
-    heatmap_raster = os.path.join(input_tif_dir, base_name + '.tif')
+    heatmap_raster = os.path.join(input_tif_dir, base_name + '_heatmap.tif')
 
     print('processing {}'.format(beach))
     mxd = arcpy.mapping.MapDocument(mxd_name)