[GRASS-SVN] r49461 - in grass/trunk/lib/python: . temporal

[svn_grass at osgeo.org]

Author: huhabla
Date: 2011-12-01 07:11:06 -0800 (Thu, 01 Dec 2011)
New Revision: 49461

Modified:
   grass/trunk/lib/python/temporal/abstract_space_time_dataset.py
   grass/trunk/lib/python/vector.py
Log:
Bugfix in parsing of v.info output in case of non 3d vector maps


Modified: grass/trunk/lib/python/temporal/abstract_space_time_dataset.py
===================================================================
--- grass/trunk/lib/python/temporal/abstract_space_time_dataset.py	2011-12-01 12:36:36 UTC (rev 49460)
+++ grass/trunk/lib/python/temporal/abstract_space_time_dataset.py	2011-12-01 15:11:06 UTC (rev 49461)
@@ -530,7 +530,6 @@
 
         return obj_list
 
-
     def get_registered_maps_as_objects_by_granularity(self, gran=None, dbif=None):
         """Return all registered maps as ordered (by start_time) object list with 
            "gap" map objects (id==None) for temporal topological operations using the

Modified: grass/trunk/lib/python/vector.py
===================================================================
--- grass/trunk/lib/python/vector.py	2011-12-01 12:36:36 UTC (rev 49460)
+++ grass/trunk/lib/python/vector.py	2011-12-01 15:11:06 UTC (rev 49461)
@@ -197,11 +197,14 @@
 	kv[k] = float(kv[k])
     for k in ['level', 'num_dblinks']:
 	kv[k] = int(kv[k])
-    for k in ['nodes', 'points', 'lines', 'boundaries', 'centroids', 'areas', 'islands', \
-              'faces', 'kernels', 'volumes', 'holes', 'primitives']:
+    for k in ['nodes', 'points', 'lines', 'boundaries', 'centroids', 'areas', 'islands', 'primitives']:
 	kv[k] = int(kv[k])
     if 'map3d' in kv:
-        kv['map3d'] = bool(kv['map3d'])
+        kv['map3d'] = bool(int(kv['map3d']))
+        if kv['map3d']:
+            for k in ['faces', 'kernels', 'volumes', 'holes']:
+                kv[k] = int(kv[k])
+
     return kv