Browse Source

v.net: ncolumn -> node_column (https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63724 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 years ago
parent
commit
c88fbc112a

+ 11 - 0
lib/gis/renamed_options

@@ -446,25 +446,32 @@ 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.allpairs
 v.net.allpairs|alayer:arc_layer
 v.net.allpairs|nlayer:node_layer
+v.net.allpairs|ncolumn:node_column
 # v.net.bridge
 v.net.bridge|alayer:arc_layer
 v.net.bridge|nlayer:node_layer
+v.net.bridge|ncolumn:node_column
 # v.net.centrality
 v.net.centrality|alayer:arc_layer
 v.net.centrality|nlayer:node_layer
+v.net.centrality|ncolumn:node_column
 # v.net.components
 v.net.components|alayer:arc_layer
 v.net.components|nlayer:node_layer
+v.net.components|ncolumn:node_column
 # v.net.connectivity
 v.net.connectivity|alayer:arc_layer
 v.net.connectivity|nlayer:node_layer
+v.net.connectivity|ncolumn:node_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.flow
 v.net.flow|alayer:arc_layer
 v.net.flow|nlayer:node_layer
@@ -473,10 +480,12 @@ 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.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.salesman
 v.net.salesman|alayer:arc_layer
 v.net.salesman|nlayer:node_layer
@@ -485,6 +494,7 @@ v.net.salesman|ccats:center_cats
 # v.net.spanningtree
 v.net.spanningtree|alayer:arc_layer
 v.net.spanningtree|nlayer:node_layer
+v.net.spanningtree|ncolumn:node_column
 # v.net.steiner
 v.net.steiner|alayer:arc_layer
 v.net.steiner|nlayer:node_layer
@@ -492,6 +502,7 @@ v.net.steiner|type:arc_type
 # v.net.timetable
 v.net.timetable|alayer:arc_layer
 v.net.timetable|nlayer:node_layer
+v.net.timetable|ncolumn:node_column
 # v.outlier
 v.outlier|soe:ew_step
 v.outlier|son:ns_step

+ 1 - 1
vector/v.net.alloc/main.c

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

+ 1 - 1
vector/v.net.allpairs/main.c

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

+ 1 - 1
vector/v.net.bridge/main.c

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

+ 1 - 1
vector/v.net.centrality/main.c

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

+ 1 - 1
vector/v.net.components/main.c

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

+ 1 - 1
vector/v.net.connectivity/main.c

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

+ 2 - 2
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>
 
 

+ 1 - 1
vector/v.net.distance/main.c

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

+ 1 - 1
vector/v.net.flow/main.c

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

+ 1 - 1
vector/v.net.iso/main.c

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

+ 1 - 1
vector/v.net.path/main.c

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

+ 1 - 1
vector/v.net.spanningtree/main.c

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

+ 1 - 1
vector/v.net.timetable/main.c

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