[grass] 01/04: Imported Upstream version 7.2.1
Bas Couwenberg
sebastic at debian.org
Wed May 3 17:03:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository grass.
commit beb009cfdfc375b2d53ed4a11383e87b3455b4cf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed May 3 18:27:18 2017 +0200
Imported Upstream version 7.2.1
---
ChangeLog_7.2.1.gz | Bin 0 -> 863712 bytes
ChangeLog_7.2.1RC2.gz | Bin 863398 -> 0 bytes
demolocation/PERMANENT/.bash_history | 45 --------------------
demolocation/PERMANENT/.bashrc | 9 ----
doc/howto_release.txt | 3 +-
imagery/i.group/i.group.html | 11 ++++-
include/VERSION | 2 +-
raster/r.circle/r.circle.html | 4 +-
temporal/t.list/t.list.py | 20 ++++-----
temporal/t.rast.what/t.rast.what.py | 2 +-
temporal/t.register/t.register.html | 80 ++++++++++++++++++++---------------
temporal/t.register/t.register.py | 12 +++---
vector/v.kernel/v.kernel.html | 18 +++++++-
vector/v.kernel/v_kernel.png | Bin 0 -> 96181 bytes
14 files changed, 94 insertions(+), 112 deletions(-)
diff --git a/ChangeLog_7.2.1.gz b/ChangeLog_7.2.1.gz
new file mode 100644
index 0000000..c7b9911
Binary files /dev/null and b/ChangeLog_7.2.1.gz differ
diff --git a/ChangeLog_7.2.1RC2.gz b/ChangeLog_7.2.1RC2.gz
deleted file mode 100644
index 390a699..0000000
Binary files a/ChangeLog_7.2.1RC2.gz and /dev/null differ
diff --git a/demolocation/PERMANENT/.bash_history b/demolocation/PERMANENT/.bash_history
deleted file mode 100644
index 18f4619..0000000
--- a/demolocation/PERMANENT/.bash_history
+++ /dev/null
@@ -1,45 +0,0 @@
-v.unpack country_boundaries.pack
-g.proj -w
-v.unpack country_boundaries.pack -v
-v.unpack country_boundaries.pack --v
-g.proj -w
-g.proj -p
-cd grass72/demolocation/PERMANENT/
-pwd
-meld PROJ_INFO ~/grassdata/ll/PERMANENT/PERMANENT/PROJ_INFO
-cp ~/grassdata/ll/PERMANENT/PERMANENT/PROJ_INFO .
-svn diff
-cat PROJ_
-cat PROJ_INFO
-cat PROJ_UNITS �
-cat PROJ_UNITS
-ccat ~/grassdata/ll/PERMANENT/PERMANENT/PROJ_UNITS
-cat ~/grassdata/ll/PERMANENT/PERMANENT/PROJ_UNITS
-svn ci -m"demolocation: update to current file structure as generated with 'grass72 -c EPSG:4326 ~/grassdata/ll/PERMANENT'" PROJ_INFO
-v.unpack country_boundaries.pack --v
-l /home/neteler/grass72/demolocation/PERMANENT/
-cd grass72/demolocation/PERMANENT/
-mkdir sqlite
-cd
-v.unpack country_boundaries.pack --v
-v.info country_boundaries
-v.db.connect -p country_boundaries
-g.region -p
-g.gui
-v.info -c country_boundaries
-v.unpack country_boundaries.pack
-v.info map=country_boundaries at PERMANENT
-g.region -p
-v.db.connect -p country_boundaries
-v.build.all
-g.gisenv
-v.split g
-v.split -n box_4_corners output=box_4_corners_many_vertices length=200 units=kilometers
-g.region -p
-v.split -n box_4_corners output=box_4_corners_many_vertices length=0.2
-v.split -n box_4_corners output=box_4_corners_many_vertices length=0.2 --o
-v.split -n box_4_corners output=box_4_corners_many_vertices length=200 units=kilometers
-v.split -n box_4_corners output=box_4_corners_many_vertices length=200 units=kilometers --o
-g.list vect
-g.remove vect=box_4_corners box_4_corners_many_vertices
-g.remove vect=box_4_corners,box_4_corners_many_vertices
diff --git a/demolocation/PERMANENT/.bashrc b/demolocation/PERMANENT/.bashrc
deleted file mode 100644
index 8a64b20..0000000
--- a/demolocation/PERMANENT/.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-test -r ~/.alias && . ~/.alias
-PS1='GRASS 7.2.0svn (demolocation):\w > '
-PROMPT_COMMAND="'/home/neteler/software/grass72_release/dist.x86_64-pc-linux-gnu/etc/prompt.py'"
-# User specific aliases and functions
-alias cp='cp -i'
-alias mv='mv -i'
-alias rm='rm -i'
-export PATH="/home/neteler/software/grass72_release/dist.x86_64-pc-linux-gnu/bin:/home/neteler/software/grass72_release/dist.x86_64-pc-linux-gnu/scripts:/home/neteler/.grass7/addons/bin:/home/neteler/.grass7/addons/scripts:/usr/lib64/qt-3.3/bin:/usr/lib64/ccache:/usr/libexec/lightdm:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/usr/sbin:/home/neteler/bin"
-export HOME="/home/neteler"
diff --git a/doc/howto_release.txt b/doc/howto_release.txt
index 8f422c1..4685a00 100644
--- a/doc/howto_release.txt
+++ b/doc/howto_release.txt
@@ -1,6 +1,6 @@
How to release GRASS GIS binaries and source code
-$Date: 2017-04-22 18:54:09 +0200 (Sat, 22 Apr 2017) $
+$Date: 2017-04-22 22:17:30 +0200 (Sa, 22. Apr 2017) $
Note: This text contains *some* rules only applicable to the
development coordinator (currently Markus Neteler, PSC Chair).
@@ -41,6 +41,7 @@ Contents
- cleanup rubbish:
rm -f locale/templates/*.pot
rm -f locale/po/messages.mo
+ rm -f demolocation/PERMANENT/.bash*
find . -name '*~' | xargs rm
find . -name '*.bak' | xargs rm
find . -name '.#*' | xargs rm
diff --git a/imagery/i.group/i.group.html b/imagery/i.group/i.group.html
index ac59995..92655c9 100644
--- a/imagery/i.group/i.group.html
+++ b/imagery/i.group/i.group.html
@@ -22,6 +22,15 @@ imagery map layers in the current LOCATION_NAME.
<p>Subgroup names may not contain more than 12 characters.
+<h3>EXAMPLE</h3>
+
+This example runs in the "landsat" mapset of the North Carolina sample
+dataset. The following command creates a group and subgroup containing
+only the visible light bands of Landsat-7:
+
+<div class="code"><pre>
+i.group group=vis_bands subgroup=vis_bands input=lsat7_2000_10,lsat7_2000_20,lsat7_2000_30
+</pre></div>
<h2>SEE ALSO</h2>
@@ -46,4 +55,4 @@ Research Laboratory
<br>
Parser support: Bob Covill (Tekmap, Canada)
-<p><i>Last changed: $Date: 2014-11-02 21:52:19 +0100 (Sun, 02 Nov 2014) $</i>
+<p><i>Last changed: $Date: 2017-05-01 11:29:04 +0200 (Mo, 01. Mai 2017) $</i>
diff --git a/include/VERSION b/include/VERSION
index 37a758d..9fed735 100644
--- a/include/VERSION
+++ b/include/VERSION
@@ -1,4 +1,4 @@
7
2
-1RC2
+1
2017
diff --git a/raster/r.circle/r.circle.html b/raster/r.circle/r.circle.html
index 85483a8..53235ef 100644
--- a/raster/r.circle/r.circle.html
+++ b/raster/r.circle/r.circle.html
@@ -32,7 +32,7 @@ of 500m and an outer radius of 1000m:
EASTCENTER=`g.region -c | awk ' /center easting:/ { print $3 }'`
NORTHCENTER=`g.region -c | awk ' /center northing:/ { print $3 }'`
r.circle -b output=circle coordinate=${EASTCENTER},${NORTHCENTER} min=500 max=1000
-</pre>
+</pre></div>
<h2>SEE ALSO</h2>
@@ -50,4 +50,4 @@ r.circle -b output=circle coordinate=${EASTCENTER},${NORTHCENTER} min=500 max=10
Bill Brown, U.S. Army Construction Engineering Research Laboratory<br>
Additional flag/min/max parameter by Markus Neteler, University of Hannover
-<p><i>Last changed: $Date: 2014-12-12 00:12:46 +0100 (Fri, 12 Dec 2014) $</i>
+<p><i>Last changed: $Date: 2017-04-28 03:32:53 +0200 (Fr, 28. Apr 2017) $</i>
diff --git a/temporal/t.list/t.list.py b/temporal/t.list/t.list.py
index 90fc5ec..182d7ad 100755
--- a/temporal/t.list/t.list.py
+++ b/temporal/t.list/t.list.py
@@ -2,15 +2,15 @@
# -*- coding: utf-8 -*-
############################################################################
#
-# MODULE: t.list
-# AUTHOR(S): Soeren Gebbert
+# MODULE: t.list
+# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: List space time datasets and maps registered in the temporal database
-# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
+# PURPOSE: List space time datasets and maps registered in the temporal database
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and 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.
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
#
#############################################################################
@@ -113,6 +113,9 @@ def main():
if gscript.verbosity() > 0 and not outpath:
sys.stderr.write("----------------------------------------------\n")
+ if outpath:
+ outfile = open(outpath, 'w')
+
for ttype in temporal_type.split(","):
if ttype == "absolute":
time = "absolute time"
@@ -125,9 +128,6 @@ def main():
# alphabetic ordering
mapsets = tgis.get_tgis_c_library_interface().available_mapsets()
- if outpath:
- outfile = open(outpath, 'w')
-
# Print for each mapset separately
for key in mapsets:
if key in stds_list.keys():
diff --git a/temporal/t.rast.what/t.rast.what.py b/temporal/t.rast.what/t.rast.what.py
index 5d095b2..35f913d 100755
--- a/temporal/t.rast.what/t.rast.what.py
+++ b/temporal/t.rast.what/t.rast.what.py
@@ -146,7 +146,7 @@ def main(options, flags):
gscript.fatal(_("Options coordinates and points are mutually exclusive"))
if not coordinates and not points and not use_stdin:
- gscript.fatal(_("Please specify the coordinates, the points option or use the 's' option to pipe coordinate positions to t.rast.what from stdin, to provide the sampling coordinates"))
+ gscript.fatal(_("Please specify the coordinates, the points option or use the 'i' flag to pipe coordinate positions to t.rast.what from stdin, to provide the sampling coordinates"))
if use_stdin:
coordinates_stdin = str(sys.__stdin__.read())
diff --git a/temporal/t.register/t.register.html b/temporal/t.register/t.register.html
index 082e672..7009600 100644
--- a/temporal/t.register/t.register.html
+++ b/temporal/t.register/t.register.html
@@ -1,9 +1,9 @@
<h2>DESCRIPTION</h2>
-The module <em>t.register</em> is designed to register raster, 3D
-raster and vector maps in the temporal database and in specific space
-time datasets. This module must be used to assign time stamps to
-raster, 3D raster and vector maps. The existing timestamp modules
+The module <em>t.register</em> has double functionality: it either only assigns
+timestamps to raster, 3D raster and vector maps in the temporal database
+(if <em>input</em> option is not provided, see below) or additionally, it also registers
+them within input space time datasets (stds). The existing timestamp modules
<a href="r.timestamp.html">r.timestamp</a>,
<a href="r3.timestamp.html">r3.timestamp</a> and
<a href="v.timestamp.html">v.timestamp</a> do not register the maps in the
@@ -12,29 +12,38 @@ with these modules can be read and used by <em>t.register</em>. This
works only for maps that are not already registered in the temporal
database.
<p>
+If the <em>input</em> option is not used (i.e.: no stds is provided), maps
+will be only registered in the temporal database with assigned
+timestamps. If, however, the <em>input</em> option
+is used and a stds is provided, maps will be first registered in the temporal
+database (if not registered before) and then, in the stds specified. If the
+user wants to register maps that are already registered in the temporal
+database in a different stds, there is no need to pass information regarding
+start and end time, <em>t.register</em> will read timestamps from the temporal
+database.
+<p>
This module supports absolute and relative time. The absolute temporal type
refers to a fixed date while the relative temporal type refers to data
-without fixed time stamps (e.g., sequential maps used to calculate
+without fixed timestamps (e.g., sequential maps used to calculate
multi-decadal averages).
-
<p>
-Maps can be registered by command line argument (a list of comma separated map
+Maps can be registered by command line argument (i.e.: a list of comma separated map
names) or using an input file. The start time, the end time and a temporal
increment can be provided by command line or in the input file. End time and
-increment are mutual exclusive. The user can register single maps or a
+increment are mutually exclusive. The user can register single maps or a
list of maps at once. Maps can be registered in several space time
datasets using the same timestamp.
<p>
The <em>increment</em> option and the <b>-i</b> flag (to create time intervals)
work only in conjunction with the <b>start</b> option.
-If an input file with time stamps is used, then the <em>increment</em> option
-and the <b>-i</b> flag are not supported.
+If an input file with timestamps (either start time or start time and end time)
+is used, then the <em>increment</em> option and the <b>-i</b> flag are not supported.
<p>
Start time and end time with absolute time must be provided using the
-format <b>yyyy-mm-dd HH:MM:SS +HHMM</b>. It is supported to specify
-only the date <b>yyyy-mm-dd</b>. In case of relative time the temporal
+format <b>yyyy-mm-dd HH:MM:SS +HHMM</b>. It is also supported to specify
+only the date <b>yyyy-mm-dd</b>. In case of relative time, the temporal
unit (years, months, days, hours, minutes or seconds) must be provided.
-The relative start time, end time and the increment are integers.
+In this case, the relative start time, end time and increment are integers.
<h2>NOTES</h2>
@@ -48,13 +57,17 @@ database.
<h2>INPUT FILE FORMAT</h2>
-The input file consists of a list of map names, optionally along with time stamps.
-Each map name is to be stored in a row in this file.
+There are several options to register maps by means of a file. The input file
+consists of a list of map names, optionally along with timestamps. Each map
+name (and timestaps if provided) should be stored in a new line in this file.
<p>
-There are several options to register maps, <em>increment</em> option and
-the <b>-i</b> flag are supported:
+When only map names are provided, the <em>increment</em> option and the <b>-i</b>
+flag are supported. However, when along with map names any kind of timestamp is
+provided, as well, the <em>increment</em> option and the <b>-i</b> are no longer
+supported.
<p>
-Specification of map names:
+Specification of map names only (<em>increment</em> option and <b>-i</b> flag
+supported):
<div class="code"><pre>
terra_lst_day20020113
terra_lst_day20020114
@@ -64,8 +77,8 @@ terra_lst_day20020117
</pre></div>
<p>
-Specification of map names and the absolute start time (date) of the time
-instances, not support for <em>increment</em> option and the <b>-i</b> flag:
+Specification of map names and absolute start time (date) of the time
+instances (no support for <em>increment</em> option nor <b>-i</b> flag):
<div class="code"><pre>
terra_lst_day20020113|2002-01-13
terra_lst_day20020114|2002-01-14
@@ -75,8 +88,8 @@ terra_lst_day20020117|2002-01-17
</pre></div>
<p>
-Specification of map names and the absolute time stamp (datetime),
-not support for <em>increment</em> option and the <b>-i</b> flag:
+Specification of map names and absolute start time (datetime) of the time
+instances (no support for <em>increment</em> option nor <b>-i</b> flag):
<div class="code"><pre>
terra_lst_day20020113|2002-01-13 10:30
terra_lst_day20020114|2002-01-14 10:30
@@ -86,9 +99,8 @@ terra_lst_day20020117|2002-01-17 10:30
</pre></div>
<p>
-Specification of the map name and the absolute time interval with start,
-not support for <em>increment</em> option and the <b>-i</b> flag:
-and end time:
+Specification of map names and absolute time interval with start and end time
+(no support for <em>increment</em> option nor <b>-i</b> flag):
<div class="code"><pre>
prec_1|2001-01-01|2001-04-01
prec_2|2001-04-01|2001-07-01
@@ -103,7 +115,7 @@ prec_6|2002-04-01|2002-07-01
<h3>North Carolina dataset</h3>
<h4>Using a text file</h4>
-Register maps in a absolute space time dataset, creating a time interval
+Register maps in an absolute space time dataset, creating a time interval
<div class="code"><pre>
# first: prepare a text file with a list of input maps (see above)
@@ -116,7 +128,7 @@ t.register -i type=raster input=precipitation_monthly \
<h4>Using <em>g.list</em> to generate the input</h4>
-Register maps in a absolute space time dataset, creating a time interval
+Register maps in an absolute space time dataset, creating a time interval
<div class="code"><pre>
t.register -i type=raster input=precipitation_monthly \
@@ -128,10 +140,10 @@ t.register -i type=raster input=precipitation_monthly \
In this example we create 6 raster maps that will be registered in a
single space time raster dataset named precip_abs using a monthly
-temporal granularity. The <b>-i</b> flag generates interval time. The
-generated timestamps will be inspected using <em>r.timestamp</em> and
-<em>t.rast.list</em>. We will register an additional map with a timestamp
-that was set with <em>r.timestamp</em>.
+temporal granularity. The <b>-i</b> flag generates time intervals of the
+provided <em>increment</em>. The generated timestamps will be inspected
+using <em>r.timestamp</em> and <em>t.rast.list</em>. We will register an
+additional map with a timestamp that was set with <em>r.timestamp</em>.
<div class="code"><pre>
r.mapcalc expression="prec_1 = 100"
@@ -189,7 +201,7 @@ offers the E-OBS dataset which is a daily gridded observational
dataset for precipitation, temperature and sea level pressure in
Europe based on ECA&D information.
-Download and decompress mean temperature data from:
+Download and decompress mean temperature data from:
<a href="http://eca.knmi.nl/download/ensembles/data/Grid_0.25deg_reg/">here</a>
by accepting their
<a href="http://eca.knmi.nl/download/ensembles/ensembles.php">Terms of use</a>.
@@ -213,7 +225,7 @@ t.create type=strds output=temperature_mean_1950_2015_daily \
# create text file with all temperature_mean rasters, one per line,
# a) using a shell script
-for i in `seq 1 23922` ; do
+for i in `seq 1 23922` ; do
echo temperature_mean.$i >> map_list.txt
done
@@ -242,5 +254,5 @@ t.register -i type=raster input=temperature_mean_1950_2015_daily \
Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
-<p><i>Last changed: $Date: 2016-05-25 18:50:20 +0200 (Wed, 25 May 2016) $</i>
+<p><i>Last changed: $Date: 2017-04-25 19:53:26 +0200 (Di, 25. Apr 2017) $</i>
diff --git a/temporal/t.register/t.register.py b/temporal/t.register/t.register.py
index 40222fe..2d5555b 100755
--- a/temporal/t.register/t.register.py
+++ b/temporal/t.register/t.register.py
@@ -5,7 +5,7 @@
# MODULE: t.register
# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Register raster, vector and raster3d maps in a space time datasets
+# PURPOSE: Registers raster, vector and raster3d maps in a space time dataset
# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
@@ -15,7 +15,7 @@
#############################################################################
#%module
-#% description: Registers raster, vector and raster3d maps in a space time datasets.
+#% description: Assigns timestamps and registers raster, vector and raster3d maps in a space time dataset.
#% keyword: temporal
#% keyword: map management
#% keyword: register
@@ -50,7 +50,7 @@
#% key: start
#% type: string
#% label: Valid start date and time of the first map
-#% description: Format absolute time: "yyyy-mm-dd HH:MM:SS +HHMM", relative time is of type integer).
+#% description: Format for absolute time: "yyyy-mm-dd HH:MM:SS +HHMM", relative time is of type integer.
#% required: no
#% multiple: no
#% guisection: Time & Date
@@ -60,7 +60,7 @@
#% key: end
#% type: string
#% label: Valid end date and time of all map
-#% description: Format absolute time: "yyyy-mm-dd HH:MM:SS +HHMM", relative time is of type integer).
+#% description: Format for absolute time: "yyyy-mm-dd HH:MM:SS +HHMM", relative time is of type integer.
#% required: no
#% multiple: no
#% guisection: Time & Date
@@ -70,7 +70,7 @@
#% key: unit
#% type: string
#% label: Time stamp unit
-#% description: Unit must be set in case of relative time stamps
+#% description: Unit must be set in case of relative timestamps
#% required: no
#% multiple: no
#% options: years,months,days,hours,minutes,seconds
@@ -81,7 +81,7 @@
#% key: increment
#% type: string
#% label: Time increment, works only in conjunction with start option
-#% description: Time increment between maps for valid time interval creation (format absolute: NNN seconds, minutes, hours, days, weeks, months, years; format relative is integer: 5)
+#% description: Time increment between maps for creation of valid time intervals (format for absolute time: NNN seconds, minutes, hours, days, weeks, months, years; format for relative time is of type integer: 5)
#% required: no
#% multiple: no
#% guisection: Time & Date
diff --git a/vector/v.kernel/v.kernel.html b/vector/v.kernel/v.kernel.html
index 54bacc2..9f55d60 100644
--- a/vector/v.kernel/v.kernel.html
+++ b/vector/v.kernel/v.kernel.html
@@ -28,7 +28,21 @@ optimal radius. The value of <em>radius</em> is taken
as maximum value. The radius is calculated based on the gaussian function,
using ALL points, not just those in the current region.
-<h2>LIMITATIONS</h2>
+
+<h2>EXAMPLES</h2>
+Compute density of points (using vector map of schools from North Carolina sample dataset):
+<div class="code"><pre>
+g.region region=wake_30m
+v.kernel input=schools_wake output=schools_density radius=5000 multiplier=1000000
+r.colors map=schools_density color=bcyr
+</pre></div>
+
+<center>
+<img src="v_kernel.png" alt="Density of schools" border=0><br>
+School density
+</center>
+
+<h2>KNOWN ISSUES</h2>
The module only considers the presence of points, but not
(yet) any attribute values.
@@ -55,4 +69,4 @@ Stefano Menegon, <a href="http://mpa.itc.it/">ITC-irst</a>, Trento, Italy<br>
Radim Blazek (additional kernel density functions and network part)
<p>
-<i>Last changed: $Date: 2016-08-03 13:53:17 +0200 (Wed, 03 Aug 2016) $</i>
+<i>Last changed: $Date: 2017-04-28 15:34:00 +0200 (Fr, 28. Apr 2017) $</i>
diff --git a/vector/v.kernel/v_kernel.png b/vector/v.kernel/v_kernel.png
new file mode 100644
index 0000000..38d65ad
Binary files /dev/null and b/vector/v.kernel/v_kernel.png differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git
More information about the Pkg-grass-devel
mailing list