sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Fix Geometry algorithm always produces multi-geometry

Browse Source 
Also added code to handle GeometryCollections
This commit is contained in:
Alexander Bruy 2017-02-01 09:01:00 +02:00
parent 5a5c1bf6e1
commit 7df04ac7e7
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python/plugins/processing/algs/qgis/FixGeometry.py
View File

@ -25,6 +25,8 @@ __copyright__ = '(C) 2017, Alexander Bruy'
__revision__ = '$Format:%H$'
from qgis.core import QgsWkbTypes
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.parameters import ParameterVector
from processing.core.outputs import OutputVector
@ -42,7 +44,8 @@ class FixGeometry(GeoAlgorithm):
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input Layer')))
self.tr('Input Layer'),
[dataobjects.TYPE_VECTOR_POLYGON, dataobjects.TYPE_VECTOR_LINE]))
self.addOutput(OutputVector(self.OUTPUT,
self.tr('Layer with fixed geometries')))
@ -53,7 +56,7 @@ class FixGeometry(GeoAlgorithm):
writer = self.getOutputFromName(
self.OUTPUT).getVectorWriter(
layer.fields(),
layer.wkbType(),
QgsWkbTypes.multiType(layer.wkbType()),
layer.crs())
features = vector.features(layer)
@ -68,6 +71,19 @@ class FixGeometry(GeoAlgorithm):
if not outputGeometry:
ProcessingLog.addToLog(ProcessingLog.LOG_WARNING,
'makeValid failed for feature {}'.format(inputFeature.id()))
if outputGeometry.wkbType() == QgsWkbTypes.Unknown or QgsWkbTypes.flatType(outputGeometry.geometry().wkbType()) == QgsWkbTypes.GeometryCollection:
tmpGeometries = outputGeometry.asGeometryCollection()
for g in tmpGeometries:
if g.type() == inputFeature.geometry().type():
try:
outputFeature.setGeometry(QgsGeometry(g))
writer.addFeature(outputFeature)
except:
pass
feedback.setProgress(int(current * total))
continue
outputFeature.setGeometry(outputGeometry)
writer.addFeature(outputFeature)