[GRASS-SVN] r56863 - in grass/trunk/temporal: t.rast.aggregate t.rast.aggregate.ds

[svn_grass at osgeo.org]

Author: huhabla
Date: 2013-06-21 00:12:28 -0700 (Fri, 21 Jun 2013)
New Revision: 56863

Modified:
   grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
   grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.py
Log:
Correct output options must be used to enable the overwrite flag in the GUI.


Modified: grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.py	2013-06-21 06:34:37 UTC (rev 56862)
+++ grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.py	2013-06-21 07:12:28 UTC (rev 56863)
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:       tr.aggregate
+# MODULE:       t.rast.aggregate
 # AUTHOR(S):    Soeren Gebbert
 #
 # PURPOSE:      Temporally aggregates the maps of a space time raster dataset by a user defined granularity.
@@ -23,9 +23,12 @@
 #%option G_OPT_STRDS_INPUT
 #%end
 
-#%option G_OPT_T_WHERE
+#%option G_OPT_STRDS_OUTPUT
 #%end
 
+#%option G_OPT_R_BASE
+#%end
+
 #%option
 #% key: granularity
 #% type: string
@@ -35,14 +38,6 @@
 #%end
 
 #%option
-#% key: output
-#% type: string
-#% description: Name of the output space time raster dataset
-#% required: yes
-#% multiple: no
-#%end
-
-#%option
 #% key: method
 #% type: string
 #% description: Aggregate operation to be performed on the raster maps
@@ -55,7 +50,7 @@
 #%option G_OPT_T_SAMPLE
 #%end
 
-#%option G_OPT_R_BASE
+#%option G_OPT_T_WHERE
 #%end
 
 #%flag

Modified: grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py	2013-06-21 06:34:37 UTC (rev 56862)
+++ grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py	2013-06-21 07:12:28 UTC (rev 56863)
@@ -32,14 +32,13 @@
 #% description: Type of the aggregation space time dataset, default is strds
 #%end
 
-#%option
-#% key: output
-#% type: string
-#% description: Name of the output space time raster dataset
-#% required: yes
-#% multiple: no
+#%option G_OPT_STRDS_OUTPUT
 #%end
 
+#%option G_OPT_R_BASE
+#% gisprompt:
+#%end
+
 #%option
 #% key: method
 #% type: string
@@ -53,10 +52,6 @@
 #%option G_OPT_T_SAMPLE
 #%end
 
-#%option G_OPT_R_BASE
-#% gisprompt:
-#%end
-
 #%flag
 #% key: n
 #% description: Register Null maps