valetudo-map-parser 0.1.9b20__py3-none-any.whl → 0.1.9b22__py3-none-any.whl

valetudo_map_parser/config/utils.py

@@ -1,11 +1,11 @@
 """Utility code for the valetudo map parser."""
 
-from dataclasses import dataclass
 import hashlib
 import json
+from dataclasses import dataclass
 from logging import getLogger
 
-from PIL import ImageOps, Image
+from PIL import Image, ImageOps
 
 from .types import ChargerPosition, ImageSize, NumpyArray, RobotPosition
 
@@ -500,14 +500,21 @@ async def async_resize_image(params: ResizeParams):
         )
 
         if params.crop_size is not None:
-            params.crop_size[0], params.crop_size[1] = await params.offset_func(
-                wsf=wsf,
-                hsf=hsf,
-                width=new_width,
-                height=new_height,
-                rand256=params.is_rand,
-            )
+            offset = OffsetParams(wsf, hsf, new_width, new_height, params.is_rand)
+            params.crop_size[0], params.crop_size[1] = await params.offset_func(offset)
 
         return ImageOps.pad(params.pil_img, (new_width, new_height))
 
     return ImageOps.pad(params.pil_img, (params.width, params.height))
+
+def prepare_resize_params(handler, pil_img, rand):
+    """Prepare resize parameters for image resizing."""
+    return ResizeParams(
+        pil_img=pil_img,
+        width=handler.shared.image_ref_width,
+        height=handler.shared.image_ref_height,
+        aspect_ratio=handler.shared.image_aspect_ratio,
+        crop_size=handler.crop_img_size,
+        offset_func=handler.async_map_coordinates_offset,
+        is_rand=rand
+    )

valetudo_map_parser/hypfer_handler.py

@@ -16,7 +16,7 @@ from .config.auto_crop import AutoCrop
 from .config.drawable import Drawable
 from .config.shared import CameraShared
 from .config.types import COLORS, CalibrationPoints, Colors, RoomsProperties
-from .config.utils import BaseHandler, ResizeParams
+from .config.utils import BaseHandler, prepare_resize_params
 from .hypfer_draw import ImageDraw as ImDraw
 from .map_data import ImageData
 
@@ -247,15 +247,7 @@ class HypferMapImageHandler(BaseHandler):
             del img_np_array
             # reduce the image size if the zoomed image is bigger then the original.
             if self.check_zoom_and_aspect_ratio():
-                resize_params = ResizeParams(
-                    pil_img=pil_img,
-                    width=self.shared.image_ref_width,
-                    height=self.shared.image_ref_height,
-                    aspect_ratio=self.shared.image_aspect_ratio,
-                    crop_size=self.crop_img_size,
-                    offset_func=self.async_map_coordinates_offset,
-                    is_rand=False,
-                )
+                resize_params = prepare_resize_params(self, pil_img, False)
                 resized_image = await self.async_resize_images(resize_params)
                 return resized_image
             _LOGGER.debug("%s: Frame Completed.", self.file_name)

valetudo_map_parser/rand25_handler.py

@@ -24,7 +24,7 @@ from .config.types import (
     RobotPosition,
     RoomsProperties,
 )
-from .config.utils import BaseHandler, ResizeParams
+from .config.utils import BaseHandler, prepare_resize_params
 from .map_data import RandImageData
 from .reimg_draw import ImageDraw
 
@@ -257,15 +257,7 @@ class ReImageHandler(BaseHandler):
 
     async def _finalize_image(self, pil_img):
         if self.check_zoom_and_aspect_ratio():
-            resize_params = ResizeParams(
-                pil_img=pil_img,
-                width=self.shared.image_ref_width,
-                height=self.shared.image_ref_height,
-                aspect_ratio=self.shared.image_aspect_ratio,
-                crop_size=self.crop_img_size,
-                offset_func=self.async_map_coordinates_offset,
-                is_rand=True,
-            )
+            resize_params = prepare_resize_params(self, pil_img, True)
             pil_img = await self.async_resize_images(resize_params)
         _LOGGER.debug("%s: Frame Completed.", self.file_name)
         return pil_img

{valetudo_map_parser-0.1.9b20.dist-info → valetudo_map_parser-0.1.9b22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b20
+Version: 0.1.9b22
 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.9b20.dist-info → valetudo_map_parser-0.1.9b22.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=sdjqhcxpRSxNFLVHIyCg-RDL9JIjtQHoR2C2WpocWBc,16107
-valetudo_map_parser/config/utils.py,sha256=Vm2gkD_t_7qRtnC_LP9sNiTkwLDLcxTU6MhiE6lBuE8,18221
+valetudo_map_parser/config/utils.py,sha256=QHF0rx72TS0Kpt2iTqqFwr6MlV0TJXK6-_008wDg8nU,18573
 valetudo_map_parser/hypfer_draw.py,sha256=s58ak9IBYLjJyoddfDC99PfQ12HTjkSfJYXqCi4vZKs,14931
-valetudo_map_parser/hypfer_handler.py,sha256=4WnjJwnLWwz0z6LFW0ONAjXSsQywc0Ciz-lTscI2gHA,13860
+valetudo_map_parser/hypfer_handler.py,sha256=8uAPum9JK_JDDSEoD_gLGxMRvdOg4oAABqc3PvW-GTs,13515
 valetudo_map_parser/map_data.py,sha256=6FbQfgxFB6E4kcOWokReJOVSekVaE1kStyhTQhAhiOg,19469
 valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valetudo_map_parser/rand25_handler.py,sha256=dgPYhGBB4Wc_hyJbik0UJeAuyvaK2qMDNTLz5gUvAiQ,15630
+valetudo_map_parser/rand25_handler.py,sha256=iGWxNgLzl-4btakBGKEbLqKOp7j2gDD6bmSAp4YGjkY,15317
 valetudo_map_parser/reimg_draw.py,sha256=dtdbYKKxmQnbOaHBHayWEF07OdSnTKo2CPSOW0qpgH0,12506
-valetudo_map_parser-0.1.9b20.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b20.dist-info/METADATA,sha256=kcTyEtTggKwBtDjmeP6EBGHY3GCY7Y5a5rzindetqy0,1029
-valetudo_map_parser-0.1.9b20.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b20.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-valetudo_map_parser-0.1.9b20.dist-info/RECORD,,
+valetudo_map_parser-0.1.9b22.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b22.dist-info/METADATA,sha256=B6EqNlL0I8Pmt-hy_nvT8HA9EdUTOb-_-X6dDAmowpo,1029
+valetudo_map_parser-0.1.9b22.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b22.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+valetudo_map_parser-0.1.9b22.dist-info/RECORD,,