rename ArrivalTime to ArrivalData due to more non-time-related information in the class

aman/types/ArrivalData.py

@@ -4,7 +4,7 @@ from datetime import datetime, timedelta
 
 from aman.types.ArrivalRoute import ArrivalRoute
 
-class ArrivalTime:
+class ArrivalData:
     def __init__(self, **kargs):
         self.Star = None
         self.MaximumTimeToGain = None
@@ -14,6 +14,8 @@ class ArrivalTime:
         self.InitialArrivalTime = None
         self.EarliestArrivalTime = None
         self.LatestArrivalTime = None
+        self.ArrivalRoute = None
+        self.Trackmiles = None
 
         for key, value in kargs.items():
             if 'ttg' == key:
@@ -60,5 +62,9 @@ class ArrivalTime:
                     self.FlightTimeUntilIaf = value
                 else:
                     raise Exception('Invalid type for entry')
+            elif 'route' == key:
+                self.ArrivalRoute = value
+            elif 'trackmiles' == key:
+                self.Trackmiles = value
             else:
                 raise Exception('Unknown key: ' + key)

aman/types/Inbound.py

@@ -11,7 +11,7 @@ from aman.formats.SctEseFormat import SctEseFormat
 from aman.sys.WeatherModel import WeatherModel
 from aman.types.PerformanceData import PerformanceData
 from aman.types.ArrivalRoute import ArrivalRoute
-from aman.types.ArrivalTime import ArrivalTime
+from aman.types.ArrivalData import ArrivalData
 from aman.types.Runway import Runway
 from aman.types.Waypoint import Waypoint
 
@@ -66,7 +66,7 @@ class Inbound:
                 earliest = ita - ttg
                 latest = ita + ttl
 
-                self.ArrivalCandidates[identifier.Runway.Name] = ArrivalTime(ttg = ttg, star = star, ita = ita, earliest = earliest,
+                self.ArrivalCandidates[identifier.Runway.Name] = ArrivalData(ttg = ttg, star = star, ita = ita, earliest = earliest,
                                                                              entry = flightTimeUntilIaf, touchdown = flightTime,
                                                                              ttl = ttl, latest = latest)