sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rldhont 2016-04-29 14:22:35 +02:00
parent abfd7740bd
commit f48e74f33c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/geometry/qgsgeometry.cpp
View File

@ -928,7 +928,7 @@ QString QgsGeometry::exportToGeoJSON( int precision ) const
{
if ( !d->geometry )
{
return QString();
return QString( "null" );
}
return d->geometry->asJSON( precision );
}

6
tests/src/core/testqgsgeometry.cpp
View File

@ -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 )