[GRASS-SVN] r61901 - in grass/branches/releasebranch_7_0: gui/wxpython/xml raster raster/r.horizon raster/r.viewshed

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2014-09-13 11:24:08 -0700 (Sat, 13 Sep 2014)
New Revision: 61901

Removed:
   grass/branches/releasebranch_7_0/raster/r.los/
   grass/branches/releasebranch_7_0/raster/r.viewshed/testscript.sh
Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
   grass/branches/releasebranch_7_0/raster/Makefile
   grass/branches/releasebranch_7_0/raster/r.horizon/r.horizon.html
   grass/branches/releasebranch_7_0/raster/r.viewshed/r.viewshed.html
Log:
r.los: move to addons (backport of r61899), remove links, remove r.los-r.viewshed test script (now in r.los addon)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml	2014-09-13 18:21:59 UTC (rev 61900)
+++ grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml	2014-09-13 18:24:08 UTC (rev 61901)
@@ -806,9 +806,6 @@
       <module-item name="r.viewshed">
         <label>Visibility</label>
       </module-item>
-      <module-item name="r.los">
-        <label>Visibility [DEPRECATED]</label>
-      </module-item>
       <module-item name="r.grow.distance">
         <label>Distance to features</label>
       </module-item>

Modified: grass/branches/releasebranch_7_0/raster/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/raster/Makefile	2014-09-13 18:21:59 UTC (rev 61900)
+++ grass/branches/releasebranch_7_0/raster/Makefile	2014-09-13 18:24:08 UTC (rev 61901)
@@ -43,7 +43,6 @@
 	r.latlong \
 	r.lake \
 	r.li \
-	r.los \
 	r.mapcalc \
 	r.mfilter \
 	r.mode \

Modified: grass/branches/releasebranch_7_0/raster/r.horizon/r.horizon.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.horizon/r.horizon.html	2014-09-13 18:21:59 UTC (rev 61900)
+++ grass/branches/releasebranch_7_0/raster/r.horizon/r.horizon.html	2014-09-13 18:24:08 UTC (rev 61901)
@@ -167,7 +167,6 @@
 <em>
 <a href="r.sun.html">r.sun</a>,
 <a href="r.sunmask.html">r.sunmask</a>,
-<a href="r.los.html">r.los</a>,
 <a href="r.viewshed.html">r.viewshed</a></em>
 
 

Modified: grass/branches/releasebranch_7_0/raster/r.viewshed/r.viewshed.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.viewshed/r.viewshed.html	2014-09-13 18:21:59 UTC (rev 61900)
+++ grass/branches/releasebranch_7_0/raster/r.viewshed/r.viewshed.html	2014-09-13 18:24:08 UTC (rev 61901)
@@ -226,7 +226,6 @@
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="r.los.html">r.los</a>,
 <a href="r.mapcalc.html">r.mapcalc</a>
 </em>
 

Deleted: grass/branches/releasebranch_7_0/raster/r.viewshed/testscript.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.viewshed/testscript.sh	2014-09-13 18:21:59 UTC (rev 61900)
+++ grass/branches/releasebranch_7_0/raster/r.viewshed/testscript.sh	2014-09-13 18:24:08 UTC (rev 61901)
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# Test script for r.viewshed based on a synthetic DEM
-# RUN THIS IS ANY GRASS LOCATION, e.g. NC or Spearfish
-
-# create first hemisphere
-g.region n=1000 s=0 w=0 e=1000 -p res=1
-r.mapcalc 'disk.15031=if(sqrt((col() - 500)^2 + (500 - row())^2)<500,sqrt((col() - 500)^2 + (500 - row())^2),null())'
-r.mapcalc 'hemisphere1=500 * sin(acos (disk.15031/500))'
-
-# create second hemisphere
-g.region n=500 s=0 w=0 e=500 -p res=1
-r.mapcalc 'disk.14947=if(sqrt((col() - 500)^2 + (500 - row())^2)<500,sqrt((col() - 500)^2 + (500 - row())^2),null())'
-r.mapcalc 'hemisphere2=500 * sin(acos (disk.14947/500))'
-g.remove --q rast=disk.14947,disk.15031
-# merge both
-r.mapcalc "hemisphere=hemisphere1 + hemisphere2"
-
-d.mon x0
-d.rast hemisphere
-
-# run r.viewshed
-r.viewshed hemisphere out=hemisphere_viewshed coord=250,250 max=1000000 obs=100 mem=2000 --o
-r.shaded.relief hemisphere --o
-d.his h=hemisphere_viewshed i=hemisphere.shade
-
-# compare to r.los
-r.los hemisphere out=hemisphere_los coord=250,250 max=1000000 obs=100 --o
-d.mon x1
-d.his h=hemisphere_los i=hemisphere.shade
-
-r.mapcalc "hemisphere_diff = hemisphere_viewshed - hemisphere_los"
-r.colors hemisphere_diff color=differences
-d.mon x2
-d.rast.leg pos=80 map=hemisphere_diff
-
-nviz hemisphere col=hemisphere_viewshed
-