[GRASS-SVN] r59422 - grass-addons/grass7/raster/r.stream.order

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-03-27 07:36:30 -0700 (Thu, 27 Mar 2014)
New Revision: 59422

Modified:
   grass-addons/grass7/raster/r.stream.order/main.c
   grass-addons/grass7/raster/r.stream.order/r.stream.order.html
Log:
r.stream.order -  - unify keywords, options

Modified: grass-addons/grass7/raster/r.stream.order/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.order/main.c	2014-03-27 14:34:58 UTC (rev 59421)
+++ grass-addons/grass7/raster/r.stream.order/main.c	2014-03-27 14:36:30 UTC (rev 59422)
@@ -45,7 +45,7 @@
 	{"strahler", NO, _("Name for output Strahler's stream order raster map")},
 	{"horton", NO, _("Name for output original Hortons's stream order raster map")},
 	{"shreve", NO, _("Name for output Shereve's stream magnitude raster map")},
-	{"hack", NO, _("Name for outut Hack's streams or Gravelius stream hierarchy raster map")},
+	{"hack", NO, _("Name for output Hack's streams or Gravelius stream hierarchy raster map")},
 	{"topo", NO, _("Name for output topological dimension of streams raster map")}
     };
     struct GModule *module;	/* GRASS module for parsing arguments */
@@ -86,10 +86,10 @@
     }
 
     opt_vector = G_define_standard_option(G_OPT_V_OUTPUT);
-    opt_vector->key = "vector";
+    opt_vector->key = "stream_vect";
     opt_vector->required = NO;
     opt_vector->description =
-	_("Name for output vector map to write stream atributes");
+	_("Name for output vector map to write stream attributes");
     opt_vector->guisection = _("Output maps");
 
     for (i = 0; i < orders_size; ++i) {

Modified: grass-addons/grass7/raster/r.stream.order/r.stream.order.html
===================================================================
--- grass-addons/grass7/raster/r.stream.order/r.stream.order.html	2014-03-27 14:34:58 UTC (rev 59421)
+++ grass-addons/grass7/raster/r.stream.order/r.stream.order.html	2014-03-27 14:36:30 UTC (rev 59422)
@@ -49,7 +49,7 @@
 
 <p>At least one output map is required: </p>
 <dl>
-<dt><b>vector</b></dt>
+<dt><b>stream_vect</b></dt>
 <dd>Vector network with table where stream network topology can be stored.
 Because r.stream.order is prepared to work both with r.watershed and
 r.stream.extract, it may be used to create correct vector from r.watershed
@@ -68,7 +68,7 @@
 <dt><b>hack</b></dt>
 <dd>Name of Hack's main streams output map : see notes for detail.</dd>
 
-<dt><b>top</b></dt>
+<dt><b>topo</b></dt>
 <dd>Name of topological dimensions streams output map: see notes for
 detail.</dd>
 </dl>
@@ -258,7 +258,7 @@
 r.stream.order streams=streams dirs=dirs strahler=riverorder_strahler horton=riverorder_horton shreve=riverorder_shreve hack=riverorder_hack topo=river_topodim
 # vector river network
 r.watershed elevation=elevation threshold=10000 accumulation=accum
-r.stream.order streams=streams dirs=dirs elevation=elevation accum=accum vector=river_vector
+r.stream.order streams=streams dirs=dirs elevation=elevation accum=accum stream_vect=river_vector
 </pre></div>
 
 <h2>SEE ALSO</h2>