Skip to content
Permalink
Browse files

Quick fix for a bug in QgsGeos::reshapeLine that causes QGIS to crash…

… because of an unhandled geos exception.
  • Loading branch information
uclaros authored and nyalldawson committed Mar 21, 2019
1 parent 258bac7 commit 4721dedd822747b169b3a943f809b9d5f88e282b
Showing with 13 additions and 1 deletion.
  1. +1 −1 src/core/geometry/qgsgeos.cpp
  2. +12 −0 tests/src/python/test_qgsgeometry.py
@@ -2382,7 +2382,7 @@ static geos::unique_ptr _mergeLinestrings( const GEOSGeometry *line1, const GEOS
return nullptr;

bool intersectionAtOrigLineEndpoint =
( intersectionPoint.x() == x1 && intersectionPoint.y() == y1 ) ||
( intersectionPoint.x() == x1 && intersectionPoint.y() == y1 ) !=
( intersectionPoint.x() == x2 && intersectionPoint.y() == y2 );
bool intersectionAtReshapeLineEndpoint =
( intersectionPoint.x() == rx1 && intersectionPoint.y() == ry1 ) ||
@@ -2271,6 +2271,18 @@ def testReshape(self):
wkt = g.asWkt()
assert compareWkt(expWkt, wkt), "testReshape failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)

# Test reshape a polygon with a line starting or ending at the polygon's first vertex, no change expexted
g = QgsGeometry.fromWkt('Polygon ((0 0, 1 0, 1 1, 0 1, 0 0))')
expWkt = g.asWkt()
g.reshapeGeometry(QgsLineString([QgsPoint(0, 0), QgsPoint(-1, -1)]))
assert compareWkt(g.asWkt(), expWkt), "testReshape failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)

# Test reshape a polygon with a line starting or ending at the polygon's first vertex
g = QgsGeometry.fromWkt('Polygon ((0 0, 1 0, 1 1, 0 1, 0 0))')
g.reshapeGeometry(QgsLineString([QgsPoint(0, 0), QgsPoint(0.5, 0.5), QgsPoint(0, 1)]))
expWkt = 'Polygon ((0 0, 1 0, 1 1, 0 1, 0.5 0.5, 0 0))'
assert compareWkt(g.asWkt(), expWkt), "testReshape failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)

# Test reshape a line from first/last vertex
g = QgsGeometry.fromWkt('LineString (0 0, 5 0, 5 1)')
# extend start

0 comments on commit 4721ded

Please sign in to comment.
You can’t perform that action at this time.