v.net modules: alayer -> arc_layer and nlayer -> node_layer (https://trac.osgeo.org/grass/ticket/2409)

v.net: type -> arc_type (https://trac.osgeo.org/grass/ticket/2409)
libgis: update renamed_options (v.net) - https://trac.osgeo.org/grass/ticket/2409
v.net: ccats -> center_cats (https://trac.osgeo.org/grass/ticket/2409)
v.net: ncolumn -> node_column (https://trac.osgeo.org/grass/ticket/2409)
v.net modules: afcolumn -> arc_column and abcolumn -> arc_backward_column (https://trac.osgeo.org/grass/ticket/2409)
v.net.steiner: tcats -> terminal_cats and nsp -> npoints (https://trac.osgeo.org/grass/ticket/2409)
v.net.visibility: coordinate -> coordinates and vis -> visibility (https://trac.osgeo.org/grass/ticket/2409)
(merge 63717-63718,63721-63727 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63730 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/gis/renamed_options

@@ -436,6 +436,99 @@ v.lrs.where|thresh:threshold
 v.mkgrid|coor:coordinates
 # v.net
 v.net|thresh:threshold
+v.net|alayer:arc_layer
+v.net|nlayer:node_layer
+# v.net.alloc
+v.net.alloc|alayer:arc_layer
+v.net.alloc|nlayer:node_layer
+v.net.alloc|type:arc_type
+v.net.alloc|ccats:center_cats
+v.net.alloc|ncolumn:node_column
+v.net.alloc|afcolumn:arc_column
+v.net.alloc|abcolumn:arc_backward_column
+# v.net.allpairs
+v.net.allpairs|alayer:arc_layer
+v.net.allpairs|nlayer:node_layer
+v.net.allpairs|ncolumn:node_column
+v.net.allpairs|afcolumn:arc_column
+v.net.allpairs|abcolumn:arc_backward_column
+# v.net.bridge
+v.net.bridge|alayer:arc_layer
+v.net.bridge|nlayer:node_layer
+v.net.bridge|ncolumn:node_column
+v.net.bridge|afcolumn:arc_column
+v.net.bridge|abcolumn:arc_backward_column
+# v.net.centrality
+v.net.centrality|alayer:arc_layer
+v.net.centrality|nlayer:node_layer
+v.net.centrality|ncolumn:node_column
+v.net.centrality|afcolumn:arc_column
+v.net.centrality|abcolumn:arc_backward_column
+# v.net.components
+v.net.components|alayer:arc_layer
+v.net.components|nlayer:node_layer
+v.net.components|ncolumn:node_column
+v.net.components|afcolumn:arc_column
+v.net.components|abcolumn:arc_backward_column
+# v.net.connectivity
+v.net.connectivity|alayer:arc_layer
+v.net.connectivity|nlayer:node_layer
+v.net.connectivity|ncolumn:node_column
+v.net.connectivity|afcolumn:arc_column
+v.net.connectivity|abcolumn:arc_backward_column
+# v.net.distance
+v.net.distance|alayer:arc_layer
+v.net.distance|nlayer:node_layer
+v.net.distance|type:arc_type
+v.net.distance|ncolumn:node_column
+v.net.distance|afcolumn:arc_column
+v.net.distance|abcolumn:arc_backward_column
+# v.net.flow
+v.net.flow|alayer:arc_layer
+v.net.flow|nlayer:node_layer
+v.net.flow|afcolumn:arc_column
+v.net.flow|abcolumn:arc_backward_column
+# v.net.iso
+v.net.iso|alayer:arc_layer
+v.net.iso|nlayer:node_layer
+v.net.iso|type:arc_type
+v.net.iso|ccats:center_cats
+v.net.iso|ncolumn:node_column
+v.net.iso|afcolumn:arc_column
+v.net.iso|abcolumn:arc_backward_column
+# v.net.path
+v.net.path|alayer:arc_layer
+v.net.path|nlayer:node_layer
+v.net.path|ncolumn:node_column
+v.net.path|afcolumn:arc_column
+v.net.path|abcolumn:arc_backward_column
+# v.net.salesman
+v.net.salesman|alayer:arc_layer
+v.net.salesman|nlayer:node_layer
+v.net.salesman|type:arc_type
+v.net.salesman|ccats:center_cats
+v.net.salesman|afcolumn:arc_column
+v.net.salesman|abcolumn:arc_backward_column
+# v.net.spanningtree
+v.net.spanningtree|alayer:arc_layer
+v.net.spanningtree|nlayer:node_layer
+v.net.spanningtree|ncolumn:node_column
+v.net.spanningtree|afcolumn:arc_columnw
+# v.net.steiner
+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
+v.net.timetable|ncolumn:node_column
+v.net.timetable|afcolumn:arc_column
+v.net.timetable|abcolumn:arc_backward_column
+# v.net.visibility
+v.net.visibility|coordinate|coordinates
+v.net.visibility|vis|visibility
 # v.outlier
 v.outlier|soe:ew_step
 v.outlier|son:ns_step

vector/v.net.alloc/main.c

@@ -72,44 +72,45 @@ int main(int argc, char **argv)
     map = G_define_standard_option(G_OPT_V_INPUT);
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
+    afield_opt = G_define_standard_option(G_OPT_V_FIELD);
+    afield_opt->key = "arc_layer";
+    afield_opt->answer = "1";
+    afield_opt->label = _("Arc layer");
+
     type_opt = G_define_standard_option(G_OPT_V_TYPE);
+    type_opt->key "arc_type";
     type_opt->options = "line,boundary";
     type_opt->answer = "line,boundary";
     type_opt->description = _("Arc type");
 
-    afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
-    afield_opt->answer = "1";
-    afield_opt->label = _("Arc layer");
-
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
 
     afcol = G_define_option();
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->type = TYPE_STRING;
     afcol->required = NO;
     afcol->description = _("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_option();
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->type = TYPE_STRING;
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_option();
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->type = TYPE_STRING;
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");
     ncol->guisection = _("Cost");
 
     term_opt = G_define_standard_option(G_OPT_V_CATS);
-    term_opt->key = "ccats";
+    term_opt->key = "center_cats";
     term_opt->required = YES;
     term_opt->description =
 	_("Categories of centers (points on nodes) to which net "

vector/v.net.alloc/v.net.alloc.html

@@ -50,7 +50,7 @@ g.copy vect=roads,myroads
 v.net myroads points=centernodes out=myroads_net op=connect thresh=200
 
 # allocate, specifying range of center cats (easier to catch all):
-v.net.alloc myroads_net out=myroads_net_alloc ccats=1-100000 nlayer=2
+v.net.alloc myroads_net out=myroads_net_alloc center_cats=1-100000 node_layer=2
 
 # report categories
 v.category myroads_net_alloc option=report
@@ -86,7 +86,7 @@ echo "591235.5|4926306.62|1
 g.copy vect=roads,myroads
 
 # create lines map connecting points to network
-v.net myroads points=centernodes out=myroads_net op=connect thresh=500 alayer=1 nlayer=2
+v.net myroads points=centernodes out=myroads_net op=connect thresh=500 arc_layer=1 node_layer=2
 
 # set up costs
 
@@ -118,7 +118,7 @@ v.db.update myroads_net_time layer=3 col=cost val="length / speed * 60"
 v.db.update myroads_net_time layer=3 col=bcost val="length / speed * 60"
 
 # subnetwork allocation with fastest paths
-v.net.alloc in=myroads_net_time alayer=3 nlayer=2 afcol=cost abcol=bcost out=myroads_net_alloc_time ccats=1-3
+v.net.alloc in=myroads_net_time arc_layer=3 node_layer=2 arc_column=cost arc_backward_column=bcost out=myroads_net_alloc_time center_cats=1-3
 </pre></div>
 
 To display the result, run for example:

vector/v.net.allpairs/main.c

@@ -69,13 +69,13 @@ int main(int argc, char *argv[])
     map_out = G_define_standard_option(G_OPT_V_OUTPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Selection");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Selection");
@@ -87,20 +87,20 @@ int main(int argc, char *argv[])
     where_opt->guisection = _("Selection");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->required = NO;
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_option();
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->type = TYPE_STRING;
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");

vector/v.net.allpairs/v.net.allpairs.html

@@ -6,7 +6,7 @@ selected nodes and the shortest paths.
 
 <h2>NOTES</h2>
 
-An attribute table is created and linked to layer <em>alayer</em>. The 
+An attribute table is created and linked to layer <em>arc_layer</em>. The 
 table contains four columns: <em>cat</em>, <em>from_cat</em>, 
 <em>to_cat</em>, <em>cost</em>. 
 Each <em>cat</em> entry denotes the category of the shortest path from 
@@ -15,7 +15,7 @@ the node with category <em>from_cat</em> to the node with category
 <b>where</b> parameters then the table is filled only for the selected 
 points.
 <br>
-If <b>abcolumn</b> is not given then then the same costs are used for 
+If <b>arc_backward_column</b> is not given then then the same costs are used for 
 forward and backward arcs.
 
 <h2>EXAMPLE</h2>

vector/v.net.bridge/main.c

@@ -55,32 +55,32 @@ int main(int argc, char *argv[])
     map_out = G_define_standard_option(G_OPT_V_OUTPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Cost");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Cost");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->required = NO;
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_option();
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->type = TYPE_STRING;
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");

vector/v.net.centrality/main.c

@@ -104,13 +104,13 @@ int main(int argc, char *argv[])
     map_in = G_define_standard_option(G_OPT_V_INPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Cost");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Cost");
@@ -123,20 +123,20 @@ int main(int argc, char *argv[])
     where_opt->guisection = _("Selection");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->required = NO;
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_option();
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->type = TYPE_STRING;
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");

vector/v.net.components/main.c

@@ -78,32 +78,32 @@ int main(int argc, char *argv[])
     map_in = G_define_standard_option(G_OPT_V_INPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Cost");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Cost");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->required = NO;
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_option();
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->type = TYPE_STRING;
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");

vector/v.net.connectivity/main.c

@@ -59,26 +59,26 @@ int main(int argc, char *argv[])
     map_in = G_define_standard_option(G_OPT_V_INPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Cost");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Cost");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->required = NO;
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
     map_out = G_define_standard_option(G_OPT_V_OUTPUT);
 
     ncol = G_define_standard_option(G_OPT_DB_COLUMN);
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");
     ncol->guisection = _("Cost");

vector/v.net.connectivity/v.net.connectivity.html

@@ -8,7 +8,7 @@
 Two sets (<em>set1</em> and <em>set2</em>) are specified by respective
 <b>layer</b>, <b>where</b> and <b>cats</b> parameters. Similarly to
 <a href="v.net.flow.html">v.net.flow</a> module, capacities of nodes can
-be given by <b>ncolumn</b> option. <em>v.net.connectivity</em> finds the
+be given by <b>node_column</b> option. <em>v.net.connectivity</em> finds the
 set of nodes of minimum total capacitiy separating the two given sets and
 outputs map containing points on the positions of these nodes. Default
 capacity, which is used when no column is specified, is one.
@@ -24,7 +24,7 @@ v.net.connectivity input=roads output=roads_conn set1_where="bank=left" \
 
 <div class="code"><pre>
 v.net.connectivity input=airtraffic output=connectivity \
-      set1_where="name=JFK" set2_where="name=Heathrow" ncolumn=capacity
+      set1_where="name=JFK" set2_where="name=Heathrow" node_column=capacity
 </pre></div>
 
 

vector/v.net.distance/main.c

@@ -75,19 +75,20 @@ int main(int argc, char *argv[])
     map_out = G_define_standard_option(G_OPT_V_OUTPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Cost");
 
     atype_opt = G_define_standard_option(G_OPT_V_TYPE);
+    atype_opt->key = "arc_type";
     atype_opt->options = "line,boundary";
     atype_opt->answer = "line,boundary";
     atype_opt->label = _("Arc type");
     atype_opt->guisection = _("Cost");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Cost");
@@ -132,20 +133,20 @@ int main(int argc, char *argv[])
     wheret_opt->guisection = _("To");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->required = NO;
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_standard_option(G_OPT_DB_COLUMN);
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");
     ncol->guisection = _("Cost");

vector/v.net.distance/v.net.distance.html

@@ -24,8 +24,8 @@ be easily obtained by querying lines with corresponding category
 number.
 <br>
 The costs of arcs in forward and backward direction are specified by 
-<b>afcolumn</b> and <b>abcolumn</b> columns respectively. If
-<b>abcolumn</b> is not given, the same cost is used in both directions.  
+<b>arc_column</b> and <b>arc_backward_column</b> columns respectively. If
+<b>arc_backward_column</b> is not given, the same cost is used in both directions.  
 <p>
 <em>v.net.distance</em> will not work if you are trying to find the 
 nearest neighbors within a group of nodes, i.e. where <em>to</em> 
@@ -48,10 +48,10 @@ crosses, shortest paths are blue lines:
 
 <p><div class="code"><pre>
 # connect schools to streets as layer 2
-v.net input=streets_wake points=schools_wake output=streets_net1 operation=connect thresh=400 alayer=1 nlayer=2
+v.net input=streets_wake points=schools_wake output=streets_net1 operation=connect thresh=400 arc_layer=1 node_layer=2
 
 # connect hospitals to streets as layer 3
-v.net input=streets_net1 points=hospitals output=streets_net2 operation=connect thresh=400 alayer=1 nlayer=3
+v.net input=streets_net1 points=hospitals output=streets_net2 operation=connect thresh=400 arc_layer=1 node_layer=3
 
 # inspect the result
 v.category in=streets_net2 op=report

vector/v.net.flow/main.c

@@ -65,13 +65,13 @@ int main(int argc, char *argv[])
     map_in = G_define_standard_option(G_OPT_V_INPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Cost");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Cost");
@@ -84,20 +84,20 @@ int main(int argc, char *argv[])
 	_("Name for output vector map containing a minimum cut");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->required = NO;
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_standard_option(G_OPT_DB_COLUMN);
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");
     ncol->guisection = _("Cost");

vector/v.net.flow/v.net.flow.html

@@ -6,8 +6,8 @@ between two sets of nodes.
 <h2>NOTES</h2>
 The two sets of nodes are called <em>sources</em> and <em>sink</em> 
 and <em>v.net.flow</em> finds the maximimum flow from the former to 
-the latter ones. Edge capacities can be specified by <b>afcolumn</b> 
-for forward direction and <b>abcolumn</b> for backward direction. If 
+the latter ones. Edge capacities can be specified by <b>arc_column</b> 
+for forward direction and <b>arc_backward_column</b> for backward direction. If 
 the latter parameter is ommited then the same capacity is used in 
 either direction. The sets are given by the respective <b>cats</b>, 
 <b>layer</b> and <b>where</b> parameters. Maximum flow corresponds 
@@ -30,7 +30,7 @@ cut.
 
 Find maximum flow from factories to stores using SPEED for the capacities.
 <div class="code"><pre>
-v.net.flow input=roads output=roads_flow cut=roads_cut afcolumn=SPEED \
+v.net.flow input=roads output=roads_flow cut=roads_cut arc_column=SPEED \
            source_where="type=factory" sink_where="type=store"
 </pre></div>
 <p>
@@ -38,7 +38,7 @@ v.net.flow input=roads output=roads_flow cut=roads_cut afcolumn=SPEED \
 If all the capacties are one then the minimum cut corresponds to the 
 minimum number of edges separating sources from sinks. 
 <div class="code"><pre>
-v.net.flow input=network output=flow cut=cut afcolumn=ones \
+v.net.flow input=network output=flow cut=cut arc_column=ones \
            source_cats=1-10 sink_cats=100-100
 </pre></div>
 

vector/v.net.iso/main.c

@@ -81,38 +81,39 @@ int main(int argc, char **argv)
     map = G_define_standard_option(G_OPT_V_INPUT);
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
+    afield_opt = G_define_standard_option(G_OPT_V_FIELD);
+    afield_opt->key = "arc_layer";
+    afield_opt->label = _("Arc layer");
+
     type_opt = G_define_standard_option(G_OPT_V_TYPE);
+    type_opt->key = "arc_type";
     type_opt->options = "line,boundary";
     type_opt->answer = "line,boundary";
     type_opt->label = _("Arc type");
 
-    afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
-    afield_opt->label = _("Arc layer");
-
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_standard_option(G_OPT_DB_COLUMN);
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->description = _("Node cost column (number)");
     ncol->guisection = _("Cost");
 
     term_opt = G_define_standard_option(G_OPT_V_CATS);
-    term_opt->key = "ccats";
+    term_opt->key = "center_cats";
     term_opt->required = YES;
     term_opt->description =
 	_("Categories of centers (points on nodes) to which net "

vector/v.net.iso/v.net.iso.html

@@ -52,7 +52,7 @@ g.copy vect=roads,myroads
 v.net myroads points=startnode out=myroads_net op=connect thresh=200
 
 # define iso networks using distance:
-v.net.iso input=myroads_net output=myroads_net_iso ccats=1-100000 costs=1000,2000,5000
+v.net.iso input=myroads_net output=myroads_net_iso center_cats=1-100000 costs=1000,2000,5000
 </pre></div>
 
 The network is divided into 4 categories:
@@ -125,7 +125,7 @@ v.db.update myroads_net_time layer=3 col=cost val="length / speed * 60"
 v.db.update myroads_net_time layer=3 col=bcost val="length / speed * 60"
 
 # define iso networks using traveling time:
-v.net.iso input=myroads_net_time output=myroads_net_iso_time alayer=3 nlayer=2 afcol=cost abcol=bcost ccats=1-100000 costs=1,2,5
+v.net.iso input=myroads_net_time output=myroads_net_iso_time arc_layer=3 node_layer=2 arc_column=cost arc_backward_column=bcost center_cats=1-100000 costs=1,2,5
 </pre></div>
 
 To display the result, run for example:

vector/v.net.path/main.c

@@ -51,12 +51,12 @@ int main(int argc, char **argv)
     type_opt->label = _("Arc type");
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
 
@@ -67,21 +67,21 @@ int main(int argc, char **argv)
 			      "If not given, read from stdin");
 
     afcol = G_define_option();
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->type = TYPE_STRING;
     afcol->required = NO;
     afcol->description = _("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_option();
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->type = TYPE_STRING;
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_option();
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->type = TYPE_STRING;
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");

vector/v.net.path/v.net.path.html

@@ -16,7 +16,7 @@ Supported are cost assignments for both arcs and nodes,
 and also different costs for both directions of a vector line. 
 For areas, costs will be calculated along boundary lines.
 <p>
-The input vector needs to be prepared with <em>v.net operation=connect</em> 
+The input vector needs to be prepared with <tt>v.net operation=connect</tt> 
 in order to connect points representing center nodes to the network.
 
 <p>Nodes and arcs can be closed using cost = -1. 
@@ -43,7 +43,7 @@ id start_point_x start_point_y end_point_x end_point_y
 
 <p>
 Points specified by category must be exactly on network nodes, and the 
-input vector map needs to be prepared with <em>v.net operation=connect</em>.
+input vector map needs to be prepared with <tt>v.net operation=connect</tt>.
 <p>
 When specifying coordinates, the next network node to a given coordinate 
 pair is used.
@@ -69,14 +69,14 @@ The attribute table will contain the following attributes:
 
 <h2>NOTES</h2>
 Nodes and arcs can be closed using cost = -1. 
-<p>If the cost columns 'afcol', 'abcol' and 'ncol' are not
+<p>If the cost columns <b>arc_column</b>, <b>arc_backward_column</b> and <b>node_column</b> are not
 specified, the length of network segments is measured and 
 zero costs are assumed for nodes.
 <p>When using attributes, the length of segments is not used. To get
 accurate results, the line length must be taken into account when 
-assigning costs as attributes. For example, to get the <b>fastest path</b>, 
+assigning costs as attributes. For example, to get the <em>fastest path</em>, 
 the columns 'max_speed' and 'length' are required. The correct fastest 
-path can then be found by specifying <tt>afcol=length/max_speed</tt>. If not yet
+path can then be found by specifying <tt>arc_column=length/max_speed</tt>. If not yet
 existing, the column containing the line length ("length") has to added to the
 attributes table using <em>v.to.db</em>.
 
@@ -98,7 +98,7 @@ v.db.select startend
 g.copy vect=roads,myroads
 
 # create lines map connecting points to network
-v.net myroads points=startend out=myroads_net op=connect thresh=500 alayer=1 nlayer=2
+v.net myroads points=startend out=myroads_net op=connect thresh=500 arc_layer=1 node_layer=2
 
 # set up costs
 
@@ -132,10 +132,10 @@ v.db.update myroads_net_time layer=3 col=bcost val="length / speed * 60"
 # ... the 'start' and 'end' nodes have category number 1 and 2
 
 # Shortest path: ID as first number, then cat1 and cat2
-echo "1 1 2" | v.net.path myroads_net_time alayer=3 nlayer=2 out=mypath
+echo "1 1 2" | v.net.path myroads_net_time arc_layer=3 node_layer=2 out=mypath
 
 # Fastest path: ID as first number, then cat1 and cat2
-echo "1 1 2" | v.net.path myroads_net_time alayer=3 nlayer=2 afcol=cost abcol=bcost out=mypath_time
+echo "1 1 2" | v.net.path myroads_net_time arc_layer=3 node_layer=2 arc_column=cost arc_backward_column=bcost out=mypath_time
 </pre></div>
 
 To display the result, run for example:

vector/v.net.salesman/main.c

@@ -135,28 +135,29 @@ int main(int argc, char **argv)
     map = G_define_standard_option(G_OPT_V_INPUT);
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
+    afield_opt = G_define_standard_option(G_OPT_V_FIELD);
+    afield_opt->key = "arc_layer";
+    afield_opt->label = _("Arc layer");
+
     type_opt = G_define_standard_option(G_OPT_V_TYPE);
+    type_opt->key = "arc_type";
     type_opt->options = "line,boundary";
     type_opt->answer = "line,boundary";
     type_opt->description = _("Arc type");
 
-    afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
-    afield_opt->label = _("Arc layer");
-
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tfield_opt->key = "nlayer";
+    tfield_opt->key = "node_layer";
     tfield_opt->answer = "2";
     tfield_opt->label = _("Node layer (used for cities)");
 
     afcol = G_define_option();
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->type = TYPE_STRING;
     afcol->required = NO;
     afcol->description = _("Arc forward/both direction(s) cost column (number)");
 
     abcol = G_define_option();
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->type = TYPE_STRING;
     abcol->required = NO;
     abcol->description = _("EXPERIMENTAL: Arc backward direction cost column (number)");
@@ -168,7 +169,7 @@ int main(int argc, char **argv)
     seq->description = _("Name for output file holding node sequence (\"-\" for stdout)");
 
     term_opt = G_define_standard_option(G_OPT_V_CATS);
-    term_opt->key = "ccats";
+    term_opt->key = "center_cats";
     term_opt->required = YES;
     term_opt->description = _("Categories of points ('cities') on nodes "
 			      "(layer is specified by nlayer)");

vector/v.net.salesman/v.net.salesman.html

@@ -69,7 +69,7 @@ v.category myroads_net op=report
 # point          6          1          5
 
 # find the shortest path
-v.net.salesman myroads_net ccats=1-6 out=mysalesman_distance
+v.net.salesman myroads_net center_cats=1-6 out=mysalesman_distance
 
 # set up costs as traveling time
 
@@ -101,7 +101,7 @@ v.db.update myroads_net_time layer=3 col=cost val="length / speed * 60"
 v.db.update myroads_net_time layer=3 col=bcost val="length / speed * 60"
 
 # find the fastest path
-v.net.salesman myroads_net_time alayer=3 nlayer=2 afcol=cost abcol=bcost ccats=1-6 out=mysalesman_time
+v.net.salesman myroads_net_time arc_layer=3 node_layer=2 arc_column=cost arc_backward_column=bcost center_cats=1-6 out=mysalesman_time
 </pre></div>
 
 To display the result, run for example:

vector/v.net.spanningtree/main.c

@@ -54,26 +54,26 @@ int main(int argc, char *argv[])
     map_out = G_define_standard_option(G_OPT_V_OUTPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Cost");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Cost");
 
     afcol = G_define_standard_option(G_OPT_DB_COLUMN);
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->required = NO;
     afcol->description =
 	_("Arc forward/both direction(s) cost column (number)");
     afcol->guisection = _("Cost");
 
     ncol = G_define_standard_option(G_OPT_DB_COLUMN);
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");
     ncol->guisection = _("Cost");

vector/v.net.steiner/main.c

@@ -356,17 +356,18 @@ int main(int argc, char **argv)
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
     type_opt = G_define_standard_option(G_OPT_V_TYPE);
+    type_opt->key = "arc_type";
     type_opt->options = "line,boundary";
     type_opt->answer = "line,boundary";
     type_opt->label = _("Arc type");
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
 
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tfield_opt->key = "nlayer";
+    tfield_opt->key = "node_layer";
     tfield_opt->answer = "2";
     tfield_opt->label = _("Node layer (used for terminals)");
 
@@ -377,13 +378,13 @@ int main(int argc, char **argv)
     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;

vector/v.net.steiner/v.net.steiner.html

@@ -80,10 +80,10 @@ v.db.update myroads_net_time layer=3 col=speed val="5.0" where="label='unimprove
 v.db.update myroads_net_time layer=3 col=cost val="length / speed * 60"
 
 # shortest path
-v.net.steiner myroads_net_time alayer=3 nlayer=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 alayer=3 nlayer=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:

vector/v.net.timetable/main.c

@@ -269,19 +269,19 @@ int main(int argc, char *argv[])
     map_out = G_define_standard_option(G_OPT_V_OUTPUT);
 
     afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    afield_opt->key = "alayer";
+    afield_opt->key = "arc_layer";
     afield_opt->answer = "1";
     afield_opt->label = _("Arc layer");
     afield_opt->guisection = _("Cost");
 
     nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    nfield_opt->key = "nlayer";
+    nfield_opt->key = "node_layer";
     nfield_opt->answer = "2";
     nfield_opt->label = _("Node layer");
     nfield_opt->guisection = _("Cost");
 
     afcol = G_define_option();
-    afcol->key = "afcolumn";
+    afcol->key = "arc_column";
     afcol->type = TYPE_STRING;
     afcol->required = NO;
     afcol->description =
@@ -289,14 +289,14 @@ int main(int argc, char *argv[])
     afcol->guisection = _("Cost");
 
     abcol = G_define_option();
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->type = TYPE_STRING;
     abcol->required = NO;
     abcol->description = _("Arc backward direction cost column (number)");
     abcol->guisection = _("Cost");
 
     ncol = G_define_option();
-    ncol->key = "ncolumn";
+    ncol->key = "node_column";
     ncol->type = TYPE_STRING;
     ncol->required = NO;
     ncol->description = _("Node cost column (number)");

vector/v.net.visibility/main.c

@@ -52,18 +52,12 @@ int main(int argc, char *argv[])
     input = G_define_standard_option(G_OPT_V_INPUT);
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
-    coor = G_define_option();
-    coor->key = "coordinate";
-    coor->key_desc = "x,y";
-    coor->type = TYPE_STRING;
-    coor->required = NO;
-    coor->multiple = YES;
-    coor->description = _("One or more coordinates");
-
-    ovis = G_define_option();
-    ovis->key = "vis";
-    ovis->type = TYPE_STRING;
+    coor = G_define_standard_option(G_OPT_M_COORDS);
+    
+    ovis = G_define_standard_option(G_OPT_V_MAP);
+    ovis->key = "visibility";
     ovis->required = NO;
+    ovis->label = _("Name of input vector map containing visable points");
     ovis->description = _("Add points after computing the visibility graph");
 
     /* options and flags parser */

vector/v.net.visibility/v.net.visibility.html

@@ -36,22 +36,22 @@ and boundaries not intersecting each other (that includes overlapping).
 The resulting map containing the visibility graph is given in the output map.
 <p>
 If you need to add additional points to compute a shortest path 
-between them afterwards you can use the <em>coordinate</em> parameter, e.g.:
+between them afterwards you can use the <em>coordinates</em> parameter, e.g.:
 <div class="code"><pre>
-coordinate=25556200,6686400,25556400,6686600
+coordinates=25556200,6686400,25556400,6686600
 </pre></div>
 where 25556200,6686400 are the coordinate of the first point and 
 25556400,6686600 are the coordinates of the second point. Of course 
 you can give as many points as you need. They will be added to the 
 visibility graph and edges from them will be computed. You can 
 always add those points after computing the visibility graph. Simply 
-use the <em>vis</em> parameter. The input will be the original 
+use the <em>visibility</em> parameter. The input will be the original 
 vector map, the vis will be the computed visibility graph and the 
 output the new visibility graph which will be the vis + the new 
 points given with coordinate (edges will be computed as well).
 <div class="code"><pre>
-v.net.visibility input=map vis=vis_map output=new_vis_map \
-      coordinate=25556200,6686400,25556400,6686600
+v.net.visibility input=map visibility=vis_map output=new_vis_map \
+      coordinates=25556200,6686400,25556400,6686600
 </pre></div>
 
 <h2>EXAMPLES</h2>
@@ -85,7 +85,7 @@ d.vect lines col=red
 An example on how to use the coordinate parameter. This will compute the
 visibility graph of the vector map lines with the point 2555678,6686343:
 <div class="code"><pre>
-v.net.visibility input=lines output=graph coordinate=2555678,6686343
+v.net.visibility input=lines output=graph coordinates=2555678,6686343
 d.vect graph
 d.vect lines col=red
 </pre></div>
@@ -102,8 +102,8 @@ g.region vector=zipcodes_wake
 d.mon wx0
 d.vect areas_7_11_25
 v.net.visibility input=zipcodes_wake output=graph
-v.net.visibility input=zipcodes_wake vis=graph output=new_graph \
-      coordinate=669547.97,208348.20
+v.net.visibility input=zipcodes_wake visibility=graph output=new_graph \
+      coordinates=669547.97,208348.20
 d.erase
 d.vect areas_7_11_25
 echo "symbol basic/star 20 669547.97 208348.20 black red" | d.graph -m

vector/v.net/args.c

@@ -50,13 +50,13 @@ void define_options(struct opt *opt)
     opt->action->descriptions = desc;
 
     opt->afield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    opt->afield_opt->key = "alayer";
+    opt->afield_opt->key = "arc_layer";
     opt->afield_opt->gisprompt = "new,layer,layer";
     opt->afield_opt->label = _("Arc layer");
     opt->afield_opt->guisection = _("Arcs");
 
     opt->nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    opt->nfield_opt->key = "nlayer";
+    opt->nfield_opt->key = "node_layer";
     opt->nfield_opt->answer = "2";
     opt->nfield_opt->gisprompt = "new,layer,layer";
     opt->nfield_opt->label = _("Node layer");
@@ -90,6 +90,7 @@ void define_options(struct opt *opt)
     opt->snap_flag->description =
 	_("For operation 'connect'. By default, a new line from the point to the network is created.");
     opt->snap_flag->guisection = _("Nodes");
+
 }
 
 void parse_arguments(const struct opt *opt,