valetudo-map-parser 0.1.9b54__py3-none-any.whl → 0.1.9b55__py3-none-any.whl

valetudo_map_parser/__init__.py

@@ -17,11 +17,12 @@ from .config.types import (
 )
 from .hypfer_handler import HypferMapImageHandler
 from .rand25_handler import ReImageHandler
-from .rooms_handler import RoomsHandler
+from .rooms_handler import RoomsHandler, RandRoomsHandler
 
 
 __all__ = [
     "RoomsHandler",
+    "RandRoomsHandler",
     "HypferMapImageHandler",
     "ReImageHandler",
     "RRMapParser",

valetudo_map_parser/config/shared.py

@@ -88,6 +88,7 @@ class CameraShared:
         self.vac_json_id = None  # Vacuum json id
         self.margins = "100"  # Image margins
         self.obstacles_data = None  # Obstacles data
+        self.obstacles_pos = None  # Obstacles position
         self.offset_top = 0  # Image offset top
         self.offset_down = 0  # Image offset down
         self.offset_left = 0  # Image offset left

valetudo_map_parser/hypfer_draw.py

@@ -303,6 +303,13 @@ class ImageDraw:
             await self.img_h.draw.async_draw_obstacles(
                 np_array, obstacle_positions, color_no_go
             )
+
+            # Update both obstacles_pos and obstacles_data
+            self.img_h.shared.obstacles_pos = obstacle_positions
+            # Only update obstacles_data if it's None or if the number of obstacles has changed
+            if (self.img_h.shared.obstacles_data is None or
+                len(self.img_h.shared.obstacles_data) != len(obstacle_positions)):
+                self.img_h.shared.obstacles_data = obstacle_positions
         return np_array
 
     async def async_draw_charger(

valetudo_map_parser/rand25_handler.py

@@ -29,13 +29,14 @@ from .config.types import (
 )
 from .config.utils import (
     BaseHandler,
-    async_extract_room_outline,
+    # async_extract_room_outline,
     initialize_drawing_config,
     manage_drawable_elements,
     prepare_resize_params,
 )
 from .map_data import RandImageData
 from .reimg_draw import ImageDraw
+from .rooms_handler import RandRoomsHandler
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -68,6 +69,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
         self.active_zones = None  # Active zones
         self.file_name = self.shared.file_name  # File name
         self.imd = ImageDraw(self)  # Image Draw
+        self.rooms_handler = RandRoomsHandler(self.file_name, self.drawing_config)  # Room data handler
 
     async def extract_room_outline_from_map(self, room_id_int, pixels):
         """Extract the outline of a room using the pixel data and element map.
@@ -110,62 +112,45 @@ class ReImageHandler(BaseHandler, AutoCrop):
                 ) = await RandImageData.async_get_rrm_segments(
                     json_data, size_x, size_y, top, left, True
                 )
+
             dest_json = destinations
-            room_data = dict(dest_json).get("rooms", [])
             zones_data = dict(dest_json).get("zones", [])
             points_data = dict(dest_json).get("spots", [])
-            room_id_to_data = {room["id"]: room for room in room_data}
+
+            # Use the RandRoomsHandler to extract room properties
+            room_properties = await self.rooms_handler.async_extract_room_properties(
+                json_data, dest_json
+            )
+
+            # Update self.rooms_pos from room_properties for compatibility with other methods
             self.rooms_pos = []
-            room_properties = {}
-            if self.outlines:
-                for id_x, room_id in enumerate(unsorted_id):
-                    if room_id in room_id_to_data:
-                        room_info = room_id_to_data[room_id]
-                        name = room_info.get("name")
-                        # Calculate x and y min/max from outlines
-                        x_min = self.outlines[id_x][0][0]
-                        x_max = self.outlines[id_x][1][0]
-                        y_min = self.outlines[id_x][0][1]
-                        y_max = self.outlines[id_x][1][1]
-                        corners = self.get_corners(x_max, x_min, y_max, y_min)
-                        # rand256 vacuums accept int(room_id) or str(name)
-                        # the card will soon support int(room_id) but the camera will send name
-                        # this avoids the manual change of the values in the card.
-                        self.rooms_pos.append(
-                            {
-                                "name": name,
-                                "corners": corners,
-                            }
-                        )
-                        room_properties[int(room_id)] = {
-                            "number": int(room_id),
-                            "outline": corners,
-                            "name": name,
-                            "x": (x_min + x_max) // 2,
-                            "y": (y_min + y_max) // 2,
-                        }
-                # get the zones and points data
-                zone_properties = await self.async_zone_propriety(zones_data)
-                # get the points data
-                point_properties = await self.async_points_propriety(points_data)
-                if room_properties or zone_properties:
-                    extracted_data = [
-                        f"{len(room_properties)} Rooms" if room_properties else None,
-                        f"{len(zone_properties)} Zones" if zone_properties else None,
-                    ]
-                    extracted_data = ", ".join(filter(None, extracted_data))
-                    _LOGGER.debug("Extracted data: %s", extracted_data)
-                else:
-                    self.rooms_pos = None
-                    _LOGGER.debug(
-                        "%s: Rooms and Zones data not available!", self.file_name
-                    )
-                rooms = RoomStore(self.file_name, room_properties)
-                _LOGGER.debug("Rooms Data: %s", rooms.get_rooms())
-                return room_properties, zone_properties, point_properties
+            for room_id, props in room_properties.items():
+                self.rooms_pos.append({
+                    "name": props["name"],
+                    "corners": props["outline"],  # Use the enhanced outline
+                })
+
+            # get the zones and points data
+            zone_properties = await self.async_zone_propriety(zones_data)
+            # get the points data
+            point_properties = await self.async_points_propriety(points_data)
+
+            if room_properties or zone_properties:
+                extracted_data = [
+                    f"{len(room_properties)} Rooms" if room_properties else None,
+                    f"{len(zone_properties)} Zones" if zone_properties else None,
+                ]
+                extracted_data = ", ".join(filter(None, extracted_data))
+                _LOGGER.debug("Extracted data: %s", extracted_data)
             else:
-                _LOGGER.debug("%s: No outlines available", self.file_name)
-                return None, None, None
+                self.rooms_pos = None
+                _LOGGER.debug(
+                    "%s: Rooms and Zones data not available!", self.file_name
+                )
+
+            rooms = RoomStore(self.file_name, room_properties)
+            _LOGGER.debug("Rooms Data: %s", rooms.get_rooms())
+            return room_properties, zone_properties, point_properties
         except (RuntimeError, ValueError) as e:
             _LOGGER.debug(
                 "No rooms Data or Error in extract_room_properties: %s",

valetudo_map_parser/rooms_handler.py

@@ -8,7 +8,7 @@ Version: 0.1.9
 from __future__ import annotations
 
 import time
-from typing import Any, Dict, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import numpy as np
 from scipy.ndimage import binary_dilation, binary_erosion
@@ -17,6 +17,7 @@ from scipy.spatial import ConvexHull
 from .config.drawable_elements import DrawableElement, DrawingConfig
 from .config.types import LOGGER, RoomsProperties
 
+from .map_data import RandImageData, ImageData
 
 class RoomsHandler:
     """
@@ -223,3 +224,247 @@ class RoomsHandler:
         total_time = time.time() - start_total
         LOGGER.debug("Room extraction Total time: %.3fs", total_time)
         return room_properties
+
+class RandRoomsHandler:
+    """
+    Handler for extracting and managing room data from Rand25 vacuum maps.
+
+    This class provides methods to:
+    - Extract room outlines using the Convex Hull algorithm
+    - Process room properties from JSON data and destinations JSON
+    - Generate room masks and extract contours
+
+    All methods are async for better integration with the rest of the codebase.
+    """
+
+    def __init__(self, vacuum_id: str, drawing_config: Optional[DrawingConfig] = None):
+        """
+        Initialize the RandRoomsHandler.
+
+        Args:
+            vacuum_id: Identifier for the vacuum
+            drawing_config: Configuration for which elements to draw (optional)
+        """
+        self.vacuum_id = vacuum_id
+        self.drawing_config = drawing_config
+        self.current_json_data = None  # Will store the current JSON data being processed
+        self.segment_data = None  # Segment data
+        self.outlines = None  # Outlines data
+
+    @staticmethod
+    def sublist(data: list, chunk_size: int) -> list:
+        """Split a list into chunks of specified size."""
+        return [data[i : i + chunk_size] for i in range(0, len(data), chunk_size)]
+
+    @staticmethod
+    def convex_hull_outline(points: List[Tuple[int, int]]) -> List[Tuple[int, int]]:
+        """
+        Generate a convex hull outline from a set of points.
+
+        Args:
+            points: List of (x, y) coordinate tuples
+
+        Returns:
+            List of (x, y) tuples forming the convex hull outline
+        """
+        if len(points) == 0:
+            return []
+
+        # Convert to numpy array for processing
+        points_array = np.array(points)
+
+        if len(points) < 3:
+            # Not enough points for a convex hull, return the points as is
+            return [(int(x), int(y)) for x, y in points_array]
+
+        try:
+            # Calculate the convex hull
+            hull = ConvexHull(points_array)
+
+            # Extract the vertices in order
+            hull_points = [
+                (int(points_array[vertex][0]), int(points_array[vertex][1]))
+                for vertex in hull.vertices
+            ]
+
+            # Close the polygon by adding the first point at the end
+            if hull_points[0] != hull_points[-1]:
+                hull_points.append(hull_points[0])
+
+            return hull_points
+
+        except Exception as e:
+            LOGGER.warning(f"Error calculating convex hull: {e}")
+
+            # Fallback to bounding box if convex hull fails
+            x_min, y_min = np.min(points_array, axis=0)
+            x_max, y_max = np.max(points_array, axis=0)
+
+            return [
+                (int(x_min), int(y_min)),  # Top-left
+                (int(x_max), int(y_min)),  # Top-right
+                (int(x_max), int(y_max)),  # Bottom-right
+                (int(x_min), int(y_max)),  # Bottom-left
+                (int(x_min), int(y_min)),  # Back to top-left to close the polygon
+            ]
+
+    async def _process_segment_data(
+        self, segment_data: List, segment_id: int, pixel_size: int
+    ) -> Tuple[Optional[str], Optional[Dict[str, Any]]]:
+        """
+        Process a single segment and extract its outline.
+
+        Args:
+            segment_data: The segment pixel data
+            segment_id: The ID of the segment
+            pixel_size: The size of each pixel
+
+        Returns:
+            Tuple of (room_id, room_data) or (None, None) if processing failed
+        """
+        # Check if this room is enabled in the drawing configuration
+        if self.drawing_config is not None:
+            try:
+                # Convert segment_id to room element (ROOM_1 to ROOM_15)
+                room_element_id = int(segment_id)
+                if 1 <= room_element_id <= 15:
+                    room_element = getattr(
+                        DrawableElement, f"ROOM_{room_element_id}", None
+                    )
+                    if room_element:
+                        is_enabled = self.drawing_config.is_enabled(room_element)
+                        if not is_enabled:
+                            # Skip this room if it's disabled
+                            LOGGER.debug("Skipping disabled room %s", segment_id)
+                            return None, None
+            except (ValueError, TypeError):
+                # If segment_id is not a valid integer, we can't map it to a room element
+                # In this case, we'll include the room (fail open)
+                LOGGER.debug(
+                    "Could not convert segment_id %s to room element", segment_id
+                )
+
+        # Skip if no pixels
+        if not segment_data:
+            return None, None
+
+        # Extract points from segment data
+        points = []
+        for x, y, _ in segment_data:
+            points.append((int(x), int(y)))
+
+        if not points:
+            return None, None
+
+        # Use convex hull to get the outline
+        outline = self.convex_hull_outline(points)
+        if not outline:
+            return None, None
+
+        # Calculate bounding box for the room
+        xs, ys = zip(*outline)
+        x_min, x_max = min(xs), max(xs)
+        y_min, y_max = min(ys), max(ys)
+
+        # Scale coordinates by pixel_size
+        scaled_outline = [
+            (int(x * pixel_size), int(y * pixel_size)) for x, y in outline
+        ]
+
+        room_id = str(segment_id)
+        room_data = {
+            "number": segment_id,
+            "outline": scaled_outline,
+            "name": f"Room {segment_id}",  # Default name, will be updated from destinations
+            "x": int(((x_min + x_max) * pixel_size) // 2),
+            "y": int(((y_min + y_max) * pixel_size) // 2),
+        }
+
+        return room_id, room_data
+
+    async def async_extract_room_properties(
+        self, json_data: Dict[str, Any], destinations: Dict[str, Any]
+    ) -> RoomsProperties:
+        """
+        Extract room properties from the JSON data and destinations.
+
+        Args:
+            json_data: The JSON data from the vacuum
+            destinations: The destinations JSON containing room names and IDs
+
+        Returns:
+            Dictionary of room properties
+        """
+        start_total = time.time()
+        room_properties = {}
+
+        # Get basic map information
+        unsorted_id = RandImageData.get_rrm_segments_ids(json_data)
+        size_x, size_y = RandImageData.get_rrm_image_size(json_data)
+        top, left = RandImageData.get_rrm_image_position(json_data)
+        pixel_size = 50  # Rand25 vacuums use a larger pixel size to match the original implementation
+
+        # Get segment data and outlines if not already available
+        if not self.segment_data or not self.outlines:
+            (
+                self.segment_data,
+                self.outlines,
+            ) = await RandImageData.async_get_rrm_segments(
+                json_data, size_x, size_y, top, left, True
+            )
+
+        # Process destinations JSON to get room names
+        dest_json = destinations
+        room_data = dest_json.get("rooms", [])
+        room_id_to_data = {room["id"]: room for room in room_data}
+
+        # Process each segment
+        if unsorted_id and self.segment_data and self.outlines:
+            for idx, segment_id in enumerate(unsorted_id):
+                # Extract points from segment data
+                points = []
+                for x, y, _ in self.segment_data[idx]:
+                    points.append((int(x), int(y)))
+
+                if not points:
+                    continue
+
+                # Use convex hull to get the outline
+                outline = self.convex_hull_outline(points)
+                if not outline:
+                    continue
+
+                # Scale coordinates by pixel_size
+                scaled_outline = [
+                    (int(x * pixel_size), int(y * pixel_size)) for x, y in outline
+                ]
+
+                # Calculate center point
+                xs, ys = zip(*outline)
+                x_min, x_max = min(xs), max(xs)
+                y_min, y_max = min(ys), max(ys)
+                center_x = int(((x_min + x_max) * pixel_size) // 2)
+                center_y = int(((y_min + y_max) * pixel_size) // 2)
+
+                # Create room data
+                room_id = str(segment_id)
+                room_data = {
+                    "number": segment_id,
+                    "outline": scaled_outline,
+                    "name": f"Room {segment_id}",  # Default name, will be updated from destinations
+                    "x": center_x,
+                    "y": center_y,
+                }
+
+                # Update room name from destinations if available
+                if segment_id in room_id_to_data:
+                    room_info = room_id_to_data[segment_id]
+                    room_data["name"] = room_info.get("name", room_data["name"])
+
+                room_properties[room_id] = room_data
+
+        # Log timing information
+        total_time = time.time() - start_total
+        LOGGER.debug("Room extraction Total time: %.3fs", total_time)
+
+        return room_properties

{valetudo_map_parser-0.1.9b54.dist-info → valetudo_map_parser-0.1.9b55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b54
+Version: 0.1.9b55
 Summary: A Python library to parse Valetudo map data returning a PIL Image object.
 License: Apache-2.0
 Author: Sandro Cantarella

{valetudo_map_parser-0.1.9b54.dist-info → valetudo_map_parser-0.1.9b55.dist-info}/RECORD

@@ -1,4 +1,4 @@
-valetudo_map_parser/__init__.py,sha256=A_rCyIP5ll-ovzHMEsGMgbNmB39vDtqgL5hpZQkNbPQ,1018
+valetudo_map_parser/__init__.py,sha256=Fz-gtKf_OlZcDQqVfGlBwIWi5DJAiRucMbBMdQ2tX_U,1060
 valetudo_map_parser/config/__init__.py,sha256=DQ9plV3ZF_K25Dp5ZQHPDoG-40dQoJNdNi-dfNeR3Zc,48
 valetudo_map_parser/config/auto_crop.py,sha256=6xt_wJQqphddWhlrr7MNUkodCi8ZYdRk42qvAaxlYCM,13546
 valetudo_map_parser/config/color_utils.py,sha256=nXD6WeNmdFdoMxPDW-JFpjnxJSaZR1jX-ouNfrx6zvE,4502
@@ -9,19 +9,19 @@ valetudo_map_parser/config/enhanced_drawable.py,sha256=QlGxlUMVgECUXPtFwIslyjubW
 valetudo_map_parser/config/optimized_element_map.py,sha256=52BCnkvVv9bre52LeVIfT8nhnEIpc0TuWTv1xcNu0Rk,15744
 valetudo_map_parser/config/rand25_parser.py,sha256=kIayyqVZBfQfAMkiArzqrrj9vqZB3pkgT0Y5ufrQmGA,16448
 valetudo_map_parser/config/room_outline.py,sha256=D20D-yeyKnlmVbW9lI7bsPtQGn2XkcWow6YNOEPnWVg,4800
-valetudo_map_parser/config/shared.py,sha256=LJPDE8MhmbY0CXXMbtDff-JVtmLKGjoWE6c4mpsaEc4,10419
+valetudo_map_parser/config/shared.py,sha256=Vr4bicL7aJoRQbwbXyjEpiWhfzZ-cakLlfRqL3LBhpM,10475
 valetudo_map_parser/config/types.py,sha256=TaRKoo7G7WIUw7ljOz2Vn5oYzKaLyQH-7Eb8ZYql8Ls,17464
 valetudo_map_parser/config/utils.py,sha256=CFuuiS5IufEu9aeaZwi7xa1jEF1z6yDZB0mcyVX79Xo,29261
-valetudo_map_parser/hypfer_draw.py,sha256=afFJ9woTVYOfETbxFLU74r4H2PUW_eTfEvhKuYKH8h0,26226
+valetudo_map_parser/hypfer_draw.py,sha256=bwNTYopTJFY0nElrHquQrSfGHgN_-6t5E-8xBxDsRXA,26660
 valetudo_map_parser/hypfer_handler.py,sha256=wvkZt6MsUF0gkHZDAwiUgOOawkdvakRzYBV3NtjxuJQ,19938
 valetudo_map_parser/hypfer_rooms_handler.py,sha256=NkpOA6Gdq-2D3lLAxvtNuuWMvPXHxeMY2TO5RZLSHlU,22652
 valetudo_map_parser/map_data.py,sha256=zQKE8EzWxR0r0qyfD1QQq51T1wFrpcIeXtnpm92-LXQ,17743
 valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valetudo_map_parser/rand25_handler.py,sha256=vK4lF7RYKKeh_6IyvUWDmwFqULHdDa3pz_Wb00KAsXs,19988
+valetudo_map_parser/rand25_handler.py,sha256=VOBzx0AY61AggOkiX-P4c73MrPrQBGfsDQTEbVL1wCQ,18855
 valetudo_map_parser/reimg_draw.py,sha256=1q8LkNTPHEA9Tsapc_JnVw51kpPYNhaBU-KmHkefCQY,12507
-valetudo_map_parser/rooms_handler.py,sha256=GKqDji8LWAowQMDAbSk-MYwzAHVj25rcF60GyTWeSpY,8687
-valetudo_map_parser-0.1.9b54.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b54.dist-info/METADATA,sha256=B7aiLJ5yxR6ye5YI6VlOKVTJCfZ2oU1YHdkYloViZA0,3321
-valetudo_map_parser-0.1.9b54.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b54.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-valetudo_map_parser-0.1.9b54.dist-info/RECORD,,
+valetudo_map_parser/rooms_handler.py,sha256=YP8OLotBH-RXluv398l7TTT2zIBHJp91b8THWxl3NdI,17794
+valetudo_map_parser-0.1.9b55.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b55.dist-info/METADATA,sha256=Af2KutWU3EHPE8F1HNCWWKlIGKqr9bz1nTbC1-d3ZCo,3321
+valetudo_map_parser-0.1.9b55.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b55.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+valetudo_map_parser-0.1.9b55.dist-info/RECORD,,