From 5821e2b481afb811cdc9560ee152ba961322347b Mon Sep 17 00:00:00 2001
From: Marco Hugentobler <marco.hugentobler@sourcepole.ch>
Date: Thu, 9 Aug 2012 17:38:44 +0200
Subject: [PATCH] Disable degree / minute / second format if map units are not
 degrees

---
 src/core/composer/qgscomposermap.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
index d299e706a5b..6a0597d9262 100644
--- a/src/core/composer/qgscomposermap.cpp
+++ b/src/core/composer/qgscomposermap.cpp
@@ -1989,11 +1989,18 @@ void QgsComposerMap::createDefaultOverviewFrameSymbol()
 void QgsComposerMap::initGridAnnotationFormatFromProject()
 {
   QString format = QgsProject::instance()->readEntry( "PositionPrecision", "/DegreeFormat", "D" );
-  if ( format == "DM" )
+
+  bool degreeUnits = true;
+  if ( mMapRenderer )
+  {
+    degreeUnits = ( mMapRenderer->mapUnits() == QGis::Degrees );
+  }
+
+  if ( format == "DM" && degreeUnits )
   {
     mGridAnnotationFormat = DegreeMinute;
   }
-  else if ( format == "DMS" )
+  else if ( format == "DMS" && degreeUnits )
   {
     mGridAnnotationFormat = DegreeMinuteSecond;
   }