Set parameter only if service call data includes elevation

home-assistant · Sep 9, 2023 · ecd317b · ecd317b
1 parent 44b6094
commit ecd317b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/homeassistant/components/homeassistant/__init__.py b/homeassistant/components/homeassistant/__init__.py
@@ -252,11 +252,19 @@ async def async_handle_reload_config(call: ha.ServiceCall) -> None:
     async def async_set_location(call: ha.ServiceCall) -> None:
         """Service handler to set location."""
         await hass.config.async_update(
-            latitude=call.data[ATTR_LATITUDE],
-            longitude=call.data[ATTR_LONGITUDE],
-            elevation=call.data.get(ATTR_ELEVATION, None),
+            latitude=call.data[ATTR_LATITUDE], longitude=call.data[ATTR_LONGITUDE]
         )
 
+        service_data = {
+            "latitude": call.data[ATTR_LATITUDE],
+            "longitude": call.data[ATTR_LONGITUDE],
+        }
+
+        if call.data.get(ATTR_ELEVATION):
+            service_data["elevation"] = call.data[ATTR_ELEVATION]
+
+        await hass.config.async_update(**service_data)
+
     async_register_admin_service(
         hass,
         ha.DOMAIN,

diff --git a/tests/components/homeassistant/test_init.py b/tests/components/homeassistant/test_init.py
@@ -311,7 +311,7 @@ async def test_setting_location(hass: HomeAssistant) -> None:
         {"latitude": 30, "longitude": 40},
         blocking=True,
     )
-    assert len(events) == 1
+    assert len(events) == 2
     assert hass.config.latitude == 30
     assert hass.config.longitude == 40
     assert hass.config.elevation != 50