vatger/aman-sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sven Czarnian
2021-11-11 20:25:20 +01:00
parent 7985dda3ce
commit 1a23499f61
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
aman/types/ArrivalTime.py → aman/types/ArrivalData.py
View File

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

4
aman/types/Inbound.py
View File

@@ -11,7 +11,7 @@ from aman.formats.SctEseFormat import SctEseFormat
from aman.sys.WeatherModel import WeatherModel from aman.sys.WeatherModel import WeatherModel
from aman.types.PerformanceData import PerformanceData from aman.types.PerformanceData import PerformanceData
from aman.types.ArrivalRoute import ArrivalRoute 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.Runway import Runway
from aman.types.Waypoint import Waypoint from aman.types.Waypoint import Waypoint
@@ -66,7 +66,7 @@ class Inbound:
earliest = ita - ttg earliest = ita - ttg
latest = ita + ttl 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, entry = flightTimeUntilIaf, touchdown = flightTime,
ttl = ttl, latest = latest) ttl = ttl, latest = latest)