pyBADA 0.1.4__tar.gz → 0.1.6__tar.gz

pybada-0.1.6/.gitignore

@@ -0,0 +1,8 @@
+.idea
+__pycache__
+dist/
+docs/build
+env/
+
+docs/source/auto_examples/
+docs/source/sg_execution_times.rst

pybada-0.1.6/AMENDMENT_TO_EUPL_license.md

@@ -0,0 +1,26 @@
+## 1. Definitions
+
+**The Licensor**: The natural or legal person that distributes or communicates the Work under the Licence $\color{red}{\text{(“EUROCONTROL”, the European Organisation for the Safety of Air Navigation)}}$.
+
+## 5. Obligations of the Licensee
+
+**Legal Protection**: This Licence does not grant permission to use the $\color{red}{\text{official emblems}}$, trade names, trademarks, service marks, or names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the copyright notice.
+
+## 9. Additional agreements
+
+###  $\color{red}{\text{9a. Processing of personal data}}$
+
+$\color{red}{\text{Licensee processes the personal data it receives from Licensor under this Agreement for the sole purpose of making use of the Work under}}$ $\color{red}{\text{the terms of the License. EUROCONTROL processes the personal data in accordance with the EUROCONTROL Regulation on Personal Data}}$ $\color{red}{\text{Protection.}}$
+
+$\color{red}{\text{Licensor processes the personal data it receives from the Licensee under the Licence for the sole purpose of distributing or communicates the }}$ $\color{red}{\text{Work under the Licence. Licensee processes the personal data in accordance with the data protection laws applicable to Licensee.}}$
+
+$\color{red}{\text{To protect the personal data, the Licensee and Licensor shall implement appropriate organisational, technical and physical measures}}$ $\color{red}{\text{ which shall be kept up to date in accordance with generally accepted standards.}}$
+
+## 14. Jurisdiction
+Without prejudice to specific agreement between parties, any litigation arising between other parties and resulting from the interpretation of this License, will be subject to the exclusive jurisdiction of the competent courts of $\color{red}{\text{Belgium}}$.
+
+## 15. Applicable Law
+Without prejudice to specific agreement between parties, this Licence shall be governed by the law of $\color{red}{\text{Belgium}}$.
+
+## Appendix
+The $\color{red}{\text{Licencor}}$ may update this Appendix to later versions of the above licences without producing a new version of the EUPL, as long as they provide the rights granted in Article 2 of this Licence and protect the covered Source Code from exclusive appropriation.

{pybada-0.1.4 → pybada-0.1.6}/PKG-INFO

@@ -1,26 +1,27 @@
 Metadata-Version: 2.4
 Name: pyBADA
-Version: 0.1.4
-Summary: pyBADA
+Version: 0.1.6
+Summary: Aircraft performance modelling, trajectory prediction and optimisation, and visualisation with EUROCONTROL's BADA.
 Project-URL: Homepage, https://github.com/eurocontrol-bada/pybada
-Author-email: Henrich Glaser-Opitz <henrich.glaser-opitz@eurocontrol.int>
+Author-email: Henrich Glaser-Opitz <henrich.glaser-opitz@eurocontrol.int>, Antonio Vivace <antonio.vivace@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.12
-Requires-Dist: numpy>=2.2.3
-Requires-Dist: pandas>=2.2.3
-Requires-Dist: scipy>=1.15.2
+Requires-Dist: numpy>=2.3.2
+Requires-Dist: pandas>=2.3.1
+Requires-Dist: scipy>=1.16.1
 Requires-Dist: simplekml>=1.3.6
-Requires-Dist: xlsxwriter>=3.2.2
+Requires-Dist: xarray>=2025.7.1
+Requires-Dist: xlsxwriter>=3.2.5
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'
-Requires-Dist: folium==0.19.5; extra == 'dev'
-Requires-Dist: matplotlib==3.10.1; extra == 'dev'
-Requires-Dist: pre-commit==4.1.0; extra == 'dev'
-Requires-Dist: pytest==8.3.5; extra == 'dev'
+Requires-Dist: folium==0.20.0; extra == 'dev'
+Requires-Dist: matplotlib==3.10.5; extra == 'dev'
+Requires-Dist: pre-commit==4.2.0; extra == 'dev'
+Requires-Dist: pytest==8.4.1; extra == 'dev'
 Requires-Dist: readthedocs-sphinx-search>=0.3.2; extra == 'dev'
 Requires-Dist: ruff==0.11.5; extra == 'dev'
 Requires-Dist: sphinx-gallery==0.19.0; extra == 'dev'
@@ -33,10 +34,10 @@ Description-Content-Type: text/markdown
 
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 <a href="https://github.com/eurocontrol-bada/pybada/blob/main/LICENCE.txt"><img alt="License: EUPL" src="https://img.shields.io/badge/license-EUPL-3785D1.svg"></a>
-<a href="https://pypi.org/project/pyBADA"><img alt="Released on PyPi" src="https://img.shields.io/pypi/v/pyBADA.svg"></a>
-![Python 3.12](https://img.shields.io/badge/Python-3.12-3776AB.svg?logo=python&logoColor=white)
+<a href="https://pypi.org/project/pyBADA"><img alt="Released on PyPi" src="https://img.shields.io/pypi/v/pyBADA.svg"></a> <img alt="PyPI - Downloads" src="https://img.shields.io/pypi/dw/pybada"> ![Python 3.12](https://img.shields.io/badge/Python-3.12-3776AB.svg?logo=python&logoColor=white)
 <a href="https://github.com/eurocontrol-bada/pybada"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
 [![Run unit tests](https://github.com/eurocontrol-bada/pybada/actions/workflows/pytest.yml/badge.svg)](https://github.com/eurocontrol-bada/pybada/actions/workflows/pytest.yml)
+![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/pyBADA_dev?style=social&label=Follow%20%40pyBADA_dev)
 
 This package provides aircraft performance modelling, trajectory prediction and optimisation, and visualisation with [BADA](https://www.eurocontrol.int/model/bada) in Python.
 
@@ -89,4 +90,5 @@ You won't receive support for it, but you can pass the flag `--ignore-requires-p
 
 BADA and pyBADA are developed and maintained by [EUROCONTROL](https://www.eurocontrol.int/model/bada).
 
-This project is released under the European Union Public License v1.2 - see the [LICENSE](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12) file for details.
+This project is released under the European Union Public License v1.2 - see the [LICENCE](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12) file for details.
+See the [Amendment to the EUPL](./AMENDMENT_TO_EUPL_license.md) for additional terms.

{pybada-0.1.4 → pybada-0.1.6}/README.md

@@ -2,10 +2,10 @@
 
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 <a href="https://github.com/eurocontrol-bada/pybada/blob/main/LICENCE.txt"><img alt="License: EUPL" src="https://img.shields.io/badge/license-EUPL-3785D1.svg"></a>
-<a href="https://pypi.org/project/pyBADA"><img alt="Released on PyPi" src="https://img.shields.io/pypi/v/pyBADA.svg"></a>
-![Python 3.12](https://img.shields.io/badge/Python-3.12-3776AB.svg?logo=python&logoColor=white)
+<a href="https://pypi.org/project/pyBADA"><img alt="Released on PyPi" src="https://img.shields.io/pypi/v/pyBADA.svg"></a> <img alt="PyPI - Downloads" src="https://img.shields.io/pypi/dw/pybada"> ![Python 3.12](https://img.shields.io/badge/Python-3.12-3776AB.svg?logo=python&logoColor=white)
 <a href="https://github.com/eurocontrol-bada/pybada"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
 [![Run unit tests](https://github.com/eurocontrol-bada/pybada/actions/workflows/pytest.yml/badge.svg)](https://github.com/eurocontrol-bada/pybada/actions/workflows/pytest.yml)
+![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/pyBADA_dev?style=social&label=Follow%20%40pyBADA_dev)
 
 This package provides aircraft performance modelling, trajectory prediction and optimisation, and visualisation with [BADA](https://www.eurocontrol.int/model/bada) in Python.
 
@@ -58,4 +58,5 @@ You won't receive support for it, but you can pass the flag `--ignore-requires-p
 
 BADA and pyBADA are developed and maintained by [EUROCONTROL](https://www.eurocontrol.int/model/bada).
 
-This project is released under the European Union Public License v1.2 - see the [LICENSE](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12) file for details.
+This project is released under the European Union Public License v1.2 - see the [LICENCE](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12) file for details.
+See the [Amendment to the EUPL](./AMENDMENT_TO_EUPL_license.md) for additional terms.

{pybada-0.1.4 → pybada-0.1.6}/examples/BADAData.py

@@ -5,9 +5,8 @@ BADA Data Retrieval
 Example of BADA parametes retrieval for specific aircraft
 """
 
-from pyBADA.bada3 import Parser as Bada3Parser
 from pyBADA.aircraft import Bada
-
+from pyBADA.bada3 import Parser as Bada3Parser
 
 # loading all the BADA data into a dataframe
 allData = Bada3Parser.parseAll(badaVersion="DUMMY")

pybada-0.1.6/examples/combinedSlopeAndDestination.py

@@ -0,0 +1,56 @@
+"""
+Required Slope & Destination Point Applying Slope For Distance and Bearing
+==========================================================================
+1. Computes the required climb/descent slope and horizontal distance between two WGS84 waypoints.
+2. Computes the destination waypoint (lat, lon, alt) from an initial waypoint, given a slope,
+   horizontal distance and bearing.
+Uses three different geodesic algorithms: Vincenty, Haversine, and Rhumb-Line.
+"""
+
+from pyBADA import conversions as conv
+from pyBADA import geodesic as geo
+
+# ——— Inputs for required–slope example ———
+waypoint1 = {
+    'latitude': 52.2367946579192,
+    'longitude': 20.7129809016565,
+    'altitude': 3500.0       # ft
+}
+waypoint2 = {
+    'latitude': 52.1697191213371,
+    'longitude': 20.9519554471793,
+    'altitude': 412.0        # ft
+}
+
+# ——— Inputs for destination–point example ———
+initial_waypoint = waypoint1.copy()
+slope_deg       = 3.5        # degrees (positive = climb)
+distance_nm     = 12.0       # nautical miles
+bearing_deg     = 75.0       # degrees from true north
+
+# ——— Run both examples for each algorithm ———
+for algo_name, Algo in [
+    ("Vincenty",  geo.Vincenty),
+    ("Haversine", geo.Haversine),
+    ("RhumbLine", geo.RhumbLine),
+]:
+    print(f"\n=== {algo_name} ===")
+
+    # 1) Required slope & horizontal distance
+    slope_req_deg, dist_m = Algo.requiredSlope(waypoint1, waypoint2)
+    dist_nm = conv.m2nm(dist_m)
+    print("Required slope from waypoint1 → waypoint2:")
+    print(f"  Slope               = {slope_req_deg:.8f}°")
+    print(f"  Horizontal distance = {dist_nm:.8f} NM")
+
+    # 2) Destination point given a slope, distance & bearing
+    dest_wp = Algo.destinationPointApplyingSlopeForDistance(
+        initial_waypoint,
+        slope_deg,
+        distance_nm,
+        bearing_deg
+    )
+    print("Destination waypoint applying slope & distance:")
+    print(f"  Latitude  = {dest_wp['latitude']:.6f}°")
+    print(f"  Longitude = {dest_wp['longitude']:.6f}°")
+    print(f"  Altitude  = {dest_wp['altitude']:.2f} ft")

pybada-0.1.4/examples/geodesic.py → pybada-0.1.6/examples/geodesicCalculations.py

@@ -11,7 +11,6 @@ import folium
 
 from pyBADA import geodesic as geo
 
-
 # input parameters
 LAT_init = 48.596289
 LON_init = 2.351640

pybada-0.1.6/examples/initialMass.py

@@ -0,0 +1,70 @@
+"""
+Initial Mass Calculation
+========================
+
+Example calculation of aircraft initial mass
+
+"""
+
+from pyBADA import atmosphere as atm
+from pyBADA import conversions as conv
+from pyBADA import trajectoryPrediction as TP
+from pyBADA.bada3 import Bada3Aircraft
+from pyBADA.bada4 import Bada4Aircraft
+from pyBADA.badaH import BadaHAircraft
+
+# calculate estimations for the fuel flow, and aircraft initial mass
+AC = Bada3Aircraft(badaVersion="DUMMY", acName="J2M")
+
+# Common inputs
+DeltaTemp           = 0                 # deviation from ISA temperature [K]
+M                   = 0.7               # Mach number [-]
+altitude            = conv.ft2m(30000)  # cruise altitude [m]
+distance            = conv.nm2m(100)    # flown distance [m]
+payload             = 80                # payload mass [% of max payload]
+fuelReserve         = 3600              # fuel reserve [s]
+flightPlanInitMass  = None              # planned takeoff mass [kg]
+
+# Precompute atmosphere & speed inputs
+theta, delta, sigma = atm.atmosphereProperties(h=altitude, DeltaTemp=DeltaTemp)
+TAS                  = atm.mach2Tas(Mach=M, theta=theta)
+GS                   = TAS  # assume no wind
+
+# Specify acName per model
+for model_name, ACClass, acName in [
+    ("BADA3", Bada3Aircraft,        "J2M"),
+    ("BADA4", Bada4Aircraft, "Dummy-TWIN-plus"),
+    ("BADAH", BadaHAircraft, "DUMH"),
+]:
+    print(f"\n=== {model_name} ===")
+    AC = ACClass(badaVersion="DUMMY", acName=acName)
+
+    # 1) Cruise fuel flow [kg/s]
+    cruiseFuelFlow = TP.cruiseFuelConsumption(
+        AC=AC, altitude=altitude, M=M, DeltaTemp=DeltaTemp
+    )
+    print(f"cruiseFuelFlow:          {cruiseFuelFlow:.6f} kg/s")
+
+    # 2) Distance based initial mass via Breguet–Leduc
+    breguetInitialMass = TP.breguetLeducInitialMass(
+        AC=AC,
+        distance=distance,
+        GS=GS,
+        cruiseFuelFlow=cruiseFuelFlow,
+        payload=payload,
+        fuelReserve=fuelReserve,
+    )
+    print(f"breguetLeducInitialMass: {breguetInitialMass:.2f} kg")
+
+    # 3) Initial mass using limited by flight envelope (OEW, MTOW)
+    initMass = TP.getInitialMass(
+        AC=AC,
+        distance=distance,
+        altitude=altitude,
+        M=M,
+        payload=payload,
+        fuelReserve=fuelReserve,
+        flightPlanInitialMass=flightPlanInitMass,
+        DeltaTemp=DeltaTemp,
+    )
+    print(f"initMass(limited):       {initMass:.2f} kg")

pybada-0.1.4/examples/optimum_speed_altitude.py → pybada-0.1.6/examples/optimumSpeedAndAltitude.py

@@ -7,7 +7,6 @@ Example of BADA4 and BADAH optimum speed and altitude calculation
 
 from pyBADA import atmosphere as atm
 from pyBADA import conversions as conv
-
 from pyBADA.bada4 import Bada4Aircraft
 from pyBADA.badaH import BadaHAircraft
 

pybada-0.1.4/examples/heli_trajectory.py → pybada-0.1.6/examples/trajectoryHELI.py

@@ -5,16 +5,16 @@ Helicopter Trajectory Calculation
 Example of BADAH trajectory using TCL
 """
 
-from math import tan, pi
 from dataclasses import dataclass
+from math import pi, tan
+
 import matplotlib.pyplot as plt
 
-from pyBADA import constants as const
 from pyBADA import TCL as TCL
-from pyBADA.flightTrajectory import FlightTrajectory as FT
-
-from pyBADA.badaH import Parser as BadaHParser
+from pyBADA import constants as const
 from pyBADA.badaH import BadaHAircraft
+from pyBADA.badaH import Parser as BadaHParser
+from pyBADA.flightTrajectory import FlightTrajectory as FT
 
 
 @dataclass

{pybada-0.1.4 → pybada-0.1.6}/pyproject.toml

@@ -4,11 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyBADA"
-version = "0.1.4"
+version = "0.1.6"
 authors = [
-  { name="Henrich Glaser-Opitz", email="henrich.glaser-opitz@eurocontrol.int" }
+  { name="Henrich Glaser-Opitz", email="henrich.glaser-opitz@eurocontrol.int" },
+  { name="Antonio Vivace", email="antonio.vivace@eurocontrol.int" }
 ]
-description = "pyBADA"
+description = "Aircraft performance modelling, trajectory prediction and optimisation, and visualisation with EUROCONTROL's BADA."
 readme = "README.md"
 requires-python = ">=3.12"
 classifiers = [
@@ -16,11 +17,12 @@ classifiers = [
     "License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)"
 ]
 dependencies = [
-  "scipy>=1.15.2",
-  "numpy>=2.2.3",
-  "pandas>=2.2.3",
+  "scipy>=1.16.1",
+  "numpy>=2.3.2",
+  "pandas>=2.3.1",
   "simplekml>=1.3.6",
-  "XlsxWriter>=3.2.2"
+  "XlsxWriter>=3.2.5",
+  "xarray >=2025.7.1"
 ]
 license = { text = "EUPL-1.2" }
 
@@ -30,11 +32,11 @@ license = { text = "EUPL-1.2" }
 dev = [
   "sphinx-rtd-theme==3.0.2",
   "Sphinx==8.2.3",
-  "pre-commit==4.1.0",
+  "pre-commit==4.2.0",
   "sphinx-gallery==0.19.0",
-  "matplotlib==3.10.1",
-  "folium==0.19.5",
-  "pytest==8.3.5",
+  "matplotlib==3.10.5",
+  "folium==0.20.0",
+  "pytest==8.4.1",
   "build",
   "twine",
   "readthedocs-sphinx-search>=0.3.2",
@@ -63,7 +65,8 @@ exclude = [
 ]
 
 [tool.ruff.lint]
-select = ["E", "F401"]
+# select = ["E", "F401", "W", "C90", "B", "UP", "SIM", "I"]
+select = ["E", "F401", "W", "I"]
 ignore = ["E501"]
 
 [tool.hatch.build.targets.wheel]

{pybada-0.1.4 → pybada-0.1.6}/src/pyBADA/TCL.py

@@ -1,21 +1,21 @@
 """Trajectory Computation Light (TCL) for BADAH/BADAE/BADA3/BADA4 aircraft
 performance module."""
 
-import numpy as np
-from pyBADA.geodesic import Vincenty as vincenty
-from pyBADA.geodesic import RhumbLine as rhumb
-from pyBADA.geodesic import Turn as turn
-
-from dataclasses import dataclass
 import itertools
 import warnings
+from dataclasses import dataclass
+from math import asin, atan, cos, degrees, radians, sin, tan
 
-from math import atan, asin, sin, tan, cos, radians, degrees
+import numpy as np
 
+from pyBADA import utils
 from pyBADA import atmosphere as atm
-from pyBADA import conversions as conv
 from pyBADA import constants as const
+from pyBADA import conversions as conv
 from pyBADA.flightTrajectory import FlightTrajectory as FT
+from pyBADA.geodesic import RhumbLine as rhumb
+from pyBADA.geodesic import Turn as turn
+from pyBADA.geodesic import Vincenty as vincenty
 
 
 @dataclass
@@ -26,13 +26,6 @@ class target:
     ESFtarget: float = None
 
 
-def checkArgument(argument, **kwargs):
-    if kwargs.get(argument) is not None:
-        return kwargs.get(argument)
-    else:
-        raise TypeError("Missing " + argument + " argument")
-
-
 def constantSpeedLevel(
     AC,
     lengthType,
@@ -7506,7 +7499,7 @@ def accDec(
         else:
             maxRating = "MCMB"
     else:
-        maxRating = checkArgument("maxRating", **kwargs)
+        maxRating = utils.checkArgument("maxRating", **kwargs)
 
     # Determine engine rating
     if (
@@ -8779,7 +8772,7 @@ def accDec_time(
         else:
             maxRating = "MCMB"
     else:
-        maxRating = checkArgument("maxRating", **kwargs)
+        maxRating = utils.checkArgument("maxRating", **kwargs)
 
     # Determine engine rating
     if (

{pybada-0.1.4 → pybada-0.1.6}/src/pyBADA/aircraft.py

@@ -1,10 +1,10 @@
 """Generic airplane/helicopter performance module."""
 
-from math import sqrt, pow, cos, radians, atan, tan, degrees
+from math import atan, cos, degrees, pow, radians, sqrt, tan
 
+from pyBADA import atmosphere as atm
 from pyBADA import constants as const
 from pyBADA import conversions as conv
-from pyBADA import atmosphere as atm
 
 
 def checkArgument(argument, **kwargs):