voussoir
/
trkpt
1
0
Fork 0
Code Issues Packages Projects Releases Activity

Merge pull request #79 from matthiasblaesing/valid-xml 

Fix XML structure for gpx export of recorded track
master
y20k 2020-08-27 13:59:25 +02:00 committed by GitHub
parent 1059bfa2fa 9a234f42dc
commit f3d4fb303f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/y20k/trackbook/helpers/TrackHelper.kt
View File

@ -158,6 +158,7 @@ object TrackHelper {
// add header // add header
gpxString = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\n" + gpxString = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\n" +
"<gpx version=\"1.1\" creator=\"Trackbook App (Android)\"\n" + "<gpx version=\"1.1\" creator=\"Trackbook App (Android)\"\n" +
" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\n" " xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\n"
@ -180,9 +181,11 @@ object TrackHelper {
/* Creates name for GPX file */ /* Creates name for GPX file */
private fun createGpxName(track: Track): String { private fun createGpxName(track: Track): String {
val gpxName = StringBuilder("") val gpxName = StringBuilder("")
gpxName.append("\t<name>") gpxName.append("\t<metadata>\n");
gpxName.append("\t\t<name>")
gpxName.append("Trackbook Recording: ${track.name}") gpxName.append("Trackbook Recording: ${track.name}")
gpxName.append("</name>\n") gpxName.append("</name>\n")
gpxName.append("\t</metadata>\n");
return gpxName.toString() return gpxName.toString()
} }
@ -241,16 +244,16 @@ object TrackHelper {
gpxTrack.append(wayPoint.longitude) gpxTrack.append(wayPoint.longitude)
gpxTrack.append("\">\n") gpxTrack.append("\">\n")
// add time
gpxTrack.append("\t\t\t\t<time>")
gpxTrack.append(dateFormat.format(Date(wayPoint.time)))
gpxTrack.append("</time>\n")
// add altitude // add altitude
gpxTrack.append("\t\t\t\t<ele>") gpxTrack.append("\t\t\t\t<ele>")
gpxTrack.append(wayPoint.altitude) gpxTrack.append(wayPoint.altitude)
gpxTrack.append("</ele>\n") gpxTrack.append("</ele>\n")
// add time
gpxTrack.append("\t\t\t\t<time>")
gpxTrack.append(dateFormat.format(Date(wayPoint.time)))
gpxTrack.append("</time>\n")
// add closing tag // add closing tag
gpxTrack.append("\t\t\t</trkpt>\n") gpxTrack.append("\t\t\t</trkpt>\n")
} }
@ -279,4 +282,4 @@ object TrackHelper {
return track return track
} }
} }