MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-10 07:31:34 +02:00
Code Releases Wiki Activity

GPX export fixes (#1060)

Browse Source
This commit is contained in:
AndrewH 2018-04-13 08:50:47 +10:00 committed by Carsten Pfeiffer
parent 8f6d287592
commit 1b9b5f821e
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
View File

@ -31,6 +31,7 @@ public class GPXExporter implements ActivityTrackExporter {
private String creator;
private boolean includeHeartRate = true;
private boolean includeHeartRateByTime = true;
@NonNull
@Override
@ -46,6 +47,7 @@ public class GPXExporter implements ActivityTrackExporter {
ser.setOutput(new FileOutputStream(targetFile), encoding);
ser.startDocument(encoding, Boolean.TRUE);
ser.setPrefix("xsi", NS_XSI_URI);
ser.setPrefix(NS_TRACKPOINT_EXTENSION, NS_TRACKPOINT_EXTENSION_URI);
ser.setPrefix(NS_DEFAULT_PREFIX, NS_DEFAULT);
ser.startTag(NS_DEFAULT, "gpx");
@ -88,7 +90,7 @@ public class GPXExporter implements ActivityTrackExporter {
String source = getSource(track);
boolean atLeastOnePointExported = false;
for (ActivityPoint point : trackPoints) {
atLeastOnePointExported = exportTrackPoint(ser, point, source) | atLeastOnePointExported ;
atLeastOnePointExported = exportTrackPoint(ser, point, source, trackPoints) | atLeastOnePointExported ;
}
if(!atLeastOnePointExported) {
@ -103,7 +105,7 @@ public class GPXExporter implements ActivityTrackExporter {
return track.getDevice().getName();
}
private boolean exportTrackPoint(XmlSerializer ser, ActivityPoint point, String source) throws IOException {
private boolean exportTrackPoint(XmlSerializer ser, ActivityPoint point, String source, List<ActivityPoint> trackPoints) throws IOException {
GPSCoordinate location = point.getLocation();
if (location == null) {
return false; // skip invalid points, that just contain hr data, for example
@ -117,29 +119,53 @@ public class GPXExporter implements ActivityTrackExporter {
if (description != null) {
ser.startTag(NS_DEFAULT, "desc").text(description).endTag(NS_DEFAULT, "desc");
}
ser.startTag(NS_DEFAULT, "src").text(source).endTag(NS_DEFAULT, "src");
//ser.startTag(NS_DEFAULT, "src").text(source).endTag(NS_DEFAULT, "src");
exportTrackpointExtensions(ser, point);
exportTrackpointExtensions(ser, point, trackPoints);
ser.endTag(NS_DEFAULT, "trkpt");
return true;
}
private void exportTrackpointExtensions(XmlSerializer ser, ActivityPoint point) throws IOException {
private void exportTrackpointExtensions(XmlSerializer ser, ActivityPoint point, List<ActivityPoint> trackPoints) throws IOException {
if (!includeHeartRate) {
return;
}
int hr = point.getHeartRate();
if (!HeartRateUtils.isValidHeartRateValue(hr)) {
if(!includeHeartRateByTime) { return; }
Date time = point.getTime();
ActivityPoint closestPointItem = null;
long lowestDifference = Long.MAX_VALUE;
for (ActivityPoint pointItem : trackPoints) {
int hrItem = pointItem.getHeartRate();
if(HeartRateUtils.isValidHeartRateValue(hrItem)) {
Date timeItem = pointItem.getTime();
if (timeItem.after(time) || timeItem.equals(time)) continue;
long difference = time.getTime() - timeItem.getTime();
if (difference < lowestDifference) {
lowestDifference = difference;
closestPointItem = pointItem;
}
}
}
if(closestPointItem != null) {
hr = closestPointItem.getHeartRate();
if (!HeartRateUtils.isValidHeartRateValue(hr)) {
return;
}
}
return;
}
ser.startTag(NS_DEFAULT, "extensions");
ser.setPrefix(NS_TRACKPOINT_EXTENSION, NS_TRACKPOINT_EXTENSION_URI);
ser.startTag(NS_TRACKPOINT_EXTENSION_URI, "TrackPointExtension");
ser.startTag(NS_TRACKPOINT_EXTENSION_URI, "hr").text(String.valueOf(hr)).endTag(NS_TRACKPOINT_EXTENSION_URI, "hr");
ser.endTag(NS_TRACKPOINT_EXTENSION_URI, "TrackPointExtension");
ser.endTag(NS_DEFAULT, "extensions");
}

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/ActivityDetailsParser.java
View File

@ -173,11 +173,11 @@ public class ActivityDetailsParser {
private ActivityPoint getActivityPointFor(long timeOffsetSeconds) {
Date time = makeAbsolute(timeOffsetSeconds);
// if (lastActivityPoint != null) {
// if (lastActivityPoint.getTime().equals(time)) {
// return lastActivityPoint;
// }
// }
if (lastActivityPoint != null) {
if (lastActivityPoint.getTime().equals(time)) {
return lastActivityPoint;
}
}
return new ActivityPoint(time);
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
View File

@ -33,7 +33,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
public class DateTimeUtils {
private static SimpleDateFormat DAY_STORAGE_FORMAT = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
public static SimpleDateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssXXX", Locale.US);
public static SimpleDateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
public static String formatDateTime(Date date) {
return DateUtils.formatDateTime(GBApplication.getContext(), date.getTime(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_NO_YEAR);