valetudo-map-parser 0.1.9b100__py3-none-any.whl → 0.1.10b1__py3-none-any.whl

valetudo_map_parser/config/drawable.py

@@ -545,95 +545,78 @@ class Drawable:
         angle: float,
         fill: Color,
         robot_state: str | None = None,
+        radius: int = 25  # user-configurable
     ) -> NumpyArray:
         """
-        Draw the robot on a smaller array to reduce memory cost.
-        Optimized with NumPy vectorized operations for better performance.
+        Draw the robot with configurable size. All elements scale with radius.
         """
-        # Ensure coordinates are within bounds
+        # Minimum radius to keep things visible
+        radius = max(8, min(radius, 25))
+    
         height, width = layers.shape[:2]
         if not (0 <= x < width and 0 <= y < height):
             return layers
-
-        # Calculate the bounding box for the robot
-        radius = 25
-        box_size = radius * 2 + 2  # Add a small margin
-
-        # Calculate the region to draw on
+    
+        # Bounding box
+        box_size = radius * 2 + 2
         top_left_x = max(0, x - radius - 1)
         top_left_y = max(0, y - radius - 1)
         bottom_right_x = min(width, x + radius + 1)
         bottom_right_y = min(height, y + radius + 1)
-
-        # Skip if the robot is completely outside the image
+    
         if top_left_x >= bottom_right_x or top_left_y >= bottom_right_y:
             return layers
-
-        # Create a temporary layer for the robot
+    
         tmp_width = bottom_right_x - top_left_x
         tmp_height = bottom_right_y - top_left_y
         tmp_layer = layers[top_left_y:bottom_right_y, top_left_x:bottom_right_x].copy()
-
-        # Calculate the robot center in the temporary layer
+    
         tmp_x = x - top_left_x
         tmp_y = y - top_left_y
-
-        # Calculate robot parameters
-        r_scaled = radius // 11
-        r_cover = r_scaled * 12
+    
+        # All geometry proportional to radius
+        r_scaled = max(1, radius / 11.0)
+        r_cover  = int(r_scaled * 12)
+        r_lidar  = max(1, int(r_scaled * 3))
+        r_button = max(1, int(r_scaled * 1))
+        lidar_offset = int(radius * 0.6)   # was fixed 15
+        button_offset = int(radius * 0.8)  # was fixed 20
+    
         lidar_angle = np.deg2rad(angle + 90)
-        r_lidar = r_scaled * 3
-        r_button = r_scaled * 1
-
-        # Set colors based on robot state
+    
         if robot_state == "error":
             outline = Drawable.ERROR_OUTLINE
             fill = Drawable.ERROR_COLOR
         else:
             outline = (fill[0] // 2, fill[1] // 2, fill[2] // 2, fill[3])
-
-        # Draw the main robot body
-        tmp_layer = Drawable._filled_circle(
-            tmp_layer, (tmp_y, tmp_x), radius, fill, outline, 1
-        )
-
-        # Draw the robot direction indicator
+    
+        # Body
+        tmp_layer = Drawable._filled_circle(tmp_layer, (tmp_y, tmp_x), radius, fill, outline, 1)
+    
+        # Direction wedge
         angle -= 90
         a1 = ((angle + 90) - 80) / 180 * math.pi
         a2 = ((angle + 90) + 80) / 180 * math.pi
-        x1 = int(tmp_x - r_cover * math.sin(a1))
-        y1 = int(tmp_y + r_cover * math.cos(a1))
-        x2 = int(tmp_x - r_cover * math.sin(a2))
-        y2 = int(tmp_y + r_cover * math.cos(a2))
-
-        # Draw the direction line
-        if (
-            0 <= x1 < tmp_width
-            and 0 <= y1 < tmp_height
-            and 0 <= x2 < tmp_width
-            and 0 <= y2 < tmp_height
-        ):
+        x1 = int(tmp_x - r_cover * np.sin(a1))
+        y1 = int(tmp_y + r_cover * np.cos(a1))
+        x2 = int(tmp_x - r_cover * np.sin(a2))
+        y2 = int(tmp_y + r_cover * np.cos(a2))
+        if 0 <= x1 < tmp_width and 0 <= y1 < tmp_height and 0 <= x2 < tmp_width and 0 <= y2 < tmp_height:
             tmp_layer = Drawable._line(tmp_layer, x1, y1, x2, y2, outline, width=1)
-
-        # Draw the lidar indicator
-        lidar_x = int(tmp_x + 15 * np.cos(lidar_angle))
-        lidar_y = int(tmp_y + 15 * np.sin(lidar_angle))
+    
+        # Lidar
+        lidar_x = int(tmp_x + lidar_offset * np.cos(lidar_angle))
+        lidar_y = int(tmp_y + lidar_offset * np.sin(lidar_angle))
         if 0 <= lidar_x < tmp_width and 0 <= lidar_y < tmp_height:
-            tmp_layer = Drawable._filled_circle(
-                tmp_layer, (lidar_y, lidar_x), r_lidar, outline
-            )
-
-        # Draw the button indicator
-        butt_x = int(tmp_x - 20 * np.cos(lidar_angle))
-        butt_y = int(tmp_y - 20 * np.sin(lidar_angle))
+            tmp_layer = Drawable._filled_circle(tmp_layer, (lidar_y, lidar_x), r_lidar, outline)
+    
+        # Button
+        butt_x = int(tmp_x - button_offset * np.cos(lidar_angle))
+        butt_y = int(tmp_y - button_offset * np.sin(lidar_angle))
         if 0 <= butt_x < tmp_width and 0 <= butt_y < tmp_height:
-            tmp_layer = Drawable._filled_circle(
-                tmp_layer, (butt_y, butt_x), r_button, outline
-            )
-
-        # Copy the robot layer back to the main layer
+            tmp_layer = Drawable._filled_circle(tmp_layer, (butt_y, butt_x), r_button, outline)
+    
         layers[top_left_y:bottom_right_y, top_left_x:bottom_right_x] = tmp_layer
-
         return layers
 
     @staticmethod

valetudo_map_parser/map_data.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 
 import numpy as np
 
-from SCR.valetudo_map_parser.config.types import ImageSize, JsonType
+from .config.types import ImageSize, JsonType
 
 
 class ImageData:

{valetudo_map_parser-0.1.9b100.dist-info → valetudo_map_parser-0.1.10b1.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ valetudo_map_parser/config/async_utils.py,sha256=e1j9uTtg4dhPVWvB2_XgqaH4aeSjRAP
 valetudo_map_parser/config/auto_crop.py,sha256=Aes7vfv4z8ihYvGaH5Nryj6Y9mHDerZLIeyvePjf9aQ,19259
 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=KpGW4Alm374jeVjsGLhjtiOpsLwxFEDkYD2nNj_G3QU,33139
+valetudo_map_parser/config/drawable.py,sha256=oiTRYA1P7XDioqbsc5WNrFgPF4xUTd0xQ_Arrd7HXYY,32788
 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
@@ -15,13 +15,13 @@ valetudo_map_parser/config/utils.py,sha256=p_ez39FPUNXxXSOEJZ16T1eQXzNJwRJN1F30i
 valetudo_map_parser/hypfer_draw.py,sha256=mMA0MLmV3Man47VUmj823xwyHprJJmb0nXxmutRNK58,28976
 valetudo_map_parser/hypfer_handler.py,sha256=kXi7f1YGHlC3yPD6knX_8rbJCH8j7uvIOhjdG0C7_as,24061
 valetudo_map_parser/hypfer_rooms_handler.py,sha256=NkpOA6Gdq-2D3lLAxvtNuuWMvPXHxeMY2TO5RZLSHlU,22652
-valetudo_map_parser/map_data.py,sha256=vd4Yjs5FFKrOjA13zyvcZbVrq22EAfUDJp_SDZHwZBU,18924
+valetudo_map_parser/map_data.py,sha256=Ogk3SE7iiNYMdlO8aFFnKOsbrqY28DR5NekbGs_Z84M,18901
 valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valetudo_map_parser/rand256_handler.py,sha256=daaSQ5ktMUYMnYxJkjS75UdBchpXVZ58HIomwHBFivs,27651
 valetudo_map_parser/reimg_draw.py,sha256=LNPEW8jtf7w4R0IM9FMy3YJQzwY21isq9eLhs3ai9o8,12735
 valetudo_map_parser/rooms_handler.py,sha256=ovqQtAjauAqwUNPR0aX27P2zhheQmqfaFhDE3_AwYWk,17821
-valetudo_map_parser-0.1.9b100.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b100.dist-info/METADATA,sha256=4Im3bBGaDoVmmdgTe60WHDEISkCAVY88_3uY2wiR6m4,3322
-valetudo_map_parser-0.1.9b100.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b100.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-valetudo_map_parser-0.1.9b100.dist-info/RECORD,,
+valetudo_map_parser-0.1.10b1.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.10b1.dist-info/METADATA,sha256=YcpN77ru36Y02pGm3KgRU9bcHCTtbDaYZtvYAEZGuFI,3321
+valetudo_map_parser-0.1.10b1.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.10b1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+valetudo_map_parser-0.1.10b1.dist-info/RECORD,,