Changeset 1034:4836f52b49cd for src/mlx/pirep.py

Timestamp:

03/14/22 09:58:58 (2 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Updated the flight type handling (re #357)

File:

• src/mlx/pirep.py (modified) (5 diffs)

src/mlx/pirep.py

@@ -42 +42 @@
 
     _flightTypes = { const.FLIGHTTYPE_SCHEDULED : "SCHEDULED",
-                     const.FLIGHTTYPE_OLDTIMER : "OT",
                      const.FLIGHTTYPE_VIP : "VIP",
-                     const.FLIGHTTYPE_CHARTER : "CHARTER" }
+                     const.FLIGHTTYPE_CHARTER : "CHARTER",
+                     const.FLIGHTTYPE_OLDTIMER : "OT" }
 
     @staticmethod
@@ -167 +167 @@
         self.arrivalRunway = flight.arrivalRunway.upper()
 
-        self.flightType = flight.flightType
         self.online = flight.online
 
@@ -237 +236 @@
         self.arrivalRunway = pirepData["arrivalRunway"]
 
-        self.flightType = PIREP.decodeFlightTypeText(pirepData["flightType"])
         self.online = int(pirepData["online"])!=0
 
@@ -300 +298 @@
     def flightTypeText(self):
         """Get the text representation of the flight type."""
-        return PIREP._flightTypes[self.flightType]
+        return PIREP._flightTypes[self.bookedFlight.flightType]
 
     @property
@@ -399 +397 @@
         attrs["bagWeight"] = self.bagWeight
         attrs["mailWeight"] = self.mailWeight
-        attrs["flightType"] = self.flightTypeText
         attrs["online"] = 1 if self.online else 0
         attrs["blockTimeStart"] = self.blockTimeStartText