[GRASS-SVN] r66825 - grass-addons/grass7/vector/v.centerline

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-11-13 07:16:36 -0800 (Fri, 13 Nov 2015)
New Revision: 66825

Modified:
   grass-addons/grass7/vector/v.centerline/v.centerline.py
Log:
v.centerline: fix v.distance usage (cannot use column and -p options together), fix underscore warning)

Modified: grass-addons/grass7/vector/v.centerline/v.centerline.py
===================================================================
--- grass-addons/grass7/vector/v.centerline/v.centerline.py	2015-11-13 08:58:18 UTC (rev 66824)
+++ grass-addons/grass7/vector/v.centerline/v.centerline.py	2015-11-13 15:16:36 UTC (rev 66825)
@@ -115,8 +115,8 @@
             rules='-', stdin=segment_input, quiet=True)
 
     center_distances = grass.pipe_command('v.distance',
-            _from=tmp_centerpoints_map, to=tmp_centerpoints_map, upload='dist',
-            column='dist', flags='pa', quiet=True)
+            from_=tmp_centerpoints_map, to=tmp_centerpoints_map, upload='dist',
+            flags='pa', quiet=True)
 
     cats = []
     mean_dists = []
@@ -247,13 +247,13 @@
 
         # Get coordinates of closest points on all input lines
         if search_range:
-            points = grass.pipe_command('v.distance', _from=tmp_points_map,
+            points = grass.pipe_command('v.distance', from_=tmp_points_map,
                         from_layer=2, to=input, upload='to_x,to_y',
-                        col='x,y', dmax=search_range, flags='pa', quiet=True)
+                        dmax=search_range, flags='pa', quiet=True)
         else:
-            points = grass.pipe_command('v.distance', _from=tmp_points_map,
+            points = grass.pipe_command('v.distance', from_=tmp_points_map,
                         from_layer=2, to=input, upload='to_x,to_y',
-                        col='x,y', flags='pa', quiet=True)
+                        flags='pa', quiet=True)
 
         firstline = True
         for point in points.stdout: