From 5f27e441f47f2565b941b321a9939d54357e1654 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Thu, 16 Apr 2026 01:23:50 +0200
Subject: meta: reorganisation, rename "token" to "trackerId"

---
 lib/Server/GTFS_RT.hs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/Server/GTFS_RT.hs')

diff --git a/lib/Server/GTFS_RT.hs b/lib/Server/GTFS_RT.hs
index 6ef6ed2..532af89 100644
--- a/lib/Server/GTFS_RT.hs
+++ b/lib/Server/GTFS_RT.hs
@@ -46,9 +46,9 @@ import           GTFS                        (Depth (..), GTFS (..),
 import           Persist                     (Announcement (..),
                                               EntityField (..), Key (..),
                                               Station (..), Stop (..),
-                                              Ticket (..), Token (..),
+                                              Ticket (..), TrackerId (..),
                                               Tracker (..), TrainAnchor (..),
-                                              TrainPing (..), latitude,
+                                              Ping (..), latitude,
                                               longitude, runSql)
 import qualified Proto.GtfsRealtime          as RT
 import qualified Proto.GtfsRealtime_Fields   as RT
@@ -168,7 +168,7 @@ gtfsRealtimeServer settings@ServerConfig{..} gtfs@GTFS{..} dbpool =
 
       -- TODO: reimplement this (since trainpings no longer reference tickets it's gone for now)
       -- positions <- forM ticket $ \(Entity key ticket) -> do
-      --   selectFirst [TrainPingTicket ==. key] [Desc TrainPingTimestamp] >>= \case
+      --   selectFirst [PingTicket ==. key] [Desc PingTimestamp] >>= \case
       --     Nothing -> pure Nothing
       --     Just lastPing ->
       --       pure (Just $ mkPosition (lastPing, ticket))
@@ -176,8 +176,8 @@ gtfsRealtimeServer settings@ServerConfig{..} gtfs@GTFS{..} dbpool =
       pure [] -- (catMaybes positions)
 
       where
-        mkPosition :: (Entity TrainPing, Ticket) -> RT.FeedEntity
-        mkPosition (Entity key TrainPing{..}, Ticket{..}) = defMessage
+        mkPosition :: (Entity Ping, Ticket) -> RT.FeedEntity
+        mkPosition (Entity key Ping{..}, Ticket{..}) = defMessage
           & RT.id .~ T.pack (show key)
           & RT.vehicle .~ (defMessage
               & RT.trip .~ defTripDescriptor ticketTripName Nothing Nothing
@@ -186,11 +186,11 @@ gtfsRealtimeServer settings@ServerConfig{..} gtfs@GTFS{..} dbpool =
                   Just trainset -> Just $ defMessage
                     & RT.label .~ trainset
               & RT.position .~ (defMessage
-                  & RT.latitude .~ double2Float (latitude trainPingGeopos)
-                  & RT.longitude .~ double2Float (longitude trainPingGeopos)
+                  & RT.latitude .~ double2Float (latitude pingGeopos)
+                  & RT.longitude .~ double2Float (longitude pingGeopos)
               )
               -- TODO: should probably give currentStopSequence/stopId here as well
-              & RT.timestamp .~ toStupidTime trainPingTimestamp
+              & RT.timestamp .~ toStupidTime pingTimestamp
           )
 
 
-- 
cgit v1.2.3