From 0e96f0402ecbf465a3038d25e890e1491c9f9930 Mon Sep 17 00:00:00 2001 From: Sven Czarnian Date: Thu, 25 Nov 2021 22:51:39 +0100 Subject: [PATCH] fix potential crashes --- aman/com/Euroscope.py | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/aman/com/Euroscope.py b/aman/com/Euroscope.py index 64e76ba..a8b2059 100644 --- a/aman/com/Euroscope.py +++ b/aman/com/Euroscope.py @@ -106,28 +106,31 @@ class Euroscope: entry = sequence.sequence.add() entry.callsign = inbound.Callsign entry.fixed = inbound.FixedSequence - entry.arrivalRoute = inbound.PlannedStar.Name - entry.arrivalRunway = inbound.PlannedRunway.Name + if None != inbound.PlannedStar: + entry.arrivalRoute = inbound.PlannedStar.Name + if None != inbound.PlannedRunway: + entry.arrivalRunway = inbound.PlannedRunway.Name - #performance = entry.performance.add() - entry.performance.iasAboveFL240 = int(round(inbound.PerformanceData.SpeedAboveFL240)) - entry.performance.iasAboveFL100 = int(round(inbound.PerformanceData.SpeedAboveFL100)) - entry.performance.iasBelowFL100 = int(round(inbound.PerformanceData.SpeedBelowFL100)) - entry.performance.iasApproach = int(round(inbound.PerformanceData.SpeedApproach)) + if None != inbound.PerformanceData: + entry.performance.iasAboveFL240 = int(round(inbound.PerformanceData.SpeedAboveFL240)) + entry.performance.iasAboveFL100 = int(round(inbound.PerformanceData.SpeedAboveFL100)) + entry.performance.iasBelowFL100 = int(round(inbound.PerformanceData.SpeedBelowFL100)) + entry.performance.iasApproach = int(round(inbound.PerformanceData.SpeedApproach)) - for waypoint in inbound.PlannedArrivalRoute: - wp = entry.waypoints.add() - wp.name = waypoint.Waypoint.Name - wp.altitude = int(round(waypoint.Altitude)) - wp.indicatedAirspeed = int(round(waypoint.IndicatedAirspeed)) - wp.groundSpeed = int(round(waypoint.GroundSpeed)) + if None != inbound.PlannedArrivalRoute: + for waypoint in inbound.PlannedArrivalRoute: + wp = entry.waypoints.add() + wp.name = waypoint.Waypoint.Name + wp.altitude = int(round(waypoint.Altitude)) + wp.indicatedAirspeed = int(round(waypoint.IndicatedAirspeed)) + wp.groundSpeed = int(round(waypoint.GroundSpeed)) - pta = str(waypoint.PTA) - delimiter = pta.find('.') - if -1 == delimiter: - delimiter = pta.find('+') + pta = str(waypoint.PTA) + delimiter = pta.find('.') + if -1 == delimiter: + delimiter = pta.find('+') - wp.pta = pta[0:delimiter] + wp.pta = pta[0:delimiter] message = sequence.SerializeToString() self.Socket.send(message)