Skip to content

Commit 9dd71b8

Browse files
committedFeb 28, 2017
An invalid CRS should return unknown units for mapUnits
1 parent fb53f54 commit 9dd71b8

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed
 

‎src/core/qgscoordinatereferencesystem.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,6 +1052,9 @@ bool QgsCoordinateReferenceSystem::isGeographic() const
10521052

10531053
QgsUnitTypes::DistanceUnit QgsCoordinateReferenceSystem::mapUnits() const
10541054
{
1055+
if ( !d->mIsValid )
1056+
return QgsUnitTypes::DistanceUnknownUnit;
1057+
10551058
return d->mMapUnits;
10561059
}
10571060

‎tests/src/core/testqgscoordinatereferencesystem.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,9 @@ void TestQgsCoordinateReferenceSystem::mapUnits()
669669
myCrs.createFromSrid( GEOSRID );
670670
QVERIFY( myCrs.mapUnits() == QgsUnitTypes::DistanceDegrees );
671671
debugPrint( myCrs );
672+
673+
// an invalid crs should return unknown unit
674+
QCOMPARE( QgsCoordinateReferenceSystem().mapUnits(), QgsUnitTypes::DistanceUnknownUnit );
672675
}
673676
void TestQgsCoordinateReferenceSystem::setValidationHint()
674677
{

0 commit comments

Comments
 (0)
Please sign in to comment.