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

make elevation part of Position

Browse Source 
this reverses the change made in 64470309 when it hadn't occured to
me that the members of a tuple can have different types
This commit is contained in:
Daniel Barlow 2024-10-31 17:09:59 +00:00
parent 5b827ed6ed
commit 7860a189b3
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Track.hs
View File

@ -5,7 +5,6 @@ module Track
Pos (..), Pos (..),
BadFile, BadFile,
pos, pos,
elevation,
cadence, cadence,
power, power,
heartRate, heartRate,
@ -29,7 +28,7 @@ import Debug.Trace (trace, traceShow)
import Text.XML import Text.XML
import Text.XML.Cursor as Cursor import Text.XML.Cursor as Cursor
import Text.Read (readMaybe) import Text.Read (readMaybe)
data Pos = Pos Float Float deriving (Show, Eq) data Pos = Pos Float Float (Maybe Float) deriving (Show, Eq)
type Power = Maybe Int type Power = Maybe Int
@ -39,7 +38,6 @@ type HeartRate = Maybe Int
data Point = Point data Point = Point
{ pos :: Pos, { pos :: Pos,
elevation :: Maybe Float,
time :: UTCTime, time :: UTCTime,
cadence :: Cadence, cadence :: Cadence,
power :: Power, power :: Power,
@ -86,8 +84,7 @@ elToPoint c =
then then
Right $ Right $
Point Point
(Pos (fromJust lat) (fromJust lon)) (Pos (fromJust lat) (fromJust lon) (ele >>= asFloat))
(ele >>= asFloat)
(fromJust ts) (fromJust ts)
(listToMaybe cadence >>= asInt) (listToMaybe cadence >>= asInt)
(listToMaybe power >>= asInt) (listToMaybe power >>= asInt)

23
tests/UnitTest.hs
View File

@ -111,16 +111,29 @@ testMissingAttrs =
test2 = test2 =
TestList [
TestCase $ TestCase $
either either
(assertFailure . displayException) (assertFailure . displayException)
( \(p : _) -> ( \(p : _) ->
assertEqual assertEqual
"matches lat/lon" "matches lat/lon"
(Track.Pos 51.0 (-0.1)) (Track.Pos 51.0 (-0.1) Nothing)
(Track.pos p) (Track.pos p)
) )
(Track.parse onepoint) (Track.parse onepoint),
TestCase $
either
(assertFailure . displayException)
( \(p : _) ->
assertEqual
"matches lat/lon"
(Track.Pos 51.0 (-0.1) (Just 25.2))
(Track.pos p)
)
(Track.parse onepointWithAttrs)
]
test3 = test3 =
TestCase $ TestCase $
@ -130,7 +143,7 @@ test3 =
assertEqual assertEqual
"handles missing attributes" "handles missing attributes"
(Nothing, Nothing) (Nothing, Nothing)
(Track.elevation p, Track.cadence p) (Track.power p, Track.cadence p)
) )
(Track.parse onepoint) (Track.parse onepoint)
@ -141,8 +154,8 @@ test4 =
( \(p : _) -> ( \(p : _) ->
assertEqual assertEqual
"handles attributes" "handles attributes"
(Just 25.2, Just 128, Just 55, Data.Time.UTCTime (toEnum 60606) 27299.779, Just 160) (Just 128, Just 55, Data.Time.UTCTime (toEnum 60606) 27299.779, Just 160)
(Track.elevation p, Track.cadence p, Track.power p, Track.time p, Track.heartRate p) (Track.cadence p, Track.power p, Track.time p, Track.heartRate p)
) )
(Track.parse onepointWithAttrs) (Track.parse onepointWithAttrs)