diff --git a/aman/app.py b/aman/app.py index f5297cb..bb0a6bf 100644 --- a/aman/app.py +++ b/aman/app.py @@ -17,12 +17,24 @@ class InboundEncoder(JSONEncoder): if None == o.PlannedArrivalTime or None == o.EnrouteArrivalTime or None == o.PlannedRunway: return {} + # configure the PTA pta = str(o.PlannedArrivalTime) delimiter = pta.find('.') if -1 == delimiter: delimiter = pta.find('+') + + # calculate the delta time delta = int((o.PlannedArrivalTime - o.EnrouteArrivalTime).total_seconds() / 60.0); - return { 'callsign' : o.Callsign, 'fixed' : o.FixedSequence, 'runway' : o.PlannedRunway.Name, 'pta' : pta[0:delimiter], 'delay' : delta } + + return { + 'callsign' : o.Callsign, + 'fixed' : o.FixedSequence, + 'runway' : o.PlannedRunway.Name, + 'pta' : pta[0:delimiter], + 'delay' : delta, + 'wtc' : o.WTC, + 'iaf' : o.Report.initialApproachFix + } class RunwaySequencingEncoder(JSONEncoder): def default(self, o):