karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Clean up UnitConversionUtils.

Browse Source
This commit is contained in:
Jimmy Shih
2012-02-16 16:30:04 -08:00
parent 81dfdb5bda
commit cd1a99727a
19 changed files with 152 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+5 -5
View File
@@ -26,7 +26,7 @@ import com.google.android.apps.mytracks.content.TracksColumns;
import com.google.android.apps.mytracks.services.ControlRecordingService;
import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.apps.mytracks.util.UnitConversions;
import com.google.android.apps.mytracks.util.UnitConversionUtils;
import com.google.android.maps.mytracks.R;
import android.app.PendingIntent;
@@ -216,9 +216,9 @@ public class TrackWidgetProvider
// TODO replace this with format strings and miles.
// convert meters to kilometers
double displayDistance = stats.getTotalDistance() / 1000.0;
double displayDistance = stats.getTotalDistance() * UnitConversionUtils.M_TO_KM;
if (!isMetric) {
displayDistance *= UnitConversions.KM_TO_MI;
displayDistance *= UnitConversionUtils.KM_TO_MI;
}
String distance =
StringUtils.formatSingleDecimalPlace(displayDistance) + " " + this.distanceLabel;
@@ -228,9 +228,9 @@ public class TrackWidgetProvider
String speed = unknown;
if (!Double.isNaN(stats.getAverageMovingSpeed())) {
// Convert m/s to km/h
double displaySpeed = stats.getAverageMovingSpeed() * 3.6;
double displaySpeed = stats.getAverageMovingSpeed() * UnitConversionUtils.MS_TO_KMH;
if (!isMetric) {
displaySpeed *= UnitConversions.KMH_TO_MPH;
displaySpeed *= UnitConversionUtils.KM_TO_MI;
}
if (reportSpeed) {
speed = StringUtils.formatSingleDecimalPlace(displaySpeed) + " " + this.speedLabel;