Merge pull request #3430 from alexbruy/output-vector

[processing] support for explicit output vector types

python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py

@@ -69,7 +69,7 @@ def defineCharacteristics(self):
         # We add the input vector layer. It can have any kind of geometry
         # It is a mandatory (not optional) one, hence the False argument
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_ANY], False))
 
         # We add a vector layer as output
         self.addOutput(OutputVector(self.OUTPUT_LAYER,

python/plugins/processing/algs/gdal/ClipByMask.py

@@ -79,7 +79,7 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('[GDAL] Extraction')
         self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
         self.addParameter(ParameterVector(self.MASK, self.tr('Mask layer'),
-                                          [ParameterVector.VECTOR_TYPE_POLYGON]))
+                                          [dataobjects.TYPE_VECTOR_POLYGON]))
         self.addParameter(ParameterString(self.NO_DATA,
                                           self.tr("Nodata value, leave blank to take the nodata value from input"),
                                           '', optional=True))

python/plugins/processing/algs/gdal/GridAverage.py

@@ -35,6 +35,7 @@
 from processing.core.parameters import ParameterNumber
 from processing.core.parameters import ParameterSelection
 from processing.core.outputs import OutputRaster
+from processing.tools import dataobjects
 from processing.algs.gdal.GdalUtils import GdalUtils
 
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -64,7 +65,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Grid (Moving average)')
         self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
         self.addParameter(ParameterVector(self.INPUT,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POINT]))
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
         self.addParameter(ParameterTableField(self.Z_FIELD,
                                               self.tr('Z field'), self.INPUT,
                                               ParameterTableField.DATA_TYPE_NUMBER, True))

python/plugins/processing/algs/gdal/GridDataMetrics.py

@@ -35,8 +35,10 @@
 from processing.core.parameters import ParameterSelection
 from processing.core.parameters import ParameterNumber
 from processing.core.outputs import OutputRaster
+from processing.tools import dataobjects
 from processing.algs.gdal.GdalUtils import GdalUtils
 
+
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
 
 
@@ -68,7 +70,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Grid (Data metrics)')
         self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
         self.addParameter(ParameterVector(self.INPUT,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POINT]))
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
         self.addParameter(ParameterTableField(self.Z_FIELD,
                                               self.tr('Z field'), self.INPUT,
                                               ParameterTableField.DATA_TYPE_NUMBER, True))

python/plugins/processing/algs/gdal/GridInvDist.py

@@ -37,6 +37,7 @@
 from processing.core.parameters import ParameterSelection
 from processing.core.outputs import OutputRaster
 from processing.algs.gdal.GdalUtils import GdalUtils
+from processing.tools import dataobjects
 
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
 
@@ -68,7 +69,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Grid (Inverse distance to a power)')
         self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
         self.addParameter(ParameterVector(self.INPUT,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POINT]))
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
         self.addParameter(ParameterTableField(self.Z_FIELD,
                                               self.tr('Z field'), self.INPUT,
                                               ParameterTableField.DATA_TYPE_NUMBER, True))

python/plugins/processing/algs/gdal/GridNearest.py

@@ -36,6 +36,7 @@
 from processing.core.parameters import ParameterNumber
 from processing.core.parameters import ParameterSelection
 from processing.core.outputs import OutputRaster
+from processing.tools import dataobjects
 from processing.algs.gdal.GdalUtils import GdalUtils
 
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -64,7 +65,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Grid (Nearest neighbor)')
         self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
         self.addParameter(ParameterVector(self.INPUT,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POINT]))
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
         self.addParameter(ParameterTableField(self.Z_FIELD,
                                               self.tr('Z field'), self.INPUT,
                                               ParameterTableField.DATA_TYPE_NUMBER, True))

python/plugins/processing/algs/gdal/buildvrt.py

@@ -36,6 +36,7 @@
 from processing.core.parameters import ParameterSelection
 from processing.algs.gdal.GdalUtils import GdalUtils
 from processing.tools.system import tempFolder
+from processing.tools import dataobjects
 
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
 
@@ -57,7 +58,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Build Virtual Raster')
         self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
         self.addParameter(ParameterMultipleInput(self.INPUT,
-                                                 self.tr('Input layers'), ParameterMultipleInput.TYPE_RASTER))
+                                                 self.tr('Input layers'), dataobjects.TYPE_RASTER))
         self.addParameter(ParameterSelection(self.RESOLUTION,
                                              self.tr('Resolution'), self.RESOLUTION_OPTIONS, 0))
         self.addParameter(ParameterBoolean(self.SEPARATE,

python/plugins/processing/algs/gdal/gdaltindex.py

@@ -34,6 +34,7 @@
 from processing.core.parameters import ParameterBoolean
 from processing.core.parameters import ParameterMultipleInput
 from processing.core.parameters import ParameterString
+from processing.tools import dataobjects
 from processing.algs.gdal.GdalUtils import GdalUtils
 
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -53,7 +54,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Tile Index')
         self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
         self.addParameter(ParameterMultipleInput(self.INPUT,
-                                                 self.tr('Input layers'), ParameterMultipleInput.TYPE_RASTER))
+                                                 self.tr('Input layers'), dataobjects.TYPE_RASTER))
         self.addParameter(ParameterString(self.FIELD_NAME,
                                           self.tr('Tile index field'),
                                           'location', optional=True))

python/plugins/processing/algs/gdal/merge.py

@@ -35,6 +35,7 @@
 from processing.core.parameters import ParameterMultipleInput
 from processing.core.parameters import ParameterSelection
 from processing.tools.system import isWindows
+from processing.tools import dataobjects
 from processing.algs.gdal.GdalUtils import GdalUtils
 
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -57,7 +58,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Merge')
         self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
         self.addParameter(ParameterMultipleInput(merge.INPUT,
-                                                 self.tr('Input layers'), ParameterMultipleInput.TYPE_RASTER))
+                                                 self.tr('Input layers'), dataobjects.TYPE_RASTER))
         self.addParameter(ParameterBoolean(merge.PCT,
                                            self.tr('Grab pseudocolor table from first layer'), False))
         self.addParameter(ParameterBoolean(merge.SEPARATE,

python/plugins/processing/algs/gdal/ogr2ogr.py

@@ -102,7 +102,7 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Conversion')
 
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
+                                          self.tr('Input layer')))
         self.addParameter(ParameterSelection(self.FORMAT,
                                              self.tr('Destination Format'), FORMATS))
         self.addParameter(ParameterString(self.OPTIONS,

python/plugins/processing/algs/gdal/ogr2ogrbuffer.py

@@ -34,6 +34,7 @@
 from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
 from processing.algs.gdal.GdalUtils import GdalUtils
 
+from processing.tools import dataobjects
 from processing.tools.system import isWindows
 from processing.tools.vector import ogrConnectionString, ogrLayerName
 
@@ -54,7 +55,7 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
 
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
+                                          self.tr('Input layer')))
         self.addParameter(ParameterString(self.GEOMETRY,
                                           self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
                                           'geometry', optional=False))
@@ -70,7 +71,7 @@ def defineCharacteristics(self):
                                           self.tr('Additional creation options (see ogr2ogr manual)'),
                                           '', optional=True))
 
-        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Buffer')))
+        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Buffer'), datatype=[dataobjects.TYPE_VECTOR_POLYGON]))
 
     def getConsoleCommands(self):
         inLayer = self.getParameterValue(self.INPUT_LAYER)

python/plugins/processing/algs/gdal/ogr2ogrclip.py

@@ -32,6 +32,7 @@
 from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
 from processing.algs.gdal.GdalUtils import GdalUtils
 
+from processing.tools import dataobjects
 from processing.tools.system import isWindows
 from processing.tools.vector import ogrConnectionString, ogrLayerName
 
@@ -48,13 +49,13 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
 
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
+                                          self.tr('Input layer')))
         self.addParameter(ParameterVector(self.CLIP_LAYER,
-                                          self.tr('Clip layer'), [ParameterVector.VECTOR_TYPE_POLYGON], False))
+                                          self.tr('Clip layer'), [dataobjects.TYPE_VECTOR_POLYGON]))
         self.addParameter(ParameterString(self.OPTIONS,
                                           self.tr('Additional creation options'), '', optional=True))
 
-        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Clipped (polygon)')))
+        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Clipped (polygon)'), datatype=[dataobjects.TYPE_VECTOR_POLYGON]))
 
     def getConsoleCommands(self):
         inLayer = self.getParameterValue(self.INPUT_LAYER)

python/plugins/processing/algs/gdal/ogr2ogrclipextent.py

@@ -49,7 +49,7 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
 
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
+                                          self.tr('Input layer')))
         self.addParameter(ParameterExtent(self.CLIP_EXTENT,
                                           self.tr('Clip extent')))
         self.addParameter(ParameterString(self.OPTIONS,

python/plugins/processing/algs/gdal/ogr2ogrdissolve.py

@@ -34,6 +34,7 @@
 from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
 from processing.algs.gdal.GdalUtils import GdalUtils
 
+from processing.tools import dataobjects
 from processing.tools.system import isWindows
 from processing.tools.vector import ogrConnectionString, ogrLayerName
 
@@ -57,7 +58,7 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
 
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POLYGON], False))
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POLYGON]))
         self.addParameter(ParameterString(self.GEOMETRY,
                                           self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
                                           'geometry', optional=False))
@@ -79,7 +80,7 @@ def defineCharacteristics(self):
                                           self.tr('Additional creation options (see ogr2ogr manual)'),
                                           '', optional=True))
 
-        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Dissolved')))
+        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Dissolved'), datatype=[dataobjects.TYPE_VECTOR_POLYGON]))
 
     def getConsoleCommands(self):
         inLayer = self.getParameterValue(self.INPUT_LAYER)

python/plugins/processing/algs/gdal/ogr2ogronesidebuffer.py

@@ -35,6 +35,7 @@
 from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
 from processing.algs.gdal.GdalUtils import GdalUtils
 
+from processing.tools import dataobjects
 from processing.tools.system import isWindows
 from processing.tools.vector import ogrConnectionString, ogrLayerName
 
@@ -59,7 +60,7 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
 
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_LINE], False))
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_LINE], False))
         self.addParameter(ParameterSelection(self.OPERATION,
                                              self.tr('Operation'), self.OPERATIONLIST, 0))
         self.addParameter(ParameterString(self.GEOMETRY,

python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py

@@ -33,6 +33,7 @@
 from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
 from processing.algs.gdal.GdalUtils import GdalUtils
 
+from processing.tools import dataobjects
 from processing.tools.system import isWindows
 from processing.tools.vector import ogrConnectionString, ogrLayerName
 
@@ -50,7 +51,7 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
 
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_LINE], False))
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_LINE], False))
         self.addParameter(ParameterString(self.GEOMETRY,
                                           self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
                                           'geometry', optional=False))
@@ -60,7 +61,7 @@ def defineCharacteristics(self):
                                           self.tr('Additional creation options (see ogr2ogr manual)'),
                                           '', optional=True))
 
-        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Points along lines')))
+        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Points along lines'), datatype=[dataobjects.TYPE_VECTOR_POINT]))
 
     def getConsoleCommands(self):
         inLayer = self.getParameterValue(self.INPUT_LAYER)

python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py

@@ -81,7 +81,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Import Vector into PostGIS database (new connection)')
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
+                                          self.tr('Input layer')))
         self.addParameter(ParameterString(self.SHAPE_ENCODING,
                                           self.tr('Shape encoding'), "", optional=True))
         self.addParameter(ParameterSelection(self.GTYPE,

python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py

@@ -98,7 +98,7 @@ def defineCharacteristics(self):
         self.addParameter(ParameterSelection(self.DATABASE,
                                              self.tr('Database (connection name)'), self.DB_CONNECTIONS))
         self.addParameter(ParameterVector(self.INPUT_LAYER,
-                                          self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
+                                          self.tr('Input layer')))
         self.addParameter(ParameterString(self.SHAPE_ENCODING,
                                           self.tr('Shape encoding'), "", optional=True))
         self.addParameter(ParameterSelection(self.GTYPE,

python/plugins/processing/algs/gdal/ogrinfo.py

@@ -47,8 +47,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('Information')
         self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
 
-        self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer'),
-                                          [ParameterVector.VECTOR_TYPE_ANY], False))
+        self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer')))
         self.addParameter(ParameterBoolean(self.SUMMARY_ONLY,
                                            self.tr('Summary output only'),
                                            True))