Merge pull request #5313 from NaturalGIS/grass7_more_output_fixes

alexbruy · web-flow · commit 7935c416d6e5 · 2017-10-06T15:54:25.000+03:00
[processing] fix output command for some GRASS 7 tools
diff --git a/python/plugins/processing/algs/grass7/ext/v_build_polylines.py b/python/plugins/processing/algs/grass7/ext/v_build_polylines.py
@@ -31,7 +31,7 @@
 
 def processOutputs(alg):
     out = alg.getOutputValue('output')
-    command = u"v.out.ogr -c -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
+    command = u"v.out.ogr --overwrite -c -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
         alg.exportedLayers[out],
         os.path.dirname(out),
         os.path.splitext(os.path.basename(out))[0]
diff --git a/python/plugins/processing/algs/grass7/ext/v_distance.py b/python/plugins/processing/algs/grass7/ext/v_distance.py
@@ -68,7 +68,7 @@ def processOutputs(alg):
     # Output results ('from' table and output table)
     for output in [u'from_output', u'output']:
         out = alg.getOutputValue(output)
-        command = u"v.out.ogr -c type=auto -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
+        command = u"v.out.ogr --overwrite -c type=auto -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
             alg.exportedLayers[out],
             os.path.dirname(out),
             os.path.basename(out)[:-4]
diff --git a/python/plugins/processing/algs/grass7/ext/v_edit.py b/python/plugins/processing/algs/grass7/ext/v_edit.py
@@ -66,7 +66,7 @@ def processOutputs(alg):
     # We need to add the from layer to outputs:
     out = alg.exportedLayers[alg.getParameterValue('map')]
     from_out = alg.getOutputValue('output')
-    command = u"v.out.ogr -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
+    command = u"v.out.ogr --overwrite -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
         out, os.path.dirname(from_out),
         os.path.splitext(os.path.basename(from_out))[0]
     )
diff --git a/python/plugins/processing/algs/grass7/ext/v_net_connect.py b/python/plugins/processing/algs/grass7/ext/v_net_connect.py
@@ -30,7 +30,7 @@
 
 def processOutputs(alg):
     out = alg.getOutputValue(u"output")
-    command = u"v.out.ogr -c type=line layer=1 -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
+    command = u"v.out.ogr --overwrite -c type=line layer=1 -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
         alg.exportedLayers[out],
         os.path.dirname(out),
         os.path.basename(out)[:-4]
diff --git a/python/plugins/processing/algs/grass7/ext/v_vect_stats.py b/python/plugins/processing/algs/grass7/ext/v_vect_stats.py
@@ -42,7 +42,7 @@ def processOutputs(alg):
     # We need to add the vector layer to outputs:
     out = alg.exportedLayers[alg.getParameterValue('areas')]
     from_out = alg.getOutputValue('output')
-    command = u"v.out.ogr -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
+    command = u"v.out.ogr --overwrite -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
         out, os.path.dirname(from_out),
         os.path.splitext(os.path.basename(from_out))[0]
     )
diff --git a/python/plugins/processing/algs/grass7/ext/v_what_rast.py b/python/plugins/processing/algs/grass7/ext/v_what_rast.py
@@ -46,7 +46,7 @@ def removeOutput(alg):
 def outputInput(alg):
     """Make output the initial point/polygon layer"""
     output = alg.getOutputValue(u'output')
-    command = u"v.out.ogr -c type=auto -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
+    command = u"v.out.ogr --overwrite -c type=auto -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
         alg.exportedLayers[alg.getParameterValue(u'map')],
         os.path.dirname(output),
         os.path.basename(output)[:-4]
diff --git a/python/plugins/processing/algs/grass7/ext/v_what_vect.py b/python/plugins/processing/algs/grass7/ext/v_what_vect.py
@@ -42,7 +42,7 @@ def processOutputs(alg):
     # We need to add the vector layer to outputs:
     out = alg.exportedLayers[alg.getParameterValue('map')]
     from_out = alg.getOutputValue('output')
-    command = u"v.out.ogr -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
+    command = u"v.out.ogr --overwrite -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(
         out, os.path.dirname(from_out),
         os.path.splitext(os.path.basename(from_out))[0]
     )

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ def processOutputs(alg):`
`66`	`66`	`# We need to add the from layer to outputs:`
`67`	`67`	`out = alg.exportedLayers[alg.getParameterValue('map')]`
`68`	`68`	`from_out = alg.getOutputValue('output')`
`69`		`- command = u"v.out.ogr -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(`
	`69`	`+ command = u"v.out.ogr --overwrite -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(`
`70`	`70`	`out, os.path.dirname(from_out),`
`71`	`71`	`os.path.splitext(os.path.basename(from_out))[0]`
`72`	`72`	`)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ def processOutputs(alg):`
`42`	`42`	`# We need to add the vector layer to outputs:`
`43`	`43`	`out = alg.exportedLayers[alg.getParameterValue('areas')]`
`44`	`44`	`from_out = alg.getOutputValue('output')`
`45`		`- command = u"v.out.ogr -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(`
	`45`	`+ command = u"v.out.ogr --overwrite -s -e input={} output=\"{}\" format=ESRI_Shapefile output_layer={}".format(`
`46`	`46`	`out, os.path.dirname(from_out),`
`47`	`47`	`os.path.splitext(os.path.basename(from_out))[0]`
`48`	`48`	`)`