wxGUI/measuring: don't report meters when units are not recognized like foot_uss

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@61132 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/core/units.py

@@ -142,10 +142,10 @@ def formatDist(distance, mapunits):
         >>> formatDist(20.2546, 'degrees')
         (20.25, 'deg')
         >>> formatDist(82.146, 'unknown')
-        (82.15, 'meters')
+        (82.15, 'units')
 
-        Accepted map units are 'meters', 'metres', 'feet', 'degree'. Any
-        other units will be considered as meters (output 'meters').
+        Accepted map units are 'meters', 'metres', 'feet', 'degree'.
+        Returns 'units' instead of unrecognized units.
 
         :param distance: map units
         :param mapunits: map units
@@ -179,11 +179,11 @@ def formatDist(distance, mapunits):
             # was: 'degree' in mapunits and not haveCtypes (for unknown reason)
             if distance < 1:
                 outunits = 'min'
-                divisor = (1/60.0)
+                divisor = (1 / 60.0)
             else:
                 outunits = 'deg'
         else:
-            outunits = 'meters'
+            return (distance, 'units')
 
         # format numbers in a nice way
         if (distance / divisor) >= 2500.0:

gui/wxpython/mapwin/analysis.py

@@ -268,6 +268,8 @@ class MeasureDistanceController(AnalysisControllerBase):
         self._totaldist += dist
         td, tdunits = units.formatDist(self._totaldist,
                                        mapunits)
+        if dunits == 'units' and mapunits:
+            dunits = tdunits = mapunits
 
         strdist = str(d)
         strtotdist = str(td)