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

apply hlint suggestions

Browse Source
This commit is contained in:
Daniel Barlow 2024-10-31 17:22:07 +00:00
parent c3c31e52b4
commit ff4451cb6f
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Track.hs
View File

@ -63,9 +63,9 @@ elToPoint :: Cursor -> Either SomeException Point
elToPoint c = elToPoint c =
case node c of case node c of
NodeElement (Element _ attrs _) -> 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 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)
@ -85,15 +85,15 @@ elToPoint c =
then then
Right $ Right $
Point Point
(Pos (fromJust lat) (fromJust lon) (ele >>= asFloat)) (Pos (fromJust lat) (fromJust lon) ele)
(fromJust ts) (fromJust ts)
(listToMaybe cadence >>= asInt) (listToMaybe cadence >>= asInt)
(listToMaybe power >>= asInt) (listToMaybe power >>= asInt)
(listToMaybe hr >>= asInt) (listToMaybe hr >>= asInt)
else Left (toException (BadFile "missing a required attribute")) else Left (toException (BadFile "missing a required attribute"))
where where
asFloat v = return (Data.Text.unpack v) >>= (readMaybe :: String -> Maybe Float) asFloat v = (readMaybe :: String -> Maybe Float) (Data.Text.unpack v)
asInt v = return (Data.Text.unpack v) >>= (readMaybe :: String -> Maybe Int) asInt v = (readMaybe :: String -> Maybe Int) (Data.Text.unpack v)
_ -> Left (toException (BadFile "did not find trkpt")) _ -> Left (toException (BadFile "did not find trkpt"))
getPoints :: Cursor -> Either SomeException [Point] getPoints :: Cursor -> Either SomeException [Point]

8
tests/UnitTest.hs
View File

@ -104,13 +104,7 @@ testMissingAttrs =
in TestCase $ in TestCase $
assertBool assertBool
"failed to catch missing/malformed attribute" "failed to catch missing/malformed attribute"
( List.all (List.all (isLeft . Track.parse . wrapPoint) els)
isLeft
( List.map
(\text -> Track.parse (wrapPoint text))
els
)
)
test2 = test2 =
TestList TestList