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

extract Position from the Point type

Browse Source
This commit is contained in:
Daniel Barlow 2024-10-24 23:06:00 +01:00
parent cf6d4cf9c0
commit 086664f8fb
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Track.elm
View File

@ -5,10 +5,10 @@ import Xml.Decode as XD exposing (path, list, single, floatAttr, stringAttr)
import Time import Time
import Iso8601 import Iso8601
type alias Position = (Float, Float, Maybe Float) -- lat, lon, ele
type alias Point = type alias Point =
{ lat : Float { loc : Position
, lon : Float
, ele : Maybe Float
, time : Maybe Time.Posix , time : Maybe Time.Posix
} }
@ -22,10 +22,11 @@ timeDecoder = XD.andThen (\ts ->
) )
XD.string XD.string
pointDecoder = XD.map4 Point triple x y z = (x,y,z)
(floatAttr "lat")
(floatAttr "lon") pointDecoder = XD.map2 Point
(XD.maybe (path ["ele"] (single XD.float))) (XD.map3 triple (floatAttr "lat") (floatAttr "lon")
(XD.maybe (path ["ele"] (single XD.float))))
(XD.maybe (path ["time"] (single timeDecoder))) (XD.maybe (path ["time"] (single timeDecoder)))

6
tests/Fixtures.elm
View File

@ -65,7 +65,7 @@ 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 (51.600643, -0.01856, Just 64.8) (Just (Time.millisToPosix 1729669252256)))
, (Point 51.600679 -0.018179 (Just 65.5) (Just (Time.millisToPosix 1729669255259))) , (Point (51.600679, -0.018179, Just 65.5) (Just (Time.millisToPosix 1729669255259)))
, (Point 51.600697 -0.018064 (Just 66.2) (Just (Time.millisToPosix 1729669256231))) , (Point (51.600697, -0.018064, Just 66.2) (Just (Time.millisToPosix 1729669256231)))
] ]

2
tests/TrackTest.elm
View File

@ -23,7 +23,7 @@ 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)))
Ok _ -> Expect.fail "empty list" Ok _ -> Expect.fail "empty list"
(Err f) -> Expect.fail f (Err f) -> Expect.fail f