[GRASS-SVN] r51279 - in grass/trunk/temporal: . t.rast.series
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Apr 5 17:10:55 EDT 2012
Author: huhabla
Date: 2012-04-05 14:10:55 -0700 (Thu, 05 Apr 2012)
New Revision: 51279
Added:
grass/trunk/temporal/t.rast.series/
grass/trunk/temporal/t.rast.series/t.rast.series.html
grass/trunk/temporal/t.rast.series/t.rast.series.py
grass/trunk/temporal/t.rast.series/test.t.rast.series.sh
Removed:
grass/trunk/temporal/t.rast.series/test.tr.series.sh
grass/trunk/temporal/t.rast.series/tr.series.html
grass/trunk/temporal/t.rast.series/tr.series.py
Modified:
grass/trunk/temporal/t.rast.series/Makefile
Log:
Using new naming scheme
Modified: grass/trunk/temporal/t.rast.series/Makefile
===================================================================
--- grass/trunk/temporal/tr.series/Makefile 2012-04-04 21:20:55 UTC (rev 51264)
+++ grass/trunk/temporal/t.rast.series/Makefile 2012-04-05 21:10:55 UTC (rev 51279)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../
-PGM = tr.series
+PGM = t.rast.series
include $(MODULE_TOPDIR)/include/Make/Script.make
Copied: grass/trunk/temporal/t.rast.series/t.rast.series.html (from rev 51264, grass/trunk/temporal/tr.series/tr.series.html)
===================================================================
Copied: grass/trunk/temporal/t.rast.series/t.rast.series.py (from rev 51264, grass/trunk/temporal/tr.series/tr.series.py)
===================================================================
--- grass/trunk/temporal/t.rast.series/t.rast.series.py (rev 0)
+++ grass/trunk/temporal/t.rast.series/t.rast.series.py 2012-04-05 21:10:55 UTC (rev 51279)
@@ -0,0 +1,135 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+############################################################################
+#
+# MODULE: t.rast.series
+# AUTHOR(S): Soeren Gebbert
+#
+# PURPOSE: Perform different aggregation algorithms from r.series on all or a selected subset of raster maps in a space time raster dataset
+# 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 GRASS
+# for details.
+#
+#############################################################################
+
+#%module
+#% description: Perform different aggregation algorithms from r.series on all or a subset of raster maps in a space time raster dataset
+#% keywords: temporal
+#% keywords: series
+#%end
+
+#%option G_OPT_STRDS_INPUT
+#%end
+
+#%option
+#% key: method
+#% type: string
+#% description: Aggregate operation to be peformed on the raster maps
+#% required: yes
+#% multiple: no
+#% options: average,count,median,mode,minimum,min_raster,maximum,max_raster,stddev,range,sum,variance,diversity,slope,offset,detcoeff,quart1,quart3,perc90,quantile,skewness,kurtosis
+#% answer: average
+#%end
+
+#%option
+#% key: order
+#% type: string
+#% description: Sort the maps by category.
+#% required: no
+#% multiple: yes
+#% options: id, name, creator, mapset, creation_time, modification_time, start_time, end_time, north, south, west, east, min, max
+#% answer: id
+#%end
+
+#%option G_OPT_T_WHERE
+#%end
+
+#%option G_OPT_R_OUTPUT
+#%end
+
+#%flag
+#% key: t
+#% description: Assign the space time raster dataset start and end time to the output map
+#%end
+
+import grass.script as grass
+import grass.temporal as tgis
+
+############################################################################
+
+def main():
+
+ # Get the options
+ input = options["input"]
+ output = options["output"]
+ method = options["method"]
+ order = options["order"]
+ where = options["where"]
+ add_time = flags["t"]
+
+ # Make sure the temporal database exists
+ tgis.create_temporal_database()
+
+ if input.find("@") >= 0:
+ id = input
+ else:
+ mapset = grass.gisenv()["MAPSET"]
+ id = input + "@" + mapset
+
+ sp = tgis.space_time_raster_dataset(id)
+
+ if sp.is_in_db() == False:
+ grass.fatal(_("Space time %s dataset <%s> not found") % (sp.get_new_map_instance(None).get_type(), id))
+
+ sp.select()
+
+ rows = sp.get_registered_maps("id", where, order, None)
+
+ if rows:
+ # Create the r.series input file
+ filename = grass.tempfile(True)
+ file = open(filename, 'w')
+
+ for row in rows:
+ string = "%s\n" % (row["id"])
+ file.write(string)
+
+ file.close()
+
+ ret = grass.run_command("r.series", flags="z", file=filename, output=output, overwrite=grass.overwrite(), method=method)
+
+ if ret == 0 and add_time:
+ if sp.is_time_absolute():
+ start_time, end_time, tz = sp.get_absolute_time()
+ else:
+ start_time, end_time = sp.get_relative_time()
+
+ # Create the time range for the output map
+ if output.find("@") >= 0:
+ id = output
+ else:
+ mapset = grass.gisenv()["MAPSET"]
+ id = output + "@" + mapset
+
+ map = sp.get_new_map_instance(id)
+ map.load()
+
+ if sp.is_time_absolute():
+ map.set_absolute_time(start_time, end_time, tz)
+ map.write_absolute_time_to_file()
+ else:
+ map.set_relative_time(start_time, end_time)
+ map.write_relative_time_to_file()
+
+ # Register the map in the temporal database
+ if map.is_in_db():
+ map.update()
+ else:
+ map.insert()
+
+if __name__ == "__main__":
+ options, flags = grass.parser()
+ main()
+
Copied: grass/trunk/temporal/t.rast.series/test.t.rast.series.sh (from rev 51264, grass/trunk/temporal/tr.series/test.tr.series.sh)
===================================================================
--- grass/trunk/temporal/t.rast.series/test.t.rast.series.sh (rev 0)
+++ grass/trunk/temporal/t.rast.series/test.t.rast.series.sh 2012-04-05 21:10:55 UTC (rev 51279)
@@ -0,0 +1,27 @@
+# We need to set a specific region in the
+# @preprocess step of this test.
+# The region setting should work for UTM and LL test locations
+g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
+
+r.mapcalc --o expr="prec_1 = 100"
+r.mapcalc --o expr="prec_2 = 200"
+r.mapcalc --o expr="prec_3 = 300"
+r.mapcalc --o expr="prec_4 = 400"
+r.mapcalc --o expr="prec_5 = 500"
+r.mapcalc --o expr="prec_6 = 600"
+
+# @test
+t.create --v --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
+
+t.register --v type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="1 months"
+
+t.rast.series --o input=precip_abs method=average output=prec_average where="start_time > '2001-03-01'"
+t.rast.series --o -t input=precip_abs method=maximum output=prec_max order=start_time
+t.rast.series --o -t input=precip_abs method=sum output=prec_sum
+
+t.unregister --v type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.remove --v type=strds input=precip_abs
+
+r.info prec_average
+t.info type=rast input=prec_max
+t.info type=rast input=prec_sum
Deleted: grass/trunk/temporal/t.rast.series/test.tr.series.sh
===================================================================
--- grass/trunk/temporal/tr.series/test.tr.series.sh 2012-04-04 21:20:55 UTC (rev 51264)
+++ grass/trunk/temporal/t.rast.series/test.tr.series.sh 2012-04-05 21:10:55 UTC (rev 51279)
@@ -1,27 +0,0 @@
-# We need to set a specific region in the
-# @preprocess step of this test.
-# The region setting should work for UTM and LL test locations
-g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
-
-r.mapcalc --o expr="prec_1 = 100"
-r.mapcalc --o expr="prec_2 = 200"
-r.mapcalc --o expr="prec_3 = 300"
-r.mapcalc --o expr="prec_4 = 400"
-r.mapcalc --o expr="prec_5 = 500"
-r.mapcalc --o expr="prec_6 = 600"
-
-# @test
-t.create --v --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
-
-t.register --v type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="1 months"
-
-tr.series --o input=precip_abs method=average output=prec_average where="start_time > '2001-03-01'"
-tr.series --o -t input=precip_abs method=maximum output=prec_max order=start_time
-tr.series --o -t input=precip_abs method=sum output=prec_sum
-
-t.unregister --v type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.remove --v type=strds input=precip_abs
-
-r.info prec_average
-t.info type=rast input=prec_max
-t.info type=rast input=prec_sum
Deleted: grass/trunk/temporal/t.rast.series/tr.series.html
===================================================================
Deleted: grass/trunk/temporal/t.rast.series/tr.series.py
===================================================================
--- grass/trunk/temporal/tr.series/tr.series.py 2012-04-04 21:20:55 UTC (rev 51264)
+++ grass/trunk/temporal/t.rast.series/tr.series.py 2012-04-05 21:10:55 UTC (rev 51279)
@@ -1,135 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-############################################################################
-#
-# MODULE: tr.series
-# AUTHOR(S): Soeren Gebbert
-#
-# PURPOSE: Perform different aggregation algorithms from r.series on all or a selected subset of raster maps in a space time raster dataset
-# 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 GRASS
-# for details.
-#
-#############################################################################
-
-#%module
-#% description: Perform different aggregation algorithms from r.series on all or a subset of raster maps in a space time raster dataset
-#% keywords: temporal
-#% keywords: series
-#%end
-
-#%option G_OPT_STRDS_INPUT
-#%end
-
-#%option
-#% key: method
-#% type: string
-#% description: Aggregate operation to be peformed on the raster maps
-#% required: yes
-#% multiple: no
-#% options: average,count,median,mode,minimum,min_raster,maximum,max_raster,stddev,range,sum,variance,diversity,slope,offset,detcoeff,quart1,quart3,perc90,quantile,skewness,kurtosis
-#% answer: average
-#%end
-
-#%option
-#% key: order
-#% type: string
-#% description: Sort the maps by category.
-#% required: no
-#% multiple: yes
-#% options: id, name, creator, mapset, creation_time, modification_time, start_time, end_time, north, south, west, east, min, max
-#% answer: id
-#%end
-
-#%option G_OPT_T_WHERE
-#%end
-
-#%option G_OPT_R_OUTPUT
-#%end
-
-#%flag
-#% key: t
-#% description: Assign the space time raster dataset start and end time to the output map
-#%end
-
-import grass.script as grass
-import grass.temporal as tgis
-
-############################################################################
-
-def main():
-
- # Get the options
- input = options["input"]
- output = options["output"]
- method = options["method"]
- order = options["order"]
- where = options["where"]
- add_time = flags["t"]
-
- # Make sure the temporal database exists
- tgis.create_temporal_database()
-
- if input.find("@") >= 0:
- id = input
- else:
- mapset = grass.gisenv()["MAPSET"]
- id = input + "@" + mapset
-
- sp = tgis.space_time_raster_dataset(id)
-
- if sp.is_in_db() == False:
- grass.fatal(_("Space time %s dataset <%s> not found") % (sp.get_new_map_instance(None).get_type(), id))
-
- sp.select()
-
- rows = sp.get_registered_maps("id", where, order, None)
-
- if rows:
- # Create the r.series input file
- filename = grass.tempfile(True)
- file = open(filename, 'w')
-
- for row in rows:
- string = "%s\n" % (row["id"])
- file.write(string)
-
- file.close()
-
- ret = grass.run_command("r.series", flags="z", file=filename, output=output, overwrite=grass.overwrite(), method=method)
-
- if ret == 0 and add_time:
- if sp.is_time_absolute():
- start_time, end_time, tz = sp.get_absolute_time()
- else:
- start_time, end_time = sp.get_relative_time()
-
- # Create the time range for the output map
- if output.find("@") >= 0:
- id = output
- else:
- mapset = grass.gisenv()["MAPSET"]
- id = output + "@" + mapset
-
- map = sp.get_new_map_instance(id)
- map.load()
-
- if sp.is_time_absolute():
- map.set_absolute_time(start_time, end_time, tz)
- map.write_absolute_time_to_file()
- else:
- map.set_relative_time(start_time, end_time)
- map.write_relative_time_to_file()
-
- # Register the map in the temporal database
- if map.is_in_db():
- map.update()
- else:
- map.insert()
-
-if __name__ == "__main__":
- options, flags = grass.parser()
- main()
-
More information about the grass-commit
mailing list