[BUGFIX] Multipoint asJSON

rldhont · rldhont · commit 8d313723f260 · 2015-11-20T11:12:44.000+01:00
Fixes #13855 Multipoint asJSON made MultiPoint as Multilinestring with only 1 point by linestring. This bugfix adds tests. Conflicts: src/core/geometry/qgsmultipointv2.cpp tests/src/core/testqgsgeometry.cpp
diff --git a/src/core/geometry/qgsmultipointv2.cpp b/src/core/geometry/qgsmultipointv2.cpp
@@ -63,20 +63,19 @@ QDomElement QgsMultiPointV2::asGML3( QDomDocument& doc, int precision, const QSt
 
 QString QgsMultiPointV2::asJSON( int precision ) const
 {
-  QString json = "{\"type\": \"MultiPoint\", \"coordinates\": [";
+  QString json = "{\"type\": \"MultiPoint\", \"coordinates\": ";
+  
+  QList<QgsPointV2> pts;
   foreach ( const QgsAbstractGeometryV2 *geom, mGeometries )
   {
     if ( dynamic_cast<const QgsPointV2*>( geom ) )
     {
       const QgsPointV2* point = static_cast<const QgsPointV2*>( geom );
-      json += QgsGeometryUtils::pointsToJSON( QList<QgsPointV2>() << *point, precision ) + ", ";
+      pts << *point;
     }
   }
-  if ( json.endsWith( ", " ) )
-  {
-    json.chop( 2 ); // Remove last ", "
-  }
-  json += "] }";
+  json += QgsGeometryUtils::pointsToJSON( pts, precision );
+  json += " }";
   return json;
 }
 
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -80,6 +80,8 @@ class TestQgsGeometry : public QObject
     void bufferCheck();
     void smoothCheck();
 
+    void exportToGeoJSON();
+
   private:
     /** A helper method to do a render check to see if the geometry op is as expected */
     bool renderCheck( QString theTestName, QString theComment = "", int mismatchCount = 0 );
@@ -706,6 +708,51 @@ void TestQgsGeometry::smoothCheck()
   QVERIFY( QgsGeometry::compare( multipoly, expectedMultiPoly ) );
 }
 
+void TestQgsGeometry::exportToGeoJSON()
+{
+  //Point
+  QString wkt = "Point (40 50)";
+  QScopedPointer<QgsGeometry> geom( QgsGeometry::fromWkt( wkt ) );
+  QString obtained = geom->exportToGeoJSON();
+  QString geojson = "{\"type\": \"Point\", \"coordinates\": [40, 50]}";
+  QCOMPARE( obtained, geojson );
+  
+  //MultiPoint
+  wkt = "MultiPoint (0 0, 10 0, 10 10, 20 10)";
+  geom.reset( QgsGeometry::fromWkt( wkt ) );
+  obtained = geom->exportToGeoJSON();
+  geojson = "{\"type\": \"MultiPoint\", \"coordinates\": [ [0, 0], [10, 0], [10, 10], [20, 10]] }";
+  QCOMPARE( obtained, geojson );
+
+  //Linestring
+  wkt = "LineString(0 0, 10 0, 10 10, 20 10)";
+  geom.reset( QgsGeometry::fromWkt( wkt ) );
+  obtained = geom->exportToGeoJSON();
+  geojson = "{\"type\": \"LineString\", \"coordinates\": [ [0, 0], [10, 0], [10, 10], [20, 10]]}";
+  QCOMPARE( obtained, geojson );
+  
+  //MultiLineString
+  wkt = "MultiLineString ((0 0, 10 0, 10 10, 20 10),(30 30, 40 30, 40 40, 50 40))";
+  geom.reset( QgsGeometry::fromWkt( wkt ) );
+  obtained = geom->exportToGeoJSON();
+  geojson = "{\"type\": \"MultiLineString\", \"coordinates\": [[ [0, 0], [10, 0], [10, 10], [20, 10]], [ [30, 30], [40, 30], [40, 40], [50, 40]]] }";
+  QCOMPARE( obtained, geojson );
+  
+  //Polygon
+  wkt = "Polygon ((0 0, 10 0, 10 10, 0 10, 0 0 ),(2 2, 4 2, 4 4, 2 4, 2 2))";
+  geom.reset( QgsGeometry::fromWkt( wkt ) );
+  obtained = geom->exportToGeoJSON();
+  geojson = "{\"type\": \"Polygon\", \"coordinates\": [[ [0, 0], [10, 0], [10, 10], [0, 10], [0, 0]], [ [2, 2], [4, 2], [4, 4], [2, 4], [2, 2]]] }";
+  QCOMPARE( obtained, geojson );
+
+  //MultiPolygon
+  wkt = "MultiPolygon (((0 0, 10 0, 10 10, 0 10, 0 0 )),((2 2, 4 2, 4 4, 2 4, 2 2)))";
+  geom.reset( QgsGeometry::fromWkt( wkt ) );
+  obtained = geom->exportToGeoJSON();
+  geojson = "{\"type\": \"MultiPolygon\", \"coordinates\": [[[ [0, 0], [10, 0], [10, 10], [0, 10], [0, 0]]], [[ [2, 2], [4, 2], [4, 4], [2, 4], [2, 2]]]] }";
+  QCOMPARE( obtained, geojson );
+}
+
 bool TestQgsGeometry::renderCheck( QString theTestName, QString theComment, int mismatchCount )
 {
   mReport += "<h2>" + theTestName + "</h2>\n";

Original file line number	Diff line number	Diff line change
`@@ -63,20 +63,19 @@ QDomElement QgsMultiPointV2::asGML3( QDomDocument& doc, int precision, const QSt`
`63`	`63`
`64`	`64`	`QString QgsMultiPointV2::asJSON( int precision ) const`
`65`	`65`	`{`
`66`		`- QString json = "{\"type\": \"MultiPoint\", \"coordinates\": [";`
	`66`	`+ QString json = "{\"type\": \"MultiPoint\", \"coordinates\": ";`
	`67`	`+`
	`68`	`+ QList<QgsPointV2> pts;`
`67`	`69`	`foreach ( const QgsAbstractGeometryV2 *geom, mGeometries )`
`68`	`70`	`{`
`69`	`71`	`if ( dynamic_cast<const QgsPointV2*>( geom ) )`
`70`	`72`	`{`
`71`	`73`	`const QgsPointV2* point = static_cast<const QgsPointV2*>( geom );`
`72`		`- json += QgsGeometryUtils::pointsToJSON( QList<QgsPointV2>() << *point, precision ) + ", ";`
	`74`	`+ pts << *point;`
`73`	`75`	`}`
`74`	`76`	`}`
`75`		`- if ( json.endsWith( ", " ) )`
`76`		`- {`
`77`		`- json.chop( 2 ); // Remove last ", "`
`78`		`- }`
`79`		`- json += "] }";`
	`77`	`+ json += QgsGeometryUtils::pointsToJSON( pts, precision );`
	`78`	`+ json += " }";`
`80`	`79`	`return json;`
`81`	`80`	`}`
`82`	`81`