[GRASS-SVN] r66089 - grass-addons/grass7/raster/r.viewshed.cva

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-09-03 12:46:40 -0700 (Thu, 03 Sep 2015)
New Revision: 66089

Modified:
   grass-addons/grass7/raster/r.viewshed.cva/r.viewshed.cva.html
   grass-addons/grass7/raster/r.viewshed.cva/r.viewshed.cva.py
Log:
r.viewshed.cva addon: fix name_column parameter name; update examples

Modified: grass-addons/grass7/raster/r.viewshed.cva/r.viewshed.cva.html
===================================================================
--- grass-addons/grass7/raster/r.viewshed.cva/r.viewshed.cva.html	2015-09-03 19:29:53 UTC (rev 66088)
+++ grass-addons/grass7/raster/r.viewshed.cva/r.viewshed.cva.html	2015-09-03 19:46:40 UTC (rev 66089)
@@ -6,14 +6,14 @@
 a python wrapper script that iterative loops through each input 
 point, calculating a viewshed map, and then creates an output map 
 that is coded by the number of input locations that can "see" each 
-cell. <em>r.viewshed.cva</em> uses the GRASS module <em>r.viewshed</em>
+cell. <em>r.viewshed.cva</em> uses the GRASS GIS module <em>r.viewshed</em>
 for the viewshed analysis. <em>r.viewshed</em> is very fast, 
 thus allowing for a cumulative viewshed analysis to run in a 
 reasonable amount of time. The final cumulative viewshed map is 
 computed using the "count" method of <em>r.series</em>, rather than 
 with mapcalc, as it better handles the null values in the individual 
 constituent viewshed maps (and allows for interim viewshed maps to 
-be coded in any way)
+be coded in any way).
 <p>
 
 <h3>Options and flags:</h3>
@@ -24,16 +24,17 @@
  you to keep the interim viewshed maps made for each input point. 
 Optionally, option <b>name_col</b> can be used with <b>-k</b> to specify 
 the suffix of the kept viewshed maps by a particular column in the 
-input vector sites' database. If no value is specified for <b>name_col</b>, 
+input vector points' database. If no value is specified for <b>name_col</b>, 
 then the cat value will be used.
 <p>
 All other flags and options are inherited from 
-<em>r.viewshed<em> (see the <a href="r.viewshed.html">r.viewshed</a> help page for more 
-information on these).
+<em>r.viewshed<em> (see the <a href="r.viewshed.html">r.viewshed</a>
+help page for more information on these).
 <p>
 
 <h2>NOTES</h2>
 
+<!-- todo: mention r.geomorphon addon for summit extraction -->
 The input vector points map can be manually digitized (with <em>
 v.digit</em>) over topographic or cultural features, or can be 
 created as a series of random points (with <em>r.random</em> or <em>
@@ -46,25 +47,26 @@
 <p>
 
 <h2>EXAMPLES</h2>
-Undertake a cumulative viewshed analysis from a digitized vector points map of prominent peaks in a region:<br>
+Undertake a cumulative viewshed analysis from a digitized vector points
+map of prominent peaks in a region:<br>
 
 <div class="code"><pre>
-g.region rast=elevation_10m_dem at PERMANENT -p
-[use v.digit to digitize points]
-r.viewshed.cva.py elev=elevation10m_demPERMANENT output=peaks_CVA_map \
-  vect=prominent_peaks_points at PERMANENT x_column=x y_column=y \
-  name_column=cat obs_elev=0.0 tgt_elev=1.75 max_dist=-1 mem=1500
+g.region raster=elevation_10m_dem -p
+# [use v.digit to digitize points or eg the r.geomorphon addon for summits]
+r.viewshed.cva input=elevation10m_dem output=peaks_CVA_map \
+  vector=prominent_peaks_points name_column=cat \
+  observer_elevation=1.75 target_elevation=0
 </pre></div>
 
 
 <br>Undertake a cumulative viewshed analysis from a 10% sample of landscape locations in a region:<br>
 
 <div class="code"><pre>
-g.region rast=elevation_10m_dem at PERMANENT
-r.random input=elevation10m_demPERMANENT n=10% vector_output=rand_points_10p
-r.viewshed.cva.py elev=elevation10m_demPERMANENT output=peaks_CVA_map \
-  vect=rand_points_10p at PERMANENT x_column=x y_column=y \
-  name_column=cat obs_elev=0.0 tgt_elev=1.75 max_dist=-1 mem=1500
+g.region raster=elevation_10m_dem
+r.random input=elevation10m_dem n=10% vector_output=rand_points_10p
+r.viewshed.cva input=elevation10m_dem output=peaks_CVA_map \
+  vector=rand_points_10p name_column=cat \
+  observer_elevation=1.75 target_elevation=0
 </pre></div>
 
 

Modified: grass-addons/grass7/raster/r.viewshed.cva/r.viewshed.cva.py
===================================================================
--- grass-addons/grass7/raster/r.viewshed.cva/r.viewshed.cva.py	2015-09-03 19:29:53 UTC (rev 66088)
+++ grass-addons/grass7/raster/r.viewshed.cva/r.viewshed.cva.py	2015-09-03 19:46:40 UTC (rev 66089)
@@ -26,7 +26,7 @@
 
 #%option G_OPT_V_INPUT
 #% key: vector
-#% description: Name of input vector points map containg the set of sites for this analysis.
+#% description: Name of input vector points map containg the set of points for this analysis.
 #%end
 
 #%option G_OPT_R_OUTPUT
@@ -76,8 +76,8 @@
 #%end
 
 #%option G_OPT_DB_COLUMN
-#% key: name_col
-#% description: Database column for site names (with flag -k)
+#% key: name_column
+#% description: Database column for point names (with flag -k)
 #% required : no
 #%end