[GRASS-SVN] r52216 - grass/trunk/raster/r.what

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-06-25 20:22:09 -0700 (Mon, 25 Jun 2012)
New Revision: 52216

Modified:
   grass/trunk/raster/r.what/main.c
   grass/trunk/raster/r.what/r.what.html
Log:
rename input= to map=, sync help page

Modified: grass/trunk/raster/r.what/main.c
===================================================================
--- grass/trunk/raster/r.what/main.c	2012-06-26 03:18:36 UTC (rev 52215)
+++ grass/trunk/raster/r.what/main.c	2012-06-26 03:22:09 UTC (rev 52216)
@@ -43,9 +43,7 @@
 
 static int tty = 0;
 
-/* *************************************************************** */
-/* *************************************************************** */
-/* *************************************************************** */
+
 int main(int argc, char *argv[])
 {
     int i, j;
@@ -98,7 +96,7 @@
     module->description =
 	_("Queries raster maps on their category values and category labels.");
 
-    opt.input = G_define_standard_option(G_OPT_R_INPUTS);
+    opt.input = G_define_standard_option(G_OPT_R_MAPS);
     opt.input->description = _("Name of existing raster map(s) to query");
 
     opt.coords = G_define_standard_option(G_OPT_M_COORDS);

Modified: grass/trunk/raster/r.what/r.what.html
===================================================================
--- grass/trunk/raster/r.what/r.what.html	2012-06-26 03:18:36 UTC (rev 52215)
+++ grass/trunk/raster/r.what/r.what.html	2012-06-26 03:22:09 UTC (rev 52216)
@@ -23,14 +23,13 @@
 
 <h2>EXAMPLES</h2>
 
-
 <h3>Input from <tt>stdin</tt> on the command line</h3>
 
 Input coordinates may be given directly from <tt>stdin</tt>, for example:
 <br> (input data appears between the "<tt>EOF</tt>" markers)
 
 <div class="code"><pre>
-r.what input=soils,aspect << EOF
+r.what map=soils,aspect << EOF
 635342.21 7654321.09 site 1
 653324.88 7563412.42 site 2
 EOF
@@ -40,7 +39,7 @@
 </pre></div>
 
 <div class="code"><pre>
-echo "635342.21 7654321.09" | r.what input=soils,aspect
+echo "635342.21 7654321.09" | r.what map=soils,aspect
 
 635342.21|7654321.09|45|21
 </pre></div>
@@ -53,7 +52,7 @@
 coordinates and labels given in the example above:
 
 <div class="code"><pre>
-r.what input=soils,aspect < input_coord.txt
+r.what map=soils,aspect < input_coord.txt
 
 635342.21|7654321.09|site 1|45|21
 653324.88|7563412.42|site 2|44|20
@@ -67,7 +66,7 @@
 maximum input line length (e.g. 4096 characters).
 
 <div class="code"><pre>
-r.what input=soils,aspect east_north=635342.21,7654321.09,653324.88,7563412.42
+r.what map=soils,aspect coordinates=635342.21,7654321.09,653324.88,7563412.42
 
 635342.21|7654321.09|45|21
 653324.88|7563412.42|44|20
@@ -76,33 +75,35 @@
 
 <h3>Input coordinates piped from another program</h3>
 
-The input coordinates may be "piped" from the <tt>stdout</tt> of another program.
+The input coordinates may be "piped" from the <tt>stdout</tt> of another
+program. 
+<!-- (d.where is still present in grass7, but not very useful in this context)
 For example:
-
 <div class="code"><pre>
-d.where | r.what input=soils,aspect
+d.where | r.what map=soils,aspect
 
 635342.21|7654321.09|45|21
 653324.88|7563412.42|44|20
 </pre></div>
-
+-->
 In the next example, vector point coordinates are piped from the
-<em>v.out.ascii</em> module . The standard UNIX program "<tt>tr</tt>" is
+<em>v.out.ascii</em> module. The standard UNIX program "<tt>tr</tt>" is
 used to convert the column separators in <em>v.out.ascii</em>'s output into
 spaces for <em>r.what</em>.
 
 
 <div class="code"><pre>
-v.out.ascii bugsites fs=' ' | r.what input=soils,aspect
+v.out.ascii bugsites fs=' ' | r.what map=soils,aspect
 </pre></div>
 
+
 <h3>Output containing raster map category labels</h3>
 
 Here we use the <b>-f</b> label flag to enable the output of category labels
 associated with the raster cell(s), as well as values. (categorical maps only)
 
 <div class="code"><pre>
-r.what -f input=soils,aspect << EOF
+r.what -f map=soils,aspect << EOF
 635342.21 7654321.09 site 1
 653324.88 7563412.42 site 2
 EOF
@@ -133,8 +134,10 @@
 <a href="v.what.vect.html">v.what.vect</a>
 </em>
 
+
 <h2>AUTHOR</h2>
 Michael Shapiro,
 U.S. Army Construction Engineering Research Laboratory
 
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>