[GRASS-SVN] r63711 - in grass/trunk: lib/gis raster/r.cost raster/r.walk

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Dec 24 03:14:13 PST 2014


Author: martinl
Date: 2014-12-24 03:14:13 -0800 (Wed, 24 Dec 2014)
New Revision: 63711

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/raster/r.cost/main.c
   grass/trunk/raster/r.cost/r.cost.html
   grass/trunk/raster/r.walk/main.c
Log:
r.cost|r.walk: stream_rast -> stream_raster (#2409)


Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2014-12-24 11:08:30 UTC (rev 63710)
+++ grass/trunk/lib/gis/renamed_options	2014-12-24 11:14:13 UTC (rev 63711)
@@ -178,6 +178,7 @@
 r.colors.stddev|input:map
 # r.cost
 r.cost|coordinate:start_coordinates
+r.cost|start_rast:start_raster
 # r.distance
 r.distance|maps:map
 # r.drain
@@ -302,6 +303,7 @@
 r.uslek|usle_k:output
 # r.walk
 r.walk|coordinate:start_coordinates
+r.walk|start_rast:start_raster
 # r.water.outlet
 r.water.outlet|drainage:input
 r.water.outlet|basin:output

Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c	2014-12-24 11:08:30 UTC (rev 63710)
+++ grass/trunk/raster/r.cost/main.c	2014-12-24 11:14:13 UTC (rev 63711)
@@ -180,7 +180,7 @@
     opt8->guisection = _("Stop");
 
     opt9 = G_define_standard_option(G_OPT_R_INPUT);
-    opt9->key = "start_rast";
+    opt9->key = "start_raster";
     opt9->required = NO;
     opt9->description = _("Name of starting raster points map");
     opt9->guisection = _("Start");

Modified: grass/trunk/raster/r.cost/r.cost.html
===================================================================
--- grass/trunk/raster/r.cost/r.cost.html	2014-12-24 11:08:30 UTC (rev 63710)
+++ grass/trunk/raster/r.cost/r.cost.html	2014-12-24 11:14:13 UTC (rev 63711)
@@ -32,7 +32,7 @@
 point from which the transportation cost should be figured. As many points as
 desired can be entered by the user. These starting points can also be read
 from a vector points file through the <b>start_points</b> option or from a
-raster map through the <b>start_rast</b> option.
+raster map through the <b>start_raster</b> option.
 <p>
 <em>r.cost</em> will stop cumulating costs when either <b>max_cost</b> is reached,
 or one of the stop points given with <b>stop_coordinates</b> is reached.
@@ -219,7 +219,7 @@
 <div class="code"><pre>
   g.region raster=roads -p
   r.mapcalc "area.one = 1"
-  r.cost -k input=area.one output=distance start_rast=roads
+  r.cost -k input=area.one output=distance start_raster=roads
   d.rast distance
   d.rast.num distance
 
@@ -251,7 +251,7 @@
 cost raster map "costs":
 
 <div class="code"><pre>
-r.cost input=costs start_rast=sources output=costsurf nearest=costalloc
+r.cost input=costs start_raster=sources output=costsurf nearest=costalloc
 </pre></div>
 
 

Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c	2014-12-24 11:08:30 UTC (rev 63710)
+++ grass/trunk/raster/r.walk/main.c	2014-12-24 11:14:13 UTC (rev 63711)
@@ -215,7 +215,7 @@
     opt8->guisection = _("Stop");
 
     opt9 = G_define_standard_option(G_OPT_R_INPUT);
-    opt9->key = "start_rast";
+    opt9->key = "start_raster";
     opt9->required = NO;
     opt9->description = _("Name of starting raster points map");
     opt9->guisection = _("Start");



More information about the grass-commit mailing list