fix: add rooms from map_info which is occassionally available

Author: Lash-L

roborock/data/v1/v1_containers.py

@@ -543,6 +543,14 @@ def __repr__(self) -> str:
         return _attr_repr(self)
 
 
+@dataclass
+class MultiMapsListRoom(RoborockBase):
+    id: int | None = None
+    tag: int | None = None
+    iot_name_id: str | None = None
+    iot_name: str | None = None
+
+
 @dataclass
 class MultiMapsListMapInfoBakMaps(RoborockBase):
     mapflag: Any | None = None
@@ -556,6 +564,7 @@ class MultiMapsListMapInfo(RoborockBase):
     add_time: Any | None = None
     length: Any | None = None
     bak_maps: list[MultiMapsListMapInfoBakMaps] | None = None
+    rooms: list[MultiMapsListRoom] | None = None
 
     @property
     def mapFlag(self) -> int:

roborock/devices/traits/v1/home.py

@@ -20,7 +20,7 @@
 import logging
 from typing import Self
 
-from roborock.data import CombinedMapInfo, RoborockBase
+from roborock.data import CombinedMapInfo, NamedRoomMapping, RoborockBase
 from roborock.data.v1.v1_code_mappings import RoborockStateCode
 from roborock.devices.cache import DeviceCache
 from roborock.devices.traits.v1 import common
@@ -117,10 +117,31 @@ async def discover_home(self) -> None:
     async def _refresh_map_info(self, map_info) -> CombinedMapInfo:
         """Collect room data for a specific map and return CombinedMapInfo."""
         await self._rooms_trait.refresh()
+
+        rooms: dict[int, NamedRoomMapping] = {}
+        if map_info.rooms:
+            # Not all vacuums resopnd with rooms inside map_info.
+            for room in map_info.rooms:
+                if room.id is not None and room.iot_name_id is not None:
+                    rooms[room.id] = NamedRoomMapping(
+                        segment_id=room.id,
+                        iot_id=room.iot_name_id,
+                        name=room.iot_name or "Unknown",
+                    )
+
+        # Add rooms from rooms_trait. If room already exists and rooms_trait has "Unknown", don't override.
+        if self._rooms_trait.rooms:
+            for room in self._rooms_trait.rooms:
+                if room.segment_id is not None and room.name:
+                    if room.segment_id not in rooms or room.name != "Unknown":
+                        # Add the room to rooms if the room segment is not already in it
+                        # or if the room name isn't unknown.
+                        rooms[room.segment_id] = room
+
         return CombinedMapInfo(
             map_flag=map_info.map_flag,
             name=map_info.name,
-            rooms=self._rooms_trait.rooms or [],
+            rooms=list(rooms.values()),
         )
 
     async def _refresh_map_content(self) -> MapContent:

tests/devices/traits/v1/test_home.py

@@ -6,8 +6,9 @@
 
 import pytest
 
-from roborock.data.containers import CombinedMapInfo
+from roborock.data.containers import CombinedMapInfo, NamedRoomMapping
 from roborock.data.v1.v1_code_mappings import RoborockStateCode
+from roborock.data.v1.v1_containers import MultiMapsListMapInfo, MultiMapsListRoom
 from roborock.devices.cache import DeviceCache, DeviceCacheData, InMemoryCache
 from roborock.devices.device import RoborockDevice
 from roborock.devices.traits.v1.home import HomeTrait
@@ -570,3 +571,78 @@ async def test_single_map_no_switching(
         if call[1].get("command") == RoborockCommand.LOAD_MULTI_MAP
     ]
     assert len(load_map_calls) == 0
+
+
+async def test_refresh_map_info_room_override_and_addition_logic(
+    home_trait: HomeTrait,
+    rooms_trait: RoomsTrait,
+) -> None:
+    """Test the room override and addition logic in _refresh_map_info.
+
+    This test verifies:
+    1. Room with "Unknown" does not override existing room from map_info
+    2. Room with valid name overrides existing room from map_info
+    3. Room with "Unknown" is added if not already in rooms
+    4. Room with valid name is added if not already in rooms
+    """
+    map_info = MultiMapsListMapInfo(
+        map_flag=0,
+        name="Test Map",
+        rooms=[
+            MultiMapsListRoom(
+                id=16,
+                iot_name_id="2362048",
+                iot_name="Kitchen from map_info",
+            ),
+            MultiMapsListRoom(
+                id=19,
+                iot_name_id="2362042",
+                iot_name="Bedroom from map_info",
+            ),
+        ],
+    )
+
+    # Mock rooms_trait to return multiple rooms covering all scenarios:
+    # - segment_id 16 with "Unknown": exists in map_info, should NOT override
+    # - segment_id 19 with valid name: exists in map_info, should override
+    # - segment_id 17 with "Unknown": not in map_info, should be added
+    # - segment_id 18 with valid name: not in map_info, should be added
+    rooms_trait.rooms = [
+        NamedRoomMapping(segment_id=16, iot_id="2362048", name="Unknown"),  # Exists in map_info, should not override
+        NamedRoomMapping(
+            segment_id=19, iot_id="2362042", name="Updated Bedroom Name"
+        ),  # Exists in map_info, should override
+        NamedRoomMapping(segment_id=17, iot_id="2362044", name="Unknown"),  # Not in map_info, should be added
+        NamedRoomMapping(segment_id=18, iot_id="2362041", name="Example room 3"),  # Not in map_info, should be added
+    ]
+
+    # Mock rooms_trait.refresh to prevent actual device calls
+    with patch.object(rooms_trait, "refresh", new_callable=AsyncMock):
+        result = await home_trait._refresh_map_info(map_info)
+
+    assert result.map_flag == 0
+    assert result.name == "Test Map"
+    assert len(result.rooms) == 4
+
+    # Sort rooms by segment_id for consistent assertions
+    sorted_rooms = sorted(result.rooms, key=lambda r: r.segment_id)
+
+    # Room 16: from map_info, kept (not overridden by Unknown)
+    assert sorted_rooms[0].segment_id == 16
+    assert sorted_rooms[0].name == "Kitchen from map_info"
+    assert sorted_rooms[0].iot_id == "2362048"
+
+    # Room 17: from rooms_trait with "Unknown", added because not in map_info
+    assert sorted_rooms[1].segment_id == 17
+    assert sorted_rooms[1].name == "Unknown"
+    assert sorted_rooms[1].iot_id == "2362044"
+
+    # Room 18: from rooms_trait with valid name, added because not in map_info
+    assert sorted_rooms[2].segment_id == 18
+    assert sorted_rooms[2].name == "Example room 3"
+    assert sorted_rooms[2].iot_id == "2362041"
+
+    # Room 19: from map_info, overridden by rooms_trait with valid name
+    assert sorted_rooms[3].segment_id == 19
+    assert sorted_rooms[3].name == "Updated Bedroom Name"
+    assert sorted_rooms[3].iot_id == "2362042"