Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-11-04 09:50:21 +01:00
commit 11485e15e4
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -251,6 +251,9 @@ public class GPXUtilities {
public long startTime = Long.MAX_VALUE;
public long endTime = Long.MIN_VALUE;
public long timeSpan = 0;
//*****Issue 3222, for testing only
public long timeMoving0 = 0;
public float totalDistanceMoving0 = 0;
public long timeMoving = 0;
public float totalDistanceMoving = 0;
@ -418,8 +421,17 @@ public class GPXUtilities {
net.osmand.Location.distanceBetween(prev.lat, prev.lon, point.lat, point.lon, calculations);
totalDistance += calculations[0];
// Averaging speed values is less exact than totalDistance/timeMoving
if (speed > 0 && point.time != 0 && prev.time != 0) {
// Motion detection:
// speed > 0 uses GPS chipset's motion detection
// calculations[0] > minDisplacment * time is heuristic needed because tracks may be filtered at recording time, so points at rest may not be present in file at all
//*****Issue 3222, for testing only
if (speed > 0 && point.time != 0 && prev.time != 0) {
timeMoving0 = timeMoving0 + (point.time - prev.time);
totalDistanceMoving0 += calculations[0];
}
if ((speed > 0) && (calculations[0] > 0.5 / 1000f * (point.time - prev.time)) && point.time != 0 && prev.time != 0) {
timeMoving = timeMoving + (point.time - prev.time);
totalDistanceMoving += calculations[0];
}
@ -444,6 +456,7 @@ public class GPXUtilities {
// 5. Max speed and Average speed, if any. Average speed is NOT overall (effective) speed, but only calculated for "moving" periods.
// Averaging speed values is less precise than totalDistanceMoving/timeMoving
if (speedCount > 0) {
if (timeMoving > 0) {
avgSpeed = (float) totalDistanceMoving / (float) timeMoving * 1000f;

6
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -133,6 +133,12 @@ public class GpxUiHelper {
// 3. Time moving, if any
if (analysis.isTimeMoving()) {
//*****Issue 3222, for testing only
final String formatDuration0 = Algorithms.formatDuration((int) (analysis.timeMoving0 / 1000), app.accessibilityEnabled());
description.append(nl).append(app.getString(R.string.gpx_timemoving,
getColorValue(timeSpanClr, formatDuration0, html)));
description.append(" (" + getColorValue(distanceClr, OsmAndFormatter.getFormattedDistance(analysis.totalDistanceMoving0, app), html) + ")");
final String formatDuration = Algorithms.formatDuration((int) (analysis.timeMoving / 1000), app.accessibilityEnabled());
description.append(nl).append(app.getString(R.string.gpx_timemoving,
getColorValue(timeSpanClr, formatDuration, html)));