[GRASS-SVN] r65416 - grass/branches/releasebranch_7_0/lib/python/temporal

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Jun 8 00:23:35 PDT 2015


Author: neteler
Date: 2015-06-08 00:23:35 -0700 (Mon, 08 Jun 2015)
New Revision: 65416

Modified:
   grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster_base_algebra.py
Log:
temporal_raster_base_algebra.py: white space cleanup; minor sync to trunk

Modified: grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster_base_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster_base_algebra.py	2015-06-08 07:23:00 UTC (rev 65415)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/temporal_raster_base_algebra.py	2015-06-08 07:23:35 UTC (rev 65416)
@@ -395,6 +395,7 @@
             # Generate an intermediate map for the result map list.
             map_new = self.generate_new_map(base_map=map_i, bool_op = 'and', 
                                                                         copy = True,  rename = True)
+            
             # Combine temporal and spatial extents of intermediate map with related maps.
             for topo in topolist:
                 if topo in tbrelations.keys():
@@ -406,6 +407,7 @@
                         # Create overlayed map extent.
                         returncode = self.overlay_map_extent(map_new, map_j, 'and', \
                                                                 temp_op = temporal)
+                        
                         # Stop the loop if no temporal or spatial relationship exist.
                         if returncode == 0:
                             break
@@ -1461,8 +1463,7 @@
             elif t[7] == 'null':
                 theninput = self.check_stds(t[5])
                 elseinput = str(t[7] + t[8] + t[9])
-        print(theninput)
-        print(elseinput)
+
         # Create conditional command map list.
         resultlist = self.build_condition_cmd_list(ifmaplist, theninput,  elseinput,  
                                                         condition_topolist = ["EQUAL"], 



More information about the grass-commit mailing list