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

@@ -153,24 +153,13 @@ const Currentdata = (props) => {
               id="condition_text"
               className="checkBoxFilter"
             />
-            <label for="condition_text">Condition Text</label>
+            <label for="condition">Condition Text</label>
             <br />
             <input
               type="checkbox"
-              id="condition_icon"
+              id="condition"
               className="checkBoxFilter"
             />
-            <label for="condition_icon">Condition Icon</label>
-            <br />
-            <input
-              type="checkbox"
-              id="condition_code"
-              className="checkBoxFilter"
-            />
-            <label for="condition_code">Condition Code</label>
-            <input type="checkbox" id="wind" className="checkBoxFilter" />
-            <label for="wind">Wind </label>
-            <br />
             <input
               type="checkbox"
               id="wind_degree"
@@ -338,9 +327,7 @@ const Currentdata = (props) => {
     const last_updated = document.getElementById("last_updated").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;
-    const condition_code = document.getElementById("condition_code").checked;
+    const condition = document.getElementById("condition_text").checked;
     const wind = document.getElementById("wind").checked;
     const wind_degree = document.getElementById("wind_degree").checked;
     const wind_dir = document.getElementById("wind_dir").checked;
@@ -413,14 +400,8 @@ const Currentdata = (props) => {
     if (id_day) {
       filterArray.push("id_day");
     }
-    if (condition_text) {
-      filterArray.push("condition_text");
-    }
-    if (condition_icon) {
-      filterArray.push("condition_icon");
-    }
-    if (condition_code) {
-      filterArray.push("condition_code");
+    if (condition) {
+      filterArray.push("condition");
     }
     if (wind) {
       if (units == "world") {
@@ -485,7 +466,7 @@ const Currentdata = (props) => {
     }
     if (vis) {
       if (units == "world") {
-        filterArray.push("vis_miles");
+        filterArray.push("vis_km");
       } else {
         filterArray.push("vis_miles");
       }
@@ -501,28 +482,28 @@ const Currentdata = (props) => {
       }
     }
     if (air_quality_co) {
-      filterArray.push("air_quality_co");
+      filterArray.push("co");
     }
     if (air_quality_no2) {
-      filterArray.push("air_quality_no2");
+      filterArray.push("no2");
     }
     if (air_quality_o3) {
-      filterArray.push("air_quality_o3");
+      filterArray.push("o3");
     }
     if (air_quality_so2) {
-      filterArray.push("air_quality_so2");
+      filterArray.push("so2");
     }
     if (air_quality_pm2_5) {
-      filterArray.push("air_quality_pm2_5");
+      filterArray.push("pm2_5");
     }
     if (air_quality_pm10) {
-      filterArray.push("air_quality_pm10");
+      filterArray.push("pm10");
     }
     if (air_quality_us_epa_index) {
-      filterArray.push("air_quality_us_epa_index");
+      filterArray.push("us-epa-index");
     }
     if (air_quality_gb_defra_index) {
-      filterArray.push("air_quality_gb_defra_index");
+      filterArray.push("gb-defra-index");
     }
 
     let filterString = filterArray.join(",");