Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

QgsGeometryValidator: Fix validation of LineString #56130

Merged
merged 1 commit into from
Feb 7, 2024
Merged

QgsGeometryValidator: Fix validation of LineString #56130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 9 additions & 46 deletions src/core/qgsgeometryvalidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,59 +187,22 @@ void QgsGeometryValidator::validatePolyline( int i, const QgsLineString *line, b
line = noDupes.get();
}

// segment Intersection
for ( int j = 0; !mStop && j < line->numPoints() - 3; j++ )
{
const double xAtJ = line->xAt( j );
const double yAtJ = line->yAt( j );
const QgsVector v( line->xAt( j + 1 ) - xAtJ, line->yAt( j + 1 ) - yAtJ );
const double vl = v.length();

const int n = ( j == 0 && ring ) ? line->numPoints() - 2 : line->numPoints() - 1;

for ( int k = j + 2; !mStop && k < n; k++ )
{
const double xAtK = line->xAt( k );
const double yAtK = line->yAt( k );

const QgsVector w( line->xAt( k + 1 ) - xAtK, line->yAt( k + 1 ) - yAtK );

double sX;
double sY;
if ( !intersectLines( xAtJ, yAtJ, v, xAtK, yAtK, w, sX, sY ) )
continue;

double d = 0.0;
try
double intersectionPointX = std::numeric_limits<double>::quiet_NaN();
double intersectionPointY = std::numeric_limits<double>::quiet_NaN();
bool isIntersection = false;
if ( QgsGeometryUtilsBase::segmentIntersection( line->xAt( j ), line->yAt( j ), line->xAt( j + 1 ), line->yAt( j + 1 ), line->xAt( k ), line->yAt( k ), line->xAt( k + 1 ), line->yAt( k + 1 ), intersectionPointX, intersectionPointY, isIntersection ) )
{
d = -distLine2Point( xAtJ, yAtJ, v.perpVector(), sX, sY );
}
catch ( QgsException &e )
{
Q_UNUSED( e )
QgsDebugError( "Error validating: " + e.what() );
continue;
}
if ( d < 0 || d > vl )
continue;

try
{
d = -distLine2Point( xAtK, yAtK, w.perpVector(), sX, sY );
}
catch ( QgsException &e )
{
Q_UNUSED( e )
QgsDebugError( "Error validating: " + e.what() );
continue;
const QString msg = QObject::tr( "segments %1 and %2 of line %3 intersect at %4, %5" ).arg( j ).arg( k ).arg( i ).arg( intersectionPointX ).arg( intersectionPointY );
QgsDebugMsgLevel( msg, 2 );
emit errorFound( QgsGeometry::Error( msg, QgsPointXY( intersectionPointX, intersectionPointY ) ) );
mErrorCount++;
}

if ( d <= 0 || d >= w.length() )
continue;

const QString msg = QObject::tr( "segments %1 and %2 of line %3 intersect at %4, %5" ).arg( j ).arg( k ).arg( i ).arg( sX ).arg( sY );
QgsDebugMsgLevel( msg, 2 );
emit errorFound( QgsGeometry::Error( msg, QgsPointXY( sX, sY ) ) );
mErrorCount++;
}
}
}
Expand Down
53 changes: 53 additions & 0 deletions tests/src/python/test_qgsgeometryvalidator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,59 @@ def test_linestring_duplicate_nodes(self):
self.assertEqual(spy[2][0].where(), QgsPointXY(1, 1))
self.assertEqual(spy[2][0].what(), 'line 1 contains 3 duplicate node(s) starting at vertex 1')

def test_linestring_intersections(self):
# no intersections
g = QgsGeometry.fromWkt("LineString (0 0, 10 0, 10 10, 0 10)")
validator = QgsGeometryValidator(g)
spy = QSignalSpy(validator.errorFound)
validator.run()

self.assertEqual(len(spy), 0)

# accept closed linestring
g = QgsGeometry.fromWkt("LineString (0 0, 10 0, 10 10, 0 10, 0 0)")
validator = QgsGeometryValidator(g)
spy = QSignalSpy(validator.errorFound)
validator.run()

self.assertEqual(len(spy), 0)

# accept segment on segment
# well, this case is ambiguous
g = QgsGeometry.fromWkt("LineString (0 0, 10 0, 10 10, 0 10, 10 10)")
lbartoletti marked this conversation as resolved.
Show resolved Hide resolved
validator = QgsGeometryValidator(g)
spy = QSignalSpy(validator.errorFound)
validator.run()

self.assertEqual(len(spy), 0)

# self-intersection
g = QgsGeometry.fromWkt("LineString (0 0, 10 10, 0 10, 10 0)")
validator = QgsGeometryValidator(g)
spy = QSignalSpy(validator.errorFound)
validator.run()

self.assertEqual(len(spy), 1)
self.assertEqual(spy[0][0].where(), QgsPointXY(5, 5))
self.assertEqual(spy[0][0].what(), 'segments 0 and 2 of line 0 intersect at 5, 5')

# tests issue #54022
# Test number 1
g = QgsGeometry.fromWkt("LineString (10.516394879668999 59.73620343022049894, 10.51672588102520045 59.73642831668259845, 10.51671297289430029 59.73629479296509004, 10.516394879668999 59.73620343022049894)")
validator = QgsGeometryValidator(g)
spy = QSignalSpy(validator.errorFound)
validator.run()

self.assertEqual(len(spy), 0)

# Test number 2
g = QgsGeometry.fromWkt("LINESTRING (10.516394879668999 59.73620343022049894, 10.51672588102520045 59.73642831668259845, 10.51671297289430029 59.73619479296509004, 10.516394879668999 59.73620343022049894)")
validator = QgsGeometryValidator(g)
spy = QSignalSpy(validator.errorFound)
validator.run()

self.assertEqual(len(spy), 0)

def test_ring_intersections(self):
# no intersections
g = QgsGeometry.fromWkt("Polygon ((0 0, 10 0, 10 10, 0 10, 0 0),(1 1, 5 1, 1 9, 1 1), (6 9, 2 9, 6 1, 6 9))")
Expand Down
Loading