[GRASS-SVN] r63712 - in grass/branches/releasebranch_7_0: . lib/gis raster/r.cost raster/r.walk
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Dec 24 03:16:01 PST 2014
Author: martinl
Date: 2014-12-24 03:16:01 -0800 (Wed, 24 Dec 2014)
New Revision: 63712
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/gis/renamed_options
grass/branches/releasebranch_7_0/raster/r.cost/main.c
grass/branches/releasebranch_7_0/raster/r.cost/r.cost.html
grass/branches/releasebranch_7_0/raster/r.walk/main.c
Log:
r.cost|r.walk: stream_rast -> stream_raster (#2409)
(merge r63711 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711
Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options 2014-12-24 11:14:13 UTC (rev 63711)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options 2014-12-24 11:16:01 UTC (rev 63712)
@@ -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/branches/releasebranch_7_0/raster/r.cost/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.cost/main.c 2014-12-24 11:14:13 UTC (rev 63711)
+++ grass/branches/releasebranch_7_0/raster/r.cost/main.c 2014-12-24 11:16:01 UTC (rev 63712)
@@ -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/branches/releasebranch_7_0/raster/r.cost/r.cost.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.cost/r.cost.html 2014-12-24 11:14:13 UTC (rev 63711)
+++ grass/branches/releasebranch_7_0/raster/r.cost/r.cost.html 2014-12-24 11:16:01 UTC (rev 63712)
@@ -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/branches/releasebranch_7_0/raster/r.walk/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.walk/main.c 2014-12-24 11:14:13 UTC (rev 63711)
+++ grass/branches/releasebranch_7_0/raster/r.walk/main.c 2014-12-24 11:16:01 UTC (rev 63712)
@@ -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