Merge branch 'master' of http://git.wrl.unsw.edu.au:3000/danh/central-coast-aerial-survey

README.md

@@ -63,7 +63,7 @@ python las_outputs.py param-files/survey-1*.yaml param-files/survey-2*.yaml
 Example usage:
 
 ```
-C:/Python27/ArcGIS10.4/python generate_heatmaps.py param-files/survey-2*.yaml
+C:\Python27\ArcGIS10.5\python generate_heatmaps.py param-files\survey-2*.yaml
 
 ```
 
@@ -76,5 +76,13 @@ C:/Python27/ArcGIS10.4/python generate_heatmaps.py param-files/survey-2*.yaml
 Example usage:
 
 ```
-C:/Python27/ArcGIS10.4/python plot_heatmaps.py param-files/survey-2-avoca.yaml
+C:\Python27\ArcGIS10.5\python plot_heatmaps.py param-files\survey-2-avoca.yaml
 ```
+
+### 7. Export 0.7 m contour for DSAS trend analysis
+`extract_contours.py` extracts a predefined contour (say 0.7 m AHD) and outputs it in a format suitable for DSAS shoreline trend analysis.
+
+Example usage:
+```
+python extract_contours.py 
+```

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')
+    previous_raster = os.path.join(input_tif_dir, previous_base_name + '_DEM.tif')
-    heatmap_raster = os.path.join(output_tif_dir, base_name + '.tif')
+    heatmap_raster = os.path.join(output_tif_dir, base_name + '_heatmap.tif')
 
     print('processing {}'.format(beach))
 

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:

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)