Merge pull request #193 from Pirate-Weather/rounding

Fix Rounding
Pirate-Weather · Feb 16, 2024 · d8dd522 · d8dd522
2 parents 6b2cbd2 + a292489
commit d8dd522
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,6 +3,9 @@ name: "Lint"
 on:
   push:
   pull_request:
+
+permissions:
+  contents: write
 
 jobs:
   ruff:
@@ -30,4 +33,4 @@ jobs:
         - name: "Auto Commit"
           uses: stefanzweifel/git-auto-commit-action@v5.0.0
           with:
-            commit_message: 'style fixes by ruff'
+            commit_message: 'style fixes by ruff'
diff --git a/custom_components/pirateweather/sensor.py b/custom_components/pirateweather/sensor.py
@@ -943,13 +943,15 @@ def get_state(self, data):
         # If output rounding is requested, round to nearest integer
         if self.outputRound == "Yes":
             roundingVal = 0
+            roundingPrecip = 2
         else:
-            roundingVal = 1
+            roundingVal = 2
+            roundingPrecip = 4
 
         # Some state data needs to be rounded to whole values or converted to
         # percentages
         if self.type in ["precip_probability", "cloud_cover", "humidity"]:
-            state = state * 100
+            state = int(state * 100)
 
         # Logic to convert from SI to requsested units for compatability
         # Temps in F
@@ -963,7 +965,7 @@ def get_state(self, data):
                 "apparent_temperature_high",
                 "apparent_temperature_low",
             ]:
-                state = (state * 9 / 5) + 32
+                state = round(state * 9 / 5) + 32
 
         # Precipitation Accumilation (mm in SI) to inches
         if self.requestUnits in ["us"]:
@@ -1015,17 +1017,25 @@ def get_state(self, data):
             "apparent_temperature_high",
             "temperature_max",
             "apparent_temperature_max",
-            "precip_accumulation",
             "pressure",
             "ozone",
-            "uvIndex",
+            "uv_index",
             "wind_speed",
             "wind_gust",
+            "visibility",
+            "nearest_storm_distance",
         ]:
             if roundingVal == 0:
                 outState = int(round(state, roundingVal))
             else:
-                outState = state
+                outState = round(state, roundingVal)
+
+        elif self.type in [
+            "precip_accumulation",
+            "precip_intensity",
+            "precip_intensity_max",
+        ]:
+            outState = round(state, roundingPrecip)
 
         else:
             outState = state