valetudo-map-parser 0.1.9b44__py3-none-any.whl → 0.1.9b46__py3-none-any.whl

valetudo_map_parser/hypfer_handler.py

@@ -26,11 +26,8 @@ from .config.types import (
 )
 from .config.utils import (
     BaseHandler,
-    blend_colors,
-    blend_pixel,
     get_element_at_position,
     get_room_at_position,
-    handle_room_outline_error,
     initialize_drawing_config,
     manage_drawable_elements,
     prepare_resize_params,
@@ -66,15 +63,15 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
         self.imd = ImDraw(self)  # Image Draw class.
         self.color_grey = (128, 128, 128, 255)
         self.file_name = self.shared.file_name  # file name of the vacuum.
-        self.element_map_manager = OptimizedElementMapGenerator(self.drawing_config,
-                                                       self.shared)  # Map of element codes
+        self.element_map_manager = OptimizedElementMapGenerator(
+            self.drawing_config, self.shared
+        )  # Map of element codes
 
     @staticmethod
     def get_corners(x_max, x_min, y_max, y_min):
         """Get the corners of the room."""
         return [(x_min, y_min), (x_max, y_min), (x_max, y_max), (x_min, y_max)]
 
-
     async def extract_room_outline_from_map(self, room_id_int, pixels, pixel_size):
         """Extract the outline of a room using the pixel data and element map.
 
@@ -159,26 +156,7 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                         x_max,
                         y_max,
                     ) = await self.data.async_get_rooms_coordinates(pixels, pixel_size)
-
-                    # Get rectangular corners as a fallback
                     corners = self.get_corners(x_max, x_min, y_max, y_min)
-
-                    # Try to extract a more accurate room outline from the element map
-                    try:
-                        # Extract the room outline using the element map
-                        outline = await self.extract_room_outline_from_map(
-                            segment_id, pixels, pixel_size
-                        )
-                        LOGGER.debug(
-                            "%s: Traced outline for room %s with %d points",
-                            self.file_name,
-                            segment_id,
-                            len(outline),
-                        )
-                    except (ValueError, IndexError, TypeError, ArithmeticError) as e:
-                        handle_room_outline_error(self.file_name, segment_id, e)
-                        outline = corners
-
                     room_id = str(segment_id)
                     self.rooms_pos.append(
                         {
@@ -188,7 +166,7 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                     )
                     room_properties[room_id] = {
                         "number": segment_id,
-                        "outline": outline,  # Use the detailed outline from the element map
+                        "outline": corners,
                         "name": name,
                         "x": ((x_min + x_max) // 2),
                         "y": ((y_min + y_max) // 2),
@@ -254,7 +232,6 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                         size_x, size_y, colors["background"]
                     )
 
-
                     LOGGER.info("%s: Drawing map with color blending", self.file_name)
 
                     # Draw layers and segments if enabled
@@ -473,9 +450,14 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                     )
 
                     # Update element map for robot position
-                    if hasattr(self.shared, 'element_map') and self.shared.element_map is not None:
+                    if (
+                        hasattr(self.shared, "element_map")
+                        and self.shared.element_map is not None
+                    ):
                         update_element_map_with_robot(
-                            self.shared.element_map, robot_position, DrawableElement.ROBOT
+                            self.shared.element_map,
+                            robot_position,
+                            DrawableElement.ROBOT,
                         )
                 # Resize the image
                 img_np_array = await self.async_auto_trim_and_zoom_image(
@@ -490,21 +472,35 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                 LOGGER.warning("%s: Image array is None.", self.file_name)
                 return None
             # Debug logging for element map creation
-            LOGGER.info("%s: Frame number: %d, has element_map: %s",
-                       self.file_name, self.frame_number, hasattr(self.shared, 'element_map'))
+            LOGGER.info(
+                "%s: Frame number: %d, has element_map: %s",
+                self.file_name,
+                self.frame_number,
+                hasattr(self.shared, "element_map"),
+            )
 
             if (self.shared.element_map is None) and (self.frame_number == 1):
                 # Create element map for tracking what's drawn where
-                LOGGER.info("%s: Creating element map with shape: %s",
-                           self.file_name, img_np_array.shape)
+                LOGGER.info(
+                    "%s: Creating element map with shape: %s",
+                    self.file_name,
+                    img_np_array.shape,
+                )
 
                 # Generate the element map directly from JSON data
                 # This will create a cropped element map containing only the non-zero elements
                 LOGGER.info("%s: Generating element map from JSON data", self.file_name)
-                self.shared.element_map = await self.element_map_manager.async_generate_from_json(m_json)
+                self.shared.element_map = (
+                    await self.element_map_manager.async_generate_from_json(m_json)
+                )
 
-                LOGGER.info("%s: Element map created with shape: %s",
-                           self.file_name, self.shared.element_map.shape if self.shared.element_map is not None else None)
+                LOGGER.info(
+                    "%s: Element map created with shape: %s",
+                    self.file_name,
+                    self.shared.element_map.shape
+                    if self.shared.element_map is not None
+                    else None,
+                )
             # Convert the numpy array to a PIL image
             pil_img = Image.fromarray(img_np_array, mode="RGBA")
             del img_np_array
@@ -595,29 +591,8 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
 
     def get_room_at_position(self, x: int, y: int) -> int | None:
         """Get the room ID at a specific position, or None if not a room."""
-        return get_room_at_position(self.shared.element_map, x, y, DrawableElement.ROOM_1)
-
-    @staticmethod
-    def blend_colors(base_color, overlay_color):
-        """
-        Blend two RGBA colors, considering alpha channels.
-
-        Args:
-            base_color: The base RGBA color
-            overlay_color: The overlay RGBA color to blend on top
-
-        Returns:
-            The blended RGBA color
-        """
-        return blend_colors(base_color, overlay_color)
-
-    def blend_pixel(self, array, x, y, color, element):
-        """
-        Blend a pixel color with the existing color at the specified position.
-        Also updates the element map if the new element has higher z-index.
-        """
-        return blend_pixel(
-            array, x, y, color, element, self.shared.element_map, self.drawing_config
+        return get_room_at_position(
+            self.shared.element_map, x, y, DrawableElement.ROOM_1
         )
 
     @staticmethod

valetudo_map_parser/map_data.py

@@ -3,7 +3,7 @@ Collections of Json and List routines
 ImageData is part of the Image_Handler
 used functions to search data in the json
 provided for the creation of the new camera frame
-Version: v0.1.9.b42
+Version: v0.1.6
 """
 
 from __future__ import annotations

valetudo_map_parser/rand25_handler.py

@@ -31,7 +31,6 @@ from .config.utils import (
     BaseHandler,
     get_element_at_position,
     get_room_at_position,
-    handle_room_outline_error,
     initialize_drawing_config,
     manage_drawable_elements,
     prepare_resize_params,
@@ -150,81 +149,55 @@ class ReImageHandler(BaseHandler, AutoCrop):
             room_id_to_data = {room["id"]: room for room in room_data}
             self.rooms_pos = []
             room_properties = {}
-            if not self.outlines:
-                # Return empty data if no outlines are available
-                _LOGGER.debug("%s: No outlines available", self.file_name)
-                return None, None, None
-
-            # If we have outlines, proceed with processing
-            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]
-
-                    # Get rectangular corners as a fallback
-                    corners = self.get_corners(x_max, x_min, y_max, y_min)
-
-                    # Try to extract a more accurate room outline from the element map
-                    try:
-                        # Extract the room outline using the element map
-                        outline = await self.extract_room_outline_from_map(
-                            room_id, self.segment_data[id_x]
+            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,
+                            }
                         )
-                        _LOGGER.debug(
-                            "%s: Traced outline for room %s with %d points",
-                            self.file_name,
-                            room_id,
-                            len(outline),
-                        )
-                    except (
-                        ValueError,
-                        IndexError,
-                        TypeError,
-                        ArithmeticError,
-                    ) as e:
-                        handle_room_outline_error(self.file_name, room_id, e)
-                        outline = corners
-
-                    # 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(
-                        {
+                        room_properties[int(room_id)] = {
+                            "number": int(room_id),
+                            "outline": corners,
                             "name": name,
-                            "corners": corners,
+                            "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
                     )
-                    room_properties[int(room_id)] = {
-                        "number": int(room_id),
-                        "outline": outline,
-                        "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)
+                rooms = RoomStore(self.file_name, room_properties)
+                _LOGGER.debug("Rooms Data: %s", rooms.get_rooms())
+                return room_properties, zone_properties, point_properties
             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
+                _LOGGER.debug("%s: No outlines available", self.file_name)
+                return None, None, None
         except (RuntimeError, ValueError) as e:
             _LOGGER.debug(
                 "No rooms Data or Error in extract_room_properties: %s",
@@ -427,7 +400,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
 
     async def get_rooms_attributes(
         self, destinations: JsonType = None
-    ) -> RoomsProperties:
+    ) -> tuple[RoomsProperties, Any, Any]:
         """Return the rooms attributes."""
         if self.room_propriety:
             return self.room_propriety
@@ -475,12 +448,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
         # If no rooms data is available, return a default position
         if not self.rooms_pos:
             _LOGGER.debug("%s: No rooms data available", self.file_name)
-            return {
-                "x": robot_x,
-                "y": robot_y,
-                "angle": angle,
-                "in_room": "unknown"
-            }
+            return {"x": robot_x, "y": robot_y, "angle": angle, "in_room": "unknown"}
 
         # If rooms data is available, search for the room
         if self.robot_in_room:
@@ -504,9 +472,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
                     "angle": angle,
                     "in_room": self.robot_in_room["room"],
                 }
-                _LOGGER.debug(
-                    "%s is in %s", self.file_name, self.robot_in_room["room"]
-                )
+                _LOGGER.debug("%s is in %s", self.file_name, self.robot_in_room["room"])
                 del room, corners, robot_x, robot_y  # free memory.
                 return temp
         # After checking all rooms and not finding a match
@@ -586,8 +552,16 @@ class ReImageHandler(BaseHandler, AutoCrop):
 
         charger_radius = 15
         # Handle both dictionary format {'x': x, 'y': y} and list format [x, y]
-        charger_x = self.charger_pos.get('x') if isinstance(self.charger_pos, dict) else self.charger_pos[0]
-        charger_y = self.charger_pos.get('y') if isinstance(self.charger_pos, dict) else self.charger_pos[1]
+        charger_x = (
+            self.charger_pos.get("x")
+            if isinstance(self.charger_pos, dict)
+            else self.charger_pos[0]
+        )
+        charger_y = (
+            self.charger_pos.get("y")
+            if isinstance(self.charger_pos, dict)
+            else self.charger_pos[1]
+        )
 
         for dy in range(-charger_radius, charger_radius + 1):
             for dx in range(-charger_radius, charger_radius + 1):
@@ -595,5 +569,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
                 if dx * dx + dy * dy <= charger_radius * charger_radius:
                     cx, cy = int(charger_x + dx), int(charger_y + dy)
                     # Check if the coordinates are within the element map bounds
-                    if (0 <= cy < self.element_map.shape[0] and 0 <= cx < self.element_map.shape[1]):
+                    if (0 <= cy < self.element_map.shape[0]) and (
+                        0 <= cx < self.element_map.shape[1]
+                    ):
                         self.element_map[cy, cx] = DrawableElement.CHARGER

valetudo_map_parser/utils/color_utils.py

@@ -12,16 +12,16 @@ def get_blended_color(
     x: int,
     y: int,
     new_element: DrawableElement,
-    new_color: Tuple[int, int, int, int]
+    new_color: Tuple[int, int, int, int],
 ) -> Tuple[int, int, int, int]:
     """
     Get a blended color for a pixel based on the current element map and the new element to draw.
-    
+
     This function:
     1. Gets the current element at position (x,y) from the element map
     2. Gets the color for that element from the colors manager
     3. Blends the new color with the existing color based on alpha values
-    
+
     Args:
         element_map_generator: The element map generator containing the current element map
         colors_manager: The colors manager to get colors for elements
@@ -29,20 +29,20 @@ def get_blended_color(
         y: Y coordinate in the element map
         new_element: The new element to draw at this position
         new_color: The RGBA color of the new element
-        
+
     Returns:
         Blended RGBA color to use for drawing
     """
     # Get current element at this position
     current_element = element_map_generator.get_element_at_position(x, y)
-    
+
     # If no current element or it's the same as the new element, just return the new color
     if current_element is None or current_element == new_element:
         return new_color
-    
+
     # Get color for the current element
     current_color = None
-    
+
     # Handle different element types
     if current_element == DrawableElement.FLOOR:
         # Floor is the background color
@@ -57,6 +57,6 @@ def get_blended_color(
     else:
         # Default for unknown elements
         current_color = (100, 100, 100, 255)
-    
+
     # Blend the colors
     return colors_manager.blend_colors(current_color, new_color)

{valetudo_map_parser-0.1.9b44.dist-info → valetudo_map_parser-0.1.9b46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b44
+Version: 0.1.9b46
 Summary: A Python library to parse Valetudo map data returning a PIL Image object.
 License: Apache-2.0
 Author: Sandro Cantarella
@@ -12,7 +12,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: Pillow (>=10.3.0)
 Requires-Dist: numpy (>=1.26.4)
-Requires-Dist: scikit-image (>=0.22.0)
 Requires-Dist: scipy (>=1.12.0)
 Project-URL: Bug Tracker, https://github.com/sca075/Python-package-valetudo-map-parser/issues
 Project-URL: Changelog, https://github.com/sca075/Python-package-valetudo-map-parser/releases

valetudo_map_parser-0.1.9b46.dist-info/RECORD

@@ -0,0 +1,26 @@
+valetudo_map_parser/__init__.py,sha256=INujZn4exaXUjqMN8nZkGJIziDWlW59t65fJ34HJX44,956
+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/colors.py,sha256=90NkvzX7b2ckEWvTQSX6mvUDvS0IuiywMPX6__74iL0,30283
+valetudo_map_parser/config/drawable.py,sha256=dZ6FZVch9GVIpT4k52I5iXWtSH9oD9KJArcK48p-OaA,23667
+valetudo_map_parser/config/drawable_elements.py,sha256=Ulfgf8B4LuLCfx-FfmC7LrP8o9ll_Sncg9mR774_3KE,43140
+valetudo_map_parser/config/enhanced_drawable.py,sha256=xNgFUNccstP245VgLFEA9gjB3-VvlSAJSjRgSZ3YFL0,16641
+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=WSl5rYSiTqE6YGAiwi9RILMZIQdFZRzVS8DwqzTZBbw,11309
+valetudo_map_parser/config/types.py,sha256=uEJY-yYHHJWW3EZjg7hERSFrC2XuKzzRGT3C0z31Aw0,18359
+valetudo_map_parser/config/utils.py,sha256=MP5_s9VFSdDERymujvDuGB8nYCXVuJcqg5tR5H9HCgY,33167
+valetudo_map_parser/hypfer_draw.py,sha256=oL_RbX0LEcPvOlMrfBA38qpJkMqqVwR-oAEbZeHqLWM,19898
+valetudo_map_parser/hypfer_handler.py,sha256=-nwGlfd-fqmNAHEeQFgCarr1t5v8gJTvb2ngDz_8PbM,27616
+valetudo_map_parser/map_data.py,sha256=lSKD-CG-RENOcNUDnUIIpqh74DuGnLmrH46IF1_EjwQ,19117
+valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valetudo_map_parser/rand25_handler.py,sha256=F9o1J6JZRV3CZTS4CG3AHNHZweKRM0nzd4HLmdPZe4w,23617
+valetudo_map_parser/reimg_draw.py,sha256=1q8LkNTPHEA9Tsapc_JnVw51kpPYNhaBU-KmHkefCQY,12507
+valetudo_map_parser/utils/__init__.py,sha256=r-GKKSPqBkMDd2K-vWe7kAix8OBrGN5HXC1RS2tbDwo,130
+valetudo_map_parser/utils/color_utils.py,sha256=VogvNcITQHvtMUrVkzKcimvKtwSw0fjH72_RWtNoULA,2394
+valetudo_map_parser-0.1.9b46.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b46.dist-info/METADATA,sha256=7UIQEEVpOu_HR4FEIXeoVHSniZYc3FaNPtfZEJZTvMQ,3321
+valetudo_map_parser-0.1.9b46.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b46.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+valetudo_map_parser-0.1.9b46.dist-info/RECORD,,