[GRASS-SVN] r60822 - grass-addons/grass7/raster/r.local.relief

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2014-06-13 10:32:50 -0700 (Fri, 13 Jun 2014)
New Revision: 60822

Modified:
   grass-addons/grass7/raster/r.local.relief/r.local.relief.py
Log:
r.local.relief: use variable for interpolation method and use bicubic instead of cubic as introduced in r58903 and r59233 (co-author: Eric Goddard)

Modified: grass-addons/grass7/raster/r.local.relief/r.local.relief.py
===================================================================
--- grass-addons/grass7/raster/r.local.relief/r.local.relief.py	2014-06-13 16:04:57 UTC (rev 60821)
+++ grass-addons/grass7/raster/r.local.relief/r.local.relief.py	2014-06-13 17:32:50 UTC (rev 60822)
@@ -103,7 +103,7 @@
     bspline = flags['v']  # when bspline == False, r.fillnulls is used
 
     # constants
-    fill_method = 'cubic'
+    fill_method = 'bicubic'
     # color table changed from difference to grey to histogram equalized-grey
     # It does make more sense to use that since many archaeologists use the same
     # color scheme for magnetometry and gpr data.
@@ -202,14 +202,14 @@
                                           _input=contour_points,
                                           raster_output=purged_elevation,
                                           layer='2', column='along',
-                                          method='cubic')
+                                          method=fill_method)
         spline_step = round(float(mean_dist.keys()[0].split(" ")[-1])) * 2
 
         gscript.info(_("Interpolating purged surface using a spline step value"
                        " of {s}".format(s=spline_step)))
         gscript.run_command('v.surf.bspline', _input=contour_points,
                             raster_output=purged_elevation, layer='2',
-                            column='along', method='cubic',
+                            column='along', method=fill_method,
                             overwrite=gcore.overwrite())
     else:
         gscript.run_command('v.to.rast', input=vector_contours,