serialize TrackPoint elevation & time

Author: jgillich

src/main/kotlin/be/yellowduck/gpx/GPX.kt

@@ -82,7 +82,7 @@ class GPX {
                     gpx.tracks.add(track)
                 }
 
-            } catch (e: SAXParseException) {
+            } catch (_: SAXParseException) {
                 throw GPXDocumentException()
             }
 
@@ -91,8 +91,8 @@ class GPX {
         }
 
         private fun parseName(doc: org.w3c.dom.Document): String {
-             return doc.getElementsByTagName("metadata").items().firstOrNull()?.let { metadata ->
-               metadata.childNodes.itemsByName("name").firstOrNull()?.textContent
+            return doc.getElementsByTagName("metadata").items().firstOrNull()?.let { metadata ->
+                metadata.childNodes.itemsByName("name").firstOrNull()?.textContent
             } ?: ""
         }
 
@@ -140,9 +140,9 @@ class GPX {
         }
 
         private fun parseTrackPoint(node: Node): TrackPoint {
-
-            val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
-            val parsedDate = node.firstChildByName("time")?.textContent?.let { LocalDateTime.parse( it, formatter) }
+            val parsedDate = node.firstChildByName("time")?.textContent?.let {
+                LocalDateTime.parse(it, DateTimeFormatter.ISO_DATE_TIME)
+            }
 
             return TrackPoint(
                 lat = node.doubleAttribute("lat"),

src/main/kotlin/be/yellowduck/gpx/GPXWriter.kt

@@ -3,6 +3,7 @@ package be.yellowduck.gpx
 import com.sun.xml.txw2.output.IndentingXMLStreamWriter
 import java.io.ByteArrayOutputStream
 import java.io.OutputStream
+import java.time.temporal.ChronoUnit
 import javax.xml.stream.XMLOutputFactory
 
 class GPXWriter : IWriter {
@@ -53,6 +54,14 @@ class GPXWriter : IWriter {
                                     element("trkpt") {
                                         attribute("lat", point.lat.toString())
                                         attribute("lon", point.lon.toString())
+
+                                        if (point.ele != 0.0) {
+                                            element("ele", point.ele.toString())
+                                        }
+
+                                        point.time?.let { time ->
+                                            element("time", time.truncatedTo(ChronoUnit.SECONDS).toString())
+                                        }
                                     }
                                 }
                             }

src/main/kotlin/be/yellowduck/gpx/TCXWriter.kt

@@ -54,6 +54,15 @@ class TCXWriter : IWriter {
                                                 element("LatitudeDegrees", point.lat.toString())
                                                 element("LongitudeDegrees", point.lon.toString())
                                             }
+
+                                            if (point.ele != 0.0) {
+                                                element("AltitudeMeters", point.ele.toString())
+                                            }
+
+                                            point.time?.let { time ->
+                                                element("Time", point.time.toString())
+                                            }
+
                                             val distance: Double = previousPoint?.distanceTo(point)?.meters ?: 0.0
                                             element("DistanceMeters", distance.toString())
                                             previousPoint = point

src/test/kotlin/be/yellowduck/gpx/TrackPointTests.kt

@@ -53,4 +53,30 @@ class TrackPointTests {
 
     }
 
+    @Test
+    fun trackPointSerialize() {
+        val point = TrackPoint()
+        point.lat = 48.1969
+        point.lon = 16.34528
+        point.ele = 2.6
+        point.time = now
+
+        val gpx = GPX.parse(
+            GPXFile(
+                tracks = mutableListOf(
+                    Track(
+                        segments = mutableListOf(
+                            Segment(
+                                points = mutableListOf(point)
+                            )
+                        )
+                    )
+                )
+            ).toString().toByteArray().inputStream()
+        )
+
+        assertThat(gpx.tracks.firstOrNull()?.segments?.firstOrNull()?.points?.first()).isEqualTo(point)
+    }
+
+
 }