valetudo-map-parser 0.1.9b58__py3-none-any.whl → 0.1.9b60__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- valetudo_map_parser/config/utils.py +20 -18
- valetudo_map_parser/hypfer_handler.py +3 -10
- valetudo_map_parser/map_data.py +11 -2
- valetudo_map_parser/rand256_handler.py +1 -5
- {valetudo_map_parser-0.1.9b58.dist-info → valetudo_map_parser-0.1.9b60.dist-info}/METADATA +1 -1
- {valetudo_map_parser-0.1.9b58.dist-info → valetudo_map_parser-0.1.9b60.dist-info}/RECORD +9 -9
- {valetudo_map_parser-0.1.9b58.dist-info → valetudo_map_parser-0.1.9b60.dist-info}/LICENSE +0 -0
- {valetudo_map_parser-0.1.9b58.dist-info → valetudo_map_parser-0.1.9b60.dist-info}/NOTICE.txt +0 -0
- {valetudo_map_parser-0.1.9b58.dist-info → valetudo_map_parser-0.1.9b60.dist-info}/WHEEL +0 -0
@@ -12,7 +12,15 @@ from PIL import Image, ImageOps
|
|
12
12
|
from .drawable import Drawable
|
13
13
|
from .drawable_elements import DrawableElement, DrawingConfig
|
14
14
|
from .enhanced_drawable import EnhancedDrawable
|
15
|
-
from .types import
|
15
|
+
from .types import (
|
16
|
+
LOGGER,
|
17
|
+
ChargerPosition,
|
18
|
+
ImageSize,
|
19
|
+
NumpyArray,
|
20
|
+
PilPNG,
|
21
|
+
RobotPosition,
|
22
|
+
WebPBytes,
|
23
|
+
)
|
16
24
|
|
17
25
|
|
18
26
|
@dataclass
|
@@ -843,10 +851,8 @@ async def async_extract_room_outline(
|
|
843
851
|
|
844
852
|
|
845
853
|
async def numpy_to_webp_bytes(
|
846
|
-
img_np_array: np.ndarray,
|
847
|
-
|
848
|
-
lossless: bool = False
|
849
|
-
) -> bytes:
|
854
|
+
img_np_array: np.ndarray, quality: int = 85, lossless: bool = False
|
855
|
+
) -> WebPBytes:
|
850
856
|
"""
|
851
857
|
Convert NumPy array directly to WebP bytes.
|
852
858
|
|
@@ -864,13 +870,12 @@ async def numpy_to_webp_bytes(
|
|
864
870
|
# Create bytes buffer
|
865
871
|
webp_buffer = io.BytesIO()
|
866
872
|
|
867
|
-
# Save as WebP
|
873
|
+
# Save as WebP - PIL images should use lossless=True for best results
|
868
874
|
pil_img.save(
|
869
875
|
webp_buffer,
|
870
|
-
format=
|
871
|
-
|
872
|
-
|
873
|
-
method=6 # Best compression method
|
876
|
+
format="WEBP",
|
877
|
+
lossless=True, # Always lossless for PIL images
|
878
|
+
method=1, # Fastest method for lossless
|
874
879
|
)
|
875
880
|
|
876
881
|
# Get bytes and cleanup
|
@@ -881,9 +886,7 @@ async def numpy_to_webp_bytes(
|
|
881
886
|
|
882
887
|
|
883
888
|
async def pil_to_webp_bytes(
|
884
|
-
pil_img: Image.Image,
|
885
|
-
quality: int = 85,
|
886
|
-
lossless: bool = False
|
889
|
+
pil_img: Image.Image, quality: int = 85, lossless: bool = False
|
887
890
|
) -> bytes:
|
888
891
|
"""
|
889
892
|
Convert PIL Image to WebP bytes.
|
@@ -899,13 +902,12 @@ async def pil_to_webp_bytes(
|
|
899
902
|
# Create bytes buffer
|
900
903
|
webp_buffer = io.BytesIO()
|
901
904
|
|
902
|
-
# Save as WebP
|
905
|
+
# Save as WebP - PIL images should use lossless=True for best results
|
903
906
|
pil_img.save(
|
904
907
|
webp_buffer,
|
905
|
-
format=
|
906
|
-
|
907
|
-
|
908
|
-
method=6 # Best compression method
|
908
|
+
format="WEBP",
|
909
|
+
lossless=True, # Always lossless for PIL images
|
910
|
+
method=1, # Fastest method for lossless
|
909
911
|
)
|
910
912
|
|
911
913
|
# Get bytes and cleanup
|
@@ -379,11 +379,8 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
|
|
379
379
|
# Return WebP bytes or PIL Image based on parameter
|
380
380
|
if return_webp:
|
381
381
|
from .config.utils import pil_to_webp_bytes
|
382
|
-
|
383
|
-
|
384
|
-
quality=90,
|
385
|
-
lossless=False
|
386
|
-
)
|
382
|
+
|
383
|
+
webp_bytes = await pil_to_webp_bytes(resized_image)
|
387
384
|
return webp_bytes
|
388
385
|
else:
|
389
386
|
return resized_image
|
@@ -391,11 +388,7 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
|
|
391
388
|
# Return WebP bytes or PIL Image based on parameter
|
392
389
|
if return_webp:
|
393
390
|
# Convert directly from NumPy to WebP for better performance
|
394
|
-
webp_bytes = await numpy_to_webp_bytes(
|
395
|
-
img_np_array,
|
396
|
-
quality=90,
|
397
|
-
lossless=False
|
398
|
-
)
|
391
|
+
webp_bytes = await numpy_to_webp_bytes(img_np_array)
|
399
392
|
del img_np_array
|
400
393
|
LOGGER.debug("%s: Frame Completed.", self.file_name)
|
401
394
|
return webp_bytes
|
valetudo_map_parser/map_data.py
CHANGED
@@ -308,8 +308,17 @@ class RandImageData:
|
|
308
308
|
Return the calculated angle and original angle.
|
309
309
|
"""
|
310
310
|
angle_c = round(json_data.get("robot_angle", 0))
|
311
|
-
|
312
|
-
|
311
|
+
# Convert negative values: -10 -> 350, -180 -> 359, but keep positive: 24 -> 24
|
312
|
+
if angle_c < 0:
|
313
|
+
if angle_c == -180:
|
314
|
+
angle = 359 # -180 becomes 359 (avoiding 360)
|
315
|
+
else:
|
316
|
+
angle = 360 + angle_c # -10 -> 350, -90 -> 270
|
317
|
+
else:
|
318
|
+
angle = angle_c
|
319
|
+
|
320
|
+
angle = (angle + 90) % 360
|
321
|
+
return angle, json_data.get("robot_angle", 0)
|
313
322
|
|
314
323
|
@staticmethod
|
315
324
|
def get_rrm_goto_target(json_data: JsonType) -> list or None:
|
@@ -191,11 +191,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
|
|
191
191
|
# Return WebP bytes or PIL Image based on parameter
|
192
192
|
if return_webp:
|
193
193
|
# Convert directly to WebP bytes for better performance
|
194
|
-
webp_bytes = await numpy_to_webp_bytes(
|
195
|
-
img_np_array,
|
196
|
-
quality=90, # High quality for vacuum maps
|
197
|
-
lossless=False, # Use lossy compression for smaller size
|
198
|
-
)
|
194
|
+
webp_bytes = await numpy_to_webp_bytes(img_np_array)
|
199
195
|
del img_np_array # free memory
|
200
196
|
return webp_bytes
|
201
197
|
else:
|
@@ -11,17 +11,17 @@ valetudo_map_parser/config/rand256_parser.py,sha256=LU3y7XvRRQxVen9iwom0dOaDnJJv
|
|
11
11
|
valetudo_map_parser/config/rand25_parser.py,sha256=kIayyqVZBfQfAMkiArzqrrj9vqZB3pkgT0Y5ufrQmGA,16448
|
12
12
|
valetudo_map_parser/config/shared.py,sha256=ogXR5qC2HuLJ3KgYc9KDozXzDQptd8nhvNc-CepN6S0,12301
|
13
13
|
valetudo_map_parser/config/types.py,sha256=HO5fowAjbGmS2rEOFbFe7eFljvpfBr0fsvhcVRTByhI,17540
|
14
|
-
valetudo_map_parser/config/utils.py,sha256=
|
14
|
+
valetudo_map_parser/config/utils.py,sha256=fnzzNywE0Z1qw968hUa_yGslq3YhOP7daFj21miuhjI,31354
|
15
15
|
valetudo_map_parser/hypfer_draw.py,sha256=Bi03FiYdxw2Kp8BwkggAkdKABNoNf-j7v7J-rER8tnQ,28953
|
16
|
-
valetudo_map_parser/hypfer_handler.py,sha256
|
16
|
+
valetudo_map_parser/hypfer_handler.py,sha256=sz2RnV1oYHJkGlzBhYXuMZgPI6qUew1KV-olVgDYPJ8,22026
|
17
17
|
valetudo_map_parser/hypfer_rooms_handler.py,sha256=NkpOA6Gdq-2D3lLAxvtNuuWMvPXHxeMY2TO5RZLSHlU,22652
|
18
|
-
valetudo_map_parser/map_data.py,sha256=
|
18
|
+
valetudo_map_parser/map_data.py,sha256=Ogk3SE7iiNYMdlO8aFFnKOsbrqY28DR5NekbGs_Z84M,18901
|
19
19
|
valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
20
|
-
valetudo_map_parser/rand256_handler.py,sha256=
|
20
|
+
valetudo_map_parser/rand256_handler.py,sha256=8X26-ApkwzfsbuXcdvt-sHWC0ibzjp3VbK0ZRCT77QE,27697
|
21
21
|
valetudo_map_parser/reimg_draw.py,sha256=1q8LkNTPHEA9Tsapc_JnVw51kpPYNhaBU-KmHkefCQY,12507
|
22
22
|
valetudo_map_parser/rooms_handler.py,sha256=ovqQtAjauAqwUNPR0aX27P2zhheQmqfaFhDE3_AwYWk,17821
|
23
|
-
valetudo_map_parser-0.1.
|
24
|
-
valetudo_map_parser-0.1.
|
25
|
-
valetudo_map_parser-0.1.
|
26
|
-
valetudo_map_parser-0.1.
|
27
|
-
valetudo_map_parser-0.1.
|
23
|
+
valetudo_map_parser-0.1.9b60.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
|
24
|
+
valetudo_map_parser-0.1.9b60.dist-info/METADATA,sha256=pw5eZwpkbz0ntVRAdCL8Mv2GlYKww6YE4j22-XywHXM,3321
|
25
|
+
valetudo_map_parser-0.1.9b60.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
|
26
|
+
valetudo_map_parser-0.1.9b60.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
|
27
|
+
valetudo_map_parser-0.1.9b60.dist-info/RECORD,,
|
File without changes
|
{valetudo_map_parser-0.1.9b58.dist-info → valetudo_map_parser-0.1.9b60.dist-info}/NOTICE.txt
RENAMED
File without changes
|
File without changes
|