valetudo-map-parser 0.1.9b2__py3-none-any.whl → 0.1.9b4__py3-none-any.whl

valetudo_map_parser/__init__.py

@@ -1,20 +1,20 @@
 """Valetudo map parser.
 Version: 0.1.8"""
 
-from .hypfer_handler import HypferMapImageHandler
-from .rand25_handler import ReImageHandler
-from .config.rand25_parser import RRMapParser
-from .config.shared import CameraShared, CameraSharedManager
 from .config.colors import ColorsManagment
 from .config.drawable import Drawable
+from .config.rand25_parser import RRMapParser
+from .config.shared import CameraShared, CameraSharedManager
 from .config.types import (
-    SnapshotStore,
-    UserLanguageStore,
-    RoomStore,
+    CameraModes,
     RoomsProperties,
+    RoomStore,
+    SnapshotStore,
     TrimCropData,
-    CameraModes,
+    UserLanguageStore,
 )
+from .hypfer_handler import HypferMapImageHandler
+from .rand25_handler import ReImageHandler
 
 __all__ = [
     "HypferMapImageHandler",

valetudo_map_parser/config/auto_crop.py

@@ -70,7 +70,7 @@ class AutoCrop:
             )
         return trimmed_width, trimmed_height
 
-    async def _async_auto_crop_data(self): #, tdata=None
+    async def _async_auto_crop_data(self):  # , tdata=None
         """Load the auto crop data from the Camera config."""
         # todo: implement this method but from config data
         # if not self.imh.auto_crop:

valetudo_map_parser/config/colors.py

@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from enum import StrEnum
-from typing import List, Dict, Tuple
 import logging
+from enum import StrEnum
+from typing import Dict, List, Tuple
 
 _LOGGER = logging.getLogger(__name__)
 

valetudo_map_parser/config/drawable.py

@@ -10,8 +10,8 @@ from __future__ import annotations
 
 import math
 
-from PIL import ImageDraw, ImageFont
 import numpy as np
+from PIL import ImageDraw, ImageFont
 
 from .types import Color, NumpyArray, PilPNG, Point, Union
 

valetudo_map_parser/config/rand25_parser.py

@@ -5,10 +5,10 @@ Version: v2024.08.2
 - Additional functions are to get in our image_handler the images datas.
 """
 
-from enum import Enum
 import math
 import struct
-from typing import Dict, List, Optional, Callable, TypeVar, Any
+from enum import Enum
+from typing import Any, Callable, Dict, List, Optional, TypeVar
 
 _CallableT = TypeVar("_CallableT", bound=Callable[..., Any])
 
@@ -257,7 +257,7 @@ class RRMapParser:
 
     @callback
     def parse_rrm_data(
-            self, map_buf: bytes, pixels: bool = False
+        self, map_buf: bytes, pixels: bool = False
     ) -> Optional[Dict[str, Any]]:
         """Parse the complete map data."""
         if not self.parse(map_buf).get("map_index"):
@@ -350,7 +350,7 @@ class RRMapParser:
 
     @staticmethod
     def _parse_virtual_walls_data(
-            parsed_map_data: Dict[str, Any], blocks: Dict[int, Any]
+        parsed_map_data: Dict[str, Any], blocks: Dict[int, Any]
     ):
         """Parse virtual walls data."""
         if RRMapParser.Types.VIRTUAL_WALLS.value in blocks:
@@ -387,6 +387,11 @@ class RRMapParser:
                 for zone in blocks[RRMapParser.Types.FORBIDDEN_MOP_ZONES.value]
             ]
 
+        if RRMapParser.Types.GOTO_TARGET.value in blocks:
+            parsed_map_data["goto_target"] = blocks[
+                RRMapParser.Types.GOTO_TARGET.value
+            ]["position"]
+
     def parse_data(
         self, payload: Optional[bytes] = None, pixels: bool = False
     ) -> Optional[Dict[str, Any]]:

valetudo_map_parser/config/shared.py

@@ -9,7 +9,9 @@ import logging
 
 from .types import (
     ATTR_CALIBRATION_POINTS,
+    ATTR_CAMERA_MODE,
     ATTR_MARGINS,
+    ATTR_OBSTACLES,
     ATTR_POINTS,
     ATTR_ROOMS,
     ATTR_ROTATE,
@@ -19,8 +21,6 @@ from .types import (
     ATTR_VACUUM_POSITION,
     ATTR_VACUUM_STATUS,
     ATTR_ZONES,
-    ATTR_CAMERA_MODE,
-    ATTR_OBSTACLES,
     CONF_ASPECT_RATIO,
     CONF_AUTO_ZOOM,
     CONF_OFFSET_BOTTOM,
@@ -35,8 +35,8 @@ from .types import (
     CONF_ZOOM_LOCK_RATIO,
     DEFAULT_VALUES,
     CameraModes,
+    Colors,
 )
-from .types import Colors
 
 _LOGGER = logging.getLogger(__name__)
 

valetudo_map_parser/config/types.py

@@ -4,13 +4,13 @@ Version 0.0.1
 """
 
 import asyncio
-from dataclasses import dataclass
 import json
 import logging
+from dataclasses import dataclass
 from typing import Any, Dict, Tuple, Union
 
-from PIL import Image
 import numpy as np
+from PIL import Image
 
 DEFAULT_ROOMS = 1
 

valetudo_map_parser/hypfer_draw.py

@@ -10,12 +10,7 @@ import hashlib
 import json
 import logging
 
-from .config.types import (
-    Color,
-    JsonType,
-    NumpyArray,
-    RobotPosition,
-)
+from .config.types import Color, JsonType, NumpyArray, RobotPosition
 
 _LOGGER = logging.getLogger(__name__)
 

valetudo_map_parser/hypfer_handler.py

@@ -12,6 +12,10 @@ import logging
 
 from PIL import Image
 
+from .config.auto_crop import AutoCrop
+from .config.colors import ColorsManagment, SupportedColor
+from .config.drawable import Drawable
+from .config.shared import CameraShared
 from .config.types import (
     CalibrationPoints,
     ChargerPosition,
@@ -19,18 +23,10 @@ from .config.types import (
     RobotPosition,
     RoomsProperties,
 )
-from .config.auto_crop import AutoCrop
-from .config.drawable import Drawable
-from .config.shared import CameraShared
+from .hypfer_draw import ImageDraw as ImDraw
+from .images_utils import ImageUtils as ImUtils
+from .images_utils import resize_to_aspect_ratio
 from .map_data import ImageData
-from .images_utils import (
-    ImageUtils as ImUtils,
-    resize_to_aspect_ratio,
-)
-from .hypfer_draw import (
-    ImageDraw as ImDraw,
-)
-from .config.colors import ColorsManagment, SupportedColor
 
 _LOGGER = logging.getLogger(__name__)
 

valetudo_map_parser/map_data.py

@@ -8,17 +8,10 @@ Version: v0.1.6
 
 from __future__ import annotations
 
-from logging import getLogger
 import numpy as np
 
-from .config.types import (
-    Colors,
-    ImageSize,
-    JsonType,
-    NumpyArray,
-)
+from .config.types import Colors, ImageSize, JsonType, NumpyArray
 
-_LOGGER = getLogger(__name__)
 
 class ImageData:
     """Class to handle the image data."""
@@ -330,7 +323,6 @@ class RandImageData:
         try:
             path_data = json_data.get("goto_target", {})
         except KeyError:
-            _LOGGER.debug("No goto target data found in the json.")
             return None
 
         if path_data and path_data != []:

valetudo_map_parser/rand25_handler.py

@@ -9,12 +9,21 @@ from __future__ import annotations
 
 import logging
 import uuid
+from typing import Any
 
 from PIL import Image, ImageOps
-from typing import Any
-from .config.types import COLORS, DEFAULT_IMAGE_SIZE, DEFAULT_PIXEL_SIZE
-from .config.types import Colors, JsonType, PilPNG, RobotPosition, RoomsProperties
+
 from .config.auto_crop import AutoCrop
+from .config.types import (
+    COLORS,
+    DEFAULT_IMAGE_SIZE,
+    DEFAULT_PIXEL_SIZE,
+    Colors,
+    JsonType,
+    PilPNG,
+    RobotPosition,
+    RoomsProperties,
+)
 from .images_utils import ImageUtils as ImUtils
 from .map_data import RandImageData
 from .reimg_draw import ImageDraw
@@ -207,9 +216,11 @@ class ReImageHandler:
     async def _setup_robot_and_image(
         self, m_json, size_x, size_y, colors, destinations
     ):
-        _, robot_position, robot_position_angle = await self.imd.async_get_robot_position(
-            m_json
-        )
+        (
+            _,
+            robot_position,
+            robot_position_angle,
+        ) = await self.imd.async_get_robot_position(m_json)
         if self.frame_number == 0:
             room_id, img_np_array = await self.imd.async_draw_base_layer(
                 m_json,
@@ -247,7 +258,9 @@ class ReImageHandler:
         img_np_array = await self.imd.async_draw_path(
             img_np_array, m_json, colors["move"]
         )
-        await self.imd.async_draw_go_to_flag(img_np_array, m_json, colors["go_to"])
+        img_np_array = await self.imd.async_draw_go_to_flag(
+            img_np_array, m_json, colors["go_to"]
+        )
         img_np_array = await self.imd.async_draw_robot_on_map(
             img_np_array, robot_position, robot_position_angle, colors["robot"]
         )

valetudo_map_parser/reimg_draw.py

@@ -10,10 +10,9 @@ import hashlib
 import json
 import logging
 
-from .config.types import Color, JsonType, NumpyArray
 from .config.drawable import Drawable
-from .map_data import RandImageData
-from .map_data import ImageData
+from .config.types import Color, JsonType, NumpyArray
+from .map_data import ImageData, RandImageData
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -43,7 +42,6 @@ class ImageDraw:
                     color_go_to,
                 )
                 predicted_path = self.data.get_rrm_goto_predicted_path(m_json)
-                _LOGGER.debug("Predicted path: %s", predicted_path)
                 if predicted_path:
                     np_array = await self.draw.lines(
                         np_array, predicted_path, 3, self.color_grey

{valetudo_map_parser-0.1.9b2.dist-info → valetudo_map_parser-0.1.9b4.dist-info}/METADATA

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

@@ -0,0 +1,20 @@
+valetudo_map_parser/__init__.py,sha256=pWRSVGM2OtPKTzdpPTEgLrNYjZ9P2duwaDLI_KN-iLY,809
+valetudo_map_parser/config/__init__.py,sha256=DQ9plV3ZF_K25Dp5ZQHPDoG-40dQoJNdNi-dfNeR3Zc,48
+valetudo_map_parser/config/auto_crop.py,sha256=z97Yqoe96ZiWmgaKTFv7sODb9UD6doRduTeQXMYWXVA,11018
+valetudo_map_parser/config/colors.py,sha256=0sTI_x0ZMchSDPTsEivdTXDn58nEbyE4REXIp0IpWdg,6514
+valetudo_map_parser/config/drawable.py,sha256=hsrEJCMVOrjs5sJfr26SeqJD0VNlYWwxcVkkHeaxx7U,20356
+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/hypfer_draw.py,sha256=YuxkAUfWphnyHLyUyTlMTvQlxRtfkTZalzV3cQkiqDs,15752
+valetudo_map_parser/hypfer_handler.py,sha256=LpC2ez-XEioURzbOYlg89BKC7N21txKDe835rxBxcJs,18456
+valetudo_map_parser/images_utils.py,sha256=0Baq48oncJy6Z_HxaRhMuknt3TMhBxl92BGDGhw-HYo,15262
+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=gHVoD5SrgViXVoUQTKb0AImdh2kWfzaRPFtco1kt3_0,19566
+valetudo_map_parser/reimg_draw.py,sha256=RpqPEjVOF0W2Ug7QhqB2ZI3KI_GBs9Sbo_7A7E9Lt_4,13307
+valetudo_map_parser-0.1.9b4.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b4.dist-info/METADATA,sha256=zqs2g9pQpNfMw2veVYffGtMc5r2v0Alb4AS7LXZYInM,1028
+valetudo_map_parser-0.1.9b4.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+valetudo_map_parser-0.1.9b4.dist-info/RECORD,,

valetudo_map_parser-0.1.9b2.dist-info/RECORD

@@ -1,20 +0,0 @@
-valetudo_map_parser/__init__.py,sha256=0pbU11Jz-SwqF-FkrZM4Kp5-LOWNSc_nIE91OE4iHm4,809
-valetudo_map_parser/config/__init__.py,sha256=DQ9plV3ZF_K25Dp5ZQHPDoG-40dQoJNdNi-dfNeR3Zc,48
-valetudo_map_parser/config/auto_crop.py,sha256=W8caSQf8Pwu3tCGgJJrF3dlEisM5pb2m0lg14PuAnV8,11016
-valetudo_map_parser/config/colors.py,sha256=HlgROKagpV7FP9LTU1IvhTKTYjnlBw1ZDMKHVJSct8M,6514
-valetudo_map_parser/config/drawable.py,sha256=8Fp4yqyFbsGvNyCEynYCTpiohRZk_plUSSOyHpECvj8,20356
-valetudo_map_parser/config/rand25_parser.py,sha256=yQz6RFS7w962MowYLoUZYgZ0tL_S6uutScnDR10V5ng,16265
-valetudo_map_parser/config/shared.py,sha256=8xYBUfKY-tiPhXaT5ttIasnCWL3_RLawIZeTValQC64,9462
-valetudo_map_parser/config/types.py,sha256=bVSEDE0ihrc01jG4fZ1_hUVtoj6hdkbqShytZ6wJwJY,16163
-valetudo_map_parser/hypfer_draw.py,sha256=R8JVrqPPavhj8exCDJKk1QsXgsB12cjy4AIgFffyQec,15773
-valetudo_map_parser/hypfer_handler.py,sha256=CTFF9O56_BBNWZadhvvS-e6U880nXtDdNtYgMcvxXXA,18453
-valetudo_map_parser/images_utils.py,sha256=0Baq48oncJy6Z_HxaRhMuknt3TMhBxl92BGDGhw-HYo,15262
-valetudo_map_parser/map_data.py,sha256=26lolgfj_XjguZgE8MwO7GMz4xt8SWzJsTiA1RbOq98,19596
-valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valetudo_map_parser/rand25_handler.py,sha256=gQZGWJbjbW3fldxl53JzeOlkx7jdxWpsVn-AhJ6t38I,19489
-valetudo_map_parser/reimg_draw.py,sha256=icyjy8To6jNIFzUCg6xA7hRliLZceFNeUjygqAJFCeU,13396
-valetudo_map_parser-0.1.9b2.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b2.dist-info/METADATA,sha256=9zy80BX81lh4y-Lc6XFAVt7KZTqq8Kk0NEzBFXouUlg,1028
-valetudo_map_parser-0.1.9b2.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-valetudo_map_parser-0.1.9b2.dist-info/RECORD,,