lib/Track.hs

@@ -17,7 +17,6 @@ import Control.Exception
 import Data.List as List
 import Data.List qualified
 import Data.Map as Map
-import Data.Maybe
 import Data.Text qualified
 import Data.Text.Lazy as T
 import Data.Time
@@ -53,12 +52,16 @@ gpxNS localName =
 tpxNS localName =
   Name localName (Just "http://www.garmin.com/xmlschemas/TrackPointExtension/v2") Nothing
 
+mkPoint pos =
+  Point
+    pos
+    Nothing
+    (UTCTime (toEnum 60631) 43200)
+    Nothing
+    Nothing
+    Nothing
 
-data BadFile = BadFile deriving (Show)
+elToPoint :: Cursor -> Point
-
-instance Exception BadFile
-
-elToPoint :: Cursor -> Either SomeException Point
 elToPoint c =
   case node c of
     NodeElement (Element _ attrs _) ->
@@ -82,27 +85,37 @@ elToPoint c =
               >>= element (Name "PowerInWatts" (Just "http://www.garmin.com/xmlschemas/PowerExtension/v1") Nothing)
               >>= child
               >>= content
-          parsedTime =
+       in Point
-            listToMaybe ts
-              >>= (Data.Time.ISO8601.parseISO8601 . Data.Text.unpack)
-       in case parsedTime of
-            Nothing -> Left (toException BadFile)
-            Just utime ->
-              Right $
-                Point
             (Pos lat lon)
-                  (listToMaybe ele >>= return . asFloat)
+            ( case ele of
-                  utime
+                [e] -> Just $ asFloat e
-                  (listToMaybe cadence >>= return . asInt)
+                _ -> Nothing
-                  (listToMaybe power >>= return . asInt)
+            )
+            ( case ts of
+                [e] -> case Data.Time.ISO8601.parseISO8601 (Data.Text.unpack e) of
+                  Just utime -> utime
+                  _ -> UTCTime (toEnum 0) 0
+                _ -> UTCTime (toEnum 0) 0
+            )
+            ( case cadence of
+                [e] -> Just (asInt e)
+                _ -> Nothing
+            )
+            ( case power of
+                [e] -> Just (asInt e)
+                _ -> Nothing
+            )
             Nothing
       where
         asFloat v = (read (Data.Text.unpack v) :: Float)
         asInt v = (read (Data.Text.unpack v) :: Int)
-        getAttr name = maybe 0 asFloat (Map.lookup name attrs)
+        getAttr name =
-    _ -> Left (toException BadFile)
+          case Map.lookup name attrs of
+            Just v -> asFloat v
+            _ -> 0
+    _ -> mkPoint (Pos 0 0)
 
-getPoints :: Cursor -> Either SomeException [Point]
+getPoints :: Cursor -> [Point]
 getPoints c =
   let trkpts =
         element (gpxNS "gpx") c
@@ -110,12 +123,12 @@ getPoints c =
           >>= element (gpxNS "trk")
           >>= descendant
           >>= element (gpxNS "trkpt")
-   in traverse elToPoint trkpts
+   in List.map elToPoint trkpts
 
 parse :: String -> Either SomeException [Point]
 parse str = do
   gpx <- parseText def (T.pack str)
-  getPoints (fromDocument gpx)
+  return (getPoints (fromDocument gpx))
 
 length :: Track -> Int
 length = Data.List.length

tests/UnitTest.hs

@@ -34,9 +34,7 @@ onepoint =
   wrap
     [r|
 <trk> <trkseg>
-<trkpt lat="51" lon="-0.1">
+<trkpt lat="51" lon="-0.1"> </trkpt>
-   <time>2024-10-23T08:34:59.779+01:00</time>
-</trkpt>
 </trkseg> </trk>
 |]