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

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

vector/v.net.alloc/main.c

@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 	  "layer for this categories is given by nlayer option");
 
     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->required = YES;
     afield_opt->label = _("Arc layer");
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
     type_opt->label = _("Arc type");
 
     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->required = YES;
     nfield_opt->label = _("Node layer");

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

@@ -63,7 +63,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 ccats=1-100000 node_layer=2
 
 # report categories
 v.category myroads_net_alloc option=report
@@ -99,7 +99,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
 
@@ -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 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 afcol=cost abcol=bcost out=myroads_net_alloc_time ccats=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");

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 

vector/v.net.bridge/main.c

@@ -55,13 +55,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 = _("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");

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");

vector/v.net.components/main.c

@@ -78,13 +78,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");

vector/v.net.connectivity/main.c

@@ -59,13 +59,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");

vector/v.net.distance/main.c

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

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

@@ -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");

vector/v.net.iso/main.c

@@ -98,7 +98,7 @@ int main(int argc, char **argv)
     cost_opt->description = _("Costs for isolines");
 
     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->required = YES;
     afield_opt->label = _("Arc layer");
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
     type_opt->label = _("Arc type");
 
     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->required = YES;
     nfield_opt->label = _("Node layer");

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 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 afcol=cost abcol=bcost ccats=1-100000 costs=1,2,5
 </pre></div>
 
 To display the result, run for example:

vector/v.net.path/main.c

@@ -48,7 +48,7 @@ int main(int argc, char **argv)
     output_opt = 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->required = YES;
     afield_opt->label = _("Arc layer");
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
     type_opt->label = _("Arc type");
 
     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->required = YES;
     nfield_opt->label = _("Node layer");

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

@@ -114,7 +114,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
 
@@ -148,10 +148,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 afcol=cost abcol=bcost out=mypath_time
 </pre></div>
 
 To display the result, run for example:

vector/v.net.salesman/main.c

@@ -143,7 +143,7 @@ int main(int argc, char **argv)
 			      "(layer is specified by nlayer)");
 
     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->required = YES;
     afield_opt->label = _("Arc layer");
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
     type_opt->label = _("Arc type");
 
     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->required = YES;
     nfield_opt->label = _("Node layer (used for cities)");

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 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 afcol=cost abcol=bcost ccats=1-6 out=mysalesman_time
 </pre></div>
 
 To display the result, run for example:

vector/v.net.spanningtree/main.c

@@ -54,13 +54,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 = _("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");

vector/v.net.steiner/main.c

@@ -361,12 +361,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");
 
     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)");
 

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 tcats=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 tcats=1-6 out=mysteiner_time
 </pre></div>
 
 To display the result, run for example:

vector/v.net.timetable/main.c

@@ -269,13 +269,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 = _("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");

vector/v.net/args.c

@@ -51,13 +51,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");
@@ -107,7 +107,7 @@ void define_options(struct opt *opt)
     opt->tucfield->label = _("Layer with unique categories used in turntable");
     opt->tucfield->description =
     _
-    ("Layer with unique categories for every line in alayer and point on every node. "
+    ("Layer with unique categories for every line in arc_layer and point on every node. "
      " The categories are used in turntable. Format: layer number[/layer name]. "
      "Required for operation 'turntable'.");
     opt->tucfield->answer = "4";

vector/v.net/v.net.html

@@ -81,7 +81,7 @@ and update the new table with cat values with <em><a href="v.to.db.html">v.to.db
 <p>
 The <em>turntable</em> operation creates a turntable  
 with the costs for every possible 
-turn on every possible node (intersection, crossroad) in given layer (alayer). 
+turn on every possible node (intersection, crossroad) in given layer (arc_layer). 
 U-turns are taken in account too.
 Turntable is created in <b>tlayer</b> and <b>tuclayer</b>.
 Building the turntable allows you to model e.g. trafic code, where some turns 
@@ -89,7 +89,7 @@ may be prohibited.
 If features in analyzed network are changed, the turntable must be created again
 (e.g. it includes v.net connect operation).
 Turntable name consists of output vector map name + "_turntable_" + "t" + "_" + tlayer +
- "_" + "tuc" + "_" + tuclayer + "_" + "a" + "_" + alayer  e. g. roads_turntable_t_3_tuc_4_a_1
+ "_" + "tuc" + "_" + tuclayer + "_" + "a" + "_" + arc_layer  e. g. roads_turntable_t_3_tuc_4_a_1
 
 <p>These modules are able to work with the turntable: 
 <em><a href="v.net.alloc.html">v.net.alloc</a></em>,

vector/v.overlay/main.c

@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 
     field_opt[0] = G_define_standard_option(G_OPT_V_FIELD);
     field_opt[0]->label = _("Layer number or name (vector map A)");
-    field_opt[0]->key = "alayer";
+    field_opt[0]->key = "arc_layer";
 
     type_opt[0] = G_define_standard_option(G_OPT_V_TYPE);
     type_opt[0]->label = _("Feature type (vector map A)");

vector/v.overlay/v.overlay.html

@@ -37,7 +37,7 @@ number. The original column names have a prefix (<em>a_</em> and
 <em>b_</em>) corresponding to <b>ainput</b> and <b>binput</b> map.
 <p>
 If the <i>second</i> number of the <b>olayer</b> option is greater than 0, then the 
-categories of <b>ainput</b> in layer <b>alayer</b> are transferred to
+categories of <b>ainput</b> in layer <b>arc_layer</b> are transferred to
 the output layer with the second number.
 <p>
 If the <i>third</i> number of the <b>olayer</b> option is greater than 0, then the 

vector/v.select/args.c

@@ -14,7 +14,7 @@ void parse_options(struct GParm *parm, struct GFlag *flag)
 
     parm->field[0] = G_define_standard_option(G_OPT_V_FIELD);
     parm->field[0]->label = _("Layer number (vector map A)");
-    parm->field[0]->key = "alayer";
+    parm->field[0]->key = "arc_layer";
     parm->field[0]->guisection = _("Selection");
 
     parm->type[0] = G_define_standard_option(G_OPT_V_TYPE);