diff --git a/src/models/environment.py b/src/models/environment.py index 89315d2..f1e9b5a 100644 --- a/src/models/environment.py +++ b/src/models/environment.py @@ -9,6 +9,10 @@ class EnvironmentModel(ApiBaseModel): latitude: float longitude: float elevation: Optional[float] = 0.0 + pressure: Optional[float | list[tuple[float, float]]] = None + temperature: Optional[float | list[tuple[float, float]]] = None + wind_u: Optional[float | list[tuple[float, float]]] = None + wind_v: Optional[float | list[tuple[float, float]]] = None # Optional parameters atmospheric_model_type: Literal[ diff --git a/src/services/environment.py b/src/services/environment.py index 4f1137c..d0cfa95 100644 --- a/src/services/environment.py +++ b/src/services/environment.py @@ -31,6 +31,10 @@ def from_env_model(cls, env: EnvironmentModel) -> Self: rocketpy_env.set_atmospheric_model( type=env.atmospheric_model_type, file=env.atmospheric_model_file, + pressure=env.pressure, + temperature=env.temperature, + wind_u=env.wind_u, + wind_v=env.wind_v, ) return cls(environment=rocketpy_env) diff --git a/src/views/environment.py b/src/views/environment.py index 4283d52..53322b3 100644 --- a/src/views/environment.py +++ b/src/views/environment.py @@ -22,7 +22,7 @@ class EnvironmentSimulation(ApiBaseView): initial_east: Optional[float] = None initial_hemisphere: Optional[str] = None initial_ew: Optional[str] = None - max_expected_height: Optional[int] = None + max_expected_height: Optional[float] = None date: Optional[datetime] = datetime.today() + timedelta(days=1) local_date: Optional[datetime] = datetime.today() + timedelta(days=1) datetime_date: Optional[datetime] = datetime.today() + timedelta(days=1)