Skip to content

Commit 4368487

Browse files
committed
MNT: pulled changes from master
2 parents 42afc99 + b3f1ede commit 4368487

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

src/models/environment.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ class EnvironmentModel(ApiBaseModel):
99
latitude: float
1010
longitude: float
1111
elevation: Optional[float] = 0.0
12+
pressure: Optional[float | list[tuple[float, float]]] = None
13+
temperature: Optional[float | list[tuple[float, float]]] = None
14+
wind_u: Optional[float | list[tuple[float, float]]] = None
15+
wind_v: Optional[float | list[tuple[float, float]]] = None
1216

1317
# Optional parameters
1418
atmospheric_model_type: Literal[

src/services/environment.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ def from_env_model(cls, env: EnvironmentModel) -> Self:
3131
rocketpy_env.set_atmospheric_model(
3232
type=env.atmospheric_model_type,
3333
file=env.atmospheric_model_file,
34+
pressure=env.pressure,
35+
temperature=env.temperature,
36+
wind_u=env.wind_u,
37+
wind_v=env.wind_v,
3438
)
3539
return cls(environment=rocketpy_env)
3640

src/views/environment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class EnvironmentSimulation(ApiBaseView):
3434
initial_east: Optional[float] = None
3535
initial_hemisphere: Optional[str] = None
3636
initial_ew: Optional[str] = None
37-
max_expected_height: Optional[int] = None
37+
max_expected_height: Optional[float] = None
3838
date: Optional[Any] = datetime.today() + timedelta(days=1)
3939
local_date: Optional[Any] = datetime.today() + timedelta(days=1)
4040
datetime_date: Optional[Any] = datetime.today() + timedelta(days=1)

0 commit comments

Comments
 (0)