v.net modules: afcolumn -> arc_column and abcolumn -> arc_backward_column (https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63725 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/gis/renamed_options

@@ -446,55 +446,78 @@ 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|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|type:arc_type
 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
@@ -503,6 +526,8 @@ v.net.steiner|type:arc_type
 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.outlier
 v.outlier|soe:ew_step
 v.outlier|son:ns_step

vector/v.net.alloc/main.c

@@ -102,14 +102,14 @@ int main(int argc, char **argv)
     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)");

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

@@ -131,7 +131,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 arc_layer=3 node_layer=2 afcol=cost abcol=bcost out=myroads_net_alloc_time center_cats=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

@@ -87,14 +87,14 @@ 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");

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

@@ -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

@@ -67,14 +67,14 @@ int main(int argc, char *argv[])
     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");

vector/v.net.centrality/main.c

@@ -123,14 +123,14 @@ 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");

vector/v.net.components/main.c

@@ -90,14 +90,14 @@ int main(int argc, char *argv[])
     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");

vector/v.net.connectivity/main.c

@@ -71,14 +71,14 @@ int main(int argc, char *argv[])
     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");

vector/v.net.distance/main.c

@@ -133,14 +133,14 @@ 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");

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> 

vector/v.net.flow/main.c

@@ -84,14 +84,14 @@ 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");

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

@@ -117,13 +117,13 @@ int main(int argc, char **argv)
     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");
 

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

@@ -135,7 +135,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 arc_layer=3 node_layer=2 afcol=cost abcol=bcost center_cats=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

@@ -73,14 +73,14 @@ 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)");

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.
@@ -85,14 +85,14 @@ For more information about turns in the vector network analyses see
 
 <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>.
 
@@ -151,7 +151,7 @@ v.db.update myroads_net_time layer=3 col=bcost val="length / speed * 60"
 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 arc_layer=3 node_layer=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

@@ -162,14 +162,14 @@ int main(int argc, char **argv)
     nfield_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)");
     afcol->guisection = _("Cost");
 
     abcol = G_define_option();
-    abcol->key = "abcolumn";
+    abcol->key = "arc_backward_column";
     abcol->type = TYPE_STRING;
     abcol->required = NO; 
     abcol->required = NO;

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

@@ -115,7 +115,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 arc_layer=3 node_layer=2 afcol=cost abcol=bcost center_cats=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

@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     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)");

vector/v.net.timetable/main.c

@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
     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,7 +289,7 @@ 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)");