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

use Pos instead of curried lat/long

Browse Source
This commit is contained in:
Daniel Barlow 2024-11-21 16:05:47 +00:00
parent f379d2d9b9
commit ab3a5aaf9f
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/Main.elm
View File

@ -80,11 +80,11 @@ type alias Lng = Float
sec x = 1 / (cos x) sec x = 1 / (cos x)
toCoord : Lat -> Lng -> Coord toCoord : Pos -> Coord
toCoord lat lng = toCoord pos =
let let
lat_rad = lat * pi / 180 lat_rad = pos.lat * pi / 180
x = (lng + 180) / 360 x = (pos.lon + 180) / 360
y = (1 - (logBase e ((tan lat_rad) + (sec lat_rad))) / pi) / 2 y = (1 - (logBase e ((tan lat_rad) + (sec lat_rad))) / pi) / 2
in in
Coord x y Coord x y
@ -166,7 +166,9 @@ init _ url navKey =
Just (Timeline (Just s) (Just d)) -> (s, d) Just (Timeline (Just s) (Just d)) -> (s, d)
_ -> (10,10) _ -> (10,10)
in in
((Model (toCoord 0 0) (FineZoomLevel (1*8)) None 0 0 Empty), ((Model
(toCoord (Pos 0 0 Nothing))
(FineZoomLevel (1*8)) None 0 0 Empty),
(fetchTrack start duration)) (fetchTrack start duration))
-- SUBSCRIPTIONS -- SUBSCRIPTIONS
@ -199,10 +201,6 @@ type Msg
| Dribble String | Dribble String
coordFromPos p =
let {lat, lon } = p
in toCoord lat lon
update : Msg -> Model -> (Model, Cmd Msg) update : Msg -> Model -> (Model, Cmd Msg)
update msg model = (updateModel msg model, Cmd.none) update msg model = (updateModel msg model, Cmd.none)
@ -248,7 +246,7 @@ updateModel msg model =
in in
{ model { model
| track = Present trk | track = Present trk
, centre = coordFromPos (Point.centre trk) , centre = toCoord (Point.centre trk)
, zoom = FineZoomLevel ( 13 * 8) , zoom = FineZoomLevel ( 13 * 8)
, startTime = floor start , startTime = floor start
, duration = ceiling duration , duration = ceiling duration
@ -492,7 +490,7 @@ eleView = measureView "elevation" "#4444ee" (.pos >> .ele)
trackView : Int -> Int -> ZoomLevel -> List Point -> Svg Msg trackView : Int -> Int -> ZoomLevel -> List Point -> Svg Msg
trackView leftedge topedge zoom points = trackView leftedge topedge zoom points =
let plot p = let plot p =
let (x, y) = pixelFromCoord (toCoord p.pos.lat p.pos.lon) zoom let (x, y) = pixelFromCoord (toCoord p.pos) zoom
x_ = x - leftedge x_ = x - leftedge
y_ = y - topedge y_ = y - topedge
in (String.fromInt x_) ++ ", " ++ in (String.fromInt x_) ++ ", " ++