Merge pull request #2006 from NaturalGIS/grass7_better_default_raster_resolution

pcav · pcav · commit c79dd9d15b51 · 2015-04-26T13:22:47.000+02:00
better GRASS7 default raster resolution and fix r.composite
diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py
@@ -194,7 +194,7 @@ def getDefaultCellsize(self):
                             )
 
         if cellsize == 0:
-            cellsize = 1
+            cellsize = 100
         return cellsize
 
     def processAlgorithm(self, progress):
@@ -359,18 +359,19 @@ def processAlgorithm(self, progress):
                 outputCommands.append('g.region raster=' + out.name
                                       + uniqueSufix)
                 if self.grassName == 'r.composite':
-                    command = 'r.out.tiff -t --verbose' # FIXME r.out.tiff deprecated, use r.out.gdal
+                    command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
                     command += ' input='
                     command += out.name + uniqueSufix
                     command += ' output="' + filename + '"'
-                    commands.append(command)
-                    outputCommands.append(command)
                 else:
                     command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
                     command += ' input='
 
                 if self.grassName == 'r.horizon':
                     command += out.name + uniqueSufix + '_0'
+                elif  self.grassName == 'r.composite':
+                    commands.append(command)
+                    outputCommands.append(command)
                 else:
                     command += out.name + uniqueSufix
                     command += ' output="' + filename + '"'
