v.to.rast: Change use=val to use=value (#3110)

The use parameter (option) had value 'val' while the parameter which is using that is called value. This makes it consistent, so use=value and value=1, not use=val and value=1. Both can be shortened, so even use=val and val=1 are still valid parameters.

This changes code which is using v.to.rast.

This does not change the other possible values (options), namely attr, cat, and dir.

gui/wxpython/rlisetup/functions.py

@@ -97,7 +97,7 @@ def convertFeature(vect, outrast, cat, origrast, layer="1", overwrite=False):
         input=tmp_vect,
         type="area",
         layer=layer,
-        use="val",
+        use="value",
         value=cat,
         output=outrast,
         overwrite=overwrite,

gui/wxpython/rlisetup/sampling_frame.py

@@ -285,7 +285,9 @@ def writeArea(self, coords, rasterName):
             "r.to.vect", input=tmpraster, output=tmpvector, type="area", overwrite=True
         )
 
-        RunCommand("v.to.rast", input=tmpvector, output=rasterName, value=1, use="val")
+        RunCommand(
+            "v.to.rast", input=tmpvector, output=rasterName, value=1, use="value"
+        )
         wx.EndBusyCursor()
         grass.use_temp_region()
         grass.run_command("g.region", vector=tmpvector)

scripts/r.mask/r.mask.py

@@ -203,8 +203,8 @@ def main():
                 input=to_rast_input,
                 layer=layer,
                 output="MASK",
-                use="val",
-                val="1",
+                use="value",
+                value="1",
                 type="area",
                 cats=cats,
                 where=where,

vector/v.to.rast/main.c

@@ -71,10 +71,10 @@ int main(int argc, char *argv[])
     use_opt->type = TYPE_STRING;
     use_opt->required = YES;
     use_opt->multiple = NO;
-    use_opt->options = "attr,cat,val,z,dir";
+    use_opt->options = "attr,cat,value,z,dir";
     use_opt->description = _("Source of raster values");
     desc = NULL;
-    G_asprintf(&desc, "attr;%s;cat;%s;val;%s;z;%s;dir;%s",
+    G_asprintf(&desc, "attr;%s;cat;%s;value;%s;z;%s;dir;%s",
                _("read values from attribute table"), _("use category values"),
                _("use value specified by value option"),
                _("use z coordinate (points or contours only)"),
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
     val_opt->required = NO;
     val_opt->multiple = NO;
     val_opt->answer = "1";
-    val_opt->description = _("Raster value (for use=val)");
+    val_opt->description = _("Raster value (for use=value)");
 
     memory = G_define_standard_option(G_OPT_MEMORYMB);
 

vector/v.to.rast/v.to.rast.html

@@ -31,7 +31,7 @@ <h2>NOTES</h2>
 <li>
 <em>cat</em>  - read values from category
 <li>
-<em>val</em>  - use value specified by <em><b>value</b></em> option
+<em>value</em>  - use value specified by <em><b>value</b></em> option
 <li>
 <em>z</em>    - use z coordinate (points or contours only)
 <li>
@@ -65,7 +65,7 @@ <h2>NOTES</h2>
 <p>
 Boundaries (usually without categories) can be rasterized with
 <div class="code"><pre>
-v.to.rast type=boundary layer=-1 use=val
+v.to.rast type=boundary layer=-1 use=value
 </pre></div>
 
 <h2>EXAMPLES</h2>