Explorar el Código

r.viewshed: rename options (merge from trunk, https://trac.osgeo.org/grass/changeset/63276)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63278 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová hace 10 años
padre
commit
b8e3d001e9
Se han modificado 2 ficheros con 7 adiciones y 3 borrados
  1. 4 0
      lib/gis/renamed_options
  2. 3 3
      raster/r.viewshed/main.cpp

+ 4 - 0
lib/gis/renamed_options

@@ -348,6 +348,10 @@ r.spreadpath|coordinate:coordinates
 r.terraflow|stream_dir:directory
 # r.out.vtk
 r.out.vtk|elevscale:zscale
+# r.viewshed
+r.viewshed|obs_elev:observer_elevation
+r.viewshed|tgt_elev:target_elevation
+r.viewshed|max_dist:max_distance
 ############################
 ### Raster 3D module changes
 ############################

+ 3 - 3
raster/r.viewshed/main.cpp

@@ -490,7 +490,7 @@ parse_args(int argc, char *argv[], int *vpRow, int *vpCol,
     struct Option *obsElevOpt;
 
     obsElevOpt = G_define_option();
-    obsElevOpt->key = "obs_elev";
+    obsElevOpt->key = "observer_elevation";
     obsElevOpt->type = TYPE_DOUBLE;
     obsElevOpt->required = NO;
     obsElevOpt->key_desc = "value";
@@ -502,7 +502,7 @@ parse_args(int argc, char *argv[], int *vpRow, int *vpCol,
     struct Option *tgtElevOpt;
 
     tgtElevOpt = G_define_option();
-    tgtElevOpt->key = "tgt_elev";
+    tgtElevOpt->key = "target_elevation";
     tgtElevOpt->type = TYPE_DOUBLE;
     tgtElevOpt->required = NO;
     tgtElevOpt->key_desc = "value";
@@ -514,7 +514,7 @@ parse_args(int argc, char *argv[], int *vpRow, int *vpCol,
     struct Option *maxDistOpt;
 
     maxDistOpt = G_define_option();
-    maxDistOpt->key = "max_dist";
+    maxDistOpt->key = "max_distance";
     maxDistOpt->type = TYPE_DOUBLE;
     maxDistOpt->required = NO;
     maxDistOpt->key_desc = "value";