|
29 | 29 |
|
30 | 30 | from qgis.PyQt.QtGui import QIcon
|
31 | 31 |
|
32 |
| -from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsWkbTypes, QgsWkbTypes |
| 32 | +from qgis.core import QgsFeature, QgsGeometry, QgsWkbTypes |
33 | 33 |
|
34 | 34 | from processing.core.GeoAlgorithm import GeoAlgorithm
|
35 | 35 | from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
|
@@ -57,7 +57,6 @@ def defineCharacteristics(self):
|
57 | 57 |
|
58 | 58 | def processAlgorithm(self, progress):
|
59 | 59 | layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
|
60 |
| - |
61 | 60 | geomType = self.multiToSingleGeom(layer.wkbType())
|
62 | 61 |
|
63 | 62 | writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
|
@@ -87,41 +86,41 @@ def processAlgorithm(self, progress):
|
87 | 86 |
|
88 | 87 | def multiToSingleGeom(self, wkbType):
|
89 | 88 | 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 |
102 | 101 | else:
|
103 |
| - return Qgis.WKBUnknown |
| 102 | + return QgsWkbTypes.Unknown |
104 | 103 | except Exception as err:
|
105 | 104 | raise GeoAlgorithmExecutionException(unicode(err))
|
106 | 105 |
|
107 | 106 | def extractAsSingle(self, geom):
|
108 | 107 | multiGeom = QgsGeometry()
|
109 | 108 | geometries = []
|
110 |
| - if geom.type() == Qgis.Point: |
| 109 | + if geom.type() == QgsWkbTypes.PointGeometry: |
111 | 110 | if geom.isMultipart():
|
112 | 111 | multiGeom = geom.asMultiPoint()
|
113 | 112 | for i in multiGeom:
|
114 | 113 | geometries.append(QgsGeometry().fromPoint(i))
|
115 | 114 | else:
|
116 | 115 | geometries.append(geom)
|
117 |
| - elif geom.type() == Qgis.Line: |
| 116 | + elif geom.type() == QgsWkbTypes. LineGeometry: |
118 | 117 | if geom.isMultipart():
|
119 | 118 | multiGeom = geom.asMultiPolyline()
|
120 | 119 | for i in multiGeom:
|
121 | 120 | geometries.append(QgsGeometry().fromPolyline(i))
|
122 | 121 | else:
|
123 | 122 | geometries.append(geom)
|
124 |
| - elif geom.type() == Qgis.Polygon: |
| 123 | + elif geom.type() == QgsWkbTypes.PolygonGeometry: |
125 | 124 | if geom.isMultipart():
|
126 | 125 | multiGeom = geom.asMultiPolygon()
|
127 | 126 | for i in multiGeom:
|
|
0 commit comments