[GRASS-SVN] r38537 - grass-addons/vector/v.krige

[svn_grass at osgeo.org]

Author: aghisla
Date: 2009-07-29 11:51:28 -0400 (Wed, 29 Jul 2009)
New Revision: 38537

Modified:
   grass-addons/vector/v.krige/v.krige.py
Log:
cleaned prevoius commit


Modified: grass-addons/vector/v.krige/v.krige.py
===================================================================
--- grass-addons/vector/v.krige/v.krige.py	2009-07-29 15:49:20 UTC (rev 38536)
+++ grass-addons/vector/v.krige/v.krige.py	2009-07-29 15:51:28 UTC (rev 38537)
@@ -147,7 +147,6 @@
     """ Executes analysis. For the moment, only with gstat functions."""
     
     def ImportMap(self, map):
-<<<<<<< .mine
         """ Adds x,y columns to the GRASS map and then imports it in R. """
         # adds x, y columns if needed.
         #@NOTE: it alters original data. Is it correct?
@@ -157,17 +156,6 @@
                               columns = 'x double precision, y double precision')
             grass.run_command('v.to.db', map = map, option = 'coor', col = 'x,y')
         return robjects.r.readVECT6(map, type= 'point')
-=======
-        """ Adds x,y columns to the GRASS map and then imports it in R. """
-        # adds x, y columns if needed
-        cols = grass.vector_columns(map=map, layer=1)
-        if not cols.has_key('x') and not cols.has_key('y'):
-            grass.run_command('v.db.addcol', map = map,
-                              columns = 'x double precision, y double precision')
-            # fills them with coordinates
-            grass.run_command('v.to.db', map = map, option = 'coor', col = 'x,y')
-        return robjects.r.readVECT6(map, type= 'point')
->>>>>>> .r38535
     
     def CreateGrid(self, inputdata):
         Region = grass.region()