Changes in src/mlx/acft.py [917:803dc6bacfa5:905:04fa2396fbdb]

File:

• src/mlx/acft.py (modified) (6 diffs)

src/mlx/acft.py

@@ -97 +97 @@
 class Aircraft(object):
     """Base class for aircraft."""
-    dowCockpit = 2
-    dowCabin = 3
-
     @staticmethod
     def create(flight, bookedFlight):
@@ -128 +125 @@
         self._landingAntiIceLineID = None
 
-        self.cockpitCrewWeight = 85.0
-        self.cabinCrewWeight = 75.0
-        self.humanWeight = 84.0
+        self.humanWeight = 82.0
 
         self.initialClimbSpeedAltitude = 1500
@@ -834 +829 @@
 class B734(Boeing737CL):
     """Boeing 737-400 aircraft."""
-    dow = 35100
-
     def __init__(self, flight):
         super(B734, self).__init__(flight)
+        self.dow = 35100
         self.mtow = 62822
         self.mlw = 54885
@@ -1249 +1243 @@
         """Get the derate type for this type."""
         return DERATE_B462
-
-#---------------------------------------------------------------------------------------
-
-class IL62(Aircraft):
-    """Ilyushin IL-62 aircraft.
-
-    The aircraft type-specific values in the aircraft state have the following
-    structure:
-    - fuel: left, centre, right
-    - n1: left outer, left inner, right inner, right outer
-    - reverser: empty (the plane has no reversers)"""
-    dow = 69500
-
-    def __init__(self, flight):
-        super(B462, self).__init__(flight)
-        self.mtow = 165000
-        self.mlw = 165000
-        self.mzfw = 165000
-        self.gearSpeedLimit = 210
-        self.flapSpeedLimits = { 18 : 217,
-                                 24 : 180,
-                                 30 : 170,
-                                 33 : 150 }
-
-    @property
-    def derateType(self):
-        """Get the derate type for this type."""
-        return DERATE_NONE
 
 #---------------------------------------------------------------------------------------
@@ -1305 +1271 @@
              const.AIRCRAFT_T154  : T154,
              const.AIRCRAFT_YK40  : YK40,
-             const.AIRCRAFT_B462  : B462,
-             const.AIRCRAFT_IL62  : IL62 }
+             const.AIRCRAFT_B462  : B462 }
 
 #---------------------------------------------------------------------------------------
@@ -1316 +1281 @@
 #---------------------------------------------------------------------------------------
 
-def setupTypes(aircraftTypes):
-    """Setup the values in the given types using the info retrieved
-    from the server."""
-    for aircraftTypeInfo in aircraftTypes:
-        clazz = getClass(aircraftTypeInfo.aircraftType)
-
-        clazz.dow = aircraftTypeInfo.dow
-        clazz.dowCockpit = aircraftTypeInfo.dowCockpit
-        clazz.dowCabin = aircraftTypeInfo.dowCabin
-
-#---------------------------------------------------------------------------------------
-
 if __name__ == "__main__":
     value = SmoothedValue()