restructure: save a ticket's stop in the database

now mostly independent of the gtfs, but still no live-reloading of it.

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/GTFS.hs b/lib/GTFS.hs
index c4652e8..cb9be2a 100644
--- a/lib/GTFS.hs
+++ b/lib/GTFS.hs
@@ -88,11 +88,11 @@ swaggerOptions prefix =
 -- whatsoever, but are given in the timezone of the transport agency, and
 -- potentially displayed in a different timezone depending on the station they
 -- apply to.
-data Time = Time { timeSeconds :: Int, timeTZseries :: TimeZoneSeries, timeTZname :: Text }
+data Time = Time { timeSeconds :: Int, tzname :: Text }
   deriving (Generic)
 
 instance ToJSON Time where
-  toJSON (Time seconds _ tzname) =
+  toJSON (Time seconds tzname) =
     A.object [ "seconds" A..= seconds, "timezone" A..= tzname ]
 
 -- | a type for all timetable values lacking context
@@ -115,7 +115,7 @@ seconds2Double = int2Double . unSeconds
 -- at the given number of seconds since midnight (note that this may lead to
 -- strange effects for timezone changes not taking place at midnight)
 toSeconds :: Time -> TimeZoneSeries -> Day -> Seconds
-toSeconds (Time seconds _ _) tzseries refday =
+toSeconds (Time seconds _) tzseries refday =
   Seconds $ seconds - timeZoneMinutes timezone * 60
   where timezone = timeZoneFromSeries tzseries reftime
         reftime = UTCTime refday (fromInteger $ toInteger seconds)
@@ -130,7 +130,7 @@ toUTC time tzseries refday =
 -- | Times in GTFS are given without timezone info, which is handled
 -- seperately (as an attribute of the stop / the agency). We attach that information
 -- back to the Time, this is just an intermediate step during parsing.
-newtype RawTime = RawTime { unRawTime :: TimeZoneSeries -> Text -> Time }
+newtype RawTime = RawTime { unRawTime :: Text -> Time }
   deriving (Generic)
 
 instance CSV.FromField RawTime where
@@ -143,7 +143,7 @@ instance CSV.FromField RawTime where
       _          -> fail $ "encountered an invalid date: " <> text
 
 instance Show Time where
-  show (Time seconds _ _) = ""
+  show (Time seconds _) = ""
     +|pad (seconds `div` 3600)|+":"
     +|pad ((seconds `mod` 3600) `div` 60)|+
     if seconds `mod` 60 /= 0 then":"+|pad (seconds `mod` 60)|+""
@@ -154,7 +154,7 @@ instance Show Time where
             where str = show num
 
 showTimeWithSeconds :: Time -> String
-showTimeWithSeconds (Time seconds _ _) = ""
+showTimeWithSeconds (Time seconds _) = ""
     +|pad (seconds `div` 3600)|+":"
     +|pad ((seconds `mod` 3600) `div` 60)|+
     ":"+|pad (seconds `mod` 60)|+""
@@ -587,8 +587,8 @@ loadGtfs path zoneinforoot = do
             tzseries <- getTimeZoneSeriesFromOlsonFile (T.unpack $ "/etc/zoneinfo/"<>tzname)
             pure (tzseries, tzname)
         pure $ stop { stopStation = station
-                    , stopDeparture = unRawTime (stopDeparture stop) tzseries tzname
-                    , stopArrival = unRawTime (stopArrival stop) tzseries tzname }
+                    , stopDeparture = unRawTime (stopDeparture stop) tzname
+                    , stopArrival = unRawTime (stopArrival stop) tzname }
       pushTrip :: Map Text (Route Deep) -> Vector (Stop Deep) -> Map Text Shape -> Trip Shallow Shallow -> IO (Trip Deep Deep)
       pushTrip routes stops shapes trip = if V.length alongRoute < 2
           then fail $ "trip with id "+|tripTripId trip|+" has no stops"