|
@@ -14,11 +14,14 @@ from aman.config.RunwaySequencing import RunwaySequencing
|
|
|
|
|
|
class InboundEncoder(JSONEncoder):
|
|
class InboundEncoder(JSONEncoder):
|
|
def default(self, o):
|
|
def default(self, o):
|
|
|
|
+ if None == o.PlannedArrivalTime or None == o.EnrouteArrivalTime or None == o.PlannedRunway:
|
|
|
|
+ return {}
|
|
|
|
+
|
|
pta = str(o.PlannedArrivalTime)
|
|
pta = str(o.PlannedArrivalTime)
|
|
delimiter = pta.find('.')
|
|
delimiter = pta.find('.')
|
|
if -1 == delimiter:
|
|
if -1 == delimiter:
|
|
delimiter = pta.find('+')
|
|
delimiter = pta.find('+')
|
|
- delta = int((o.PlannedArrivalTime - o.InitialArrivalTime).total_seconds() / 60.0);
|
|
|
|
|
|
+ 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 }
|
|
|
|
|
|
class RunwaySequencingEncoder(JSONEncoder):
|
|
class RunwaySequencingEncoder(JSONEncoder):
|