Skip to content

Commit

Permalink
* fix QgsGeometry::moveVertex for multipolygons()
Browse files Browse the repository at this point in the history 
* add test for QgsGeometry::addPart()
* remove expectedFailure decoration from PyQgsGeometry.testSimplifyIssue4189
* modify move and translate tests by 1,1 to 1,2
  • Loading branch information
@jef-n
jef-n committed Jan 29, 2014
1 parent d63104a commit bc757ff
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 34 deletions.
3 changes: 2 additions & 1 deletion python/core/qgsgeometry.sip
View file
Expand Up @@ -200,7 +200,7 @@ class QgsGeometry
* Searches for the closest vertex in this geometry to the given point.
* @param point Specifiest the point for search
* @param atVertex Receives index of the closest vertex
* @return The squared cartesian distance, negative number on error
* @return The squared cartesian distance is also returned in sqrDist, negative number on error
*/
double closestVertexWithContext( const QgsPoint& point, int& atVertex /Out/ );

Expand Down Expand Up @@ -415,6 +415,7 @@ class QgsGeometry
class Error
{
public:
Error();
Error( QString m );
Error( QString m, QgsPoint p );

Expand Down
15 changes: 9 additions & 6 deletions src/core/qgsgeometry.cpp
View file
Expand Up @@ -1198,13 +1198,16 @@ bool QgsGeometry::moveVertex( QgsWkbPtr &wkbPtr, const double &x, const double &
const int ps = ( hasZValue ? 3 : 2 ) * sizeof( double );

// Not this linestring/ring?
if ( atVertex > pointIndex + nPoints )
if ( atVertex >= pointIndex + nPoints )
{
wkbPtr += ps * nPoints;
pointIndex += nPoints;
return false;
}

if ( isRing && atVertex == pointIndex + nPoints - 1 )
atVertex = pointIndex;

// Goto point in this linestring/ring
wkbPtr += ps * ( atVertex - pointIndex );
wkbPtr << x << y;
Expand Down Expand Up @@ -2449,7 +2452,7 @@ int QgsGeometry::addPart( const QList<QgsPoint> &points, QGis::GeometryType geom
break;

case QGis::Line:
// Line needs to have at least two points and must be closed
// line needs to have at least two points
if ( points.size() < 2 )
{
QgsDebugMsg( "line must at least have two points: " + QString::number( points.size() ) );
Expand All @@ -2458,14 +2461,14 @@ int QgsGeometry::addPart( const QList<QgsPoint> &points, QGis::GeometryType geom
break;

case QGis::Polygon:
// Polygon needs to have at least three points and must be closed
if ( points.size() < 3 )
// polygon needs to have at least three distinct points and must be closed
if ( points.size() < 4 )
{
QgsDebugMsg( "polygon must at least have three points: " + QString::number( points.size() ) );
QgsDebugMsg( "polygon must at least have three distinct points and must be closed: " + QString::number( points.size() ) );
return 2;
}

// polygon must be closed
// Polygon must be closed
if ( points.first() != points.last() )
{
QgsDebugMsg( "polygon not closed" );
Expand Down
97 changes: 70 additions & 27 deletions tests/src/python/test_qgsgeometry.py
View file
Expand Up @@ -216,7 +216,6 @@ def testCrosses(self):
("True", crossesGeom))
assert crossesGeom == True, myMessage

@expectedFailure
def testSimplifyIssue4189(self):
"""Test we can simplify a complex geometry.
Expand Down Expand Up @@ -752,16 +751,16 @@ def testMultipoint(self):
if not TestQgsGeometry.wkbPtr:
return

# #9423
points = [ QgsPoint(10, 30), QgsPoint(40, 20), QgsPoint(30,10), QgsPoint(20,10) ]
wkt = "MULTIPOINT (10 30, 40 20, 30 10, 20 10)"
multipoint = QgsGeometry.fromWkt(wkt)
assert multipoint.isMultipart(), "Expected MULTIPOINT to be multipart"
assert multipoint.wkbType() == QGis.WKBMultiPoint, "Expected wkbType to be WKBMultipoint"
i = 0
for p in multipoint.asMultiPoint():
assert p == points[i], "Expected %s at %d, got %s" % (points[i].toString(), i, p.toString())
i+=1
# #9423
points = [ QgsPoint(10, 30), QgsPoint(40, 20), QgsPoint(30,10), QgsPoint(20,10) ]
wkt = "MULTIPOINT (10 30, 40 20, 30 10, 20 10)"
multipoint = QgsGeometry.fromWkt(wkt)
assert multipoint.isMultipart(), "Expected MULTIPOINT to be multipart"
assert multipoint.wkbType() == QGis.WKBMultiPoint, "Expected wkbType to be WKBMultipoint"
i = 0
for p in multipoint.asMultiPoint():
assert p == points[i], "Expected %s at %d, got %s" % (points[i].toString(), i, p.toString())
i+=1

multipoint = QgsGeometry.fromWkt( "MULTIPOINT(5 5)" )
assert multipoint.vertexAt( 0 ) == QgsPoint(5,5), "MULTIPOINT fromWkt failed"
Expand Down Expand Up @@ -802,8 +801,8 @@ def testMultipoint(self):
def testMoveVertex(self):
multipoint = QgsGeometry.fromWkt( "MULTIPOINT(5 0,0 0,0 4,5 4,5 1,1 1,1 3,4 3,4 2,2 2)" )
for i in range(0,10):
assert multipoint.moveVertex( i+1, i+1, i ), "move vertex %d failed" % i
expwkt = "MULTIPOINT(1 1, 2 2, 3 3, 4 4, 5 5, 6 6, 7 7, 8 8, 9 9, 10 10)"
assert multipoint.moveVertex( i+1, -1-i, i ), "move vertex %d failed" % i
expwkt = "MULTIPOINT(1 -1, 2 -2, 3 -3, 4 -4, 5 -5, 6 -6, 7 -7, 8 -8, 9 -9, 10 -10)"
wkt = multipoint.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

Expand Down Expand Up @@ -833,12 +832,15 @@ def testMoveVertex(self):
wkt = polygon.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

assert polygon.moveVertex( 1, 1, 0 ), "move vertex failed"
expwkt = "MULTIPOLYGON(((1 1,1 0,1 1,2 1,2 2,0 2,1 1)),((4 0,5 0,6 2,3 2,3 1,4 1,4 0)))"

assert polygon.moveVertex( 1, 1, 8 ), "move vertex failed"
expwkt = "MULTIPOLYGON(((1 1,1 0,1 1,2 1,2 2,0 2,1 1)),((1 1,5 0,6 2,3 2,3 1,4 1,1 1)))"
assert polygon.moveVertex( 1, 2, 0 ), "move vertex failed"
expwkt = "MULTIPOLYGON(((1 2,1 0,1 1,2 1,2 2,0 2,1 2)),((4 0,5 0,6 2,3 2,3 1,4 1,4 0)))"
wkt = polygon.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

assert polygon.moveVertex( 2, 1, 7 ), "move vertex failed"
expwkt = "MULTIPOLYGON(((1 2,1 0,1 1,2 1,2 2,0 2,1 2)),((2 1,5 0,6 2,3 2,3 1,4 1,2 1)))"
wkt = polygon.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

def testDeleteVertex(self):
# 2-+-+-+-+-3
Expand Down Expand Up @@ -957,27 +959,26 @@ def testInsertVertex(self):

def testTranslate(self):
point = QgsGeometry.fromWkt( "POINT(1 1)" )
assert point.translate( 1, 1 )==0, "Translate failed"
expwkt = "POINT(2 2)"
assert point.translate( 1, 2 )==0, "Translate failed"
expwkt = "POINT(2 3)"
wkt = point.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

point = QgsGeometry.fromWkt( "MULTIPOINT(1 1,2 2,3 3)" )
assert point.translate( 1, 1 )==0, "Translate failed"
expwkt = "MULTIPOINT(2 2, 3 3, 4 4)"
assert point.translate( 1, 2 )==0, "Translate failed"
expwkt = "MULTIPOINT(2 3, 3 4, 4 5)"
wkt = point.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

linestring = QgsGeometry.fromWkt( "LINESTRING(1 0,2 0)" )

assert linestring.translate( 1, 1 )==0, "Translate failed"
expwkt = "LINESTRING(2 1, 3 1)"
assert linestring.translate( 1, 2 )==0, "Translate failed"
expwkt = "LINESTRING(2 2, 3 2)"
wkt = linestring.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

polygon = QgsGeometry.fromWkt( "MULTIPOLYGON(((0 0,1 0,1 1,2 1,2 2,0 2,0 0)),((4 0,5 0,5 2,3 2,3 1,4 1,4 0)))" )
assert polygon.translate( 1, 1 )==0, "Translate failed"
expwkt = "MULTIPOLYGON(((1 1,2 1,2 2,3 2,3 3,1 3,1 1)),((5 1,6 1,6 1,4 3,4 2,5 2,5 1)))"
assert polygon.translate( 1, 2 )==0, "Translate failed"
expwkt = "MULTIPOLYGON(((1 2,2 2,2 3,3 3,3 4,1 4,1 2)),((5 2,6 2,6 2,4 4,4 3,5 3,5 2)))"
wkt = polygon.exportToWkt()

ct = QgsCoordinateTransform()
Expand Down Expand Up @@ -1077,5 +1078,47 @@ def testBoundingBox(self):
bb = polygon.boundingBox()
assert expbb == bb, "Expected:\n%s\nGot:\n%s\n" % (expbb.toString(), bb.toString())

def testAddPart(self):
# 2-3 6-+-7
# | | | |
# 0-1 4 5 8-9
points = [
[ QgsPoint(0,0), QgsPoint(1,0), QgsPoint(1,1), QgsPoint(2,1), QgsPoint(2,0), ],
[ QgsPoint(3,0), QgsPoint(3,1), QgsPoint(5,1), QgsPoint(5,0), QgsPoint(6,0), ]
]

polyline = QgsGeometry.fromPolyline( points[0] )
assert polyline.addPart( points[1][0:1] ) == 2, "addPart with one point line unexpectedly succeeded."
assert polyline.addPart( points[1][0:2] ) == 0, "addPart with two point line failed."
expwkt = "MULTILINESTRING((0 0, 1 0, 1 1, 2 1, 2 0), (3 0, 3 1))"
wkt = polyline.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

polyline = QgsGeometry.fromPolyline( points[0] )
assert polyline.addPart( points[1] ) == 0, "addPart with %d point line failed." % len(points[1])
expwkt = "MULTILINESTRING((0 0, 1 0, 1 1, 2 1, 2 0), (3 0, 3 1, 5 1, 5 0, 6 0))"

# 5-+-4 0-+-9
# | | | |
# | 2-3 1-2 |
# | | | |
# 0-1 7-8
points = [
[ [ QgsPoint(0,0), QgsPoint(1,0), QgsPoint(1,1), QgsPoint(2,1), QgsPoint(2,2), QgsPoint(0,2), QgsPoint(0,0), ] ],
[ [ QgsPoint(4,0), QgsPoint(5,0), QgsPoint(5,2), QgsPoint(3,2), QgsPoint(3,1), QgsPoint(4,1), QgsPoint(4,0), ] ]
]

polygon = QgsGeometry.fromPolygon( points[0] )

assert polygon.addPart( points[1][0][0:1] ) == 2, "addPart with one point ring unexpectedly succeeded."
assert polygon.addPart( points[1][0][0:2] ) == 2, "addPart with two point ring unexpectedly succeeded."
assert polygon.addPart( points[1][0][0:3] ) == 2, "addPart with unclosed three point ring unexpectedly succeeded."
assert polygon.addPart( [ QgsPoint(4,0), QgsPoint(5,0), QgsPoint(4,0) ] ) == 2, "addPart with 'closed' three point ring unexpectedly succeeded."

assert polygon.addPart( points[1][0] ) == 0, "addPart failed"
expwkt = "MULTIPOLYGON(((0 0,1 0,1 1,2 1,2 2,0 2,0 0)),((4 0,5 0,5 2,3 2,3 1,4 1,4 0)))"
wkt = polygon.exportToWkt()
assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )

if __name__ == '__main__':
unittest.main()

0 comments on commit bc757ff

Please sign in to comment.