[GRASS-SVN] r63289 - in grass/trunk/temporal: t.create t.info t.list t.rast.aggregate.ds t.remove t.select t.shift t.snap t.support t.topology
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Nov 29 07:43:17 PST 2014
Author: neteler
Date: 2014-11-29 07:43:17 -0800 (Sat, 29 Nov 2014)
New Revision: 63289
Modified:
grass/trunk/temporal/t.create/t.create.py
grass/trunk/temporal/t.info/t.info.py
grass/trunk/temporal/t.list/t.list.py
grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
grass/trunk/temporal/t.remove/t.remove.py
grass/trunk/temporal/t.select/t.select.py
grass/trunk/temporal/t.shift/t.shift.py
grass/trunk/temporal/t.snap/t.snap.py
grass/trunk/temporal/t.support/t.support.py
grass/trunk/temporal/t.topology/t.topology.py
Log:
temporal: standardization
Modified: grass/trunk/temporal/t.create/t.create.py
===================================================================
--- grass/trunk/temporal/t.create/t.create.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.create/t.create.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -2,11 +2,11 @@
# -*- coding: utf-8 -*-
############################################################################
#
-# MODULE: t.create
+# MODULE: t.create
# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Create a space time dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# PURPOSE: Create a space time dataset
+# COPYRIGHT: (C) 2011-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -25,7 +25,7 @@
#%end
#%option G_OPT_STDS_TYPE
-#% description: The output type of the space time dataset
+#% description: Type of the output space time dataset
#%end
#%option G_OPT_T_TYPE
@@ -57,8 +57,8 @@
#% multiple: no
#%end
+import grass.script as grass
import grass.temporal as tgis
-import grass.script as grass
############################################################################
@@ -73,6 +73,7 @@
descr = options["description"]
semantic = options["semantictype"]
+ # Make sure the temporal database exists
tgis.init()
tgis.open_new_stds(name, type, temporaltype, title, descr,
Modified: grass/trunk/temporal/t.info/t.info.py
===================================================================
--- grass/trunk/temporal/t.info/t.info.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.info/t.info.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -24,15 +24,10 @@
#% description: Name of an existing space time dataset or map
#%end
-#%option
-#% key: type
-#% type: string
-#% description: Type of the dataset, default is strds (space time raster dataset)
-#% required: no
+#%option G_OPT_STDS_TYPE
#% guidependency: input
#% guisection: Required
-#% options: strds, str3ds, stvds, rast, rast3d, vect
-#% answer: strds
+#% options: strds, str3ds, stvds, rast, 3draster, vect
#%end
#%flag
Modified: grass/trunk/temporal/t.list/t.list.py
===================================================================
--- grass/trunk/temporal/t.list/t.list.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.list/t.list.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -27,7 +27,7 @@
#% description: Type of the space time dataset or map, default is strds
#% guisection: Selection
#% required: no
-#% options: strds, str3ds, stvds, rast, rast3d, vect
+#% options: strds, str3ds, stvds, rast, 3draster, vect
#% answer: strds
#%end
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 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -6,10 +6,10 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Aggregates data of an existing space time raster dataset using the time intervals of a second space time dataset
-# COPYRIGHT: (C) 2011 by the gcore Development Team
+# COPYRIGHT: (C) 2011 by the GRASS Development Team
#
# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with gcore
+# License (version 2). Read the file COPYING that comes with GRASS
# for details.
#
#############################################################################
@@ -29,7 +29,7 @@
#%end
#%option G_OPT_STDS_TYPE
-#% description: Type of the aggregation space time dataset, default is strds
+#% description: Type of the aggregation space time dataset
#%end
#%option G_OPT_STRDS_OUTPUT
Modified: grass/trunk/temporal/t.remove/t.remove.py
===================================================================
--- grass/trunk/temporal/t.remove/t.remove.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.remove/t.remove.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -144,7 +144,7 @@
if type == "stvds":
remove(type="vect", name=",".join(name_list), run_=True)
if type == "str3ds":
- remove(type="rast3d", name=",".join(name_list), run_=True)
+ remove(type="3draster", name=",".join(name_list), run_=True)
statement += sp.delete(dbif=dbif, execute=False)
Modified: grass/trunk/temporal/t.select/t.select.py
===================================================================
--- grass/trunk/temporal/t.select/t.select.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.select/t.select.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -44,6 +44,8 @@
import grass.temporal as tgis
import sys
+############################################################################
+
def main():
expression = options['expression']
Modified: grass/trunk/temporal/t.shift/t.shift.py
===================================================================
--- grass/trunk/temporal/t.shift/t.shift.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.shift/t.shift.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -2,11 +2,11 @@
# -*- coding: utf-8 -*-
############################################################################
#
-# MODULE: t.shift
+# MODULE: t.shift
# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Temporally shift the maps of a space time dataset.
-# COPYRIGHT: (C) 2013 by the GRASS Development Team
+# PURPOSE: Temporally shift the maps of a space time dataset
+# COPYRIGHT: (C) 2013-2014 by the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -24,15 +24,9 @@
#% description: Name of an existing space time dataset
#%end
-#%option
-#% key: type
-#% type: string
-#% description: Type of the dataset, default is strds (space time raster dataset)
-#% required: no
+#%option G_OPT_T_TYPE
#% guidependency: input
#% guisection: Required
-#% options: strds, str3ds, stvds
-#% answer: strds
#%end
#%option
Modified: grass/trunk/temporal/t.snap/t.snap.py
===================================================================
--- grass/trunk/temporal/t.snap/t.snap.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.snap/t.snap.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -24,15 +24,9 @@
#% description: Name of an existing space time dataset
#%end
-#%option
-#% key: type
-#% type: string
-#% description: Type of the dataset, default is strds (space time raster dataset)
-#% required: no
+#%option G_OPT_STDS_TYPE
#% guidependency: input
#% guisection: Required
-#% options: strds, str3ds, stvds
-#% answer: strds
#%end
import grass.script as grass
Modified: grass/trunk/temporal/t.support/t.support.py
===================================================================
--- grass/trunk/temporal/t.support/t.support.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.support/t.support.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -65,8 +65,9 @@
#% description: Update metadata information, temporal and spatial extent from registered maps
#%end
+
+import grass.script as grass
import grass.temporal as tgis
-import grass.script as grass
############################################################################
Modified: grass/trunk/temporal/t.topology/t.topology.py
===================================================================
--- grass/trunk/temporal/t.topology/t.topology.py 2014-11-29 15:24:08 UTC (rev 63288)
+++ grass/trunk/temporal/t.topology/t.topology.py 2014-11-29 15:43:17 UTC (rev 63289)
@@ -2,10 +2,10 @@
# -*- coding: utf-8 -*-
############################################################################
#
-# MODULE: t.topology
+# MODULE: t.topology
# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: List temporal topology of a space time dataset
+# PURPOSE: List temporal topology of a space time dataset
# COPYRIGHT: (C) 2011 by the GRASS Development Team
#
# This program is free software under the GNU General Public
More information about the grass-commit
mailing list