valetudo-map-parser 0.1.9b6__py3-none-any.whl → 0.1.9b8__py3-none-any.whl

valetudo_map_parser/config/utils.py

@@ -31,6 +31,7 @@ class BaseHandler:
         self.offset_x = 0
         self.offset_y = 0
         self.shared = None
+        self.crop_area = [0, 0, 0, 0]
 
     def get_frame_number(self) -> int:
         """Return the frame number of the image."""
@@ -316,20 +317,20 @@ class BaseHandler:
         # get_calibration_data
         vacuum_points = [
             {
-                "x": self.img.crop_area[0] + self.img.offset_x,
-                "y": self.img.crop_area[1] + self.img.offset_y,
+                "x": self.crop_area[0] + self.offset_x,
+                "y": self.crop_area[1] + self.offset_y,
             },  # Top-left corner 0
             {
-                "x": self.img.crop_area[2] - self.img.offset_x,
-                "y": self.img.crop_area[1] + self.img.offset_y,
+                "x": self.crop_area[2] - self.offset_x,
+                "y": self.crop_area[1] + self.offset_y,
             },  # Top-right corner 1
             {
-                "x": self.img.crop_area[2] - self.img.offset_x,
-                "y": self.img.crop_area[3] - self.img.offset_y,
+                "x": self.crop_area[2] - self.offset_x,
+                "y": self.crop_area[3] - self.offset_y,
             },  # Bottom-right corner 2
             {
-                "x": self.img.crop_area[0] + self.img.offset_x,
-                "y": self.img.crop_area[3] - self.img.offset_y,
+                "x": self.crop_area[0] + self.offset_x,
+                "y": self.crop_area[3] - self.offset_y,
             },  # Bottom-left corner (optional)3
         ]
 
@@ -363,20 +364,20 @@ class BaseHandler:
         RAND256 Vacuums Calibration Points are in 10th of a mm."""
         vacuum_points = [
             {
-                "x": ((self.img.crop_area[0] + self.img.offset_x) * 10),
-                "y": ((self.img.crop_area[1] + self.img.offset_y) * 10),
+                "x": ((self.crop_area[0] + self.offset_x) * 10),
+                "y": ((self.crop_area[1] + self.offset_y) * 10),
             },  # Top-left corner 0
             {
-                "x": ((self.img.crop_area[2] - self.img.offset_x) * 10),
-                "y": ((self.img.crop_area[1] + self.img.offset_y) * 10),
+                "x": ((self.crop_area[2] - self.offset_x) * 10),
+                "y": ((self.crop_area[1] + self.offset_y) * 10),
             },  # Top-right corner 1
             {
-                "x": ((self.img.crop_area[2] - self.img.offset_x) * 10),
-                "y": ((self.img.crop_area[3] - self.img.offset_y) * 10),
+                "x": ((self.crop_area[2] - self.offset_x) * 10),
+                "y": ((self.crop_area[3] - self.offset_y) * 10),
             },  # Bottom-right corner 2
             {
-                "x": ((self.img.crop_area[0] + self.img.offset_x) * 10),
-                "y": ((self.img.crop_area[3] - self.img.offset_y) * 10),
+                "x": ((self.crop_area[0] + self.offset_x) * 10),
+                "y": ((self.crop_area[3] - self.offset_y) * 10),
             },  # Bottom-left corner (optional)3
         ]
 

valetudo_map_parser/hypfer_draw.py

@@ -70,7 +70,7 @@ class ImageDraw:
         self, img_np_array, pixels, layer_type, room_id, pixel_size, color_zone_clean
     ):
         """Process a room layer (segment or floor)."""
-        room_color = self.img_h.rooms_colors[room_id]
+        room_color = self.img_h.shared.rooms_colors[room_id]
 
         try:
             if layer_type == "segment":

valetudo_map_parser/hypfer_handler.py

@@ -207,7 +207,7 @@ class HypferMapImageHandler(BaseHandler):
                 img_np_array = await self.async_copy_array(self.img_base_layer)
                 # All below will be drawn at each frame.
                 # Draw zones if any.
-                img_np_array = await self.async_draw_zones(
+                img_np_array = await self.imd.async_draw_zones(
                     m_json,
                     img_np_array,
                     colors["zone_clean"],
@@ -219,7 +219,7 @@ class HypferMapImageHandler(BaseHandler):
                 )
                 # Draw path prediction and paths.
                 img_np_array = await self.imd.async_draw_paths(
-                    img_np_array, m_json, colors["color_move"], self.color_grey
+                    img_np_array, m_json, colors["move"], self.color_grey
                 )
                 # Check if the robot is docked.
                 if self.shared.vacuum_state == "docked":
@@ -233,13 +233,13 @@ class HypferMapImageHandler(BaseHandler):
                         x=robot_position[0],
                         y=robot_position[1],
                         angle=robot_position_angle,
-                        fill=colors["color_robot"],
+                        fill=colors["robot"],
                         robot_state=self.shared.vacuum_state,
                     )
                 # Resize the image
                 img_np_array = await self.ac.async_auto_trim_and_zoom_image(
                     img_np_array,
-                    colors["color_background"],
+                    colors["background"],
                     int(self.shared.margins),
                     int(self.shared.image_rotate),
                     self.zooming,

{valetudo_map_parser-0.1.9b6.dist-info → valetudo_map_parser-0.1.9b8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b6
+Version: 0.1.9b8
 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.9b6.dist-info → valetudo_map_parser-0.1.9b8.dist-info}/RECORD

@@ -6,15 +6,15 @@ valetudo_map_parser/config/drawable.py,sha256=hsrEJCMVOrjs5sJfr26SeqJD0VNlYWwxcV
 valetudo_map_parser/config/rand25_parser.py,sha256=fehyF18hRWRWbXbojocQCIaIch21Lbh1wtl2XdKRSl0,16447
 valetudo_map_parser/config/shared.py,sha256=LQV5K8tbVhEKUkby9ssjEmh_T4Ai-Euzsbag_HWYVRc,9448
 valetudo_map_parser/config/types.py,sha256=-8F1WwCH5hKSih83-WPjYbGdQyKmNqkDmSKvlyz6qPg,16163
-valetudo_map_parser/config/utils.py,sha256=W4meKptsRCAmfNLGPktFy1GiBM1F6tLLZW750VCwCJ8,16717
-valetudo_map_parser/hypfer_draw.py,sha256=JFiWb-06WI1Gt0TrIl2ieBVLHe1_zxh4h9N7V5dXtaM,14951
-valetudo_map_parser/hypfer_handler.py,sha256=SAQFg0VUEA5tDdvnAqDOD6oM_1v5EMRFHwuUcyBmN9g,14087
+valetudo_map_parser/config/utils.py,sha256=V_GmVL10hLaGWRltv8FvxEEohRfswWDmmnp6HA0vsn8,16627
+valetudo_map_parser/hypfer_draw.py,sha256=46bYtbcaZHDYDtOie4byM3Z8CcXw-vl7uQfwN7KdZOk,14958
+valetudo_map_parser/hypfer_handler.py,sha256=hBYy6trd1hmFkyOPJmm1T-y4byi-xGqS8yN_Xwhl0E0,14073
 valetudo_map_parser/map_data.py,sha256=qm1Zlfex0JrfhQsAKUOzsceZL0X92oAyGJ5Wvsq6YhA,19447
 valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valetudo_map_parser/rand25_handler.py,sha256=vph1BCO0g77kTi18y6sqqJfyJfT5033l9CoxJIDO1Ak,15827
 valetudo_map_parser/reimg_draw.py,sha256=dtdbYKKxmQnbOaHBHayWEF07OdSnTKo2CPSOW0qpgH0,12506
-valetudo_map_parser-0.1.9b6.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b6.dist-info/METADATA,sha256=khbAEjQwo2HSh1P9JHBa3OX1tei2MtdgvA2_mWTvvJM,1028
-valetudo_map_parser-0.1.9b6.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-valetudo_map_parser-0.1.9b6.dist-info/RECORD,,
+valetudo_map_parser-0.1.9b8.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b8.dist-info/METADATA,sha256=uoqN0vHYxk79Tfy0Sq4D9aiHjbjwm2gzqUxQbxD3WPU,1028
+valetudo_map_parser-0.1.9b8.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b8.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+valetudo_map_parser-0.1.9b8.dist-info/RECORD,,