[GRASS-SVN] r56613 - in grass/trunk/raster: . r.shaded.relief

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Jun 5 08:09:05 PDT 2013


Author: mmetz
Date: 2013-06-05 08:09:05 -0700 (Wed, 05 Jun 2013)
New Revision: 56613

Added:
   grass/trunk/raster/r.shaded.relief/
   grass/trunk/raster/r.shaded.relief/Makefile
   grass/trunk/raster/r.shaded.relief/r.shaded.relief.html
Removed:
   grass/trunk/raster/r.shaded.relief/Makefile
   grass/trunk/raster/r.shaded.relief/r.shaded.relief2.html
Modified:
   grass/trunk/raster/Makefile
Log:
r.shaded.relief2 -> r.shaded.relief

Modified: grass/trunk/raster/Makefile
===================================================================
--- grass/trunk/raster/Makefile	2013-06-05 15:06:57 UTC (rev 56612)
+++ grass/trunk/raster/Makefile	2013-06-05 15:09:05 UTC (rev 56613)
@@ -88,7 +88,7 @@
 	r.ros \
 	r.series \
 	r.series.interp \
-	r.shaded.relief2 \
+	r.shaded.relief \
 	r.slope.aspect \
 	r.solute.transport \
 	r.spread \

Deleted: grass/trunk/raster/r.shaded.relief/Makefile
===================================================================
--- grass/trunk/raster/r.shaded.relief2/Makefile	2013-05-31 19:48:30 UTC (rev 56523)
+++ grass/trunk/raster/r.shaded.relief/Makefile	2013-06-05 15:09:05 UTC (rev 56613)
@@ -1,10 +0,0 @@
-MODULE_TOPDIR = ../..
-
-PGM = r.shaded.relief2
-
-LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(RASTERDEP) $(GISDEP)
-
-include $(MODULE_TOPDIR)/include/Make/Module.make
-
-default: cmd

Copied: grass/trunk/raster/r.shaded.relief/Makefile (from rev 56612, grass/trunk/raster/r.shaded.relief2/Makefile)
===================================================================
--- grass/trunk/raster/r.shaded.relief/Makefile	                        (rev 0)
+++ grass/trunk/raster/r.shaded.relief/Makefile	2013-06-05 15:09:05 UTC (rev 56613)
@@ -0,0 +1,10 @@
+MODULE_TOPDIR = ../..
+
+PGM = r.shaded.relief
+
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd

Copied: grass/trunk/raster/r.shaded.relief/r.shaded.relief.html (from rev 56612, grass/trunk/raster/r.shaded.relief2/r.shaded.relief.html)
===================================================================
--- grass/trunk/raster/r.shaded.relief/r.shaded.relief.html	                        (rev 0)
+++ grass/trunk/raster/r.shaded.relief/r.shaded.relief.html	2013-06-05 15:09:05 UTC (rev 56613)
@@ -0,0 +1,88 @@
+<h2>DESCRIPTION</h2>
+
+<em>r.shaded.relief</em> creates a raster shaded relief map based on 
+current resolution settings and on sun altitude, azimuth, and 
+z-exaggeration values entered by the user. If no output shademap 
+name is given, the new shaded relief map is named <em><input_map
+>.shade</em>. The map is assigned a grey-scale color table.
+
+<p>The parameters controlling the shading are:
+<ol>
+<li>A raster map layer to provide elevation values for the shaded 
+relief map.  Typically, this would be a map layer of elevation; 
+however, any raster map layer can be named.
+
+<li>The <b>altitude</b> of the sun in degrees above the horizon
+(a value between 0 and 90 degrees).
+
+<li>The <b>azimuth</b> of the sun in degrees to the east of north
+(a value between 0 and 360 degrees).
+
+<li>The scaling parameter, which compensates for a different 
+horizontal <b>scale</b> than vertical scale. If <b>scale</b> is a 
+number, then the ewres and nsres are multiplied by that scale to 
+calculate the shading. (Default=1.0 for equivalent horizontal and 
+vertical scales.)
+
+<li>The <b>zmult</b> exaggeration factor that changes the apparent relief
+for the shaded relief map.  This can be any positive (or negative) floating
+point value. (Default=1.0)
+
+<li>Horizontal distances are calculated in meters, using geodesic 
+distances for a latitude-longitude projection. With an elevation map 
+measured in feet, the <b>units</b> option can be set to automatically 
+convert meters to international feet (0.3048 meters = 1 foot) or survey 
+feet (1200 / 3937 meters = 1 foot). The <b>units</b> parameter overrides 
+the <b>scale</b> parameter.
+
+</ol>
+
+<p><em>r.shaded.relief</em> assigns a grey-scale color table to the new 
+shaded relief map.
+
+<h2>NOTES</h2>
+
+To visually improve the result of shade maps from low resolution elevation
+models, use <em>r.resamp.interp</em> with bilinear or bicubic method to
+resample the DEM at higher resolution. <em>r.shaded.relief</em> is then
+run on the resampled DEM.
+
+<h2>EXAMPLES</h2>
+
+In this example, the aspect map in the North Carolina sample
+dataset location is used to hillshade the elevation map:
+
+<div class="code"><pre>
+g.region rast=elevation -p
+r.shaded.relief input=elevation output=elevation.shaded
+</pre></div>
+
+<p>In Latitude-Longitude locations (or other non-metric locations), the
+<em>scale</em> factor has to be used:
+
+<div class="code"><pre>
+# Latitude-Longitude example
+r.shaded.relief input=srtm output=srtm.shaded scale=111120
+</pre></div>
+
+<h2>SEE ALSO</h2>
+
+<p><!-- RGB version not ported to GRASS 6 (why?):
+  <em><a href="shade.clr.sh.html">shade.clr.sh</a></em><br>
+ -->
+<em>
+<a href="d.his.html">d.his</a>,
+<a href="g.region.html">g.region</a>,
+<a href="r.blend.html">r.blend</a>,
+<a href="r.colors.html">r.colors</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.resamp.interp.html">r.resamp.interp</a>
+</em>
+
+<h2>AUTHORS</h2>
+
+Jim Westervelt, U.S. Army Construction Engineering Research Laboratory
+<br>
+Markus Metz: GRASS GIS 7- enhanced fast C version of r.shaded.relief
+
+<p><i>Last changed: $Date$</i>

Deleted: grass/trunk/raster/r.shaded.relief/r.shaded.relief2.html
===================================================================
--- grass/trunk/raster/r.shaded.relief2/r.shaded.relief2.html	2013-05-31 19:48:30 UTC (rev 56523)
+++ grass/trunk/raster/r.shaded.relief/r.shaded.relief2.html	2013-06-05 15:09:05 UTC (rev 56613)
@@ -1,88 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<em>r.shaded.relief</em> creates a raster shaded relief map based on 
-current resolution settings and on sun altitude, azimuth, and 
-z-exaggeration values entered by the user. If no output shademap 
-name is given, the new shaded relief map is named <em><input_map
->.shade</em>. The map is assigned a grey-scale color table.
-
-<p>The parameters controlling the shading are:
-<ol>
-<li>A raster map layer to provide elevation values for the shaded 
-relief map.  Typically, this would be a map layer of elevation; 
-however, any raster map layer can be named.
-
-<li>The <b>altitude</b> of the sun in degrees above the horizon
-(a value between 0 and 90 degrees).
-
-<li>The <b>azimuth</b> of the sun in degrees to the east of north
-(a value between 0 and 360 degrees).
-
-<li>The scaling parameter, which compensates for a different 
-horizontal <b>scale</b> than vertical scale. If <b>scale</b> is a 
-number, then the ewres and nsres are multiplied by that scale to 
-calculate the shading. (Default=1.0 for equivalent horizontal and 
-vertical scales.)
-
-<li>The <b>zmult</b> exaggeration factor that changes the apparent relief
-for the shaded relief map.  This can be any positive (or negative) floating
-point value. (Default=1.0)
-
-<li>Horizontal distances are calculated in meters, using geodesic 
-distances for a latitude-longitude projection. With an elevation map 
-measured in feet, the <b>units</b> option can be set to automatically 
-convert meters to international feet (0.3048 meters = 1 foot) or survey 
-feet (1200 / 3937 meters = 1 foot). The <b>units</b> parameter overrides 
-the <b>scale</b> parameter.
-
-</ol>
-
-<p><em>r.shaded.relief</em> assigns a grey-scale color table to the new 
-shaded relief map.
-
-<h2>NOTES</h2>
-
-To visually improve the result of shade maps from low resolution elevation
-models, use <em>r.resamp.interp</em> with bilinear or bicubic method to
-resample the DEM at higher resolution. <em>r.shaded.relief</em> is then
-run on the resampled DEM.
-
-<h2>EXAMPLES</h2>
-
-In this example, the aspect map in the North Carolina sample
-dataset location is used to hillshade the elevation map:
-
-<div class="code"><pre>
-g.region rast=elevation -p
-r.shaded.relief input=elevation output=elevation.shaded
-</pre></div>
-
-<p>In Latitude-Longitude locations (or other non-metric locations), the
-<em>scale</em> factor has to be used:
-
-<div class="code"><pre>
-# Latitude-Longitude example
-r.shaded.relief input=srtm output=srtm.shaded scale=111120
-</pre></div>
-
-<h2>SEE ALSO</h2>
-
-<p><!-- RGB version not ported to GRASS 6 (why?):
-  <em><a href="shade.clr.sh.html">shade.clr.sh</a></em><br>
- -->
-<em>
-<a href="d.his.html">d.his</a>,
-<a href="g.region.html">g.region</a>,
-<a href="r.blend.html">r.blend</a>,
-<a href="r.colors.html">r.colors</a>,
-<a href="r.mapcalc.html">r.mapcalc</a>,
-<a href="r.resamp.interp.html">r.resamp.interp</a>
-</em>
-
-<h2>AUTHORS</h2>
-
-Jim Westervelt, U.S. Army Construction Engineering Research Laboratory
-<br>
-Markus Metz: GRASS GIS 7- enhanced fast C version of r.shaded.relief
-
-<p><i>Last changed: $Date$</i>



More information about the grass-commit mailing list