An invalid CRS should return unknown units for mapUnits

nyalldawson · nyalldawson · commit 9dd71b8ffb7e · 2017-03-01T09:30:59.000+10:00
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()
 {

Original file line number	Diff line number	Diff line change
`@@ -1052,6 +1052,9 @@ bool QgsCoordinateReferenceSystem::isGeographic() const`
`1052`	`1052`
`1053`	`1053`	`QgsUnitTypes::DistanceUnit QgsCoordinateReferenceSystem::mapUnits() const`
`1054`	`1054`	`{`
	`1055`	`+ if ( !d->mIsValid )`
	`1056`	`+ return QgsUnitTypes::DistanceUnknownUnit;`
	`1057`	`+`
`1055`	`1058`	`return d->mMapUnits;`
`1056`	`1059`	`}`
`1057`	`1060`
Original file line number	Diff line number	Diff line change
`@@ -669,6 +669,9 @@ void TestQgsCoordinateReferenceSystem::mapUnits()`
`669`	`669`	`myCrs.createFromSrid( GEOSRID );`
`670`	`670`	`QVERIFY( myCrs.mapUnits() == QgsUnitTypes::DistanceDegrees );`
`671`	`671`	`debugPrint( myCrs );`
	`672`	`+`
	`673`	`+ // an invalid crs should return unknown unit`
	`674`	`+ QCOMPARE( QgsCoordinateReferenceSystem().mapUnits(), QgsUnitTypes::DistanceUnknownUnit );`
`672`	`675`	`}`
`673`	`676`	`void TestQgsCoordinateReferenceSystem::setValidationHint()`
`674`	`677`	`{`