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

Check if location speed and accuracy are available.

Browse Source
This commit is contained in:
Jimmy Shih
2013-07-11 14:38:09 -07:00
parent 4b6c9a875b
commit e7e671c1ff
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
+3 -1
View File
@@ -107,7 +107,9 @@ public class MapOverlay {
public CachedLocation(Location location) { public CachedLocation(Location location) {
this.valid = LocationUtils.isValidLocation(location); this.valid = LocationUtils.isValidLocation(location);
this.latLng = valid ? new LatLng(location.getLatitude(), location.getLongitude()) : null; this.latLng = valid ? new LatLng(location.getLatitude(), location.getLongitude()) : null;
this.speed = (int) Math.floor(location.getSpeed() * UnitConversions.MS_TO_KMH); this.speed = location.hasSpeed() ? (int) Math.floor(
location.getSpeed() * UnitConversions.MS_TO_KMH)
: -1;
} }
/** /**
MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java
+2 -1
View File
@@ -714,7 +714,8 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData
hasGoodFix = false; hasGoodFix = false;
} else { } else {
hasFix = !LocationUtils.isLocationOld(currentLocation); hasFix = !LocationUtils.isLocationOld(currentLocation);
hasGoodFix = currentLocation.getAccuracy() <= recordingGpsAccuracy; hasGoodFix = currentLocation.hasAccuracy()
&& currentLocation.getAccuracy() < recordingGpsAccuracy;
} }
if (!hasFix) { if (!hasFix) {
message = getString(R.string.gps_wait_for_signal); message = getString(R.string.gps_wait_for_signal);
MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
+2 -1
View File
@@ -148,7 +148,8 @@ public class StatsFragment extends Fragment implements TrackDataListener {
if (lastLocation != null) { if (lastLocation != null) {
boolean hasFix = !LocationUtils.isLocationOld(lastLocation); boolean hasFix = !LocationUtils.isLocationOld(lastLocation);
boolean hasGoodFix = lastLocation.getAccuracy() <= recordingGpsAccuracy; boolean hasGoodFix = lastLocation.hasAccuracy()
&& lastLocation.getAccuracy() < recordingGpsAccuracy;
if (!hasFix || !hasGoodFix) { if (!hasFix || !hasGoodFix) {
lastLocation = null; lastLocation = null;
MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+1 -1
View File
@@ -888,7 +888,7 @@ public class TrackRecordingService extends Service {
return; return;
} }
if (location.getAccuracy() > recordingGpsAccuracy) { if (!location.hasAccuracy() || location.getAccuracy() >= recordingGpsAccuracy) {
Log.d(TAG, "Ignore onLocationChangedAsync. Poor accuracy."); Log.d(TAG, "Ignore onLocationChangedAsync. Poor accuracy.");
return; return;
} }
MyTracks/src/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java
+5 -3
View File
@@ -192,15 +192,17 @@ public class TripStatisticsUpdater {
currentSegment.addMovingTime(movingTime); currentSegment.addMovingTime(movingTime);
// Update grade // Update grade
if (lastLocation.hasAltitude() && location.hasAltitude()) { if (location.hasAltitude() && lastLocation.hasAltitude()) {
float run = lastLocation.distanceTo(location); float run = lastLocation.distanceTo(location);
double rise = location.getAltitude() - lastLocation.getAltitude(); double rise = location.getAltitude() - lastLocation.getAltitude();
updateGrade(run, rise); updateGrade(run, rise);
} }
// Update max speed // Update max speed
updateSpeed( if (location.hasSpeed() && lastLocation.hasSpeed()) {
location.getTime(), location.getSpeed(), lastLocation.getTime(), lastLocation.getSpeed()); updateSpeed(
location.getTime(), location.getSpeed(), lastLocation.getTime(), lastLocation.getSpeed());
}
lastLocation = location; lastLocation = location;
lastMovingLocation = location; lastMovingLocation = location;