[GRASS-SVN] r63444 - in grass-addons/grass7/misc/m.surf.nnbathy: libnnbathy r.surf.nnbathy v.surf.nnbathy
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 8 08:01:19 PST 2014
Author: lazaa
Date: 2014-12-08 08:01:19 -0800 (Mon, 08 Dec 2014)
New Revision: 63444
Modified:
grass-addons/grass7/misc/m.surf.nnbathy/libnnbathy/nnbathy.py
grass-addons/grass7/misc/m.surf.nnbathy/r.surf.nnbathy/r.surf.nnbathy.html
grass-addons/grass7/misc/m.surf.nnbathy/v.surf.nnbathy/v.surf.nnbathy.html
grass-addons/grass7/misc/m.surf.nnbathy/v.surf.nnbathy/v.surf.nnbathy.py
Log:
m.surf.nnbathy: use standardized key option names
manual cosmetics
Modified: grass-addons/grass7/misc/m.surf.nnbathy/libnnbathy/nnbathy.py
===================================================================
--- grass-addons/grass7/misc/m.surf.nnbathy/libnnbathy/nnbathy.py 2014-12-08 15:48:24 UTC (rev 63443)
+++ grass-addons/grass7/misc/m.surf.nnbathy/libnnbathy/nnbathy.py 2014-12-08 16:01:19 UTC (rev 63444)
@@ -126,23 +126,17 @@
_column = ''
else:
_layer = int(options['layer'])
- if options['zcolumn']:
- _column = options['zcolumn']
+ if options['column']:
+ _column = options['column']
else:
grass.message('Name of z column required for 2D vector maps.')
# convert vector to ASCII
- if options['kwhere']:
- grass.run_command("v.out.ascii", flags='r', overwrite=1,
- input=options['input'], output=self._tmpcat,
- format="point", separator="space", dp=15,
- where=options['kwhere'], layer=_layer,
- columns=_column)
- else:
- grass.run_command("v.out.ascii", flags='r', overwrite=1,
- input=options['input'], output=self._tmpcat,
- format="point", separator="space", dp=15,
- layer=_layer, columns=_column)
+ grass.run_command("v.out.ascii", flags='r', overwrite=1,
+ input=options['input'], output=self._tmpcat,
+ format="point", separator="space", precision=15,
+ where=options['where'], layer=_layer,
+ columns=_column)
# edit ASCII file, crop out one column
if int(options['layer']) > 0:
Modified: grass-addons/grass7/misc/m.surf.nnbathy/r.surf.nnbathy/r.surf.nnbathy.html
===================================================================
--- grass-addons/grass7/misc/m.surf.nnbathy/r.surf.nnbathy/r.surf.nnbathy.html 2014-12-08 15:48:24 UTC (rev 63443)
+++ grass-addons/grass7/misc/m.surf.nnbathy/r.surf.nnbathy/r.surf.nnbathy.html 2014-12-08 16:01:19 UTC (rev 63444)
@@ -18,7 +18,7 @@
<p>
The <b>output</b> raster map is a continous surface interpolated from the
-<b>raster</b> data.
+<b>input</b> data.
<h2>NOTES</h2>
@@ -29,7 +29,7 @@
held in the memory.
<ol>
-<li>Requires <em>GRASS</em> 6 and <em>nnbathy</em> 1.76 or greater.</li>
+<li>Requires <em>GRASS</em> 7 and <em>nnbathy</em> 1.76 or greater.</li>
<li>Build <em>nnbathy</em> according to instructions provided with its source
code and put it somewhere in your $PATH.</li>
<li>The output raster map extent and resolution match the region settings at
@@ -50,6 +50,16 @@
GRASS raster map would actually occupy.</li>
</ol>
+<h2>EXAMPLE</h2>
+
+TODO
+
+<h2>REFERENCES</h2>
+
+<ul>
+ <li><a href="https://code.google.com/p/nn-c/">nnbathy</a> library by Pavel Sakov</li>
+</ul>
+
<h2>SEE ALSO</h2>
<em>
@@ -58,12 +68,13 @@
<h2>AUTHOR</h2>
-Adam Laza (mentor: Martin Landa)<br>
+
+Adam Laza, Czech Technical University in Prague (mentor: Martin Landa)
+
+<p>
based on v.surf.nnbathy from GRASS 6 by<br>
Hamish Bowman, Otago University, New Zealand<br>
Based on <em>r.surf.nnbathy</em> by Maciej Sieczka<br>
-<em><a href="https://code.google.com/p/nn-c/">nnbathy</a></em>
- written by Pavel Sakov
<p>
<i>Last changed: $Date$</i>
Modified: grass-addons/grass7/misc/m.surf.nnbathy/v.surf.nnbathy/v.surf.nnbathy.html
===================================================================
--- grass-addons/grass7/misc/m.surf.nnbathy/v.surf.nnbathy/v.surf.nnbathy.html 2014-12-08 15:48:24 UTC (rev 63443)
+++ grass-addons/grass7/misc/m.surf.nnbathy/v.surf.nnbathy/v.surf.nnbathy.html 2014-12-08 16:01:19 UTC (rev 63444)
@@ -29,7 +29,7 @@
held in the memory.
<ol>
-<li>Requires <em>GRASS</em> 6 and <em>nnbathy</em> 1.76 or greater.</li>
+<li>Requires <em>GRASS</em> 7 and <em>nnbathy</em> 1.76 or greater.</li>
<li>Build <em>nnbathy</em> according to instructions provided with its source
code and put it somewhere in your $PATH.</li>
<li>The output raster map extent and resolution match the region settings at
@@ -50,20 +50,30 @@
GRASS raster map would actually occupy.</li>
</ol>
+<h2>EXAMPLE</h2>
+
+TODO
+
+<h2>REFERENCES</h2>
+
+<ul>
+ <li><a href="https://code.google.com/p/nn-c/">nnbathy</a> library by Pavel Sakov</li>
+</ul>
+
<h2>SEE ALSO</h2>
<em>
<a href="r.surf.nnbathy.html">r.surf.nnbathy</a>
</em>
+<h2>AUTHOR</h2>
-<h2>AUTHOR</h2>
-Adam Laza (mentor: Martin Landa)<br>
-based on v.surf.nnbathy from GRASS 6 by<br>
+Adam Laza, Czech Technical University in Prague (mentor: Martin Landa)
+
+<p>
+Based on v.surf.nnbathy from GRASS 6 by:<br>
Hamish Bowman, Otago University, New Zealand<br>
Based on <em>r.surf.nnbathy</em> by Maciej Sieczka<br>
-<em><a href="https://code.google.com/p/nn-c/">nnbathy</a></em>
- written by Pavel Sakov
<p>
<i>Last changed: $Date$</i>
Modified: grass-addons/grass7/misc/m.surf.nnbathy/v.surf.nnbathy/v.surf.nnbathy.py
===================================================================
--- grass-addons/grass7/misc/m.surf.nnbathy/v.surf.nnbathy/v.surf.nnbathy.py 2014-12-08 15:48:24 UTC (rev 63443)
+++ grass-addons/grass7/misc/m.surf.nnbathy/v.surf.nnbathy/v.surf.nnbathy.py 2014-12-08 16:01:19 UTC (rev 63444)
@@ -59,14 +59,10 @@
#% description: Name of output raster map
#%end
#%option G_OPT_DB_COLUMN
-#% key: zcolumn
#% description: Name of the attribute column with values to be used for approximation (if layer>0)
#% guisection: Settings
#%end
#%option G_OPT_DB_WHERE
-#% key: kwhere
-#% type: string
-#% label: WHERE conditions of SQL query statement without 'where' keyword
#% guisection: Selection
#%end
#%option
More information about the grass-commit
mailing list