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

In Stats view, only show speed and elevation when they are available.

Browse Source
This commit is contained in:
Jimmy Shih
2013-07-11 09:51:54 -07:00
parent e30d816765
commit 9b0c14c9c7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
+6 -4
View File
@@ -54,7 +54,8 @@ public class StatsUtils {
activity, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT); activity, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
// Set speed/pace // Set speed/pace
double speed = !isRecording || location == null ? Double.NaN : location.getSpeed(); double speed = isRecording && location != null && location.hasSpeed() ? location.getSpeed()
: Double.NaN;
setSpeed(activity, R.id.stats_speed, R.string.stats_speed, R.string.stats_pace, speed, setSpeed(activity, R.id.stats_speed, R.string.stats_speed, R.string.stats_pace, speed,
metricUnits, reportSpeed); metricUnits, reportSpeed);
@@ -65,7 +66,8 @@ public class StatsUtils {
View elevation = activity.findViewById(R.id.stats_elevation); View elevation = activity.findViewById(R.id.stats_elevation);
if (showGradeElevation && isRecording) { if (showGradeElevation && isRecording) {
double altitude = location == null ? Double.NaN : location.getAltitude(); double altitude = location != null && location.hasAltitude() ? location.getAltitude()
: Double.NaN;
elevation.setVisibility(View.VISIBLE); elevation.setVisibility(View.VISIBLE);
setElevationValue(activity, R.id.stats_elevation, -1, altitude, metricUnits); setElevationValue(activity, R.id.stats_elevation, -1, altitude, metricUnits);
} else { } else {
@@ -79,8 +81,8 @@ public class StatsUtils {
View coordinateContainer = activity.findViewById(R.id.stats_coordinate_container); View coordinateContainer = activity.findViewById(R.id.stats_coordinate_container);
if (showCoordinate && isRecording) { if (showCoordinate && isRecording) {
double latitude = location == null ? Double.NaN : location.getLatitude(); double latitude = location != null ? location.getLatitude() : Double.NaN;
double longitude = location == null ? Double.NaN : location.getLongitude(); double longitude = location != null ? location.getLongitude() : Double.NaN;
coordinateHorizontalLine.setVisibility(View.VISIBLE); coordinateHorizontalLine.setVisibility(View.VISIBLE);
coordinateContainer.setVisibility(View.VISIBLE); coordinateContainer.setVisibility(View.VISIBLE);
setCoordinateValue(activity, R.id.stats_latitude, R.string.stats_latitude, latitude); setCoordinateValue(activity, R.id.stats_latitude, R.string.stats_latitude, latitude);