瀏覽代碼

v.net.steiner: tcats -> terminal_cats and nsp -> npoints (https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63726 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 年之前
父節點
當前提交
7f605b7c24
共有 3 個文件被更改,包括 6 次插入4 次删除
  1. 2 0
      lib/gis/renamed_options
  2. 2 2
      vector/v.net.steiner/main.c
  3. 2 2
      vector/v.net.steiner/v.net.steiner.html

+ 2 - 0
lib/gis/renamed_options

@@ -522,6 +522,8 @@ v.net.spanningtree|afcolumn:arc_columnw
 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

+ 2 - 2
vector/v.net.steiner/main.c

@@ -378,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;

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