[BUGFIX] QgsGeometry exportToGeoJSON return 'null' for null Geometry

rldhont · rldhont · commit f48e74f33c34 · 2016-04-29T14:25:41.000+02:00
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -928,7 +928,7 @@ QString QgsGeometry::exportToGeoJSON( int precision ) const
 {
   if ( !d->geometry )
   {
-    return QString();
+    return QString( "null" );
   }
   return d->geometry->asJSON( precision );
 }
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -3311,6 +3311,12 @@ void TestQgsGeometry::exportToGeoJSON()
   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 );
+
+  // no geometry
+  QgsGeometry nullGeom( nullptr );
+  obtained = nullGeom.exportToGeoJSON();
+  geojson = "null";
+  QCOMPARE( obtained, geojson );
 }
 
 bool TestQgsGeometry::renderCheck( const QString& theTestName, const QString& theComment, int mismatchCount )

Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,7 @@ QString QgsGeometry::exportToGeoJSON( int precision ) const`
`928`	`928`	`{`
`929`	`929`	`if ( !d->geometry )`
`930`	`930`	`{`
`931`		`- return QString();`
	`931`	`+ return QString( "null" );`
`932`	`932`	`}`
`933`	`933`	`return d->geometry->asJSON( precision );`
`934`	`934`	`}`