[GRASS-SVN] r63726 - in grass/trunk: lib/gis vector/v.net.steiner

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-24 06:17:53 -0800 (Wed, 24 Dec 2014)
New Revision: 63726

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/vector/v.net.steiner/main.c
   grass/trunk/vector/v.net.steiner/v.net.steiner.html
Log:
v.net.steiner: tcats -> terminal_cats and nsp -> npoints (#2409)


Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2014-12-24 14:11:14 UTC (rev 63725)
+++ grass/trunk/lib/gis/renamed_options	2014-12-24 14:17:53 UTC (rev 63726)
@@ -522,6 +522,8 @@
 v.net.steiner|alayer:arc_layer
 v.net.steiner|nlayer:node_layer
 v.net.steiner|type:arc_type
+v.net.steiner|tcats:terminal_cats
+v.net.steiner|nsp:npoints
 # v.net.timetable
 v.net.timetable|alayer:arc_layer
 v.net.timetable|nlayer:node_layer

Modified: grass/trunk/vector/v.net.steiner/main.c
===================================================================
--- grass/trunk/vector/v.net.steiner/main.c	2014-12-24 14:11:14 UTC (rev 63725)
+++ grass/trunk/vector/v.net.steiner/main.c	2014-12-24 14:17:53 UTC (rev 63726)
@@ -378,13 +378,13 @@
     afcol->description = _("Arcs' cost column (for both directions)");
 
     term_opt = G_define_standard_option(G_OPT_V_CATS);
-    term_opt->key = "tcats";
+    term_opt->key = "terminal_cats";
     term_opt->required = YES;
     term_opt->description =
 	_("Categories of points on terminals (layer is specified by nlayer)");
 
     nsp_opt = G_define_option();
-    nsp_opt->key = "nsp";
+    nsp_opt->key = "npoints";
     nsp_opt->type = TYPE_INTEGER;
     nsp_opt->required = NO;
     nsp_opt->multiple = NO;

Modified: grass/trunk/vector/v.net.steiner/v.net.steiner.html
===================================================================
--- grass/trunk/vector/v.net.steiner/v.net.steiner.html	2014-12-24 14:11:14 UTC (rev 63725)
+++ grass/trunk/vector/v.net.steiner/v.net.steiner.html	2014-12-24 14:17:53 UTC (rev 63726)
@@ -80,10 +80,10 @@
 v.db.update myroads_net_time layer=3 col=cost val="length / speed * 60"
 
 # shortest path
-v.net.steiner myroads_net_time arc_layer=3 node_layer=2 tcats=1-6 out=mysteiner_distance
+v.net.steiner myroads_net_time arc_layer=3 node_layer=2 terminal_cats=1-6 out=mysteiner_distance
 
 # fastest path
-v.net.steiner myroads_net_time arc_layer=3 node_layer=2 acol=cost tcats=1-6 out=mysteiner_time
+v.net.steiner myroads_net_time arc_layer=3 node_layer=2 acol=cost terminal_cats=1-6 out=mysteiner_time
 </pre></div>
 
 To display the result, run for example: