[GRASS-SVN] r62874 - in grass/branches/releasebranch_7_0/temporal: . t.rast.algebra t.rast.univar t.rast3d.algebra t.rast3d.extract t.rast3d.list t.rast3d.mapcalc t.rast3d.univar t.register t.remove t.rename t.sample t.select t.shift t.snap t.support t.unregister
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Nov 23 13:29:43 PST 2014
Author: huhabla
Date: 2014-11-23 13:29:42 -0800 (Sun, 23 Nov 2014)
New Revision: 62874
Modified:
grass/branches/releasebranch_7_0/temporal/
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.html
grass/branches/releasebranch_7_0/temporal/t.rast.univar/t.rast.univar.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.py
grass/branches/releasebranch_7_0/temporal/t.register/t.register.html
grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.html
grass/branches/releasebranch_7_0/temporal/t.rename/t.rename.html
grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html
grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.py
grass/branches/releasebranch_7_0/temporal/t.select/t.select.html
grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.html
grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.html
grass/branches/releasebranch_7_0/temporal/t.support/t.support.html
grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html
Log:
temporal modules: Backport of r62873 from trunk, manual page update
Property changes on: grass/branches/releasebranch_7_0/temporal
___________________________________________________________________
Added: svn:mergeinfo
+ /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -469,7 +469,7 @@
<a href="t.rast.mapcalc.html">t.rast.mapcalc</a>
</em>
-<h2>AUTHOR</h2>
+<h2>AUTHORS</h2>
Thomas Leppelt, Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.univar/t.rast.univar.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.univar/t.rast.univar.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.univar/t.rast.univar.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -101,7 +101,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -12,7 +12,7 @@
<br>
<br>
-The statement structure is exact the same as of <em>t.rast.mapcalc2</em>,
+The statement structure is exact the same as of <em>t.rast.algebra</em>,
see <a href="t.rast.algebra.html">t.rast.algebra</a> but allows four dimensional indexing.
<h2>REFERENCES</h2>
@@ -30,9 +30,9 @@
</em>
-<h2>AUTHOR</h2>
+<h2>AUTHORS</h2>
-Thomas Leppelt, Soeren Gebbert, Thuenen Institut, Germany <br>
+Thomas Leppelt, Sören Gebbert, Thünen Institute of Climate-Smart Agriculture <br>
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py 2014-11-23 21:29:42 UTC (rev 62874)
@@ -5,7 +5,7 @@
# MODULE: t.rast3d.algebra
# AUTHOR(S): Thomas Leppelt, Soeren Gebbert
#
-# PURPOSE: Provide temporal 3D raster algebra to perform spatial an temporal operations
+# PURPOSE: Provide temporal 3d raster algebra to perform spatial an temporal operations
# for space time datasets by topological relationships to other space time
# datasets.
# COPYRIGHT: (C) 2014 by the GRASS Development Team
@@ -17,7 +17,7 @@
#############################################################################
#%module
-#% description: Apply temporal and spatial operations on space time 3D raster datasets using temporal raster algebra.
+#% description: Apply temporal and spatial operations on space time 3d raster datasets using temporal 3d raster algebra.
#% keywords: temporal
#% keywords: algebra
#%end
@@ -25,7 +25,7 @@
#%option
#% key: expression
#% type: string
-#% description: r3.mapcalc expression for temporal and spatial analysis of space time 3D raster datasets
+#% description: Algebraic expression for temporal and spatial analysis of space time 3d raster datasets
#% required : yes
#%end
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -1,25 +1,26 @@
<h2>DESCRIPTION</h2>
-TBD.
-<h2>EXAMPLE</h2>
+The purpose of <b>t.rast3d.extract</b> is to extract a subset of a space
+time 3d raster dataset and to store that subset in a different space time
+3d raster dataset. It has exactly the same functionality as
+<a href="t.rast.extract.html">t.rast.extract</a>. The only difference is the
+that this module works on STR3DS and 3d raster maps.
+<p>
+Please refer to <a href="t.rast.extract.html">t.rast.extract</a> for documentation
+and examples.
-The example is based on the XXX sample dataset:
-
-<div class="code"><pre>
-TBD
-</pre></div>
-
<h2>SEE ALSO</h2>
<em>
+<a href="t.rast.extract.html">t.rast.extract</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>
</em>
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -6,18 +6,18 @@
<h2>SEE ALSO</h2>
<em>
+<a href="t.rast.list.html">t.rast.list</a>,
<a href="g.list.html">g.list</a>,
<a href="g.mlist.html">g.mlist</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>,
<a href="t.list.html">t.list</a>,
-<a href="t.rast.list.html">t.rast.list</a>,
<a href="t.vect.list.html">t.vect.list</a>
</em>
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -1,25 +1,21 @@
<h2>DESCRIPTION</h2>
-TBD.
+The module <em>t.rast3d.mapcalc</em> provides exact the same functionality as <em>t.rast.mapcalc</em>,
+but for space time 3d raster datasets. Please refer to <a href="t.rast.mapcalc.html">t.rast.mapcalc</a>
+for documentation.
+<p>
+It is a simple wrapper for <a href="r3.mapcalc.html">r3.mapcalc</a> enhanced with temporal functions.
-<h2>EXAMPLE</h2>
-
-The example is based on the XXX sample dataset:
-
-<div class="code"><pre>
-TBD
-</pre></div>
-
<h2>SEE ALSO</h2>
<em>
-<a href="t.create.html">t.create</a>,
-<a href="t.info.html">t.info</a>
+<a href="t.rast.mapcalc.html">t.rast.mapcalc</a>,
+<a href="t.rast3d.algebra.html">t.rast3d.algebra</a>,
+<a href="r3.mapcalc.html">r3.mapcalc</a>,
</em>
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
-
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -1,9 +1,10 @@
<h2>DESCRIPTION</h2>
-This module provides the same functionality as <a href="t.rast.univar.html">t.rast.list</a>,
-the only difference is the vector map layer metadata. Please refer to the manpage of <a href="t.rast.univar.html">t.rast.list</a>.
+This module provides the same functionality as
+<a href="t.rast.univar.html">t.rast.univar</a>, the only difference is the
+3d raster map layer metadata. Please refer to the manual page of
+<a href="t.rast.univar.html">t.rast.univar</a> for documentation and examples.
-
<h2>SEE ALSO</h2>
<em>
@@ -14,7 +15,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.py 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.py 2014-11-23 21:29:42 UTC (rev 62874)
@@ -5,7 +5,8 @@
# MODULE: t.rast3d.univar
# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Calculates univariate statistics from the non-null cells for each registered raster3d map of a space time raster3d dataset
+# PURPOSE: Calculates univariate statistics from the non-null cells for each registered 3d
+# raster map of a space time 3d raster dataset
# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
@@ -15,7 +16,7 @@
#############################################################################
#%module
-#% description: Calculates univariate statistics from the non-null cells for each registered raster3d map of a space time raster3d dataset.
+#% description: Calculates univariate statistics from the non-null cells for each registered 3d raster map of a space time 3d raster dataset.
#% keywords: temporal
#% keywords: statistics
#% keywords: raster
Modified: grass/branches/releasebranch_7_0/temporal/t.register/t.register.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/t.register.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.register/t.register.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -110,12 +110,13 @@
t.rast.list input=precip_abs
-prec_1 test2 2001-01-01 00:00:00 2001-02-01 00:00:00
-prec_2 test2 2001-02-01 00:00:00 2001-03-01 00:00:00
-prec_3 test2 2001-03-01 00:00:00 2001-04-01 00:00:00
-prec_4 test2 2001-04-01 00:00:00 2001-05-01 00:00:00
-prec_5 test2 2001-05-01 00:00:00 2001-06-01 00:00:00
-prec_6 test2 2001-06-01 00:00:00 2001-07-01 00:00:00
+name|mapset|start_time|end_time
+prec_1|PERMANENT|2001-01-01 00:00:00|2001-02-01 00:00:00
+prec_2|PERMANENT|2001-02-01 00:00:00|2001-03-01 00:00:00
+prec_3|PERMANENT|2001-03-01 00:00:00|2001-04-01 00:00:00
+prec_4|PERMANENT|2001-04-01 00:00:00|2001-05-01 00:00:00
+prec_5|PERMANENT|2001-05-01 00:00:00|2001-06-01 00:00:00
+prec_6|PERMANENT|2001-06-01 00:00:00|2001-07-01 00:00:00
r.mapcalc expr="prec_7 = 700"
r.timestamp map=prec_7 date="1 jul 2001 / 1 aug 2001"
@@ -124,13 +125,15 @@
t.rast.list input=precip_abs
-prec_1 test2 2001-01-01 00:00:00 2001-02-01 00:00:00
-prec_2 test2 2001-02-01 00:00:00 2001-03-01 00:00:00
-prec_3 test2 2001-03-01 00:00:00 2001-04-01 00:00:00
-prec_4 test2 2001-04-01 00:00:00 2001-05-01 00:00:00
-prec_5 test2 2001-05-01 00:00:00 2001-06-01 00:00:00
-prec_6 test2 2001-06-01 00:00:00 2001-07-01 00:00:00
-prec_7 test2 2001-07-01 00:00:00 2001-08-01 00:00:00
+name|mapset|start_time|end_time
+prec_1|PERMANENT|2001-01-01 00:00:00|2001-02-01 00:00:00
+prec_2|PERMANENT|2001-02-01 00:00:00|2001-03-01 00:00:00
+prec_3|PERMANENT|2001-03-01 00:00:00|2001-04-01 00:00:00
+prec_4|PERMANENT|2001-04-01 00:00:00|2001-05-01 00:00:00
+prec_5|PERMANENT|2001-05-01 00:00:00|2001-06-01 00:00:00
+prec_6|PERMANENT|2001-06-01 00:00:00|2001-07-01 00:00:00
+prec_7|PERMANENT|2001-07-01 00:00:00|2001-08-01 00:00:00
+
</pre></div>
@@ -143,7 +146,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -53,7 +53,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.rename/t.rename.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rename/t.rename.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.rename/t.rename.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -3,14 +3,10 @@
This module renames space time datasets of different types (strds, stvds, str3ds)
and updates the space time dataset register entries of the registered maps.
-<h2>EXAMPLE</h2>
+<h2>NOTE</h2>
-The example is based on the XXX sample dataset:
+Renaming of space time datasets works only for sqlite3 based temporal databases.
-<div class="code"><pre>
-TBD
-</pre></div>
-
<h2>SEE ALSO</h2>
<em>
@@ -21,7 +17,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -1,13 +1,161 @@
<h2>DESCRIPTION</h2>
-TBD.
+The purpose of this module is to compute and to show spatio-temporal relations between
+space time datasets of different type. Several input space time datasets are sampled
+by a <em>sample</em> space time dataset using temporal topological relations. The types of
+the input space time datasets and the type of the sample space time dataset can be different.
+<p>
+This module is useful to analyze temporal relationships between space time datasets using temporal topology.
+The flag <em>-s</em> enables a spatio-temporal topology, so that only spatio-temporal related
+map layers of space time datasets are considered in the analysis.
+<h2>NOTE</h2>
+
+The temporal relation <em>start</em> means that the start time of an input map layer is temporally
+located in an interval of a sample map layer.
+<p>
+The textual output at the command line shows the names of the maps, start and end time as well
+as the <em>interval length</em> in days and the temporal <em>distance from begin</em> in days.
+<p>
+The default <em>separator</em> is the pipe symbol.
+<p>
+Temporal gaps, if present, in the input and sampling space time datasets will be used in the sampling process.
+Gaps have no map name, instead <em>None</em> is printed.
+
<h2>EXAMPLE</h2>
-The example is based on the XXX sample dataset:
+In the examples below we create a space time raster dataset <em>A</em> and a space time vector dataset
+<em>P</em> that have different temporal layouts and number of map layers. The space time vector dataset
+contains a gap, that will be used in the sampling process.
+We use <em>t.sample</em> to inspect the topological relations between the time
+stamped map layers in <em>A</em> and <em>P</em>.
+<p>
+<div class="code"><pre>
+# Set an appropriate region
+g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
-<div class="code"><pre>
-TBD
+# Generate the raster map layer
+r.mapcalc expr="a1 = rand(0, 550)" -s
+r.mapcalc expr="a2 = rand(0, 450)" -s
+r.mapcalc expr="a3 = rand(0, 320)" -s
+r.mapcalc expr="a4 = rand(0, 510)" -s
+r.mapcalc expr="a5 = rand(0, 300)" -s
+r.mapcalc expr="a6 = rand(0, 650)" -s
+
+# Generate the vector map layer
+v.random -z output=pnts1 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts2 n=20 zmin=0 zmax=100 column=height
+
+n1=`g.tempfile pid=1 -d`
+n2=`g.tempfile pid=2 -d`
+
+cat > "${n1}" << EOF
+a1
+a2
+a3
+a4
+a5
+a6
+EOF
+
+cat > "${n2}" << EOF
+pnts1|2001-01-01|2001-03-01
+pnts2|2001-05-01|2001-07-01
+EOF
+
+# Register the maps in new space time datasets
+t.create type=strds temporaltype=absolute output=A \
+ title="A test with raster input files" descr="A test with raster input files"
+
+t.create type=stvds temporaltype=absolute output=P \
+ title="A test with vector input files" descr="A test with vector input files"
+
+t.register type=rast -i input=A file="${n1}" start="2001-01-01" increment="1 months"
+
+# Raster map layer in A
+t.rast.list A
+
+name|mapset|start_time|end_time
+a1|PERMANENT|2001-01-01 00:00:00|2001-02-01 00:00:00
+a2|PERMANENT|2001-02-01 00:00:00|2001-03-01 00:00:00
+a3|PERMANENT|2001-03-01 00:00:00|2001-04-01 00:00:00
+a4|PERMANENT|2001-04-01 00:00:00|2001-05-01 00:00:00
+a5|PERMANENT|2001-05-01 00:00:00|2001-06-01 00:00:00
+a6|PERMANENT|2001-06-01 00:00:00|2001-07-01 00:00:00
+
+
+t.register type=vect input=P file="${n2}"
+
+# Vector map layer in P
+t.vect.list P
+
+name|layer|mapset|start_time|end_time
+pnts1|None|PERMANENT|2001-01-01 00:00:00|2001-03-01 00:00:00
+pnts2|None|PERMANENT|2001-05-01 00:00:00|2001-07-01 00:00:00
+
+# Start time of maps in A located in maps in P
+t.sample method=start input=A samtype=stvds sample=P -c
+
+P at PERMANENT|A at PERMANENT|start_time|end_time|interval_length|distance_from_begin
+pnts1 at PERMANENT|a1 at PERMANENT,a2 at PERMANENT|2001-01-01 00:00:00|2001-03-01 00:00:00|59.0|0.0
+None|a3 at PERMANENT,a4 at PERMANENT|2001-03-01 00:00:00|2001-05-01 00:00:00|61.0|59.0
+pnts2 at PERMANENT|a5 at PERMANENT,a6 at PERMANENT|2001-05-01 00:00:00|2001-07-01 00:00:00|61.0|120.0
+
+
+# P contains A
+t.sample method=contain input=A samtype=stvds sample=P -c
+
+P at PERMANENT|A at PERMANENT|start_time|end_time|interval_length|distance_from_begin
+pnts1 at PERMANENT|a1 at PERMANENT,a2 at PERMANENT|2001-01-01 00:00:00|2001-03-01 00:00:00|59.0|0.0
+None|a3 at PERMANENT,a4 at PERMANENT|2001-03-01 00:00:00|2001-05-01 00:00:00|61.0|59.0
+pnts2 at PERMANENT|a5 at PERMANENT,a6 at PERMANENT|2001-05-01 00:00:00|2001-07-01 00:00:00|61.0|120.0
+
+
+# A druing P
+t.sample method=during intype=stvds input=P samtype=strds sample=A -c
+
+A at PERMANENT|P at PERMANENT|start_time|end_time|interval_length|distance_from_begin
+a1 at PERMANENT|pnts1 at PERMANENT|2001-01-01 00:00:00|2001-02-01 00:00:00|31.0|0.0
+a2 at PERMANENT|pnts1 at PERMANENT|2001-02-01 00:00:00|2001-03-01 00:00:00|28.0|31.0
+a3 at PERMANENT|None|2001-03-01 00:00:00|2001-04-01 00:00:00|31.0|59.0
+a4 at PERMANENT|None|2001-04-01 00:00:00|2001-05-01 00:00:00|30.0|90.0
+a5 at PERMANENT|pnts2 at PERMANENT|2001-05-01 00:00:00|2001-06-01 00:00:00|31.0|120.0
+a6 at PERMANENT|pnts2 at PERMANENT|2001-06-01 00:00:00|2001-07-01 00:00:00|30.0|151.0
+
+
+# No Overlapping
+t.sample method=overlap input=A samtype=stvds sample=P -cs
+
+P at PERMANENT|A at PERMANENT|start_time|end_time|interval_length|distance_from_begin
+pnts1 at PERMANENT|None|2001-01-01 00:00:00|2001-03-01 00:00:00|59.0|0.0
+None|None|2001-03-01 00:00:00|2001-05-01 00:00:00|61.0|59.0
+pnts2 at PERMANENT|None|2001-05-01 00:00:00|2001-07-01 00:00:00|61.0|120.0
+
+
+t.sample method=precedes input=A samtype=stvds sample=P -c
+
+P at PERMANENT|A at PERMANENT|start_time|end_time|interval_length|distance_from_begin
+pnts1 at PERMANENT|a3 at PERMANENT|2001-01-01 00:00:00|2001-03-01 00:00:00|59.0|0.0
+None|a5 at PERMANENT|2001-03-01 00:00:00|2001-05-01 00:00:00|61.0|59.0
+pnts2 at PERMANENT|None|2001-05-01 00:00:00|2001-07-01 00:00:00|61.0|120.0
+
+
+t.sample method=follows input=A samtype=stvds sample=P -c
+
+P at PERMANENT|A at PERMANENT|start_time|end_time|interval_length|distance_from_begin
+pnts1 at PERMANENT|None|2001-01-01 00:00:00|2001-03-01 00:00:00|59.0|0.0
+None|a2 at PERMANENT|2001-03-01 00:00:00|2001-05-01 00:00:00|61.0|59.0
+pnts2 at PERMANENT|a4 at PERMANENT|2001-05-01 00:00:00|2001-07-01 00:00:00|61.0|120.0
+
+
+t.sample method=precedes,follows input=A samtype=stvds sample=P -c
+
+P at PERMANENT|A at PERMANENT|start_time|end_time|interval_length|distance_from_begin
+pnts1 at PERMANENT|a3 at PERMANENT|2001-01-01 00:00:00|2001-03-01 00:00:00|59.0|0.0
+None|a5 at PERMANENT,a2 at PERMANENT|2001-03-01 00:00:00|2001-05-01 00:00:00|61.0|59.0
+pnts2 at PERMANENT|a4 at PERMANENT|2001-05-01 00:00:00|2001-07-01 00:00:00|61.0|120.0
+
+
</pre></div>
<h2>SEE ALSO</h2>
@@ -19,7 +167,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.py 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.py 2014-11-23 21:29:42 UTC (rev 62874)
@@ -64,7 +64,6 @@
############################################################################
-
def main():
# Get the options
Modified: grass/branches/releasebranch_7_0/temporal/t.select/t.select.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.select/t.select.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.select/t.select.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -318,7 +318,7 @@
This statement select all maps from space time data set A that are during the temporal extent of single map 'event'
<br>
-<h3>Examples: </h3>
+<h2>Examples</h2>
Select all maps from space time dataset A which have equal time stamps
with space time dataset B and C and are ealier that Jan. 1. 2005 and
@@ -354,7 +354,7 @@
<h2>AUTHORS</h2>
-Thomas Leppelt, Soeren Gebbert, Thuenen Institut, Germany <br>
+Thomas Leppelt, Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -47,12 +47,13 @@
+-------------------- Space Time Raster Dataset -----------------------------+
| |
+-------------------- Basic information -------------------------------------+
- | Id: ........................ precipitation_daily at soeren
+ | Id: ........................ precipitation_daily at PERMANENT
| Name: ...................... precipitation_daily
- | Mapset: .................... soeren
+ | Mapset: .................... PERMANENT
| Creator: ................... soeren
- | Creation time: ............. 2013-04-20 14:41:55.392394
| Temporal type: ............. absolute
+ | Creation time: ............. 2014-11-23 19:20:26.004855
+ | Modification time:.......... 2014-11-23 19:20:26.471536
| Semantic type:.............. mean
+-------------------- Absolute time -----------------------------------------+
| Start time:................. 2012-01-01 00:00:00
@@ -67,42 +68,45 @@
| Top:........................ 0.0
| Bottom:..................... 0.0
+-------------------- Metadata information ----------------------------------+
+ | Raster register table:...... raster_map_register_882043e9afaa4e60b845aceb1a1fee2c
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 0.0
+ | Minimum value max:.......... 16.0
+ | Maximum value min:.......... 297.0
+ | Maximum value max:.......... 647.0
+ | Aggregation type:........... None
| Number of registered maps:.. 6
+ |
| Title:
| Daily precipitation
| Description:
| Test dataset with daily precipitation
- | Commands of creation:
- | - 2013-04-20 14:41:55 -
+ | Command history:
+ | # 2014-11-23 19:20:26
| t.create type="strds" temporaltype="absolute"
| output="precipitation_daily" title="Daily precipitation"
| description="Test dataset with daily precipitation"
- | - 2013-04-20 14:41:55 -
- | t.register -i type="rast"
- | input="precipitation_daily"
+ | # 2014-11-23 19:20:26
+ | t.register -i type="rast" input="precipitation_daily"
| maps="prec_1,prec_2,prec_3,prec_4,prec_5,prec_6" start="2012-01-01"
| increment="1 day"
|
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 296.0
- | Maximum value max:.......... 648.0
- | Raster register table:...... precipitation_daily_soeren_raster_register
+----------------------------------------------------------------------------+
-
+
t.rast.list input=precipitation_daily
-prec_1 soeren 2012-01-01 00:00:00 2012-01-02 00:00:00
-prec_2 soeren 2012-01-02 00:00:00 2012-01-03 00:00:00
-prec_3 soeren 2012-01-03 00:00:00 2012-01-04 00:00:00
-prec_4 soeren 2012-01-04 00:00:00 2012-01-05 00:00:00
-prec_5 soeren 2012-01-05 00:00:00 2012-01-06 00:00:00
-prec_6 soeren 2012-01-06 00:00:00 2012-01-07 00:00:00
+name|mapset|start_time|end_time
+prec_1|PERMANENT|2012-01-01 00:00:00|2012-01-02 00:00:00
+prec_2|PERMANENT|2012-01-02 00:00:00|2012-01-03 00:00:00
+prec_3|PERMANENT|2012-01-03 00:00:00|2012-01-04 00:00:00
+prec_4|PERMANENT|2012-01-04 00:00:00|2012-01-05 00:00:00
+prec_5|PERMANENT|2012-01-05 00:00:00|2012-01-06 00:00:00
+prec_6|PERMANENT|2012-01-06 00:00:00|2012-01-07 00:00:00
+
t.shift type=strds input=precipitation_daily granularity="12 hours"
t.info type=strds input=precipitation_daily
@@ -110,12 +114,13 @@
+-------------------- Space Time Raster Dataset -----------------------------+
| |
+-------------------- Basic information -------------------------------------+
- | Id: ........................ precipitation_daily at soeren
+ | Id: ........................ precipitation_daily at PERMANENT
| Name: ...................... precipitation_daily
- | Mapset: .................... soeren
+ | Mapset: .................... PERMANENT
| Creator: ................... soeren
- | Creation time: ............. 2013-04-20 14:41:55.392394
| Temporal type: ............. absolute
+ | Creation time: ............. 2014-11-23 19:20:26.004855
+ | Modification time:.......... 2014-11-23 19:21:08.240018
| Semantic type:.............. mean
+-------------------- Absolute time -----------------------------------------+
| Start time:................. 2012-01-01 12:00:00
@@ -130,44 +135,48 @@
| Top:........................ 0.0
| Bottom:..................... 0.0
+-------------------- Metadata information ----------------------------------+
+ | Raster register table:...... raster_map_register_882043e9afaa4e60b845aceb1a1fee2c
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 0.0
+ | Minimum value max:.......... 16.0
+ | Maximum value min:.......... 297.0
+ | Maximum value max:.......... 647.0
+ | Aggregation type:........... None
| Number of registered maps:.. 6
+ |
| Title:
| Daily precipitation
| Description:
| Test dataset with daily precipitation
- | Commands of creation:
- | - 2013-04-20 14:41:55 -
+ | Command history:
+ | # 2014-11-23 19:20:26
| t.create type="strds" temporaltype="absolute"
| output="precipitation_daily" title="Daily precipitation"
| description="Test dataset with daily precipitation"
- | - 2013-04-20 14:41:55 -
- | t.register -i type="rast"
- | input="precipitation_daily"
+ | # 2014-11-23 19:20:26
+ | t.register -i type="rast" input="precipitation_daily"
| maps="prec_1,prec_2,prec_3,prec_4,prec_5,prec_6" start="2012-01-01"
| increment="1 day"
- | - 2013-04-20 14:42:21 -
+ | # 2014-11-23 19:21:08
| t.shift type="strds" input="precipitation_daily"
| granularity="12 hours"
|
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 296.0
- | Maximum value max:.......... 648.0
- | Raster register table:...... precipitation_daily_soeren_raster_register
+----------------------------------------------------------------------------+
+
t.rast.list input=precipitation_daily
-prec_1 soeren 2012-01-01 12:00:00 2012-01-02 12:00:00
-prec_2 soeren 2012-01-02 12:00:00 2012-01-03 12:00:00
-prec_3 soeren 2012-01-03 12:00:00 2012-01-04 12:00:00
-prec_4 soeren 2012-01-04 12:00:00 2012-01-05 12:00:00
-prec_5 soeren 2012-01-05 12:00:00 2012-01-06 12:00:00
-prec_6 soeren 2012-01-06 12:00:00 2012-01-07 12:00:00
+name|mapset|start_time|end_time
+prec_1|PERMANENT|2012-01-01 12:00:00|2012-01-02 12:00:00
+prec_2|PERMANENT|2012-01-02 12:00:00|2012-01-03 12:00:00
+prec_3|PERMANENT|2012-01-03 12:00:00|2012-01-04 12:00:00
+prec_4|PERMANENT|2012-01-04 12:00:00|2012-01-05 12:00:00
+prec_5|PERMANENT|2012-01-05 12:00:00|2012-01-06 12:00:00
+prec_6|PERMANENT|2012-01-06 12:00:00|2012-01-07 12:00:00
+
</pre></div>
<h2>SEE ALSO</h2>
@@ -180,7 +189,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -42,12 +42,13 @@
+-------------------- Space Time Raster Dataset -----------------------------+
| |
+-------------------- Basic information -------------------------------------+
- | Id: ........................ precipitation_daily at soeren
+ | Id: ........................ precipitation_daily at PERMANENT
| Name: ...................... precipitation_daily
- | Mapset: .................... soeren
+ | Mapset: .................... PERMANENT
| Creator: ................... soeren
- | Creation time: ............. 2013-04-20 14:39:07.136253
| Temporal type: ............. absolute
+ | Creation time: ............. 2014-11-23 19:22:22.657317
+ | Modification time:.......... 2014-11-23 19:22:23.149603
| Semantic type:.............. mean
+-------------------- Absolute time -----------------------------------------+
| Start time:................. 2012-01-01 00:00:00
@@ -62,41 +63,46 @@
| Top:........................ 0.0
| Bottom:..................... 0.0
+-------------------- Metadata information ----------------------------------+
+ | Raster register table:...... raster_map_register_4483cba5e46944bd9933e5392a9fd734
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 1.0
+ | Minimum value max:.......... 25.0
+ | Maximum value min:.......... 294.0
+ | Maximum value max:.......... 642.0
+ | Aggregation type:........... None
| Number of registered maps:.. 6
+ |
| Title:
| Daily precipitation
| Description:
| Test dataset with daily precipitation
- | Commands of creation:
- | - 2013-04-20 14:39:07 -
+ | Command history:
+ | # 2014-11-23 19:22:22
| t.create type="strds" temporaltype="absolute"
| output="precipitation_daily" title="Daily precipitation"
| description="Test dataset with daily precipitation"
- | - 2013-04-20 14:39:07 -
+ | # 2014-11-23 19:22:23
| t.register type="rast" input="precipitation_daily"
| maps="prec_1,prec_2,prec_3,prec_4,prec_5,prec_6" start="2012-01-01"
| increment="1 day"
|
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 296.0
- | Maximum value max:.......... 648.0
- | Raster register table:...... precipitation_daily_soeren_raster_register
+----------------------------------------------------------------------------+
-
+
+
t.rast.list input=precipitation_daily
-prec_1 soeren 2012-01-01 00:00:00 None
-prec_2 soeren 2012-01-02 00:00:00 None
-prec_3 soeren 2012-01-03 00:00:00 None
-prec_4 soeren 2012-01-04 00:00:00 None
-prec_5 soeren 2012-01-05 00:00:00 None
-prec_6 soeren 2012-01-06 00:00:00 None
+name|mapset|start_time|end_time
+prec_1|PERMANENT|2012-01-01 00:00:00|None
+prec_2|PERMANENT|2012-01-02 00:00:00|None
+prec_3|PERMANENT|2012-01-03 00:00:00|None
+prec_4|PERMANENT|2012-01-04 00:00:00|None
+prec_5|PERMANENT|2012-01-05 00:00:00|None
+prec_6|PERMANENT|2012-01-06 00:00:00|None
+
t.snap type=strds input=precipitation_daily
t.info type=strds input=precipitation_daily
@@ -104,12 +110,13 @@
+-------------------- Space Time Raster Dataset -----------------------------+
| |
+-------------------- Basic information -------------------------------------+
- | Id: ........................ precipitation_daily at soeren
+ | Id: ........................ precipitation_daily at PERMANENT
| Name: ...................... precipitation_daily
- | Mapset: .................... soeren
+ | Mapset: .................... PERMANENT
| Creator: ................... soeren
- | Creation time: ............. 2013-04-20 14:39:07.136253
| Temporal type: ............. absolute
+ | Creation time: ............. 2014-11-23 19:22:22.657317
+ | Modification time:.......... 2014-11-23 19:23:12.517443
| Semantic type:.............. mean
+-------------------- Absolute time -----------------------------------------+
| Start time:................. 2012-01-01 00:00:00
@@ -124,42 +131,46 @@
| Top:........................ 0.0
| Bottom:..................... 0.0
+-------------------- Metadata information ----------------------------------+
+ | Raster register table:...... raster_map_register_4483cba5e46944bd9933e5392a9fd734
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 1.0
+ | Minimum value max:.......... 25.0
+ | Maximum value min:.......... 294.0
+ | Maximum value max:.......... 642.0
+ | Aggregation type:........... None
| Number of registered maps:.. 6
+ |
| Title:
| Daily precipitation
| Description:
| Test dataset with daily precipitation
- | Commands of creation:
- | - 2013-04-20 14:39:07 -
+ | Command history:
+ | # 2014-11-23 19:22:22
| t.create type="strds" temporaltype="absolute"
| output="precipitation_daily" title="Daily precipitation"
| description="Test dataset with daily precipitation"
- | - 2013-04-20 14:39:07 -
+ | # 2014-11-23 19:22:23
| t.register type="rast" input="precipitation_daily"
| maps="prec_1,prec_2,prec_3,prec_4,prec_5,prec_6" start="2012-01-01"
| increment="1 day"
- | - 2013-04-20 14:39:54 -
+ | # 2014-11-23 19:23:12
| t.snap type="strds" input="precipitation_daily"
|
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 296.0
- | Maximum value max:.......... 648.0
- | Raster register table:...... precipitation_daily_soeren_raster_register
+----------------------------------------------------------------------------+
t.rast.list input=precipitation_daily
-prec_1 soeren 2012-01-01 00:00:00 2012-01-02 00:00:00
-prec_2 soeren 2012-01-02 00:00:00 2012-01-03 00:00:00
-prec_3 soeren 2012-01-03 00:00:00 2012-01-04 00:00:00
-prec_4 soeren 2012-01-04 00:00:00 2012-01-05 00:00:00
-prec_5 soeren 2012-01-05 00:00:00 2012-01-06 00:00:00
-prec_6 soeren 2012-01-06 00:00:00 2012-01-07 00:00:00
+name|mapset|start_time|end_time
+prec_1|PERMANENT|2012-01-01 00:00:00|2012-01-02 00:00:00
+prec_2|PERMANENT|2012-01-02 00:00:00|2012-01-03 00:00:00
+prec_3|PERMANENT|2012-01-03 00:00:00|2012-01-04 00:00:00
+prec_4|PERMANENT|2012-01-04 00:00:00|2012-01-05 00:00:00
+prec_5|PERMANENT|2012-01-05 00:00:00|2012-01-06 00:00:00
+prec_6|PERMANENT|2012-01-06 00:00:00|2012-01-07 00:00:00
+
</pre></div>
<h2>SEE ALSO</h2>
@@ -172,7 +183,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.support/t.support.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.support/t.support.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.support/t.support.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -1,15 +1,32 @@
<h2>DESCRIPTION</h2>
-TBD.
+This module is dedicated to modify and update the metadata of a space time dataset.
+<p>
+The title, description and the semantic type can be modified.
+<p>
+The flag <em>-u</em> allows to update the STDS metadata from
+registered map layers. This is useful in case the map layers have been modified without using temporal
+commands.
+<p>
+The flag <em>-m</em> will update the metadata from registered maps, but also checks if the registered
+map layers have been removed from the spatial database.
+It deletes missing map layers from the space time dataset register table and the temporal database.
-<h2>EXAMPLE</h2>
+<h2>Examples</h2>
-The example is based on the XXX sample dataset:
-
+Modification of title and description of space time raster dataset <em>A</em>.
+<p>
<div class="code"><pre>
-TBD
+t.support type=strds input=A title="New title" description="New description"
</pre></div>
+<p>
+Update the metadata of space time raster dataset <em>A</em> and check for removed map layers.
+<p>
+<div class="code"><pre>
+t.support -m type=strds input=A
+</pre></div>
+
<h2>SEE ALSO</h2>
<em>
@@ -19,7 +36,7 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html 2014-11-23 21:16:04 UTC (rev 62873)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html 2014-11-23 21:29:42 UTC (rev 62874)
@@ -67,6 +67,6 @@
<h2>AUTHOR</h2>
-Sören Gebbert
+Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
<p><i>Last changed: $Date$</i>
More information about the grass-commit
mailing list