[GRASS-SVN] r64600 - grass/branches/releasebranch_7_0/raster/r.ros

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-02-12 19:10:26 -0800 (Thu, 12 Feb 2015)
New Revision: 64600

Modified:
   grass/branches/releasebranch_7_0/raster/r.ros/main.c
Log:
r.ros: remove unnecessary checks which caused crash when using spotting, fix label, remove unused variable (merge from trunk, r64541, r64542)

Modified: grass/branches/releasebranch_7_0/raster/r.ros/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.ros/main.c	2015-02-13 03:07:07 UTC (rev 64599)
+++ grass/branches/releasebranch_7_0/raster/r.ros/main.c	2015-02-13 03:10:26 UTC (rev 64600)
@@ -202,7 +202,6 @@
     } parm;
 
     /* please, remove before GRASS 7 released */
-    struct Flag *flag_s;
     struct GModule *module;
 
     /* initialize access to database and create temporary files */
@@ -273,9 +272,9 @@
     parm.vel = G_define_standard_option(G_OPT_R_INPUT);
     parm.vel->key = "velocity";
     parm.vel->required = NO;
+    parm.vel->label =
+	_("Raster map containing midflame wind velocities (ft/min)");
     parm.vel->description =
-	_("Raster map containing midflame wind velocitys (ft/min)");
-    parm.vel->description =
 	_("Name of an existing raster map layer in the user's "
 	  "current mapset search path containing wind velocities at half of the average "
 	  "flame height (feet/minute).");
@@ -351,7 +350,7 @@
     parm.spotdist->label =
 	_("Output raster map containing maximal spotting distance (m)");
     parm.spotdist->description =
-	_("The maximal potential spotting distance raster will be also generated"
+	_("The maximal potential spotting distance"
 	  " (requires elevation raster map to be provided).");
 
     /*   Parse command line */
@@ -449,27 +448,9 @@
     name_max = parm.max->answer;
     name_maxdir = parm.maxdir->answer;
 
-    /*check if the output layer names EXIST */
-    if (G_check_overwrite(argc, argv) == 0) {
-	if (G_find_raster2(name_base, G_mapset()))
-	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
-			  name_base, G_mapset());
-	
-	if (G_find_raster2(name_max, G_mapset()))
-	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
-			  name_max, G_mapset());
-	
-	if (G_find_raster2(name_maxdir, G_mapset()))
-	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
-			  name_maxdir, G_mapset());
-	
-	/*assign a name to output SPOTTING distance layer */
-	if (spotting) {
-	    name_spotdist = parm.spotdist->answer;
-	    if (G_find_raster2(name_spotdist, G_mapset()))
-		G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
-			      name_spotdist, G_mapset());
-	}
+    /*assign a name to output SPOTTING distance layer */
+    if (spotting) {
+        name_spotdist = parm.spotdist->answer;
     }
 
     /*  Get database window parameters  */