Skip to content

fix: name a development manufacturer in the course's FileId #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haraldh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: name a development manufacturer in the course's FileId #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/org/surfsite/gexporter/Gpx2Fit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,9 @@ public void writeFit(File outfile) {
{
//Generate FileIdMessage
FileIdMesg fileIdMesg = new FileIdMesg(); // Every FIT file MUST contain a 'File ID' message as the first message
fileIdMesg.setManufacturer(Manufacturer.GARMIN);
fileIdMesg.setManufacturer(Manufacturer.DEVELOPMENT); // not a Garmin product, as in the FIT SDK's EncodeCourse example
fileIdMesg.setType(com.garmin.fit.File.COURSE);
fileIdMesg.setProduct(12345);
fileIdMesg.setProduct(0);
fileIdMesg.setSerialNumber(12345L);
fileIdMesg.setNumber(trkPoints.hashCode());
fileIdMesg.setTimeCreated(new DateTime(new Date()));
Expand Down
18 changes: 18 additions & 0 deletions app/src/test/java/org/surfsite/gexporter/TestCourseFit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

import com.garmin.fit.CoursePointMesg;
import com.garmin.fit.Decode;
import com.garmin.fit.FileIdMesg;
import com.garmin.fit.Manufacturer;
import com.garmin.fit.MesgBroadcaster;
import com.garmin.fit.RecordMesg;

Expand All @@ -32,6 +34,7 @@ public class TestCourseFit {

private final List<RecordMesg> records = new ArrayList<>();
private final List<CoursePointMesg> coursePoints = new ArrayList<>();
private final List<FileIdMesg> fileIds = new ArrayList<>();

/** A straight track north, 0.01掳 (about 1.1 km) per point. */
private File gpx(String wpts, String timeFormat) throws Exception {
Expand Down Expand Up @@ -64,6 +67,7 @@ private void convertAndDecode(File gpx) throws Exception {
MesgBroadcaster broadcaster = new MesgBroadcaster(decode);
broadcaster.addListener((com.garmin.fit.RecordMesgListener) records::add);
broadcaster.addListener((com.garmin.fit.CoursePointMesgListener) coursePoints::add);
broadcaster.addListener((com.garmin.fit.FileIdMesgListener) fileIds::add);
try (InputStream in = new FileInputStream(fit)) {
assertTrue("FIT integrity", decode.checkFileIntegrity(in));
}
Expand Down Expand Up @@ -115,4 +119,18 @@ public void currentTimesAreKept() throws Exception {
long expected = (1788602400000L - 631065600000L) / 1000L;
assertEquals(expected, (long) records.get(0).getTimestamp().getTimestamp());
}

@Test
public void fileIdNamesADevelopmentManufacturer() throws Exception {
convertAndDecode(gpx("", null));

// gexporter is not a Garmin product, so it does not claim to be one
// (as in the FIT SDK's EncodeCourse example)
assertEquals(1, fileIds.size());
FileIdMesg fileId = fileIds.get(0);
assertEquals(com.garmin.fit.File.COURSE, fileId.getType());
assertEquals(Manufacturer.DEVELOPMENT, (int) fileId.getManufacturer());
assertEquals(0, (int) fileId.getProduct());
assertEquals(12345L, (long) fileId.getSerialNumber());
}
}
Loading