Merge branch 'devbackend' of...

Merge branch 'devbackend' of https://transfer.hft-stuttgart.de/gitlab/22kaen1bdi/swp_ss24_wetterdaten_sammeln into devbackend

frontend/src/components/weather/currentData.js

@@ -277,7 +277,7 @@ const Currentdata = (props) => {
     const last_updated_epoch =
       document.getElementById("last_updated_epoch").checked;
     const last_updated = document.getElementById("last_updated").checked;
-    const temp_c = document.getElementById("temp").checked;
+    const temp = document.getElementById("temp").checked;
     const id_day = document.getElementById("id_day").checked;
     const condition_text = document.getElementById("condition_text").checked;
     const condition_icon = document.getElementById("condition_icon").checked;
@@ -364,9 +364,10 @@ const Currentdata = (props) => {
     }
     if (wind) {
       if (units == world) {
+        filterArray.push("wind_kph");
+      } else {
         filterArray.push("wind_mph");
       }
-      filterArray.push("wind_kph");
     }
     if (wind_degree) {
       filterArray.push("wind_degree");
@@ -377,14 +378,16 @@ const Currentdata = (props) => {
     if (pressure) {
       if (units == world) {
         filterArray.push("temp_mb");
+      } else {
+        filterArray.push("pressure_in");
       }
-      filterArray.push("pressure_in");
     }
     if (precip) {
       if (units == world) {
         filterArray.push("temp_mm");
+      } else {
+        filterArray.push("precip_in");
       }
-      filterArray.push("precip_in");
     }
     if (humidity) {
       filterArray.push("humidity");
@@ -395,32 +398,37 @@ const Currentdata = (props) => {
     if (feelslike) {
       if (units == world) {
         filterArray.push("feelslike_c");
+      } else {
+        filterArray.push("feelslike_f");
       }
-      filterArray.push("feelslike_f");
     }
     if (windchill) {
       if (units == world) {
         filterArray.push("windchill_c");
+      } else {
+        filterArray.push("windchill_f");
       }
-      filterArray.push("windchill_f");
     }
     if (heatindex) {
       if (units == world) {
         filterArray.push("heatindex_c");
+      } else {
+        filterArray.push("heatindex_f");
       }
-      filterArray.push("heatindex_f");
     }
     if (dewpoint) {
       if (units == world) {
         filterArray.push("dewpoint_c");
+      } else {
+        filterArray.push("dewpoint_f");
       }
-      filterArray.push("dewpoint_f");
     }
     if (vis) {
       if (units == world) {
         filterArray.push("vis_miles");
+      } else {
+        filterArray.push("vis_miles");
       }
-      filterArray.push("vis_miles");
     }
     if (uv) {
       filterArray.push("uv");
@@ -428,8 +436,9 @@ const Currentdata = (props) => {
     if (gust) {
       if (units == world) {
         filterArray.push("gust_kph");
+      } else {
+        filterArray.push("gust_mph");
       }
-      filterArray.push("gust_mph");
     }
     if (air_quality_co) {
       filterArray.push("air_quality_co");