From 5c5cb4066a058fa24f9a25bb6c9d0f7daea653b1 Mon Sep 17 00:00:00 2001 From: Giovanni Manghi Date: Thu, 5 Feb 2015 18:37:59 +0000 Subject: [PATCH] fixes processing ogr clip tools when input is postgis/spatialite --- python/plugins/processing/algs/gdal/ogr2ogrclip.py | 5 +++-- python/plugins/processing/algs/gdal/ogr2ogrclipextent.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python/plugins/processing/algs/gdal/ogr2ogrclip.py b/python/plugins/processing/algs/gdal/ogr2ogrclip.py index 40394339a6f..22c02ab2a6a 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogrclip.py +++ b/python/plugins/processing/algs/gdal/ogr2ogrclip.py @@ -56,7 +56,7 @@ class Ogr2OgrClip(OgrAlgorithm): 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 @@ class Ogr2OgrClip(OgrAlgorithm): 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 index 897e471c08a..4fcf765eaff 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py +++ b/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py @@ -57,7 +57,7 @@ class Ogr2OgrClipExtent(OgrAlgorithm): 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 @@ class Ogr2OgrClipExtent(OgrAlgorithm): arguments.append(regionCoords[2]) arguments.append(regionCoords[1]) arguments.append(regionCoords[3]) - #arguments.append('-spat') - #arguments.append(ogrclipExtent) + arguments.append('-clipsrc spat_extent') if len(options) > 0: arguments.append(options) arguments.append(output) arguments.append(ogrLayer) + arguments.append(self.ogrLayerName(inLayer)) commands = [] if isWindows():