create standardized option for location and dbase, use it in r.proj, v.proj, g.mapset (merge from trunk, https://trac.osgeo.org/grass/changeset/64732)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@64733 15284696-431f-4ddb-bdfa-cd5b030d7da7

general/g.mapset/main.c

@@ -57,20 +57,10 @@ int main(int argc, char *argv[])
     opt.mapset->guisection = _("Mapset");
     opt.mapset->gisprompt = "new,mapset,mapset";
 
-    opt.location = G_define_option();
-    opt.location->key = "location";
-    opt.location->type = TYPE_STRING;
-    opt.location->required = NO;
-    opt.location->multiple = NO;
-    opt.location->key_desc = "name";
-    opt.location->description = _("Location name (not location path)");
+    opt.location = G_define_standard_option(G_OPT_M_LOCATION);
     opt.location->guisection = _("Mapset");
 
-    opt.gisdbase = G_define_standard_option(G_OPT_M_DIR);
-    opt.gisdbase->key = "dbase";
-    opt.gisdbase->required = NO;
-    opt.gisdbase->label = _("GIS data directory");
-    opt.gisdbase->description = _("Full path to the directory where the new location is");
+    opt.gisdbase = G_define_standard_option(G_OPT_M_DBASE);
     opt.gisdbase->guisection = _("Mapset");
 
     flag.add = G_define_flag();

include/gis.h

@@ -264,6 +264,8 @@ typedef enum
     G_OPT_M_UNITS,              /*!< units */
     G_OPT_M_DATATYPE,           /*!< datatype */
     G_OPT_M_MAPSET,             /*!< mapset */
+    G_OPT_M_LOCATION,           /*!< location */
+    G_OPT_M_DBASE,              /*!< dbase */
     G_OPT_M_COORDS,             /*!< coordinates */
     G_OPT_M_COLR,               /*!< color rules */
     G_OPT_M_DIR,                /*!< directory input */    

lib/gis/parser_standard_options.c

@@ -100,6 +100,8 @@
    - G_OPT_M_UNITS
    - G_OPT_M_DATATYPE
    - G_OPT_M_MAPSET
+   - G_OPT_M_LOCATION
+   - G_OPT_M_DBASE
    - G_OPT_M_COORDS
    - G_OPT_M_COLR
    - G_OPT_M_REGION
@@ -653,6 +655,28 @@ struct Option *G_define_standard_option(int opt)
 	Opt->label = _("Name of mapset (default: current search path)");
 	Opt->description = _("'.' for current mapset");
 	break;
+	
+    case G_OPT_M_LOCATION:
+    Opt->key = "location";
+    Opt->type = TYPE_STRING;
+    Opt->required = NO;
+    Opt->multiple = NO;
+    Opt->label = _("Location name");
+    Opt->description = _("Location name (not location path)");
+    Opt->gisprompt = "old,location,location";
+    Opt->key_desc = "name";
+    break;
+
+    case G_OPT_M_DBASE:
+    Opt->key = "dbase";
+    Opt->type = TYPE_STRING;
+    Opt->required = NO;
+    Opt->multiple = NO;
+    Opt->label = _("GRASS GIS database directory");
+    Opt->description = _("Default: path to the current GRASS GIS database");
+    Opt->gisprompt = "old,dbase,dbase";
+    Opt->key_desc = "path";
+    break;
 
     case G_OPT_M_COORDS:
 	Opt->key = "coordinates";

raster/r.proj/main.c

@@ -152,26 +152,18 @@ int main(int argc, char **argv)
     inmap->required = NO;
     inmap->guisection = _("Source");
 
-    inlocation = G_define_option();
-    inlocation->key = "location";
-    inlocation->type = TYPE_STRING;
+    inlocation = G_define_standard_option(G_OPT_M_LOCATION);
     inlocation->required = YES;
-    inlocation->description = _("Location containing input raster map");
-    inlocation->gisprompt = "old,location,location";
-    inlocation->key_desc = "name";
+    inlocation->label = _("Location containing input raster map");
+    inlocation->guisection = _("Source");
 
     imapset = G_define_standard_option(G_OPT_M_MAPSET);
     imapset->label = _("Mapset containing input raster map");
     imapset->description = _("Default: name of current mapset");
     imapset->guisection = _("Source");
 
-    indbase = G_define_option();
-    indbase->key = "dbase";
-    indbase->type = TYPE_STRING;
-    indbase->required = NO;
-    indbase->description = _("Path to GRASS database of input location");
-    indbase->gisprompt = "old,dbase,dbase";
-    indbase->key_desc = "path";
+    indbase = G_define_standard_option(G_OPT_M_DBASE);
+    indbase->label = _("Path to GRASS database of input location");
     indbase->guisection = _("Source");
 
     outmap = G_define_standard_option(G_OPT_R_OUTPUT);

vector/v.proj/main.c

@@ -77,27 +77,18 @@ int main(int argc, char *argv[])
     mapopt->description = NULL;
     mapopt->guisection = _("Source");
     
-    ilocopt = G_define_option();
-    ilocopt->key = "location";
-    ilocopt->type = TYPE_STRING;
+    ilocopt = G_define_standard_option(G_OPT_M_LOCATION);
     ilocopt->required = YES;
-    ilocopt->description = _("Location containing input vector map");
-    ilocopt->gisprompt = "old,location,location";
-    ilocopt->key_desc = "name";
+    ilocopt->label = _("Location containing input vector map");
+    ilocopt->guisection = _("Source");
     
     isetopt = G_define_standard_option(G_OPT_M_MAPSET);
     isetopt->label = _("Mapset containing input vector map");
     isetopt->description = _("Default: name of current mapset");
     isetopt->guisection = _("Source");
 
-    ibaseopt = G_define_option();
-    ibaseopt->key = "dbase";
-    ibaseopt->type = TYPE_STRING;
-    ibaseopt->required = NO;
+    ibaseopt = G_define_standard_option(G_OPT_M_DBASE);
     ibaseopt->label = _("Path to GRASS database of input location");
-    ibaseopt->description = _("Default: path to the current GRASS database");
-    ibaseopt->gisprompt = "old,dbase,dbase";
-    ibaseopt->key_desc = "path";
     ibaseopt->guisection = _("Source");
 
     smax = G_define_option();