[GRASS-SVN] r59434 - grass-addons/grass7/raster/r.stream.snap

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-03-27 08:36:51 -0700 (Thu, 27 Mar 2014)
New Revision: 59434

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

Modified: grass-addons/grass7/raster/r.stream.snap/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.snap/main.c	2014-03-27 15:16:41 UTC (rev 59433)
+++ grass-addons/grass7/raster/r.stream.snap/main.c	2014-03-27 15:36:51 UTC (rev 59434)
@@ -58,19 +58,19 @@
     out_points_opt->description = _("Name of output vector points map");
 
     in_stream_opt = G_define_standard_option(G_OPT_R_INPUT);
-    in_stream_opt->key = "streams";
+    in_stream_opt->key = "stream_rast";
     in_stream_opt->required = NO;
     in_stream_opt->description = _("Name of input streams mask raster map");
     in_stream_opt->guisection = _("Input maps");
 
     in_accum_opt = G_define_standard_option(G_OPT_R_INPUT);
-    in_accum_opt->key = "accum";
+    in_accum_opt->key = "accumulation";
     in_accum_opt->required = NO;
     in_accum_opt->description = _("Name of input accumulation raster map");
     in_accum_opt->guisection = _("Input maps");
  
     opt_accum_treshold = G_define_option();
-    opt_accum_treshold->key = "accumtres";
+    opt_accum_treshold->key = "threshold";
     opt_accum_treshold->type = TYPE_DOUBLE;
     opt_accum_treshold->answer = "-1";
     opt_accum_treshold->description =

Modified: grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html
===================================================================
--- grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html	2014-03-27 15:16:41 UTC (rev 59433)
+++ grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html	2014-03-27 15:36:51 UTC (rev 59434)
@@ -28,13 +28,13 @@
 
 <h2>OPTIONS</h2>
 <dl>
-<dt><b>streams</b></dt>
+<dt><b>stream_rast</b></dt>
 <dd>Stream network created by r.stream.extract or r.watershed. If used, the points
 are snapped to the nearest streamline point whose accumulation is greater than
 threshold. If the accumulation is not used, the point is snapped to the nearest stream.
 </dd>
 
-<dt><b>accum</b></dt>
+<dt><b>accumulation</b></dt>
 <dd>Accumulation map created with r.watershed and used to generate the stream network
 with r.stream.extract. If the stream network is not used, the point is adaptively
 snapped to the point where the value is greater than mean values of accumulation
@@ -46,7 +46,7 @@
 point also is not snapped.
 </dd>
 
-<dt><b>accumtres</b></dt>
+<dt><b>threshold</b></dt>
 <dd>Minimum value of accumulation which cell must have to snap point. This
 option is added to snap stream inits to the stream tubes and to distinguish
 between local tributaries and main streams.
@@ -77,7 +77,7 @@
 g.region -p -a rast=elevation align=elevation
 r.watershed elevation=elevation threshold=10000 drainage=dirs stream=streams accumulation=accum
 # snap a point sampled in the riverine landscape to the calculated river network
-r.stream.snap input=mysampleoutlet output=mysampleoutlet_snapped streams=streams accum=accum
+r.stream.snap input=mysampleoutlet output=mysampleoutlet_snapped stream_rast=streams accumulation=accum
 </pre></div>
 
 <h2>SEE ALSO</h2>