dan/souplesse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove redundant pattern match

Browse Source 
we get the attributes using the cursor, so no need to parse
it for the node
This commit is contained in:
Daniel Barlow 2024-10-31 17:25:01 +00:00
parent ff4451cb6f
commit 6e4073ca7a
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Track.hs
View File

@ -61,14 +61,12 @@ instance Exception BadFile
elToPoint :: Cursor -> Either SomeException Point elToPoint :: Cursor -> Either SomeException Point
elToPoint c = elToPoint c =
case node c of
NodeElement (Element _ attrs _) ->
let lat = listToMaybe (attribute "lat" c) >>= asFloat let lat = listToMaybe (attribute "lat" c) >>= asFloat
lon = listToMaybe (attribute "lon" c) >>= asFloat lon = listToMaybe (attribute "lon" c) >>= asFloat
ele = listToMaybe (child c >>= element (gpxNS "ele") >>= child >>= content) >>= asFloat
ts = ts =
listToMaybe (child c >>= element (gpxNS "time") >>= child >>= content) listToMaybe (child c >>= element (gpxNS "time") >>= child >>= content)
>>= (Data.Time.ISO8601.parseISO8601 . Data.Text.unpack) >>= (Data.Time.ISO8601.parseISO8601 . Data.Text.unpack)
ele = listToMaybe (child c >>= element (gpxNS "ele") >>= child >>= content) >>= asFloat
gpxtpx = gpxtpx =
child c child c
>>= element (gpxNS "extensions") >>= element (gpxNS "extensions")
@ -94,7 +92,6 @@ elToPoint c =
where where
asFloat v = (readMaybe :: String -> Maybe Float) (Data.Text.unpack v) asFloat v = (readMaybe :: String -> Maybe Float) (Data.Text.unpack v)
asInt v = (readMaybe :: String -> Maybe Int) (Data.Text.unpack v) asInt v = (readMaybe :: String -> Maybe Int) (Data.Text.unpack v)
_ -> Left (toException (BadFile "did not find trkpt"))
getPoints :: Cursor -> Either SomeException [Point] getPoints :: Cursor -> Either SomeException [Point]
getPoints c = getPoints c =