Merge pull request #1887 from gioman/fix_processing_ogr_clip

fixes processing ogr clip tools when input is postgis/spatialite
qgis · Feb 6, 2015 · 6f338d7 · 6f338d7
2 parents 59b758b + 5c5cb40
commit 6f338d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrclip.py b/python/plugins/processing/algs/gdal/ogr2ogrclip.py
@@ -56,7 +56,7 @@ def defineCharacteristics(self):
 
     def processAlgorithm(self, progress):
         inLayer = self.getParameterValue(self.INPUT_LAYER)
-        ogrLayer = self.ogrConnectionString(inLayer)
+        ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
         clipLayer = self.getParameterValue(self.CLIP_LAYER)
         ogrClipLayer = self.ogrConnectionString(clipLayer)
 
@@ -74,7 +74,8 @@ def processAlgorithm(self, progress):
 
         arguments.append(output)
         arguments.append(ogrLayer)
-
+        arguments.append(self.ogrLayerName(inLayer))
+
         commands = []
         if isWindows():
             commands = ['cmd.exe', '/C ', 'ogr2ogr.exe',

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py b/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
@@ -57,7 +57,7 @@ def defineCharacteristics(self):
 
     def processAlgorithm(self, progress):
         inLayer = self.getParameterValue(self.INPUT_LAYER)
-        ogrLayer = self.ogrConnectionString(inLayer)
+        ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
         clipExtent = self.getParameterValue(self.CLIP_EXTENT)
         ogrclipExtent = self.ogrConnectionString(clipExtent)
 
@@ -74,14 +74,14 @@ def processAlgorithm(self, progress):
         arguments.append(regionCoords[2])
         arguments.append(regionCoords[1])
         arguments.append(regionCoords[3])
-        #arguments.append('-spat')
+        arguments.append('-clipsrc spat_extent')
-        #arguments.append(ogrclipExtent)
 
         if len(options) > 0:
             arguments.append(options)
 
         arguments.append(output)
         arguments.append(ogrLayer)
+        arguments.append(self.ogrLayerName(inLayer))
 
         commands = []
         if isWindows():