An invalid CRS should return unknown units for mapUnits

qgis · Feb 28, 2017 · 9dd71b8 · 9dd71b8
1 parent fb53f54
commit 9dd71b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1052,6 +1052,9 @@ bool QgsCoordinateReferenceSystem::isGeographic() const
 
 QgsUnitTypes::DistanceUnit QgsCoordinateReferenceSystem::mapUnits() const
 {
+  if ( !d->mIsValid )
+    return QgsUnitTypes::DistanceUnknownUnit;
+
   return d->mMapUnits;
 }
 

diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -669,6 +669,9 @@ void TestQgsCoordinateReferenceSystem::mapUnits()
   myCrs.createFromSrid( GEOSRID );
   QVERIFY( myCrs.mapUnits() == QgsUnitTypes::DistanceDegrees );
   debugPrint( myCrs );
+
+  // an invalid crs should return unknown unit
+  QCOMPARE( QgsCoordinateReferenceSystem().mapUnits(), QgsUnitTypes::DistanceUnknownUnit );
 }
 void TestQgsCoordinateReferenceSystem::setValidationHint()
 {