fix QgsGeometry::asMultiPoint() (followup 6bbd17c; fixes #9423)

qgis · Jan 25, 2014 · 781e34a5bc690df4c1868bbc1b35cfdda0eb25da · 781e34a
1 parent 9439eb8
commit 781e34a5bc690df4c1868bbc1b35cfdda0eb25da
Unified Split

Showing with 11 additions and 1 deletion.

+0 −1 src/core/qgsgeometry.cpp

+11 −0 tests/src/python/test_qgsgeometry.py
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -5367,7 +5367,6 @@ QgsMultiPoint QgsGeometry::asMultiPoint() const
   QgsMultiPoint points( nPoints );
   for ( int i = 0; i < nPoints; i++ )
   {
-    wkbPtr += 1 + sizeof( int );
     points[i] = asPoint( wkbPtr, hasZValue );
   }
 

diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
@@ -752,6 +752,17 @@ 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
+
         multipoint = QgsGeometry.fromWkt( "MULTIPOINT(5 5)" )
         assert multipoint.vertexAt( 0 ) == QgsPoint(5,5), "MULTIPOINT fromWkt failed"