[Geometry checker] Make line intersection test and line layer intersection test also report multiple intersections for same line

manisandro · manisandro · commit baf4a39c684d · 2017-10-23T17:25:07.000+02:00
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
@@ -253,23 +253,25 @@ namespace QgsGeometryCheckerUtils
     return false;
   }
 
-  bool linesIntersect( const QgsLineString *line1, const QgsLineString *line2, double tol, QgsPoint &inter )
+  QList<QgsPoint> lineIntersections( const QgsLineString *line1, const QgsLineString *line2, double tol )
   {
+    QList<QgsPoint> intersections;
+    QgsPoint inter;
     for ( int i = 0, n = line1->vertexCount() - 1; i < n; ++i )
     {
       for ( int j = 0, m = line2->vertexCount() - 1; j < m; ++j )
       {
         QgsPoint p1 = line1->vertexAt( QgsVertexId( 0, 0, i ) );
         QgsPoint p2 = line1->vertexAt( QgsVertexId( 0, 0, i + 1 ) );
-        QgsPoint q1 = line1->vertexAt( QgsVertexId( 0, 0, j ) );
-        QgsPoint q2 = line1->vertexAt( QgsVertexId( 0, 0, j + 1 ) );
+        QgsPoint q1 = line2->vertexAt( QgsVertexId( 0, 0, j ) );
+        QgsPoint q2 = line2->vertexAt( QgsVertexId( 0, 0, j + 1 ) );
         if ( QgsGeometryUtils::segmentIntersection( p1, p2, q1, q2, inter, tol ) )
         {
-          return true;
+          intersections.append( inter );
         }
       }
     }
-    return false;
+    return intersections;
   }
 
   double sharedEdgeLength( const QgsAbstractGeometry *geom1, const QgsAbstractGeometry *geom2, double tol )
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
@@ -133,7 +133,7 @@ namespace QgsGeometryCheckerUtils
 
   bool pointOnLine( const QgsPoint &p, const QgsLineString *line, double tol, bool excludeExtremities = false );
 
-  bool linesIntersect( const QgsLineString *line1, const QgsLineString *line2, double tol, QgsPoint &inter );
+  QList<QgsPoint> lineIntersections( const QgsLineString *line1, const QgsLineString *line2, double tol );
 
   double sharedEdgeLength( const QgsAbstractGeometry *geom1, const QgsAbstractGeometry *geom2, double tol );
 
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp
@@ -59,10 +59,9 @@ void QgsGeometryLineIntersectionCheck::collectErrors( QList<QgsGeometryCheckErro
           {
             continue;
           }
-          QgsPoint inter;
-          if ( QgsGeometryCheckerUtils::linesIntersect( line, testLine, mContext->tolerance, inter ) )
+          for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance ) )
           {
-            errors.append( new QgsGeometryCheckError( this, layerFeature, inter ) );
+            errors.append( new QgsGeometryCheckError( this, layerFeatureA, inter, QgsVertexId(), layerFeatureB.id() ) );
           }
         }
       }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp
@@ -42,22 +42,21 @@ void QgsGeometryLineLayerIntersectionCheck::collectErrors( QList<QgsGeometryChec
         const QgsAbstractGeometry *testGeom = checkFeature.geometry();
         for ( int jPart = 0, mParts = testGeom->partCount(); jPart < mParts; ++jPart )
         {
-          QgsPoint inter;
           const QgsAbstractGeometry *part = QgsGeometryCheckerUtils::getGeomPart( testGeom, jPart );
           if ( const QgsLineString *testLine = dynamic_cast<const QgsLineString *>( part ) )
           {
-            if ( QgsGeometryCheckerUtils::linesIntersect( line, testLine, mContext->tolerance, inter ) )
+            for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance ) )
             {
-              errors.append( new QgsGeometryCheckError( this, layerFeature, inter ) );
+              errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId(), checkFeature.id() ) );
             }
           }
           else if ( const QgsPolygonV2 *polygon = dynamic_cast<const QgsPolygonV2 *>( part ) )
           {
             for ( const QgsLineString *ring : QgsGeometryCheckerUtils::polygonRings( polygon ) )
             {
-              if ( QgsGeometryCheckerUtils::linesIntersect( ring, testLine, mContext->tolerance, inter ) )
+              for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, ring, mContext->tolerance ) )
               {
-                errors.append( new QgsGeometryCheckError( this, layerFeature, inter ) );
+                errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId(), checkFeature.id() ) );
               }
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -253,23 +253,25 @@ namespace QgsGeometryCheckerUtils`
`253`	`253`	`return false;`
`254`	`254`	`}`
`255`	`255`
`256`		`- bool linesIntersect( const QgsLineString line1, const QgsLineString line2, double tol, QgsPoint &inter )`
	`256`	`+ QList<QgsPoint> lineIntersections( const QgsLineString line1, const QgsLineString line2, double tol )`
`257`	`257`	`{`
	`258`	`+ QList<QgsPoint> intersections;`
	`259`	`+ QgsPoint inter;`
`258`	`260`	`for ( int i = 0, n = line1->vertexCount() - 1; i < n; ++i )`
`259`	`261`	`{`
`260`	`262`	`for ( int j = 0, m = line2->vertexCount() - 1; j < m; ++j )`
`261`	`263`	`{`
`262`	`264`	`QgsPoint p1 = line1->vertexAt( QgsVertexId( 0, 0, i ) );`
`263`	`265`	`QgsPoint p2 = line1->vertexAt( QgsVertexId( 0, 0, i + 1 ) );`
`264`		`- QgsPoint q1 = line1->vertexAt( QgsVertexId( 0, 0, j ) );`
`265`		`- QgsPoint q2 = line1->vertexAt( QgsVertexId( 0, 0, j + 1 ) );`
	`266`	`+ QgsPoint q1 = line2->vertexAt( QgsVertexId( 0, 0, j ) );`
	`267`	`+ QgsPoint q2 = line2->vertexAt( QgsVertexId( 0, 0, j + 1 ) );`
`266`	`268`	`if ( QgsGeometryUtils::segmentIntersection( p1, p2, q1, q2, inter, tol ) )`
`267`	`269`	`{`
`268`		`- return true;`
	`270`	`+ intersections.append( inter );`
`269`	`271`	`}`
`270`	`272`	`}`
`271`	`273`	`}`
`272`		`- return false;`
	`274`	`+ return intersections;`
`273`	`275`	`}`
`274`	`276`
`275`	`277`	`double sharedEdgeLength( const QgsAbstractGeometry geom1, const QgsAbstractGeometry geom2, double tol )`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,9 @@ void QgsGeometryLineIntersectionCheck::collectErrors( QList<QgsGeometryCheckErro`
`59`	`59`	`{`
`60`	`60`	`continue;`
`61`	`61`	`}`
`62`		`- QgsPoint inter;`
`63`		`- if ( QgsGeometryCheckerUtils::linesIntersect( line, testLine, mContext->tolerance, inter ) )`
	`62`	`+ for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance ) )`
`64`	`63`	`{`
`65`		`- errors.append( new QgsGeometryCheckError( this, layerFeature, inter ) );`
	`64`	`+ errors.append( new QgsGeometryCheckError( this, layerFeatureA, inter, QgsVertexId(), layerFeatureB.id() ) );`
`66`	`65`	`}`
`67`	`66`	`}`
`68`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,22 +42,21 @@ void QgsGeometryLineLayerIntersectionCheck::collectErrors( QList<QgsGeometryChec`
`42`	`42`	`const QgsAbstractGeometry *testGeom = checkFeature.geometry();`
`43`	`43`	`for ( int jPart = 0, mParts = testGeom->partCount(); jPart < mParts; ++jPart )`
`44`	`44`	`{`
`45`		`- QgsPoint inter;`
`46`	`45`	`const QgsAbstractGeometry *part = QgsGeometryCheckerUtils::getGeomPart( testGeom, jPart );`
`47`	`46`	`if ( const QgsLineString testLine = dynamic_cast<const QgsLineString >( part ) )`
`48`	`47`	`{`
`49`		`- if ( QgsGeometryCheckerUtils::linesIntersect( line, testLine, mContext->tolerance, inter ) )`
	`48`	`+ for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance ) )`
`50`	`49`	`{`
`51`		`- errors.append( new QgsGeometryCheckError( this, layerFeature, inter ) );`
	`50`	`+ errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId(), checkFeature.id() ) );`
`52`	`51`	`}`
`53`	`52`	`}`
`54`	`53`	`else if ( const QgsPolygonV2 polygon = dynamic_cast<const QgsPolygonV2 >( part ) )`
`55`	`54`	`{`
`56`	`55`	`for ( const QgsLineString *ring : QgsGeometryCheckerUtils::polygonRings( polygon ) )`
`57`	`56`	`{`
`58`		`- if ( QgsGeometryCheckerUtils::linesIntersect( ring, testLine, mContext->tolerance, inter ) )`
	`57`	`+ for ( const QgsPoint &inter : QgsGeometryCheckerUtils::lineIntersections( line, ring, mContext->tolerance ) )`
`59`	`58`	`{`
`60`		`- errors.append( new QgsGeometryCheckError( this, layerFeature, inter ) );`
	`59`	`+ errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId(), checkFeature.id() ) );`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`	`}`