Changeset 1033:330058d37574 for src/mlx/pirep.py

Timestamp:

03/14/22 08:46:34 (2 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Updates for the new crew and passenger handling (re #357)

File:

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

src/mlx/pirep.py

@@ -116 +116 @@
             with open(path, "rb") as f:
                 pirep = pickle.load(f, fix_imports = True, encoding = "bytes")
-                if "numCrew" not in dir(pirep):
-                    pirep.numCrew = pirep.bookedFlight.numCrew
+                if "numCabinCrew" not in dir(pirep):
+                    if "numCrew" not in dir(pirep):
+                        pirep.numCabinCrew = pirep.bookedFlight.numCabinCrew
+                    else:
+                        pirep.numCabinCrew = pirep.bookedFlight.numCrew
                 if "numPassengers" not in dir(pirep):
                     pirep.numPassengers = pirep.bookedFlight.numPassengers
+                if "numChildren" not in dir(pirep):
+                    pirep.numChildren = 0
+                if "numInfants" not in dir(pirep):
+                    pirep.numInfants = 0
                 if "bagWeight" not in dir(pirep):
                     pirep.bagWeight = pirep.bookedFlight.bagWeight
@@ -137 +144 @@
         self.bookedFlight = flight.bookedFlight
 
-        self.numCrew = flight.numCrew
+        self.numCabinCrew = flight.numCabinCrew
         self.numPassengers = flight.numPassengers
+        self.numChildren = flight.numChildren
+        self.numInfants = flight.numInfants
         self.bagWeight = flight.bagWeight
         self.cargoWeight = flight.cargoWeight
@@ -183 +192 @@
         self.bookedFlight = bookedFlight
 
-        self.numCrew = int(pirepData["numCrew"])
+        self.numCabinCrew = int(pirepData["numCabinCrew"])
         self.numPassengers = int(pirepData["numPassengers"])
+        self.numChildren = int(pirepData["numChildren"])
+        self.numInfants = int(pirepData["numInfants"])
         self.bagWeight = int(pirepData["bagWeight"])
         self.cargoWeight = int(pirepData["cargoWeight"])
@@ -382 +393 @@
         attrs["arrivalICAO"] = self.bookedFlight.arrivalICAO
         attrs["numPassengers"] = self.numPassengers
-        attrs["numCrew"] = self.numCrew
+        attrs["numChildren"] = self.numChildren
+        attrs["numInfants"] = self.numInfants
+        attrs["numCabinCrew"] = self.numCabinCrew
         attrs["cargoWeight"] = self.cargoWeight
         attrs["bagWeight"] = self.bagWeight