r.colors|r3.colors|v.colors: rename 'volume' to 'raster_3d' - https://trac.osgeo.org/grass/ticket/2409

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63704 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/gis/renamed_options

@@ -170,6 +170,8 @@ r.basins.fill|t_map:tnetwork
 r.basins.fill|result:output
 # r.blend
 r.blend|output:output_prefix
+# r.colors
+r.colors|volume:raster_3d
 # r.colors.stddev
 r.colors.stddev|input:map
 # r.cost
@@ -375,6 +377,8 @@ r.viewshed|max_dist:max_distance
 ############################
 ### Raster 3D module changes
 ############################
+# r3.colors
+r3.colors|volume:raster_3d
 # r3.gwflow
 r3.gwflow|q:sink
 r3.gwflow|s:yield
@@ -402,6 +406,8 @@ t.vect.export|extrdir:directory
 #########################
 # v.clean
 v.clean|thresh:threshold
+# v.colors
+v.colors|volume:raster_3d
 # v.drape
 v.drape|rast:elevation
 # v.edit

raster/r.colors/edit_colors.c

@@ -97,7 +97,7 @@ int edit_colors(int argc, char **argv, int type, const char *maptype,
     opt.rast->guisection = _("Define");
 
     opt.volume = G_define_standard_option(G_OPT_R3_INPUT);
-    opt.volume->key = "volume";
+    opt.volume->key = "raster_3d";
     opt.volume->required = NO;
     opt.volume->description =
         _("3D raster map from which to copy color table");

raster/r.colors/r.colors.html

@@ -6,10 +6,10 @@ The raster maps (specified on the command line
 by <b>map</b> or as <b>file</b> using an input file with one map name per line) 
 must exist in the user's current mapset search path.
 
-<p>The <b>rast</b> option allows user to specify a raster map <i>name</i>
+<p>The <b>raster</b> option allows user to specify a raster map <i>name</i>
 from which to copy the color map.
 
-<p>The <b>volume</b> option allows user to specify a volume (3D raster)
+<p>The <b>raster_3d</b> option allows user to specify a 3D raster
 map <i>name</i> from which to copy the color map.
 
 <p>The <b>-e</b> flag equalizes the original raster's color table. It can

temporal/t.rast.colors/t.rast.colors.py

@@ -41,7 +41,7 @@
 #%end
 
 #%option G_OPT_R3_INPUT
-#% key: volume
+#% key: raster_3d
 #% description: 3D raster map from which to copy color table
 #% required: no
 #% guisection: Define
@@ -108,7 +108,7 @@ def main():
     input = options["input"]
     color = options["color"]
     raster = options["raster"]
-    volume = options["volume"]
+    volume = options["raster_3d"]
     rules = options["rules"]
     remove = flags["r"]
     write = flags["w"]

vector/v.colors/main.c

@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
     opt.rast->guisection = _("Define");
 
     opt.volume = G_define_standard_option(G_OPT_R3_INPUT);
-    opt.volume->key = "volume";
+    opt.volume->key = "raster_3d";
     opt.volume->required = NO;
     opt.volume->description =
         _("3D raster map from which to copy color table");

vector/v.colors/v.colors.html

@@ -11,7 +11,7 @@ rules based on points or centroids z-coordinate (<b>use=z</b>). 3D
 vector lines are not supported.
 
 <p>The <b>raster</b> option allows user to specify a raster map from
-which to copy the color table, similarly <b>volume</b> option for 3D
+which to copy the color table, similarly <b>raster_3d</b> option for 3D
 raster map.
 
 <p>The <b>rules</b> color table type will cause <em>v.colors</em> to