From 12e0a2ebd6d6dd5d0bcf5634af512d14dc99fdfc Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Mon, 1 Apr 2019 19:03:52 -0400
Subject: [PATCH] Faster, more accurate volume measurements

---
 app/plugins/grass_engine.py       |  3 ---
 plugins/measure/calc_volume.grass | 14 +++++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/plugins/grass_engine.py b/app/plugins/grass_engine.py
index 8fa979b5..2072244a 100644
--- a/app/plugins/grass_engine.py
+++ b/app/plugins/grass_engine.py
@@ -98,9 +98,6 @@ class GrassContext:
         out = out.decode('utf-8').strip()
         err = err.decode('utf-8').strip()
 
-        logger.info("GOT!")
-        logger.info(out)
-
         if p.returncode == 0:
             return out
         else:
diff --git a/plugins/measure/calc_volume.grass b/plugins/measure/calc_volume.grass
index e071869c..106211a5 100755
--- a/plugins/measure/calc_volume.grass
+++ b/plugins/measure/calc_volume.grass
@@ -4,14 +4,12 @@
 # ------
 # output: prints the volume to stdout
 
-#Import raster ans vector
+#Import raster and vector
 v.import input=${area_file} output=polygon_area --overwrite 
 v.import input=${points_file} output=polygon_points --overwrite
 v.buffer -s --overwrite input=polygon_area type=area output=region distance=3 minordistance=3
 r.external input=${dsm_file} output=dsm --overwrite
 
-# Set Grass region to DSM resolution
-g.region rast=dsm
 # Set Grass region to vector bbox
 g.region vector=region
 
@@ -20,13 +18,15 @@ r.mask vect=region
 
 # Transfer dsm raster data to vector
 v.what.rast map=polygon_points raster=dsm column=height
-v.to.rast input=polygon_area output=r_polygon_area use=val value=255 --overwrite
 
 # Decimate DSM and generate interpolation of new terrain
-#v.surf.rst --overwrite input=polygon_points zcolumn=height elevation=dsm_below_pile mask=r_polygon_area
-v.surf.bspline --overwrite input=polygon_points column=height raster_output=dsm_below_pile lambda_i=100
+v.surf.rst --overwrite input=polygon_points zcolumn=height elevation=dsm_below_pile
 
 # Compute difference between dsm and new dsm
 r.mapcalc expression='pile_height_above_dsm=dsm-dsm_below_pile' --overwrite
+
+# Set region to polygon area to calculate volume
+g.region vect=polygon_area
+
 # Volume output from difference
-r.volume -f input=pile_height_above_dsm clump=r_polygon_area
+r.volume -f input=pile_height_above_dsm