[GRASS-SVN] r33985 - grass-addons/raster/r.viewshed

Wed Oct 22 17:59:36 EDT 2008

Author: neteler
Date: 2008-10-22 17:59:36 -0400 (Wed, 22 Oct 2008)
New Revision: 33985

Modified:
   grass-addons/raster/r.viewshed/main.cc
   grass-addons/raster/r.viewshed/r.viewshed.html
Log:
changes parameter names to r.los compatibility (in agreement with ltoma)

Modified: grass-addons/raster/r.viewshed/main.cc
===================================================================

--- grass-addons/raster/r.viewshed/main.cc	2008-10-22 21:55:01 UTC (rev 33984)
+++ grass-addons/raster/r.viewshed/main.cc	2008-10-22 21:59:36 UTC (rev 33985)
@@ -519,7 +519,7 @@
   /* viewpoint coordinates */
   struct Option *viewLocOpt;
   viewLocOpt = G_define_option();
-  viewLocOpt->key = "viewpoint_location";
+  viewLocOpt->key = "coordinate";
   viewLocOpt->type = TYPE_STRING;
   viewLocOpt->required = YES;
   viewLocOpt->key_desc = "lat,long";
@@ -530,12 +530,12 @@
   /* observer elevation */
   struct Option *obsElevOpt;
   obsElevOpt = G_define_option();
-  obsElevOpt->key = "observer_elevation";
+  obsElevOpt->key = "obs_elev";
   obsElevOpt->type = TYPE_DOUBLE;
   obsElevOpt->required = NO;
   obsElevOpt->key_desc = "value";
   obsElevOpt->description = _("Viewing elevation above the ground");
-  obsElevOpt->answer = "0.0";
+  obsElevOpt->answer = "1.75";
   obsElevOpt->guisection = _("Input_options");
   
   /* max distance */

Modified: grass-addons/raster/r.viewshed/r.viewshed.html
===================================================================
--- grass-addons/raster/r.viewshed/r.viewshed.html	2008-10-22 21:55:01 UTC (rev 33984)
+++ grass-addons/raster/r.viewshed/r.viewshed.html	2008-10-22 21:59:36 UTC (rev 33985)
@@ -1,15 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>GRASS GIS: r.viewshed</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="grassdocs.css" type="text/css">
-</head>
-<body bgcolor="white">
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
-<h2>NAME</h2>
-<em><b>r.viewshed</b></em>
-
 <H2>DESCRIPTION</H2>
 
 <p><em>r.viewshed</em> is a module that computes the viewshed of a
@@ -26,9 +14,9 @@
 To run <em>r.viewshed</em>, the user must specify an input map name,
 an output map name, and the location of the viewpoint.  
 
-<p>Viewpoint: For the time being the viewpoint is assumed to be
-located inside the terrain.  The viewpoint location is, by default, in
-coordinate format, but if the <b>-r</b> flag is set, it is in
+<p>Viewpoint (<em>coordinate</em> parameter): For the time being the viewpoint
+is assumed to be located inside the terrain.  The viewpoint location is, by
+default, in coordinate format, but if the <b>-r</b> flag is set, it is in
 row-column format instead.
 
 <p>Output: The output map may have one of three possible formats,
@@ -84,7 +72,7 @@
 
 <p>Observer elevation: By default the observer is assumed to have
 height=0 above the terrain.  The user can change this using option
-<em>observer_elevation=...</em>. The value entered is in the same units
+<em>obs_elev=...</em>. The value entered is in the same units
 as the elevation.
 
 <p>Maximum visibility distance: By default there is no restriction on
@@ -192,7 +180,7 @@
 of a mountain:
 
 <div class="code"><pre>
-r.viewshed input=elevation.dem output=viewshed viewpoint_location=598869,4916642 mem=800
+r.viewshed input=elevation.dem output=viewshed coordinate=598869,4916642 mem=800
 </pre></div>
 
 <h3>REFERENCES</h3>
@@ -220,8 +208,6 @@
 <p> Yi Zhuang (Carnegie-Mellon University): <tt>yzhuang at andrew.cmu.edu</tt>
 
 <p>William Richard (Bowdoin College): <tt>willster3021 at gmail.com </tt>
-<HR>
-<P><a href="index.html">Main index</a> - <a href="raster.html">raster index</a> - <a href="full_index.html">Full index</a></P>
-<P>&copy; 2003-2008 <a href="http://grass.osgeo.org">GRASS Development Team</a></p>
-</body>
-</html>
+
+<p><i>Last changed: $Date: 2008-05-16 21:09:06 +0200 (Fri, 16 May 2008) $</i>
+

