Added missing localizations, changed configuration defaults, fixed is…

…sues in reconfiguration of integration.
jesmak · Oct 25, 2023 · 06c8250 · 06c8250
1 parent 680e500
commit 06c8250
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -18,9 +18,9 @@ A custom component that integrates with Finnish Meteorological Institute to wate
 | Name           | Type    | Requirement  | Description                                     | Default |
 |----------------|---------| ------------ |-------------------------------------------------|---------|
 | location       | string  | **Required** | Target location from a predefined list          | Föglö   |
-| hours          | int     | **Required** | Number of hours of observations to retrieve     | 48      |
-| forecast_hours | int     | **Required** | Number of hours of forecasts to retrieve        | 48      |
-| step           | int     | **Required** | Time step between two values in minutes         | 15      |
+| hours          | int     | **Required** | Number of hours of observations to retrieve     | 36      |
+| forecast_hours | int     | **Required** | Number of hours of forecasts to retrieve        | 36      |
+| step           | int     | **Required** | Time step between two values in minutes         | 20      |
 | overlap        | int     | **Required** | Overlap of forecast and observations in minutes | 120     |
 
 ### State attributes

diff --git a/config_flow.py b/config_flow.py
@@ -22,9 +22,9 @@
 CONFIGURE_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_LOCATION): vol.All(cv.string, vol.In(FMISID_LOCATIONS)),
-        vol.Required(CONF_HOURS, default=48): cv.positive_int,
-        vol.Required(CONF_FORECAST_HOURS, default=48): cv.positive_int,
-        vol.Required(CONF_STEP, default=15): cv.positive_int,
+        vol.Required(CONF_HOURS, default=36): cv.positive_int,
+        vol.Required(CONF_FORECAST_HOURS, default=36): cv.positive_int,
+        vol.Required(CONF_STEP, default=20): cv.positive_int,
         vol.Required(CONF_OVERLAP, default=120): cv.positive_int,
     }
 )
@@ -50,7 +50,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, any]) -> str:
     except FMIWaterLevelException:
         raise ConnectionProblem
 
-    return fmisid
+    return data[CONF_LOCATION]
 
 
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@@ -93,14 +93,17 @@ async def async_step_init(self, user_input: dict[str, any] = None) -> FlowResult
         if user_input is None:
             return self.async_show_form(step_id="init", data_schema=vol.Schema(
                 {
-                    vol.Required(CONF_LOCATION, default=self._config_entry.data.get(CONF_LOCATION)): cv.positive_int
+                    vol.Required(CONF_OVERLAP, default=self._config_entry.data.get(CONF_OVERLAP)): cv.positive_int,
+                    vol.Required(CONF_STEP, default=self._config_entry.data.get(CONF_STEP)): cv.positive_int,
                 })
             )
 
         errors = {}
 
         try:
             user_input[CONF_LOCATION] = self._config_entry.data[CONF_LOCATION]
+            user_input[CONF_HOURS] = self._config_entry.data[CONF_HOURS]
+            user_input[CONF_FORECAST_HOURS] = self._config_entry.data[CONF_FORECAST_HOURS]
             await validate_input(self.hass, user_input)
         except ConnectionProblem:
             errors["base"] = "connection_problem"

diff --git a/translations/en.json b/translations/en.json
@@ -15,7 +15,8 @@
           "hours": "Hours of observation data to retrieve",
           "forecast_hours": "Hours of forecast data to retrieve",
           "location": "Mareograph location",
-          "step": "Time step between two values in minutes"
+          "step": "Time step between two values in minutes",
+          "overlap": "Overlap between forecast and observations in minutes"
         }
       }
     }
@@ -33,7 +34,8 @@
           "days": "Days to retrieve",
           "maturity": "Maturity",
           "location": "Mareograph location",
-          "step": "Time step between two values in minutes"
+          "step": "Time step between two values in minutes",
+          "overlap": "Overlap between forecast and observations in minutes"
         }
       }
     }

diff --git a/translations/fi.json b/translations/fi.json
@@ -15,7 +15,8 @@
           "hours": "Moneltako tunnilta mittausdata haetaan",
           "forecast_hours": "Moneltako tunnilta ennustedata haetaan",
           "location": "Mareografin sijainti",
-          "step": "Aikaväli kahden mitta-arvon välillä (minuuteissa)"
+          "step": "Aikaväli kahden mitta-arvon välillä minuuteissa",
+          "overlap": "Ennusteen ja mittausten päällekkäisyys minuuteissa"
         }
       }
     }
@@ -33,7 +34,8 @@
           "hours": "Moneltako tunnilta mittausdata haetaan",
           "forecast_hours": "Moneltako tunnilta ennustedata haetaan",
           "location": "Mareografin sijainti",
-          "step": "Aikaväli kahden mitta-arvon välillä (minuuteissa)"
+          "step": "Aikaväli kahden mitta-arvon välillä minuuteissa",
+          "overlap": "Ennusteen ja mittausten päällekkäisyys minuuteissa"
         }
       }
     }