Prechádzať zdrojové kódy

v.net modules: tlayer -> turn_layer and tuclayer -> turn_cat_layer (https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63728 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 rokov pred
rodič
commit
6218ba1cf4

+ 8 - 0
lib/gis/renamed_options

@@ -449,6 +449,8 @@ 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.alloc|tlayer:turn_layer
+v.net.alloc|tuclayer:turn_cat_layer
 # v.net.allpairs
 v.net.allpairs|alayer:arc_layer
 v.net.allpairs|nlayer:node_layer
@@ -499,6 +501,8 @@ 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.iso|tlayer:turn_layer
+v.net.iso|tuclayer:turn_cat_layer
 # v.net.path
 v.net.path|alayer:arc_layer
 v.net.path|nlayer:node_layer
@@ -506,6 +510,8 @@ 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.path|tlayer:turn_layer
+v.net.path|tuclayer:turn_cat_layer
 # v.net.salesman
 v.net.salesman|alayer:arc_layer
 v.net.salesman|nlayer:node_layer
@@ -513,6 +519,8 @@ 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.salesman|tlayer:turn_layer
+v.net.salesman|tuclayer:turn_cat_layer
 # v.net.spanningtree
 v.net.spanningtree|alayer:arc_layer
 v.net.spanningtree|nlayer:node_layer

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

@@ -128,7 +128,7 @@ int main(int argc, char **argv)
     turntable_f->guisection = _("Turntable");
 
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tfield_opt->key = "tlayer";
+    tfield_opt->key = "turn_layer";
     tfield_opt->answer = "3";
     tfield_opt->label = _("Layer with turntable");
     tfield_opt->description =
@@ -136,7 +136,7 @@ int main(int argc, char **argv)
     tfield_opt->guisection = _("Turntable");
 
     tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tucfield_opt->key = "tuclayer";
+    tucfield_opt->key = "turn_cat_layer";
     tucfield_opt->answer = "4";
     tucfield_opt->label = _("Layer with unique categories used in turntable");
     tucfield_opt->description =

+ 1 - 1
vector/v.net.alloc/v.net.alloc.html

@@ -20,7 +20,7 @@ The input vector needs to be prepared with <em>v.net operation=connect</em>
 in order to connect points representing center nodes to the network.
 <p>
 Application of flag <b>-t</b> enables a turntable support. 
-This flag requires additional parameters <b>tlayer</b> and <b>tuclayer</b> 
+This flag requires additional parameters <b>turn_layer</b> and <b>turn_cat_layer</b> 
 that are otherwise ignored.
  The turntable allows 
 to model e.g. trafic code, where some turns may be prohibited. 

+ 1 - 1
vector/v.net.distance/v.net.distance.html

@@ -57,7 +57,7 @@ v.net input=streets_net1 points=hospitals output=streets_net2 operation=connect
 v.category in=streets_net2 op=report
 
 # shortest paths from schools (points in layer 2) to nearest hospitals (points in layer 3)
-v.net.distance in=streets_net2 out=schools_to_hospitals flayer=2 tlayer=3
+v.net.distance in=streets_net2 out=schools_to_hospitals flayer=2 turn_layer=3
 </pre></div>
 
 <p>

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

@@ -138,7 +138,7 @@ int main(int argc, char **argv)
     turntable_f->guisection = _("Turntable");
 
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tfield_opt->key = "tlayer";
+    tfield_opt->key = "turn_layer";
     tfield_opt->answer = "3";
     tfield_opt->label = _("Layer with turntable");
     tfield_opt->description =
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
     tfield_opt->guisection = _("Turntable");
 
     tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tucfield_opt->key = "tuclayer";
+    tucfield_opt->key = "turn_cat_layer";
     tucfield_opt->answer = "4";
     tucfield_opt->label = _("Layer with unique categories used in turntable");
     tucfield_opt->description =

+ 1 - 1
vector/v.net.iso/v.net.iso.html

@@ -16,7 +16,7 @@ and also different costs for both directions of a vector line.
 For areas, costs will be calculated along boundary lines.
 <p>
 Application of flag <b>-t</b> enables a turntable support. 
-This flag requires additional parameters <b>tlayer</b> and <b>tuclayer</b> 
+This flag requires additional parameters <b>turn_layer</b> and <b>turn_cat_layer</b> 
 that are otherwise ignored.
  The turntable allows 
 to model e.g. trafic code, where some turns may be prohibited. 

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

@@ -111,7 +111,7 @@ int main(int argc, char **argv)
     turntable_f->guisection = _("Turntable");
 
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tfield_opt->key = "tlayer";
+    tfield_opt->key = "turn_layer";
     tfield_opt->answer = "3";
     tfield_opt->label = _("Layer with turntable");
     tfield_opt->description =
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
     tfield_opt->guisection = _("Turntable");
 
     tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tucfield_opt->key = "tuclayer";
+    tucfield_opt->key = "turn_cat_layer";
     tucfield_opt->answer = "4";
     tucfield_opt->label = _("Layer with unique categories used in turntable");
     tucfield_opt->description =

+ 1 - 1
vector/v.net.path/v.net.path.html

@@ -70,7 +70,7 @@ The attribute table will contain the following attributes:
 <p>
 
 Application of flag <b>-t</b> enables a turntable support. 
-This flag requires additional parameters <b>tlayer</b> and <b>tuclayer</b> 
+This flag requires additional parameters <b>turn_layer</b> and <b>turn_cat_layer</b> 
 that are otherwise ignored.
  The turntable allows 
 to model e.g. trafic code, where some turns may be prohibited. 

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

@@ -182,14 +182,14 @@ int main(int argc, char **argv)
     turntable_f->guisection = _("Turntable");
 
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tfield_opt->key = "tlayer";
+    tfield_opt->key = "turn_layer";
     tfield_opt->answer = "3";
     tfield_opt->label = _("Layer with turntable");
     tfield_opt->description = _("Relevant only with -t flag");
     tfield_opt->guisection = _("Turntable");
 
     tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tucfield_opt->key = "tuclayer";
+    tucfield_opt->key = "turn_cat_layer";
     tucfield_opt->answer = "4";
     tucfield_opt->label = _("Layer with unique categories used in turntable");
     tucfield_opt->description = _("Relevant only with -t flag");

+ 1 - 1
vector/v.net.salesman/v.net.salesman.html

@@ -21,7 +21,7 @@ in order to connect points representing center nodes to the network.
 input vector map needs to be prepared with <em>v.net operation=connect</em>.
 
 <p>Application of flag <b>-t</b> enables a turntable support. 
-This flag requires additional parameters <b>tlayer</b> and <b>tuclayer</b> 
+This flag requires additional parameters <b>turn_layer</b> and <b>turn_cat_layer</b> 
 that are otherwise ignored.
  The turntable allows 
 to model e.g. trafic code, where some turns may be prohibited.