Fix wind direction

Hoff97 · Sep 27, 2024 · 984bed1 · 984bed1
1 parent 77df8b0
commit 984bed1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/backend-rust/src/bin/main.rs b/backend-rust/src/bin/main.rs
@@ -1,7 +1,7 @@
 use core::f32;
 use std::{
     cmp::{max, min},
-    fs,
+    f32::consts::PI,
     hash::{Hash, Hasher},
     io::Cursor,
 };
@@ -17,12 +17,10 @@ use quick_xml::{
     Writer,
 };
 use rocket::{
-    config::TlsConfig,
     fs::FileServer,
     http::ContentType,
     response::Redirect,
     serde::{json::Json, Serialize},
-    Config,
 };
 
 use ndarray::{s, Array2};
@@ -52,7 +50,7 @@ const WIND_SPEED_MAXIMUM: f32 = 50.0;
 const WIND_DIRECTION_DEFAULT: f32 = 0.0;
 const TRIM_SPEED_DEFAULT: f32 = 38.0;
 const TRIM_SPEED_MINIMUM: f32 = 0.0;
-const TRIM_SPEED_MAXIMUM: f32 = 50.0;
+const TRIM_SPEED_MAXIMUM: f32 = 80.0;
 const SAFETY_MARGIN_DEFAULT: f32 = 0.0;
 const SAFETY_MARGIN_MINIMUM: f32 = 0.0;
 const START_DISTANCE_DEFAULT: f32 = 0.0;
@@ -183,7 +181,7 @@ pub fn search_from_request(
         SearchQueryHashable {
             additional_height: Distance(additional_height),
             wind_speed: Distance(wind_speed),
-            wind_direction: Distance(wind_direction),
+            wind_direction: Distance(wind_direction / 180.0 * PI),
             glide_ratio: Distance(1.0 / glide_number),
             trim_speed: Distance(trim_speed),
             safety_margin: Distance(safety_margin),

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -473,12 +473,12 @@ function SettingsCard({ settings, setSettings, setImageState, setGrid, grid, pat
                         labelStepSize={90} stepSize={15}></Slider>
                     Trim speed (km/h):
                     <Slider
-                        initialValue={25}
-                        min={25}
-                        max={45}
+                        initialValue={20}
+                        min={20}
+                        max={80}
                         onChange={setTrimSpeed}
                         value={settings.trimSpeed}
-                        labelStepSize={5}
+                        labelStepSize={10}
                         stepSize={1}
                     ></Slider>
                     <Divider />

diff --git a/run.sh b/run.sh
@@ -0,0 +1,5 @@
+docker buildx build --progress=plain -t hoff97/hikeandfly:latest ./
+docker run -p 8080:8080 hoff97/hikeandfly:latest
+
+
+docker buildx build --progress=plain -t hoff97/hikeandfly_slow:latest -f Dockerfile_python_backend ./