- if (Config.getConfigBoolean(Config.KEY_METRIC_UNITS)) {
- return _distanceFormatter.format(lengthM / 1000.0) + " " + I18nManager.getText("units.kilometres.short");
- }
- // must be imperial
- return _distanceFormatter.format(Distance.convertMetresToMiles(lengthM))
- + " " + I18nManager.getText("units.miles.short");
+ // convert to current distance units
+ Unit distUnit = Config.getUnitSet().getDistanceUnit();
+ double length = lengthM * distUnit.getMultFactorFromStd();
+ // Make text
+ return _distanceFormatter.format(length) + " " + I18nManager.getText(distUnit.getShortnameKey());