valetudo-map-parser 0.1.10b8__tar.gz → 0.1.10rc1__tar.gz

{valetudo_map_parser-0.1.10b8 → valetudo_map_parser-0.1.10rc1}/PKG-INFO

@@ -1,19 +1,19 @@
 Metadata-Version: 2.4
 Name: valetudo-map-parser
-Version: 0.1.10b8
+Version: 0.1.10rc1
 Summary: A Python library to parse Valetudo map data returning a PIL Image object.
 License: Apache-2.0
 License-File: LICENSE
 License-File: NOTICE.txt
 Author: Sandro Cantarella
 Author-email: gsca075@gmail.com
-Requires-Python: >=3.12
+Requires-Python: >=3.13
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: Pillow (>=10.3.0)
+Requires-Dist: mvcrender (>=0.0.2)
 Requires-Dist: numpy (>=1.26.4)
 Requires-Dist: scipy (>=1.12.0)
 Project-URL: Bug Tracker, https://github.com/sca075/Python-package-valetudo-map-parser/issues

{valetudo_map_parser-0.1.10b8 → valetudo_map_parser-0.1.10rc1}/SCR/valetudo_map_parser/config/utils.py

@@ -556,8 +556,12 @@ class BaseHandler:
 
 async def async_resize_image(params: ResizeParams):
     """Resize the image to the given dimensions and aspect ratio."""
-    if params.aspect_ratio:
-        wsf, hsf = [int(x) for x in params.aspect_ratio.split(",")]
+
+    if params.aspect_ratio == "None":
+        return params.pil_img
+    if params.aspect_ratio != "None":
+        wsf, hsf = [int(x) for x in params.aspect_ratio.split(":")]
+
 
         if wsf == 0 or hsf == 0 or params.width <= 0 or params.height <= 0:
             LOGGER.warning(
@@ -586,15 +590,15 @@ async def async_resize_image(params: ResizeParams):
 
         return ImageOps.pad(params.pil_img, (new_width, new_height))
 
-    return ImageOps.pad(params.pil_img, (params.width, params.height))
+    return params.pil_img
 
 
 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,
+        width=pil_img.width,
+        height=pil_img.height,
         aspect_ratio=handler.shared.image_aspect_ratio,
         crop_size=handler.crop_img_size,
         offset_func=handler.async_map_coordinates_offset,

{valetudo_map_parser-0.1.10b8 → valetudo_map_parser-0.1.10rc1}/SCR/valetudo_map_parser/hypfer_handler.py

@@ -14,8 +14,8 @@ from PIL import Image
 
 from .config.async_utils import AsyncNumPy, AsyncPIL
 
-from .config.auto_crop import AutoCrop
-# from mvcrender.autocrop import AutoCrop
+# from .config.auto_crop import AutoCrop
+from mvcrender.autocrop import AutoCrop
 from .config.drawable_elements import DrawableElement
 from .config.shared import CameraShared
 from .config.utils import pil_to_webp_bytes
@@ -368,7 +368,7 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                 self.zooming = self.imd.img_h.zooming
 
                 # Resize the image
-                img_np_array = await self.async_auto_trim_and_zoom_image(
+                img_np_array = self.async_auto_trim_and_zoom_image(
                     img_np_array,
                     colors["background"],
                     int(self.shared.margins),

{valetudo_map_parser-0.1.10b8 → valetudo_map_parser-0.1.10rc1}/SCR/valetudo_map_parser/rand256_handler.py

@@ -15,8 +15,8 @@ import numpy as np
 
 from .config.async_utils import AsyncNumPy, AsyncPIL
 
-from .config.auto_crop import AutoCrop
-# from mvcrender.autocrop import AutoCrop
+# from .config.auto_crop import AutoCrop
+from mvcrender.autocrop import AutoCrop
 from .config.drawable_elements import DrawableElement
 from .config.types import (
     COLORS,
@@ -362,7 +362,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
             else:
                 self.zooming = False
 
-        img_np_array = await self.async_auto_trim_and_zoom_image(
+        img_np_array = self.async_auto_trim_and_zoom_image(
             img_np_array,
             detect_colour=colors["background"],
             margin_size=int(self.shared.margins),

{valetudo_map_parser-0.1.10b8 → valetudo_map_parser-0.1.10rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "valetudo-map-parser"
-version = "0.1.10b8"
+version = "0.1.10rc1"
 description = "A Python library to parse Valetudo map data returning a PIL Image object."
 authors = ["Sandro Cantarella <gsca075@gmail.com>"]
 license = "Apache-2.0"
@@ -14,10 +14,11 @@ packages = [{include = "valetudo_map_parser", from = "SCR"}]
 "Changelog" = "https://github.com/sca075/Python-package-valetudo-map-parser/releases"
 
 [tool.poetry.dependencies]
-python = ">=3.12"
+python = ">=3.13"
 numpy = ">=1.26.4"
 Pillow = ">=10.3.0"
 scipy = ">=1.12.0"
+mvcrender = ">=0.0.2"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "*"