allow unset weather provider
This commit is contained in:
@@ -28,15 +28,16 @@ class ComThread(Thread):
|
||||
report.ParseFromString(msg)
|
||||
|
||||
# try to associate the received aircrafts to airports
|
||||
icao = []
|
||||
icao = None
|
||||
for inbound in report.reports:
|
||||
self.AMAN.updateAircraftReport(inbound)
|
||||
icao = inbound.destination
|
||||
|
||||
# get the sequence of the airport
|
||||
airport = self.AMAN.findAirport(icao)
|
||||
if None != airport:
|
||||
self.Com.sendSequence('', airport.inboundSequence(), airport.WeatherModel)
|
||||
if None != icao:
|
||||
airport = self.AMAN.findAirport(icao)
|
||||
if None != airport:
|
||||
self.Com.sendSequence(icao, airport.inboundSequence(), airport.WeatherModel)
|
||||
|
||||
except zmq.ZMQError as error:
|
||||
if zmq.EAGAIN == error.errno:
|
||||
|
||||
@@ -21,7 +21,7 @@ class Weather(Thread):
|
||||
|
||||
if 'DWD' == config.Provider.upper():
|
||||
self.Provider = DwdCrawler()
|
||||
else:
|
||||
elif 'NONE' != config.Provider.upper():
|
||||
sys.stderr.write('Invalid or unknown weather-provider defined')
|
||||
sys.exit(-1)
|
||||
|
||||
|
||||
@@ -98,6 +98,9 @@ class WeatherModel:
|
||||
return ias * math.sqrt(1.225 / self.densityModel(altitude).item())
|
||||
|
||||
def updateWindModel(self):
|
||||
if None == self.Weather or None == self.Weather.Provider:
|
||||
return
|
||||
|
||||
if None == self.LastWeatherUpdate or self.LastWeatherUpdate != self.Weather.Provider.UpdateTime:
|
||||
self.MinimumAltitude = 1000000
|
||||
self.MaximumAltitude = -1
|
||||
|
||||
@@ -27,7 +27,10 @@ class Worker(Thread):
|
||||
self.PerformanceData = performance
|
||||
self.UpdateLock = Lock()
|
||||
self.ReportQueue = {}
|
||||
self.WeatherModel = WeatherModel(configuration.GaforId, weather)
|
||||
if None != weather:
|
||||
self.WeatherModel = WeatherModel(configuration.GaforId, weather)
|
||||
else:
|
||||
self.WeatherModel = WeatherModel(0, None)
|
||||
self.RecedingHorizonControl = RecedingHorizonControl(configuration.RecedingHorizonControl)
|
||||
self.Euroscope = euroscope
|
||||
|
||||
|
||||
Reference in New Issue
Block a user