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

valetudo_map_parser/rooms_handler.py

@@ -0,0 +1,225 @@
+"""
+Hipfer Rooms Handler Module.
+Handles room data extraction and processing for Valetudo Hipfer vacuum maps.
+Provides async methods for room outline extraction and properties management.
+Version: 0.1.9
+"""
+
+from __future__ import annotations
+
+import time
+from typing import Any, Dict, Optional, Tuple
+
+import numpy as np
+from scipy.ndimage import binary_dilation, binary_erosion
+from scipy.spatial import ConvexHull
+
+from .config.drawable_elements import DrawableElement, DrawingConfig
+from .config.types import LOGGER, RoomsProperties
+
+
+class RoomsHandler:
+    """
+    Handler for extracting and managing room data from Hipfer vacuum maps.
+
+    This class provides methods to:
+    - Extract room outlines using the Ramer-Douglas-Peucker algorithm
+    - Process room properties from JSON data
+    - 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 HipferRoomsHandler.
+
+        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
+        )
+
+    @staticmethod
+    def sublist(data: list, chunk_size: int) -> list:
+        return [data[i : i + chunk_size] for i in range(0, len(data), chunk_size)]
+
+    @staticmethod
+    def convex_hull_outline(mask: np.ndarray) -> list[tuple[int, int]]:
+        y_indices, x_indices = np.where(mask > 0)
+        if len(x_indices) == 0 or len(y_indices) == 0:
+            return []
+
+        points = np.column_stack((x_indices, y_indices))
+        if len(points) < 3:
+            return [(int(x), int(y)) for x, y in points]
+
+        hull = ConvexHull(points)
+        # Convert numpy.int64 values to regular Python integers
+        hull_points = [
+            (int(points[vertex][0]), int(points[vertex][1])) for vertex in hull.vertices
+        ]
+        if hull_points[0] != hull_points[-1]:
+            hull_points.append(hull_points[0])
+        return hull_points
+
+    async def _process_room_layer(
+        self, layer: Dict[str, Any], width: int, height: int, pixel_size: int
+    ) -> Tuple[Optional[str], Optional[Dict[str, Any]]]:
+        """Process a single room layer and extract its outline.
+
+        Args:
+            layer: The layer data from the JSON
+            width: The width of the map
+            height: The height of the map
+            pixel_size: The size of each pixel
+
+        Returns:
+            Tuple of (room_id, room_data) or (None, None) if processing failed
+        """
+        meta_data = layer.get("metaData", {})
+        segment_id = meta_data.get("segmentId")
+        name = meta_data.get("name", "Room {}".format(segment_id))
+        compressed_pixels = layer.get("compressedPixels", [])
+        pixels = self.sublist(compressed_pixels, 3)
+
+        # Check if this room is enabled in the drawing configuration
+        if self.drawing_config is not None:
+            # Convert segment_id to room element (ROOM_1 to ROOM_15)
+            try:
+                # Segment IDs might not be sequential, so we need to map them to room elements
+                # We'll use a simple approach: if segment_id is an integer, use it directly
+                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
+                )
+
+        # Optimization: Create a smaller mask for just the room area
+        if not pixels:
+            # Skip if no pixels
+            return None, None
+
+        # Convert to numpy arrays for vectorized operations
+        pixel_data = np.array(pixels)
+
+        if pixel_data.size == 0:
+            return None, None
+
+        # Find the actual bounds of the room to create a smaller mask
+        # Add padding to ensure we don't lose edge details
+        padding = 10  # Add padding pixels around the room
+        min_x = max(0, int(np.min(pixel_data[:, 0])) - padding)
+        max_x = min(
+            width, int(np.max(pixel_data[:, 0]) + np.max(pixel_data[:, 2])) + padding
+        )
+        min_y = max(0, int(np.min(pixel_data[:, 1])) - padding)
+        max_y = min(height, int(np.max(pixel_data[:, 1]) + 1) + padding)
+
+        # Create a smaller mask for just the room area (much faster)
+        local_width = max_x - min_x
+        local_height = max_y - min_y
+
+        # Skip if dimensions are invalid
+        if local_width <= 0 or local_height <= 0:
+            return None, None
+
+        # Create a smaller mask
+        local_mask = np.zeros((local_height, local_width), dtype=np.uint8)
+
+        # Fill the mask efficiently
+        for x, y, length in pixel_data:
+            x, y, length = int(x), int(y), int(length)
+            # Adjust coordinates to local mask
+            local_x = x - min_x
+            local_y = y - min_y
+
+            # Ensure we're within bounds
+            if 0 <= local_y < local_height and 0 <= local_x < local_width:
+                # Calculate the end point, clamping to mask width
+                end_x = min(local_x + length, local_width)
+                if end_x > local_x:  # Only process if there's a valid segment
+                    local_mask[local_y, local_x:end_x] = 1
+
+        # Apply morphological operations
+        struct_elem = np.ones((3, 3), dtype=np.uint8)
+        eroded = binary_erosion(local_mask, structure=struct_elem, iterations=1)
+        mask = binary_dilation(eroded, structure=struct_elem, iterations=1).astype(
+            np.uint8
+        )
+
+        # Extract contour from the mask
+        outline = self.convex_hull_outline(mask)
+        if not outline:
+            return None, None
+
+        # Adjust coordinates back to global space
+        outline = [(x + min_x, y + min_y) for (x, y) in outline]
+
+        # Use coordinates as-is without flipping Y coordinates
+        xs, ys = zip(*outline)
+        x_min, x_max = min(xs), max(xs)
+        y_min, y_max = min(ys), max(ys)
+
+        room_id = str(segment_id)
+
+        # Scale coordinates by pixel_size and convert to regular Python integers
+        scaled_outline = [
+            (int(x * pixel_size), int(y * pixel_size)) for x, y in outline
+        ]
+        room_data = {
+            "number": segment_id,
+            "outline": scaled_outline,
+            "name": name,
+            "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) -> RoomsProperties:
+        """Extract room properties from the JSON data.
+
+        This method processes all room layers in the JSON data and extracts their outlines.
+        It respects the drawing configuration, skipping rooms that are disabled.
+
+        Args:
+            json_data: The JSON data from the vacuum
+
+        Returns:
+            Dictionary of room properties
+        """
+        start_total = time.time()
+        room_properties = {}
+        pixel_size = json_data.get("pixelSize", 5)
+        height = json_data["size"]["y"]
+        width = json_data["size"]["x"]
+
+        for layer in json_data.get("layers", []):
+            if layer.get("__class") == "MapLayer" and layer.get("type") == "segment":
+                room_id, room_data = await self._process_room_layer(
+                    layer, width, height, pixel_size
+                )
+                if room_id is not None and room_data is not None:
+                    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.9b52.dist-info → valetudo_map_parser-0.1.9b54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b52
+Version: 0.1.9b54
 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/RECORD

@@ -0,0 +1,27 @@
+valetudo_map_parser/__init__.py,sha256=A_rCyIP5ll-ovzHMEsGMgbNmB39vDtqgL5hpZQkNbPQ,1018
+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
+valetudo_map_parser/config/colors.py,sha256=DG-oPQoN5gsnwDbEsuFr8a0hRCxmbFHObWa4_5pr-70,29910
+valetudo_map_parser/config/drawable.py,sha256=2MeVHXqZuVuJk3eerMJYGwo25rVetHx3xB_vxecEFOQ,34168
+valetudo_map_parser/config/drawable_elements.py,sha256=o-5oiXmfqPwNQLzKIhkEcZD_A47rIU9E0CqKgWipxgc,11516
+valetudo_map_parser/config/enhanced_drawable.py,sha256=QlGxlUMVgECUXPtFwIslyjubWxQuhIixsRymWV3lEvk,12586
+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/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_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/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-0.1.9b52.dist-info/RECORD

@@ -1,26 +0,0 @@
-valetudo_map_parser/__init__.py,sha256=cewtLadNSOg3X2Ts2SuG8mTJqo0ncsFRg_sQ4VkM4ow,1037
-valetudo_map_parser/config/__init__.py,sha256=DQ9plV3ZF_K25Dp5ZQHPDoG-40dQoJNdNi-dfNeR3Zc,48
-valetudo_map_parser/config/auto_crop.py,sha256=6OvRsWzXMXBaSEvgwpaaisNdozDKiDyTmPjknFxoUMc,12624
-valetudo_map_parser/config/color_utils.py,sha256=D4NXRhuPdQ7UDKM3vLNYR0HnACl9AB75EnfCp5tGliI,4502
-valetudo_map_parser/config/colors.py,sha256=5nk8QbNomv_WeE2rOLIswroGsxV4RZMd0slXrPlt-MY,29297
-valetudo_map_parser/config/drawable.py,sha256=VhaNK62EBCxcQdNg7-dyUNepsYX6IFzej3raOt7_rVU,34268
-valetudo_map_parser/config/drawable_elements.py,sha256=bkEwdbx1upt9vaPaqE_VR1rtwRsaiH-IVKc3mHNa8IY,12065
-valetudo_map_parser/config/enhanced_drawable.py,sha256=6yGoOq_dLf2VCghO_URSyGfLAshFyzS3iEPeHw1PeDo,12586
-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=GIEMF-M6BVA6SFBrql7chV7TciWNMLJ8geqwHB0NrW8,11253
-valetudo_map_parser/config/types.py,sha256=e-eZSwbPm3m5JfCDaKhnUFspmcRFSv74huxegkSBDXM,17566
-valetudo_map_parser/config/utils.py,sha256=RsMjpjVqNbkI502yhLiRaB0GjCADqmRRcz-TkC6zklQ,31073
-valetudo_map_parser/hypfer_draw.py,sha256=P8CrKysLaBb63ZArfqxN2Og6JCU6sPHPFHOte5noCGg,26654
-valetudo_map_parser/hypfer_handler.py,sha256=WYFrp-q5wBsy0cTcVQUCXXVGTtW30z2W2dYvjKz2el8,23292
-valetudo_map_parser/hypfer_rooms_handler.py,sha256=3QL8QZc6aMXxYn_L6gv1iL204I0rAzutWPVzc_4MfJ4,14505
-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=eLFX_gmGLaWQwvp8hVj8CgcNOfLsYNIdE1OLRcQy_yM,19988
-valetudo_map_parser/reimg_draw.py,sha256=1q8LkNTPHEA9Tsapc_JnVw51kpPYNhaBU-KmHkefCQY,12507
-valetudo_map_parser-0.1.9b52.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b52.dist-info/METADATA,sha256=jd0uF9vdxA_LxkXlWoLtOCyWvXJD3knHXVTQYDNn3E4,3321
-valetudo_map_parser-0.1.9b52.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b52.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-valetudo_map_parser-0.1.9b52.dist-info/RECORD,,