[GRASS-SVN] r50792 - grass/trunk/scripts/r.buffer
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Feb 13 09:27:03 EST 2012
Author: mmetz
Date: 2012-02-13 06:27:02 -0800 (Mon, 13 Feb 2012)
New Revision: 50792
Modified:
grass/trunk/scripts/r.buffer/r.buffer.py
Log:
r.buffer fix for latlong
Modified: grass/trunk/scripts/r.buffer/r.buffer.py
===================================================================
--- grass/trunk/scripts/r.buffer/r.buffer.py 2012-02-13 14:26:10 UTC (rev 50791)
+++ grass/trunk/scripts/r.buffer/r.buffer.py 2012-02-13 14:27:02 UTC (rev 50792)
@@ -82,17 +82,16 @@
distances = distances.split(',')
distances1 = [scale * float(d) for d in distances]
- distances2 = [d * d for d in distances1]
s = grass.read_command("g.proj", flags='j')
kv = grass.parse_key_val(s)
if kv['+proj'] == 'longlat':
metric = 'geodesic'
else:
- metric = 'squared'
+ metric = 'euclidean'
grass.run_command('r.grow.distance', input = input, metric = metric,
- distance = temp_dist)
+ distance = temp_dist, flags = 'm')
if zero:
exp = "$temp_src = if($input == 0,null(),1)"
@@ -103,7 +102,7 @@
grass.mapcalc(exp, temp_src = temp_src, input = input)
exp = "$output = if(!isnull($input),$input,%s)"
- for n, dist2 in enumerate(distances2):
+ for n, dist2 in enumerate(distances1):
exp %= "if($dist <= %f,%d,%%s)" % (dist2,n + 2)
exp %= "null()"
More information about the grass-commit
mailing list