valetudo-map-parser 0.1.10b2__py3-none-any.whl → 0.1.10b3__py3-none-any.whl

valetudo_map_parser/config/shared.py

@@ -1,7 +1,7 @@
 """
 Class Camera Shared.
 Keep the data between the modules.
-Version: v0.1.9
+Version: v0.1.10
 """
 
 import asyncio
@@ -82,7 +82,7 @@ class CameraShared:
         self.user_colors = Colors  # User base colors
         self.rooms_colors = Colors  # Rooms colors
         self.vacuum_battery = 0  # Vacuum battery state
-        self.vacuum_bat_charged: bool = True  # Vacuum charged and ready
+        self.vacuum_bat_charged: bool = False  # Vacuum charged and ready
         self.vacuum_connection = None  # Vacuum connection state
         self.vacuum_state = None  # Vacuum state
         self.charger_position = None  # Vacuum Charger position

valetudo_map_parser/config/utils.py

@@ -88,6 +88,7 @@ class BaseHandler:
         bytes_format: bool = False,
         text_enabled: bool = False,
         vacuum_status: str | None = None,
+
     ) -> PilPNG | None:
         """
         Unified async function to get PIL image from JSON data for both Hypfer and Rand256 handlers.
@@ -101,6 +102,7 @@ class BaseHandler:
         @param m_json: The JSON data to use to draw the image
         @param destinations: MQTT destinations for labels (used by Rand256)
         @param bytes_format: If True, also convert to PNG bytes and store in shared.binary_image
+
         @param text_enabled: If True, draw text on the image
         @param vacuum_status: Vacuum status to display on the image
         @return: PIL Image or None

valetudo_map_parser/hypfer_handler.py

@@ -62,7 +62,7 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
         self.img_work_layer = (
             None  # persistent working buffer to avoid per-frame allocations
         )
-        self.active_zones = None  # vacuum active zones.
+        self.active_zones = []  # vacuum active zones.
         self.svg_wait = False  # SVG image creation wait.
         self.imd = ImDraw(self)  # Image Draw class.
         self.color_grey = (128, 128, 128, 255)
@@ -137,9 +137,10 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
 
                 # Get the pixels size and layers from the JSON data
                 pixel_size = int(m_json["pixelSize"])
+                self.active_zones = self.json_data.active_zones
 
                 new_frame_hash = await self.calculate_array_hash(
-                    self.json_data.layers, self.json_data.active_zones
+                    self.json_data.layers, self.active_zones
                 )
                 if self.frame_number == 0:
                     self.img_hash = new_frame_hash

valetudo_map_parser/map_data.py

@@ -217,7 +217,6 @@ class ImageData:
         """
         if layer_dict is None:
             layer_dict = {}
-        if active_list is None:
             active_list = []
 
         if isinstance(json_obj, dict):
@@ -228,12 +227,12 @@ class ImageData:
                     layer_dict.setdefault(layer_type, []).append(
                         json_obj.get("compressedPixels", [])
                     )
-                if layer_type == "segment":
                     # Safely extract "active" flag if present and convertible to int
-                    try:
-                        active_list.append(int(meta_data.get("active", 0)))
-                    except (ValueError, TypeError):
-                        pass  # skip invalid/missing 'active' values
+                    if layer_type == "segment":
+                        try:
+                            active_list.append(int(meta_data.get("active", 0)))
+                        except (ValueError, TypeError):
+                            pass  # skip invalid/missing 'active' values
 
             # json_obj.items() yields (key, value), so we only want the values
             for _, value in json_obj.items():
@@ -724,13 +723,15 @@ class HyperMapData:
         paths = ImageData.find_paths_entities(json_data)
         image_size = ImageData.get_image_size(json_data)
         areas = ImageData.find_zone_entities(json_data)
+        layers = {}
+        active_zones = []
         # Hypothetical obstacles finder, if you have one
         obstacles = getattr(ImageData, "find_obstacles_entities", lambda *_: {})(
             json_data
         )
         virtual_walls = ImageData.find_virtual_walls(json_data)
         pixel_size = int(json_data["pixelSize"])
-        layers, active_zones = ImageData.find_layers(json_data["layers"], {}, [])
+        layers, active_zones = ImageData.find_layers(json_data["layers"], layers, active_zones)
         entity_dict = ImageData.find_points_entities(json_data)
 
         return cls(

{valetudo_map_parser-0.1.10b2.dist-info → valetudo_map_parser-0.1.10b3.dist-info}/METADATA

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

@@ -16,19 +16,19 @@ valetudo_map_parser/config/fonts/NotoSansCJKhk-VF.ttf,sha256=xIXXLKCJzmWoPEg8Hdv
 valetudo_map_parser/config/fonts/NotoSansKhojki.ttf,sha256=XJWzSmpN-Ql6jTfTvFojP_JkCHOztQvixQc1_7hPWrc,107388
 valetudo_map_parser/config/optimized_element_map.py,sha256=52BCnkvVv9bre52LeVIfT8nhnEIpc0TuWTv1xcNu0Rk,15744
 valetudo_map_parser/config/rand256_parser.py,sha256=LU3y7XvRRQxVen9iwom0dOaDnJJvhZdg97NqOYRZFas,16279
-valetudo_map_parser/config/shared.py,sha256=iAPUhwBUsgxtnkOoGozU6V4pYLn1C19kxvVsYMcxjTE,13023
+valetudo_map_parser/config/shared.py,sha256=fyJqie3pIUxClHJLUqEtxbQ0gPmYdBhz38IWIAMP3ng,13025
 valetudo_map_parser/config/types.py,sha256=pq0FmSQkyrG0b0BRcZdRUXJ9pFmg4l_qmhVyAYoZ84o,17357
-valetudo_map_parser/config/utils.py,sha256=2FFw-z8vcOi-DVUvkwNKBK22L29FHp_iWNLchBcfMM4,35422
+valetudo_map_parser/config/utils.py,sha256=0iqrLGhZHXMCxsEfYL94m-GUPnP3aaYRMbCxdFUjO5k,35424
 valetudo_map_parser/hypfer_draw.py,sha256=yN7g-ExRVY2_fft3jTCtQqxNlaU09brt5jVnZILFE6s,28239
-valetudo_map_parser/hypfer_handler.py,sha256=ArQo-God2NnsgmNGXdRAAloCSF0eqktgi6XIXwsqM10,23930
+valetudo_map_parser/hypfer_handler.py,sha256=DE8wAXVMWywK6jGaykjnuC4Y_QtcmsgPtPQBXkGADBs,23982
 valetudo_map_parser/hypfer_rooms_handler.py,sha256=NkpOA6Gdq-2D3lLAxvtNuuWMvPXHxeMY2TO5RZLSHlU,22652
-valetudo_map_parser/map_data.py,sha256=SNyNBCSoEaWslSV1d9fZd6B6BKGoStlq8wL-27F4aL0,25315
+valetudo_map_parser/map_data.py,sha256=EN9zQclFCrkJ28JIjGERapeGJ_ND_zs3C21Qt4XFBQc,25363
 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=XR5ISyyJE4F4Ss5chF1ORmGZtwTjy0ViYQsdNumbz80,12788
 valetudo_map_parser/rooms_handler.py,sha256=ovqQtAjauAqwUNPR0aX27P2zhheQmqfaFhDE3_AwYWk,17821
-valetudo_map_parser-0.1.10b2.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.10b2.dist-info/METADATA,sha256=vhUWpKORonJRGeIqc7iBgT2JaRykfg1-r-JKajrf6wk,3321
-valetudo_map_parser-0.1.10b2.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.10b2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-valetudo_map_parser-0.1.10b2.dist-info/RECORD,,
+valetudo_map_parser-0.1.10b3.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.10b3.dist-info/METADATA,sha256=u9UlGHgJco9t15A9A74CC7n3JND3C72UuxwjaeC-4Bo,3321
+valetudo_map_parser-0.1.10b3.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.10b3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+valetudo_map_parser-0.1.10b3.dist-info/RECORD,,