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

parse power

Browse Source
This commit is contained in:
Daniel Barlow 2024-10-25 00:00:37 +01:00
parent 086664f8fb
commit 2204a53a4f
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Track.elm
View File

@ -10,6 +10,7 @@ type alias Position = (Float, Float, Maybe Float) -- lat, lon, ele
type alias Point = type alias Point =
{ loc : Position { loc : Position
, time : Maybe Time.Posix , time : Maybe Time.Posix
, power : Maybe Int
} }
type alias Track = List Point type alias Track = List Point
@ -24,10 +25,11 @@ timeDecoder = XD.andThen (\ts ->
triple x y z = (x,y,z) triple x y z = (x,y,z)
pointDecoder = XD.map2 Point pointDecoder = XD.map3 Point
(XD.map3 triple (floatAttr "lat") (floatAttr "lon") (XD.map3 triple (floatAttr "lat") (floatAttr "lon")
(XD.maybe (path ["ele"] (single XD.float)))) (XD.maybe (path ["ele"] (single XD.float))))
(XD.maybe (path ["time"] (single timeDecoder))) (XD.maybe (path ["time"] (single timeDecoder)))
(XD.maybe (path ["extensions", "gpxtpx:TrackPointExtension", "pwr:PowerInWatts"] (single XD.int)))
gpxDecoder = gpxDecoder =

16
tests/Fixtures.elm
View File

@ -65,7 +65,17 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/
""" """
threepoints_expected = threepoints_expected =
[ (Point (51.600643, -0.01856, Just 64.8) (Just (Time.millisToPosix 1729669252256))) [ (Point
, (Point (51.600679, -0.018179, Just 65.5) (Just (Time.millisToPosix 1729669255259))) (51.600643, -0.01856, Just 64.8)
, (Point (51.600697, -0.018064, Just 66.2) (Just (Time.millisToPosix 1729669256231))) (Just (Time.millisToPosix 1729669252256))
(Just 89)
)
, (Point
(51.600679, -0.018179, Just 65.5)
(Just (Time.millisToPosix 1729669255259))
(Just 86))
, (Point
(51.600697, -0.018064, Just 66.2)
(Just (Time.millisToPosix 1729669256231))
(Just 86))
] ]

3
tests/TrackTest.elm
View File

@ -23,7 +23,8 @@ specs =
Fixtures.threepoints Fixtures.threepoints
in in
case Track.parse xml of case Track.parse xml of
Ok (p::pts) -> Expect.equal p (Point (51.600643, -0.01856, Nothing) (Just (Time.millisToPosix 1729669252256))) Ok (p::pts) ->
Expect.equal p (Point (51.600643, -0.01856, Nothing) (Just (Time.millisToPosix 1729669252256)) (Just 89))
Ok _ -> Expect.fail "empty list" Ok _ -> Expect.fail "empty list"
(Err f) -> Expect.fail f (Err f) -> Expect.fail f