Skip to content

Commit 7ee1cbf

Browse files
alexbruyalexbruy
committedMay 1, 2017
Revert "[processing] handle NULL values in the Singleparts to multiparts (fix #15822)"
This reverts commit a944f7c.
·
ltr-3_40final-3_0_0
1 parent 5c8365c commit 7ee1cbf

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed
 

‎python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py

Lines changed: 1 addition & 8 deletions
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 QgsFeature, QgsGeometry, QgsWkbTypes, QgsProcessingUtils, NULL
33+
from qgis.core import QgsFeature, QgsGeometry, QgsWkbTypes, QgsProcessingUtils
3434

3535
from processing.core.GeoAlgorithm import GeoAlgorithm
3636
from processing.core.parameters import ParameterVector
@@ -88,13 +88,6 @@ def processAlgorithm(self, context, feedback):
8888
for current, feature in enumerate(features):
8989
atMap = feature.attributes()
9090
idVar = atMap[index]
91-
if idVar in [None, NULL]:
92-
outFeat.setAttributes(atMap)
93-
outFeat.setGeometry(feature.geometry())
94-
writer.addFeature(outFeat)
95-
feedback.setProgress(int(current * total))
96-
continue
97-
9891
key = str(idVar).strip()
9992
if key not in collection_geom:
10093
collection_geom[key] = []

‎python/plugins/processing/tests/testdata/custom/single_part_poly.gml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,50 @@
66
xmlns:gml="http://www.opengis.net/gml">
77
<gml:boundedBy>
88
<gml:Box>
9-
<gml:coord><gml:X>0.210196746268657</gml:X><gml:Y>-5.48232335820895</gml:Y></gml:coord>
10-
<gml:coord><gml:X>8.96288098507463</gml:X><gml:Y>7.16399364353312</gml:Y></gml:coord>
9+
<gml:coord><gml:X>0.2101967462686566</gml:X><gml:Y>-5.482323358208955</gml:Y></gml:coord>
10+
<gml:coord><gml:X>8.962880985074626</gml:X><gml:Y>7.163993643533122</gml:Y></gml:coord>
1111
</gml:Box>
1212
</gml:boundedBy>
13-
13+
1414
<gml:featureMember>
1515
<ogr:single_part_poly fid="single_part_poly.0">
16-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0.80194134384858,7.16399364353312 5.26276665671642,6.74081294029851 5.20295625867508,4.2839177066246 0.672499728706625,4.76932376340694 0.80194134384858,7.16399364353312</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
16+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0.80194134384858,7.16399364353312 0.672499728706625,4.76932376340694 5.20295625867508,4.2839177066246 5.26276665671642,6.74081294029851 0.80194134384858,7.16399364353312</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
1717
<ogr:id>1</ogr:id>
1818
</ogr:single_part_poly>
1919
</gml:featureMember>
2020
<gml:featureMember>
2121
<ogr:single_part_poly fid="single_part_poly.1">
22-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>6.30900588059701,4.21452798507463 8.24837614925373,7.04702929850746 8.96288098507463,4.26556404477612 8.4525203880597,1.81583317910448 6.00278952238806,2.60689210447761 6.30900588059701,4.21452798507463</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
22+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>6.30900588059701,4.21452798507463 6.00278952238806,2.60689210447761 8.4525203880597,1.81583317910448 8.96288098507463,4.26556404477612 8.24837614925373,7.04702929850746 6.30900588059701,4.21452798507463</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
2323
<ogr:id>1</ogr:id>
2424
</ogr:single_part_poly>
2525
</gml:featureMember>
2626
<gml:featureMember>
2727
<ogr:single_part_poly fid="single_part_poly.2">
28-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3.96134713432836,1.68824302985075 8.120786,0.64200380597015 8.27389417910448,-1.50151070149254 3.93582910447761,-1.14425828358209 3.96134713432836,1.68824302985075</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
28+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3.96134713432836,1.68824302985075 3.93582910447761,-1.14425828358209 8.27389417910448,-1.50151070149254 8.120786,0.64200380597015 3.96134713432836,1.68824302985075</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
29+
<ogr:id>1</ogr:id>
2930
</ogr:single_part_poly>
3031
</gml:featureMember>
3132
<gml:featureMember>
3233
<ogr:single_part_poly fid="single_part_poly.3">
33-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>1.69024247761194,3.0406986119403 3.45098653731343,3.52554117910448 3.47650456716418,2.47930195522388 1.9454227761194,1.48409879104478 1.69024247761194,3.0406986119403</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
34+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>1.69024247761194,3.0406986119403 1.9454227761194,1.48409879104478 3.47650456716418,2.47930195522388 3.45098653731343,3.52554117910448 1.69024247761194,3.0406986119403</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
3435
<ogr:id>2</ogr:id>
3536
</ogr:single_part_poly>
3637
</gml:featureMember>
3738
<gml:featureMember>
3839
<ogr:single_part_poly fid="single_part_poly.4">
39-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>1.46058020895522,-2.93052037313433 6.411078,-2.57326795522388 6.02830755223881,-4.35953004477612 2.40474731343284,-5.48232335820895 1.46058020895522,-2.93052037313433</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
40+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>1.46058020895522,-2.93052037313433 2.40474731343284,-5.48232335820895 6.02830755223881,-4.35953004477612 6.411078,-2.57326795522388 1.46058020895522,-2.93052037313433</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
4041
<ogr:id>2</ogr:id>
4142
</ogr:single_part_poly>
4243
</gml:featureMember>
4344
<gml:featureMember>
4445
<ogr:single_part_poly fid="single_part_poly.5">
45-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0.592967194029851,-0.17457314925373 2.63440958208955,0.284751388059703 2.37922928358209,-1.3739205522388 1.58817035820896,-2.06290735820895 0.592967194029851,-0.17457314925373</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
46+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0.592967194029851,-0.17457314925373 1.58817035820896,-2.06290735820895 2.37922928358209,-1.3739205522388 2.63440958208955,0.284751388059703 0.592967194029851,-0.17457314925373</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
4647
<ogr:id>3</ogr:id>
4748
</ogr:single_part_poly>
4849
</gml:featureMember>
4950
<gml:featureMember>
5051
<ogr:single_part_poly fid="single_part_poly.6">
51-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0.210196746268657,2.19860362686567 0.720557343283582,4.0359017761194 1.15436385074627,1.02477425373134 0.439859014925373,1.05029228358209 0.210196746268657,2.19860362686567</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
52+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0.210196746268657,2.19860362686567 0.439859014925373,1.05029228358209 1.15436385074627,1.02477425373134 0.720557343283582,4.0359017761194 0.210196746268657,2.19860362686567</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
5253
<ogr:id>4</ogr:id>
5354
</ogr:single_part_poly>
5455
</gml:featureMember>

0 commit comments

Comments
 (0)
Please sign in to comment.