ExerciseViewer TopoGrafixGpxParser: bugfix for issue #260

- added support for timestamps with timezone / offset info
ssaring · Sep 1, 2023 · bacf7ec · bacf7ec
1 parent 3e1adf8
commit bacf7ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/sportstracker/docs/CHANGES.txt b/sportstracker/docs/CHANGES.txt
@@ -37,6 +37,8 @@ v8.0.0:
    (when the lap contains just a break without any activity)
  - All XML-based parsers (GPX, TCX, Polar): fixed error when opening files with
    spaces or special characters in the filename
+ - GPX parser (TopoGrafixGpxParser): bugfix for issue #260
+   - support for GPX files where timestamps contain timezone / offset info
 
 v7.9.1:
  Project changes:

diff --git a/...xerciseviewer/src/main/kotlin/de/saring/exerciseviewer/parser/impl/TopoGrafixGpxParser.kt b/...xerciseviewer/src/main/kotlin/de/saring/exerciseviewer/parser/impl/TopoGrafixGpxParser.kt
@@ -269,7 +269,7 @@ class TopoGrafixGpxParser : AbstractExerciseParser() {
      * Calculates the speed summary (only when samples contain timestamps, from which speed is derived).
      */
     private fun calculateSpeedSummary(exercise: EVExercise) {
-        if (!exercise.sampleList.isEmpty()) {
+        if (exercise.sampleList.isNotEmpty()) {
 
             val speedMax = exercise.sampleList
                     .map { it.speed!! }
@@ -292,21 +292,16 @@ class TopoGrafixGpxParser : AbstractExerciseParser() {
         val sampleHeartrates:List<Short> = exercise.sampleList
                 .mapNotNull { it.heartRate }
 
-        if (!sampleHeartrates.isEmpty()) {
+        if (sampleHeartrates.isNotEmpty()) {
             exercise.heartRateAVG = sampleHeartrates.average().roundToInt().toShort()
             exercise.heartRateMax = sampleHeartrates.maxOrNull()
         }
     }
 
     /**
-     * Parses the date time in ISO format specified in the passed text and returns the appropriate LocalDateTime.
+     * Parses the specified date time in ISO format and returns the appropriate LocalDateTime.
      */
     private fun parseDateTime(dateTimeText: String): LocalDateTime {
-        // remove the suffix 'Z' if contained in the passed text, can't be ignored by ISO_LOCAL_DATE_TIME
-        val dateTimeTextFixed = if (dateTimeText.endsWith('Z'))
-            dateTimeText.substring(0, dateTimeText.length - 1)
-        else
-            dateTimeText
-        return LocalDateTime.parse(dateTimeTextFixed, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+        return LocalDateTime.parse(dateTimeText, DateTimeFormatter.ISO_DATE_TIME)
     }
 }