Skip to content

Commit 885cc82

Browse files
committed
[processing] more clean in QGIS algs
1 parent acdde31 commit 885cc82

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

python/plugins/processing/algs/qgis/MultipartToSingleparts.py

+17-18
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
from qgis.PyQt.QtGui import QIcon
3131

32-
from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsWkbTypes, QgsWkbTypes
32+
from qgis.core import QgsFeature, QgsGeometry, QgsWkbTypes
3333

3434
from processing.core.GeoAlgorithm import GeoAlgorithm
3535
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -57,7 +57,6 @@ def defineCharacteristics(self):
5757

5858
def processAlgorithm(self, progress):
5959
layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
60-
6160
geomType = self.multiToSingleGeom(layer.wkbType())
6261

6362
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
@@ -87,41 +86,41 @@ def processAlgorithm(self, progress):
8786

8887
def multiToSingleGeom(self, wkbType):
8988
try:
90-
if wkbType in (Qgis.WKBPoint, Qgis.WKBMultiPoint,
91-
Qgis.WKBPoint25D, Qgis.WKBMultiPoint25D):
92-
return Qgis.WKBPoint
93-
elif wkbType in (Qgis.WKBLineString, Qgis.WKBMultiLineString,
94-
Qgis.WKBMultiLineString25D,
95-
Qgis.WKBLineString25D):
96-
97-
return Qgis.WKBLineString
98-
elif wkbType in (Qgis.WKBPolygon, Qgis.WKBMultiPolygon,
99-
Qgis.WKBMultiPolygon25D, Qgis.WKBPolygon25D):
100-
101-
return Qgis.WKBPolygon
89+
if wkbType in (QgsWkbTypes.Point, QgsWkbTypes.MultiPoint,
90+
QgsWkbTypes.Point25D, QgsWkbTypes.MultiPoint25D):
91+
return QgsWkbTypes.Point
92+
elif wkbType in (QgsWkbTypes.LineString, QgsWkbTypes.MultiLineString,
93+
QgsWkbTypes.MultiLineString25D,
94+
QgsWkbTypes.LineString25D):
95+
96+
return QgsWkbTypes.LineString
97+
elif wkbType in (QgsWkbTypes.Polygon, QgsWkbTypes.MultiPolygon,
98+
QgsWkbTypes.MultiPolygon25D, QgsWkbTypes.Polygon25D):
99+
100+
return QgsWkbTypes.Polygon
102101
else:
103-
return Qgis.WKBUnknown
102+
return QgsWkbTypes.Unknown
104103
except Exception as err:
105104
raise GeoAlgorithmExecutionException(unicode(err))
106105

107106
def extractAsSingle(self, geom):
108107
multiGeom = QgsGeometry()
109108
geometries = []
110-
if geom.type() == Qgis.Point:
109+
if geom.type() == QgsWkbTypes.PointGeometry:
111110
if geom.isMultipart():
112111
multiGeom = geom.asMultiPoint()
113112
for i in multiGeom:
114113
geometries.append(QgsGeometry().fromPoint(i))
115114
else:
116115
geometries.append(geom)
117-
elif geom.type() == Qgis.Line:
116+
elif geom.type() == QgsWkbTypes. LineGeometry:
118117
if geom.isMultipart():
119118
multiGeom = geom.asMultiPolyline()
120119
for i in multiGeom:
121120
geometries.append(QgsGeometry().fromPolyline(i))
122121
else:
123122
geometries.append(geom)
124-
elif geom.type() == Qgis.Polygon:
123+
elif geom.type() == QgsWkbTypes.PolygonGeometry:
125124
if geom.isMultipart():
126125
multiGeom = geom.asMultiPolygon()
127126
for i in multiGeom:

python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from qgis.PyQt.QtGui import QIcon
3232

33-
from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint
33+
from qgis.core import QgsWkbTypes, QgsFeature, QgsGeometry, QgsPoint
3434

3535
from processing.core.GeoAlgorithm import GeoAlgorithm
3636
from processing.core.ProcessingLog import ProcessingLog
@@ -98,7 +98,7 @@ def processAlgorithm(self, progress):
9898
writer = self.getOutputFromName(
9999
self.OUTPUT_LAYER).getVectorWriter(
100100
layer.fields().toList(),
101-
Qgis.WKBPolygon,
101+
QgsWkbTypes.Polygon,
102102
layer.crs())
103103

104104
outFeat = QgsFeature()

0 commit comments

Comments
 (0)