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

…12730) (cherry picked from commit 3eef29a)
qgis · Jun 23, 2015 · 2a066d898410a01f30fc05e8ab1556842f2e22cb · 2a066d8
1 parent 4d1d2ff
commit 2a066d898410a01f30fc05e8ab1556842f2e22cb
Unified Split

Showing with 3 additions and 1 deletion.

+3 −1 src/core/qgsgeometryvalidator.cpp
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 )