geometry validator: fix touching lines check (followup b9b9bc3, fixes #12730)

jef-n · jef-n · commit 2a066d898410 · 2015-06-30T13:49:30.000+02:00
(cherry picked from commit 3eef29a)
diff --git a/src/core/qgsgeometryvalidator.cpp b/src/core/qgsgeometryvalidator.cpp
@@ -62,7 +62,9 @@ void QgsGeometryValidator::checkRingIntersections(
         if ( d >= 0 && d <= v.length() )
         {
           d = -distLine2Point( ring1[j], w.perpVector(), s );
-          if ( d > 0 && d < w.length() )
+          if ( d > 0 && d < w.length() &&
+               ring0[i+1] != ring1[j+1] && ring0[i+1] != ring1[j] &&
+               ring0[i+0] != ring1[j+1] && ring0[i+0] != ring1[j] )
           {
             QString msg = QObject::tr( "segment %1 of ring %2 of polygon %3 intersects segment %4 of ring %5 of polygon %6 at %7" )
                           .arg( i0 ).arg( i ).arg( p0 )

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ void QgsGeometryValidator::checkRingIntersections(`
`62`	`62`	`if ( d >= 0 && d <= v.length() )`
`63`	`63`	`{`
`64`	`64`	`d = -distLine2Point( ring1[j], w.perpVector(), s );`
`65`		`- if ( d > 0 && d < w.length() )`
	`65`	`+ if ( d > 0 && d < w.length() &&`
	`66`	`+ ring0[i+1] != ring1[j+1] && ring0[i+1] != ring1[j] &&`
	`67`	`+ ring0[i+0] != ring1[j+1] && ring0[i+0] != ring1[j] )`
`66`	`68`	`{`
`67`	`69`	`QString msg = QObject::tr( "segment %1 of ring %2 of polygon %3 intersects segment %4 of ring %5 of polygon %6 at %7" )`
`68`	`70`	`.arg( i0 ).arg( i ).arg( p0 )`