[GRASS-SVN] r64399 - grass-addons/grass7/vector/v.surf.icw

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-02-02 07:14:35 -0800 (Mon, 02 Feb 2015)
New Revision: 64399

Modified:
   grass-addons/grass7/vector/v.surf.icw/v.surf.icw.html
   grass-addons/grass7/vector/v.surf.icw/v.surf.icw.py
Log:
v.surf.icw: fix g.remove calls

Modified: grass-addons/grass7/vector/v.surf.icw/v.surf.icw.html
===================================================================
--- grass-addons/grass7/vector/v.surf.icw/v.surf.icw.html	2015-02-02 14:23:15 UTC (rev 64398)
+++ grass-addons/grass7/vector/v.surf.icw/v.surf.icw.html	2015-02-02 15:14:35 UTC (rev 64399)
@@ -88,7 +88,7 @@
 d.erase black
 d.rast annual_interp.3
 d.vect precip_30ynormals fcolor=red icon=basic/circle
-d.legend annual_interp.3 color=white at=48.4,94.8,3.4,6.0
+d.legend annual_interp.3 at=48.4,94.8,3.4,6.0
 </pre></div>
 
 

Modified: grass-addons/grass7/vector/v.surf.icw/v.surf.icw.py
===================================================================
--- grass-addons/grass7/vector/v.surf.icw/v.surf.icw.py	2015-02-02 14:23:15 UTC (rev 64398)
+++ grass-addons/grass7/vector/v.surf.icw/v.surf.icw.py	2015-02-02 15:14:35 UTC (rev 64399)
@@ -319,7 +319,7 @@
     proc = {}
     for i in range(n):
 	cost_site_name = tmp_base + 'cost_site.' + '%05d' % (i+1)
-        grass.run_command('g.remove', flags = 'f', rast = cost_site_name, quiet = True)
+        grass.run_command('g.remove', flags='f', type='raster', name=cost_site_name, quiet=True)
         grass.run_command('g.rename', raster = cost_site_name + '.cleansed'
                           + ',' + cost_site_name, quiet = True)
 
@@ -457,8 +457,8 @@
         proc[i].wait()
 
     # free up disk space ASAP
-    grass.run_command('g.remove', flags = 'f',
-    		      rast = tmp_base + '1by_cost_site_sq.*', quiet = True)
+    grass.run_command('g.remove', flags='f', type='raster',
+    		      pattern=tmp_base + '1by_cost_site_sq.*', quiet=True)
     #grass.run_command('g.list', type = 'raster', mapset = '.')