Fix distance rounding for non-metric units

Closes #29
otsaloma · Jun 10, 2018 · 1c80c4b · 1c80c4b
1 parent a5b41d0
commit 1c80c4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/TODO.md b/TODO.md
@@ -6,4 +6,5 @@ WhoGo Maps 0.93
 * [x] Raise maximum map scale to 2
 * [x] Adapt Foursquare provider to API changes
 * [x] Prioritise understandable languages in Foursquare tips (#24)
+* [x] Fix display of non-metric distances in navigation (#29)
 * [x] Fix parsing negative coordinates in search query
diff --git a/poor/util.py b/poor/util.py
@@ -414,12 +414,12 @@ def round_distance(meters, n=2):
         if meters >= mile:
             return siground(meters/mile, n) * mile
         n = min(n, math.ceil(math.log10(meters/foot)))
-        return siground(meters/foot, n) * mile
+        return siground(meters/foot, n) * foot
     elif poor.conf.units == "british":
         if meters >= mile:
             return siground(meters/mile, n) * mile
         n = min(n, math.ceil(math.log10(meters/yard)))
-        return siground(meters/yard, n) * mile
+        return siground(meters/yard, n) * yard
     else: # Metric
         if meters >= 1000:
             return siground(meters/1000, n) * 1000