[GRASS-SVN] r51712 - in grass/trunk: general/g.parser include lib/gis raster/r.viewshed vector/v.what

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-05-24 09:45:50 -0700 (Thu, 24 May 2012)
New Revision: 51712

Modified:
   grass/trunk/general/g.parser/standard_option.c
   grass/trunk/include/gis.h
   grass/trunk/lib/gis/parser_standard_options.c
   grass/trunk/raster/r.viewshed/main.cpp
   grass/trunk/vector/v.what/main.c
Log:
libgis; G_OPT_M_EN -> G_OPT_M_COORDS


Modified: grass/trunk/general/g.parser/standard_option.c
===================================================================
--- grass/trunk/general/g.parser/standard_option.c	2012-05-24 16:22:55 UTC (rev 51711)
+++ grass/trunk/general/g.parser/standard_option.c	2012-05-24 16:45:50 UTC (rev 51712)
@@ -106,8 +106,8 @@
 	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)

Modified: grass/trunk/include/gis.h
===================================================================
--- grass/trunk/include/gis.h	2012-05-24 16:22:55 UTC (rev 51711)
+++ grass/trunk/include/gis.h	2012-05-24 16:45:50 UTC (rev 51712)
@@ -227,7 +227,7 @@
     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 */    
 

Modified: grass/trunk/lib/gis/parser_standard_options.c
===================================================================
--- grass/trunk/lib/gis/parser_standard_options.c	2012-05-24 16:22:55 UTC (rev 51711)
+++ grass/trunk/lib/gis/parser_standard_options.c	2012-05-24 16:45:50 UTC (rev 51712)
@@ -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 @@
 	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;
 

Modified: grass/trunk/raster/r.viewshed/main.cpp
===================================================================
--- grass/trunk/raster/r.viewshed/main.cpp	2012-05-24 16:22:55 UTC (rev 51711)
+++ grass/trunk/raster/r.viewshed/main.cpp	2012-05-24 16:45:50 UTC (rev 51712)
@@ -482,7 +482,7 @@
     /* 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");

Modified: grass/trunk/vector/v.what/main.c
===================================================================
--- grass/trunk/vector/v.what/main.c	2012-05-24 16:22:55 UTC (rev 51711)
+++ grass/trunk/vector/v.what/main.c	2012-05-24 16:45:50 UTC (rev 51712)
@@ -67,7 +67,7 @@
     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");