pyBADA 0.1.1__tar.gz → 0.1.2__tar.gz

{pybada-0.1.1 → pybada-0.1.2}/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.3
 Name: pyBADA
-Version: 0.1.1
+Version: 0.1.2
 Summary: pyBADA
 Project-URL: Homepage, https://github.com/eurocontrol/pybada
 Author-email: Henrich Glaser-Opitz <henrich.glaser-opitz@eurocontrol.int>
 License: EUPL-1.2
-License-File: AUTHORS
-License-File: LICENCE.txt
 Classifier: License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
@@ -44,11 +42,11 @@ pip install pyBADA
 ## Examples
 
 -   `file_parser`: BADA file parser and retrieval of some basic BADA parameters for all BADA3/4/H
--   `BADAData`: loading complete BADA3 dataset and retrievel of a specific parameters for a specific aircraft
+-   `BADAData`: loading complete BADA3 dataset and retrieval of a specific parameters for a specific aircraft
 -   `optimum_speed_altitude`: calculation of optimum speeds and altitude for BADA4 and BADAH aircraft
--   `ac_trajectory`: simple, but complete aircraft trajectory for BADA3 and BADA4 aircraft
--   `ac_trajectory_GPS`: simple, but complete aircraft trajectory for BADA3 and BADA4 aircraft including geodesic calculations
--   `heli_trajectory`: simple, but complete helicopter trajectory for BADAH aircraft
+-   `ac_trajectory`: simple, but complete, aircraft trajectory for BADA3 and BADA4 aircraft
+-   `ac_trajectory_GPS`: simple, but complete, aircraft trajectory for BADA3 and BADA4 aircraft including geodesic calculations
+-   `heli_trajectory`: simple, but complete, helicopter trajectory for BADAH aircraft
 
 ## Development
 

{pybada-0.1.1 → pybada-0.1.2}/README.md

@@ -16,11 +16,11 @@ pip install pyBADA
 ## Examples
 
 -   `file_parser`: BADA file parser and retrieval of some basic BADA parameters for all BADA3/4/H
--   `BADAData`: loading complete BADA3 dataset and retrievel of a specific parameters for a specific aircraft
+-   `BADAData`: loading complete BADA3 dataset and retrieval of a specific parameters for a specific aircraft
 -   `optimum_speed_altitude`: calculation of optimum speeds and altitude for BADA4 and BADAH aircraft
--   `ac_trajectory`: simple, but complete aircraft trajectory for BADA3 and BADA4 aircraft
--   `ac_trajectory_GPS`: simple, but complete aircraft trajectory for BADA3 and BADA4 aircraft including geodesic calculations
--   `heli_trajectory`: simple, but complete helicopter trajectory for BADAH aircraft
+-   `ac_trajectory`: simple, but complete, aircraft trajectory for BADA3 and BADA4 aircraft
+-   `ac_trajectory_GPS`: simple, but complete, aircraft trajectory for BADA3 and BADA4 aircraft including geodesic calculations
+-   `heli_trajectory`: simple, but complete, helicopter trajectory for BADAH aircraft
 
 ## Development
 

{pybada-0.1.1 → pybada-0.1.2}/docs/source/conf.py

@@ -46,3 +46,5 @@ modindex_common_prefix = ["pyBADA."]
 
 html_theme = "sphinx_rtd_theme"
 html_static_path = ["_static"]
+
+copyright = "2024, EUROCONTROL"

{pybada-0.1.1 → pybada-0.1.2}/examples/BADAData.py

@@ -5,24 +5,23 @@ BADA Data Retrieval
 Example of BADA parametes retrieval for specific aircraft
 """
 
-from pyBADA.bada3 import Bada3Aircraft
 from pyBADA.bada3 import Parser as Bada3Parser
+from pyBADA.aircraft import Bada
 
-badaVersion = "DUMMY"
 
 # loading all the BADA data into a dataframe
-allData = Bada3Parser.parseAll(badaVersion=badaVersion)
+allData = Bada3Parser.parseAll(badaVersion="DUMMY")
 
 # retrieve specific data from the whole database, including synonyms
-params = Bada3Parser.getBADAParameters(
+params = Bada.getBADAParameters(
     df=allData,
-    acName=["B737", "A1", "P38", "AT45", "DA42"],
+    acName=["A1", "P38", "AT45", "DA42", "B789", "J2H"],
     parameters=["VMO", "MMO", "MTOW", "engineType"],
 )
 print(params)
 print("\n")
 
-params = Bada3Parser.getBADAParameters(
+params = Bada.getBADAParameters(
     df=allData,
     acName=["B737"],
     parameters=["VMO", "MMO", "MTOW", "engineType"],
@@ -30,14 +29,12 @@ params = Bada3Parser.getBADAParameters(
 print(params)
 print("\n")
 
-params = Bada3Parser.getBADAParameters(
+params = Bada.getBADAParameters(
     df=allData, acName="DA42", parameters=["VMO", "MMO", "MTOW", "engineType"]
 )
 print(params)
 print("\n")
 
-params = Bada3Parser.getBADAParameters(
-    df=allData, acName="DA42", parameters="VMO"
-)
+params = Bada.getBADAParameters(df=allData, acName="DA42", parameters="VMO")
 print(params)
 print("\n")

{pybada-0.1.1 → pybada-0.1.2}/examples/file_parser.py

@@ -8,23 +8,30 @@ Example of BADA3, BADA4 and BADAH file parser
 from pyBADA.bada3 import Bada3Aircraft
 from pyBADA.bada4 import Bada4Aircraft
 from pyBADA.badaH import BadaHAircraft
-from pyBADA.bada3 import Parser as Bada3Parser
-from pyBADA.bada4 import Parser as Bada4Parser
-from pyBADA.badaH import Parser as BadaHParser
 
+# initialization of BADAH
+AC = BadaHAircraft(badaVersion="DUMMY", acName="DUMH")
 
-# initialization of BADA3, BADA4 and BADAH
-# uncomment for testing different BADA family if available
 # BADAH
-badaVersion = "DUMMY"
-AC = BadaHAircraft(badaVersion=badaVersion, acName="DUMH")
-
-# BADA4
-# AC = Bada4Aircraft(badaVersion=badaVersion, acName='Dummy-TBP')
-
-# BADA3
-# AC = Bada3Aircraft(badaVersion=badaVersion, acName='BZJT')
+if AC.BADAFamily.BADAH:
+    ICAO = AC.ICAO
+    WTC = AC.WTC
+    MTOW = AC.MTOW
+    print(
+        "BADA Family:",
+        AC.BADAFamilyName,
+        "| BADA Version:",
+        AC.BADAVersion,
+        "| ICAO:",
+        ICAO,
+        "| WTC:",
+        WTC,
+        "| MTOW =",
+        MTOW,
+    )
 
+# initialization of BADA4
+AC = Bada4Aircraft(badaVersion="DUMMY", acName="Dummy-TBP")
 
 # BADA3 or BADA4
 if AC.BADAFamily.BADA3 or AC.BADAFamily.BADA4:
@@ -50,10 +57,15 @@ if AC.BADAFamily.BADA3 or AC.BADAFamily.BADA4:
         MTOW,
     )
 
-# BADAH
-if AC.BADAFamily.BADAH:
+# initialization of BADA3
+AC = Bada3Aircraft(badaVersion="DUMMY", acName="BZJT")
+
+# BADA3 or BADA4
+if AC.BADAFamily.BADA3 or AC.BADAFamily.BADA4:
     ICAO = AC.ICAO
     WTC = AC.WTC
+    VMO = AC.VMO
+    MMO = AC.MMO
     MTOW = AC.MTOW
     print(
         "BADA Family:",
@@ -62,8 +74,12 @@ if AC.BADAFamily.BADAH:
         AC.BADAVersion,
         "| ICAO:",
         ICAO,
-        " |WTC:",
+        "| WTC:",
         WTC,
+        "| VMO =",
+        VMO,
+        "| MMO =",
+        MMO,
         "| MTOW =",
         MTOW,
     )

{pybada-0.1.1 → pybada-0.1.2}/examples/optimum_speed_altitude.py

@@ -13,11 +13,11 @@ from pyBADA.badaH import BadaHAircraft
 from pyBADA.bada4 import Parser as Bada4Parser
 from pyBADA.badaH import Parser as BadaHParser
 
-# initialization of BADA3, BADA4 and BADAH
-# uncomment for testing different BADA family if available
 badaVersion = "DUMMY"
-AC = BadaHAircraft(badaVersion=badaVersion, acName="DUMH")
-# AC = Bada4Aircraft(badaVersion=badaVersion, acName='DUMMY-TWIN')
+
+# initialization of BADA4
+AC = Bada4Aircraft(badaVersion=badaVersion, acName="Dummy-TWIN")
+print("BADA4 Optimum Speed and Altitude:")
 
 # BADA4
 if AC.BADAFamily.BADA4:
@@ -77,6 +77,9 @@ if AC.BADAFamily.BADA4:
     optAlt_precomputed = AC.OPT.getOPTParam("OPTALT", M, mass)
     print("optAlt_precomputed = ", optAlt_precomputed)
 
+# initialization of BADAH
+AC = BadaHAircraft(badaVersion=badaVersion, acName="DUMH")
+print("\nBADAH Optimum Speed and Altitude:")
 
 # BADAH
 if AC.BADAFamily.BADAH:

{pybada-0.1.1 → pybada-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyBADA"
-version = "0.1.1"
+version = "0.1.2"
 authors = [
   { name="Henrich Glaser-Opitz", email="henrich.glaser-opitz@eurocontrol.int" }
 ]
@@ -64,4 +64,4 @@ packages = ["src/pyBADA"]
 "src/aircraft/BADA3/DUMMY" = "pyBADA/aircraft/BADA3/DUMMY"
 "src/aircraft/BADA4/DUMMY" = "pyBADA/aircraft/BADA4/DUMMY"
 "src/aircraft/BADAH/DUMMY" = "pyBADA/aircraft/BADAH/DUMMY"
-"src/data" = "pyBADA/data"
+"src/data" = "pyBADA/data"