[processing] Adjust code for line intersection with collection intersections

gacarrillor · gacarrillor · commit ac348686fece · 2018-04-24T16:05:46.000-05:00
diff --git a/src/analysis/processing/qgsalgorithmlineintersection.cpp b/src/analysis/processing/qgsalgorithmlineintersection.cpp
@@ -196,10 +196,10 @@ QVariantMap QgsLineIntersectionAlgorithm::processAlgorithm( const QVariantMap &p
           {
             outAttributes.append( inFeatureB.attribute( b ) );
           }
-          if ( intersectGeom.wkbType() == QgsWkbTypes::GeometryCollection )
+          if ( QgsWkbTypes::flatType( intersectGeom.wkbType() ) == QgsWkbTypes::GeometryCollection )
           {
-            QVector<QgsGeometry> geomCollection = intersectGeom.asGeometryCollection();
-            for ( const QgsGeometry &part : qgis::as_const( geomCollection ) )
+            const QVector<QgsGeometry> geomCollection = intersectGeom.asGeometryCollection();
+            for ( const QgsGeometry &part : geomCollection )
             {
               if ( part.type() == QgsWkbTypes::PointGeometry )
               {
@@ -214,18 +214,15 @@ QVariantMap QgsLineIntersectionAlgorithm::processAlgorithm( const QVariantMap &p
               }
             }
           }
-          else
+          else if ( intersectGeom.type() == QgsWkbTypes::PointGeometry )
           {
-            if ( intersectGeom.type() == QgsWkbTypes::PointGeometry )
+            if ( intersectGeom.isMultipart() )
             {
-              if ( intersectGeom.isMultipart() )
-              {
-                points = intersectGeom.asMultiPoint();
-              }
-              else
-              {
-                points.append( intersectGeom.asPoint() );
-              }
+              points = intersectGeom.asMultiPoint();
+            }
+            else
+            {
+              points.append( intersectGeom.asPoint() );
             }
           }
           for ( const QgsPointXY &j : qgis::as_const( points ) )

Original file line number	Diff line number	Diff line change
`@@ -196,10 +196,10 @@ QVariantMap QgsLineIntersectionAlgorithm::processAlgorithm( const QVariantMap &p`
`196`	`196`	`{`
`197`	`197`	`outAttributes.append( inFeatureB.attribute( b ) );`
`198`	`198`	`}`
`199`		`- if ( intersectGeom.wkbType() == QgsWkbTypes::GeometryCollection )`
	`199`	`+ if ( QgsWkbTypes::flatType( intersectGeom.wkbType() ) == QgsWkbTypes::GeometryCollection )`
`200`	`200`	`{`
`201`		`- QVector<QgsGeometry> geomCollection = intersectGeom.asGeometryCollection();`
`202`		`- for ( const QgsGeometry &part : qgis::as_const( geomCollection ) )`
	`201`	`+ const QVector<QgsGeometry> geomCollection = intersectGeom.asGeometryCollection();`
	`202`	`+ for ( const QgsGeometry &part : geomCollection )`
`203`	`203`	`{`
`204`	`204`	`if ( part.type() == QgsWkbTypes::PointGeometry )`
`205`	`205`	`{`
`@@ -214,18 +214,15 @@ QVariantMap QgsLineIntersectionAlgorithm::processAlgorithm( const QVariantMap &p`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`	`}`
`217`		`- else`
	`217`	`+ else if ( intersectGeom.type() == QgsWkbTypes::PointGeometry )`
`218`	`218`	`{`
`219`		`- if ( intersectGeom.type() == QgsWkbTypes::PointGeometry )`
	`219`	`+ if ( intersectGeom.isMultipart() )`
`220`	`220`	`{`
`221`		`- if ( intersectGeom.isMultipart() )`
`222`		`- {`
`223`		`- points = intersectGeom.asMultiPoint();`
`224`		`- }`
`225`		`- else`
`226`		`- {`
`227`		`- points.append( intersectGeom.asPoint() );`
`228`		`- }`
	`221`	`+ points = intersectGeom.asMultiPoint();`
	`222`	`+ }`
	`223`	`+ else`
	`224`	`+ {`
	`225`	`+ points.append( intersectGeom.asPoint() );`
`229`	`226`	`}`
`230`	`227`	`}`
`231`	`228`	`for ( const QgsPointXY &j : qgis::as_const( points ) )`