python-roborock 7.4.1__py3-none-any.whl → 7.4.2__py3-none-any.whl

{python_roborock-7.4.1.dist-info → python_roborock-7.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-roborock
-Version: 7.4.1
+Version: 7.4.2
 Summary: A package to control Roborock vacuums.
 Project-URL: Repository, https://github.com/python-roborock/python-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/

{python_roborock-7.4.1.dist-info → python_roborock-7.4.2.dist-info}/RECORD

@@ -104,7 +104,7 @@ roborock/map/b01_map_parser.py,sha256=tTeeWH4fA4Pv4DvqN7PBQs92DuWTaD2rvD44Mo_t3O
 roborock/map/b01_q10_map_parser.py,sha256=EQMx2ZNVjHKsmKr6vR8JS7o86IZu85dNg3bKi5S0ZYw,29985
 roborock/map/b01_q10_overlays.py,sha256=JmriUbT4-oe6NiE94VttMplFc1HHQrAGNQIiZHj5QKk,6640
 roborock/map/b01_q10_render.py,sha256=b7YUBr53WXxOJhXbfb5IVmgi82iGcC0lJ_j9Ef3kV7M,13502
-roborock/map/map_parser.py,sha256=2Rse_VhC2HEfjO2aXw7p-QhYN3NLl9JoRbxqxGGPR64,7275
+roborock/map/map_parser.py,sha256=EcJcz9yld_wu7d5QrmxR2BTfJ801F6SaEgJkbIIap4w,5111
 roborock/map/room_colors.py,sha256=5Q85oR_7xsUyzHYGOJPuzsZ6LQSCpJwfxfWql1v6T1E,2152
 roborock/map/proto/__init__.py,sha256=XcH_s-E67_hcQNwqSkdtY7DgYE0mRBBJwctzsf8zng4,60
 roborock/map/proto/b01_scmap.proto,sha256=ux1OnI_-LSDOlTujCCUeOJrTsVCvjLAUKfyddu-rH5U,1929
@@ -125,8 +125,8 @@ roborock/testing/channel.py,sha256=vjulT5MHBe8lAq6XITUqcxJVcCILWx7ZEcw5imTx0Tk,7
 roborock/testing/cloud.py,sha256=L2L0KlZDYaMuoV19KUQUoq5EAUDeNQ1lJ8Ew5YaOgjo,11946
 roborock/testing/simulator.py,sha256=g8ZUWVSjgAzuRRxWOCeOq-7deodyEItwUpqEw9RzCmQ,4347
 roborock/testing/v1_simulator.py,sha256=TQ2PsRoP_4kJvVn-Tm532ByHuaCKltsVjvTa2Ju4PAo,14407
-python_roborock-7.4.1.dist-info/METADATA,sha256=rB0hTcmV3i3rR3cSxnW-Jy1Pzc9QsV9pFBsM2FZdaS4,5278
-python_roborock-7.4.1.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-python_roborock-7.4.1.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
-python_roborock-7.4.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-python_roborock-7.4.1.dist-info/RECORD,,
+python_roborock-7.4.2.dist-info/METADATA,sha256=2EEnCpez1BS4kd3YAaXGO1fxAZ4y6tBwQ54lzvnB4UI,5278
+python_roborock-7.4.2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+python_roborock-7.4.2.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
+python_roborock-7.4.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+python_roborock-7.4.2.dist-info/RECORD,,

roborock/map/map_parser.py

@@ -2,7 +2,6 @@
 
 import io
 import logging
-import threading
 from dataclasses import dataclass, field
 
 from vacuum_map_parser_base.config.color import Color, ColorsPalette, SupportedColor
@@ -11,13 +10,10 @@ from vacuum_map_parser_base.config.image_config import ImageConfig
 from vacuum_map_parser_base.config.size import Size, Sizes
 from vacuum_map_parser_base.image_generator import ImageGenerator
 from vacuum_map_parser_base.map_data import MapData
-from vacuum_map_parser_roborock.image_parser import RoborockImageParser
 from vacuum_map_parser_roborock.map_data_parser import RoborockMapDataParser
 
 from roborock.exceptions import RoborockException
 
-from .room_colors import adjacency_aware_room_colors
-
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_DRAWABLES = {
@@ -103,68 +99,16 @@ class MapParser:
         return ParsedMapData(image_content=img_byte_arr.getvalue(), map_data=parsed_map)
 
 
-class _AdjacencyAwareRoborockImageParser(RoborockImageParser):
-    """Apply the shared adjacency color policy to V1 room cells."""
-
-    def __init__(
-        self,
-        palette: ColorsPalette,
-        image_config: ImageConfig,
-        *,
-        recolor_rooms: bool = True,
-    ) -> None:
-        super().__init__(palette, image_config)
-        self._room_palette = palette
-        self._base_room_colors = palette.cached_room_colors.copy()
-        self._recolor_rooms = recolor_rooms
-        self._palette_lock = threading.Lock()
-
-    def parse(
-        self,
-        raw_data: bytes,
-        width: int,
-        height: int,
-        carpet_map: set[int] | None,
-        removed_map: set[int] | None = None,
-    ):
-        """Assign non-conflicting room colors before the V1 image pass."""
-        with self._palette_lock:
-            # cached_room_colors is a read-only property, so reset its dict in place.
-            cached_room_colors = self._room_palette.cached_room_colors
-            cached_room_colors.clear()
-            cached_room_colors.update(self._base_room_colors)
-
-            if self._recolor_rooms:
-
-                def room_id(value: int) -> int | None:
-                    if value in (self.MAP_OUTSIDE, self.MAP_WALL, self.MAP_INSIDE, self.MAP_SCAN):
-                        return None
-                    return self._get_room_number(value) if value & 0x07 == 0x07 else None
-
-                room_colors = adjacency_aware_room_colors(raw_data, width, self._room_palette, room_id)
-                for number, color in room_colors.items():
-                    # ColorsPalette caches both forms for get_room_color(str | int).
-                    cached_room_colors[number] = color
-                    cached_room_colors[str(number)] = color
-            return super().parse(raw_data, width, height, carpet_map, removed_map)
-
-
 def _create_map_data_parser(config: MapParserConfig) -> RoborockMapDataParser:
     """Create a RoborockMapDataParser based on the config entry."""
     palette, sizes, image_config = _create_rendering_components(config)
-    parser = RoborockMapDataParser(
+    return RoborockMapDataParser(
         palette,
         sizes,
         config.drawables,
         image_config,
         [],
     )
-    parser._image_parser = _AdjacencyAwareRoborockImageParser(
-        palette,
-        image_config,
-        recolor_rooms=config.show_rooms,
-    )
-    return parser
 
 
 def _create_image_generator(