libgis; G_OPT_M_EN -> G_OPT_M_COORDS

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

general/g.parser/standard_option.c

@@ -106,8 +106,8 @@ struct Option *define_standard_option(const char *name)
 	key = G_OPT_M_DATATYPE;
     else if (G_strcasecmp(name, "G_OPT_M_MAPSET") == 0)
 	key = G_OPT_M_MAPSET;
-    else if (G_strcasecmp(name, "G_OPT_M_EN") == 0)
-	key = G_OPT_M_EN;
+    else if (G_strcasecmp(name, "G_OPT_M_COORDS") == 0)
+	key = G_OPT_M_COORDS;
     else if (G_strcasecmp(name, "G_OPT_V_MAP") == 0)
 	key = G_OPT_V_MAP;
     else if (G_strcasecmp(name, "G_OPT_STDS_INPUT") == 0)

include/gis.h

@@ -227,7 +227,7 @@ static const char *GRASS_copyright __attribute__ ((unused))
     G_OPT_M_UNITS,              /* units */
     G_OPT_M_DATATYPE,           /* datatype */
     G_OPT_M_MAPSET,             /* mapset */
-    G_OPT_M_EN,                 /* coordinates */
+    G_OPT_M_COORDS,             /* coordinates */
     G_OPT_M_COLR,               /* color rules */
     G_OPT_M_DIR,                /* directory input */    
 

lib/gis/parser_standard_options.c

@@ -88,7 +88,7 @@
    - G_OPT_M_UNITS
    - G_OPT_M_DATATYPE
    - G_OPT_M_MAPSET
-   - G_OPT_M_EN
+   - G_OPT_M_COORDS
    - G_OPT_M_COLR
    - G_OPT_M_DIR
 
@@ -583,12 +583,13 @@ struct Option *G_define_standard_option(int opt)
 	Opt->description = _("'.' for current mapset");
 	break;
 
-    case G_OPT_M_EN:
-	Opt->key = "east_north";
+    case G_OPT_M_COORDS:
+	Opt->key = "coordinates";
 	Opt->type = TYPE_DOUBLE;
 	Opt->required = NO;
-	Opt->multiple = YES;
+	Opt->multiple = NO;
 	Opt->key_desc = "east,north";
+	Opt->gisprompt = "old,coords,coords";
 	Opt->description = _("Coordinates");
 	break;
 

raster/r.viewshed/main.cpp

@@ -482,7 +482,7 @@ parse_args(int argc, char *argv[], int *vpRow, int *vpCol,
     /* viewpoint coordinates */
     struct Option *viewLocOpt;
 
-    viewLocOpt = G_define_standard_option(G_OPT_M_EN);
+    viewLocOpt = G_define_standard_option(G_OPT_M_COORDS);
     viewLocOpt->key = "coordinate";
     viewLocOpt->required = YES;
     viewLocOpt->description = _("Coordinates of viewing position");

vector/v.what/main.c

@@ -67,7 +67,7 @@ int main(int argc, char **argv)
     opt.field = G_define_standard_option(G_OPT_V_FIELD_ALL);
     opt.field->multiple = YES;
     
-    opt.coords = G_define_standard_option(G_OPT_M_EN);
+    opt.coords = G_define_standard_option(G_OPT_M_COORDS);
     opt.coords->required = YES;
     opt.coords->label = _("Coordinates for query");
     opt.coords->description = _("\"-\" to read from standard input");