valetudo-map-parser 0.1.9b25__tar.gz → 0.1.9b26__tar.gz

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b25
+Version: 0.1.9b26
 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.9b25 → valetudo_map_parser-0.1.9b26}/SCR/valetudo_map_parser/config/shared.py

@@ -6,7 +6,7 @@ Version: v2024.12.0
 
 import asyncio
 import logging
-from typing import Dict, List
+from typing import List
 
 from .types import (
     ATTR_CALIBRATION_POINTS,
@@ -104,7 +104,7 @@ class CameraShared:
         self.map_old_path = None  # Old path data
         self.user_language = None  # User language
         self.trim_crop_data = None
-        self.trims = TrimsData  # Trims data
+        self.trims = TrimsData.from_dict(DEFAULT_VALUES["trims_data"])  # Trims data
         self.skip_room_ids: List[str] = []
 
     def update_user_colors(self, user_colors):

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b26}/SCR/valetudo_map_parser/config/types.py

@@ -7,7 +7,6 @@ import asyncio
 import json
 import logging
 from dataclasses import dataclass, asdict
-from enum import Enum
 from typing import Any, Dict, Tuple, Union
 
 import numpy as np
@@ -617,6 +616,11 @@ class TrimsData:
         """Convert TrimsConfig instance to a JSON string."""
         return json.dumps(asdict(self))
 
+    @classmethod
+    def from_dict(cls, data: dict):
+        """Initialize TrimData from a dictionary."""
+        return cls(**data)
+
     def to_dict(self) -> dict:
-        """Convert TrimsConfig instance to a dictionary."""
+        """Convert TrimData to a dictionary."""
         return asdict(self)

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b26}/SCR/valetudo_map_parser/hypfer_handler.py

@@ -15,7 +15,7 @@ from PIL import Image
 from .config.auto_crop import AutoCrop
 from .config.drawable import Drawable
 from .config.shared import CameraShared
-from .config.types import COLORS, CalibrationPoints, Colors, RoomsProperties, TrimsData
+from .config.types import COLORS, CalibrationPoints, Colors, RoomsProperties
 from .config.utils import BaseHandler, prepare_resize_params
 from .hypfer_draw import ImageDraw as ImDraw
 from .map_data import ImageData
@@ -42,18 +42,11 @@ class HypferMapImageHandler(BaseHandler):
         self.img_base_layer = None  # numpy array store the map base layer.
         self.active_zones = None  # vacuum active zones.
         self.svg_wait = False  # SVG image creation wait.
-        self.trim_up = self.shared.trims.get(
-            TrimsData.TRIM_UP, 0
-        )  # memory stored trims calculated once.
-        self.trim_down = self.shared.trims.get(
-            TrimsData.TRIM_DOWN, 0
-        )  # memory stored trims calculated once.
-        self.trim_left = self.shared.trims.get(
-            TrimsData.TRIM_LEFT, 0
-        )  # memory stored trims calculated once.
-        self.trim_right = self.shared.trims.get(
-            TrimsData.TRIM_RIGHT, 0
-        )  # memory stored trims calculated once.
+        trim_data = self.shared.trims.to_dict()  # trims data
+        self.trim_up = trim_data.get("trim_up", 0)  # trim up
+        self.trim_down = trim_data.get("trim_down", 0)  # trim down
+        self.trim_left = trim_data.get("trim_left", 0)  # trim left
+        self.trim_right = trim_data.get("trim_right", 0)  # trim right
         self.offset_top = self.shared.offset_top  # offset top
         self.offset_bottom = self.shared.offset_down  # offset bottom
         self.offset_left = self.shared.offset_left  # offset left

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b26}/SCR/valetudo_map_parser/rand25_handler.py

@@ -23,7 +23,6 @@ from .config.types import (
     PilPNG,
     RobotPosition,
     RoomsProperties,
-    TrimsData,
 )
 from .config.utils import BaseHandler, prepare_resize_params
 from .map_data import RandImageData
@@ -53,18 +52,11 @@ class ReImageHandler(BaseHandler):
         self.room_propriety = None  # Room propriety data
         self.shared = camera_shared  # Shared data
         self.active_zones = None  # Active zones
-        self.trim_up = self.shared.trims.get(
-            TrimsData.TRIM_UP, 0
-        )  # memory stored trims calculated once.
-        self.trim_down = self.shared.trims.get(
-            TrimsData.TRIM_DOWN, 0
-        )  # memory stored trims calculated once.
-        self.trim_left = self.shared.trims.get(
-            TrimsData.TRIM_LEFT, 0
-        )  # memory stored trims calculated once.
-        self.trim_right = self.shared.trims.get(
-            TrimsData.TRIM_RIGHT, 0
-        )  # memory stored trims calculated once.
+        trim_data = self.shared.trims.to_dict()  # trims data
+        self.trim_up = trim_data.get("trim_up", 0)  # trim up
+        self.trim_down = trim_data.get("trim_down", 0)  # trim down
+        self.trim_left = trim_data.get("trim_left", 0)  # trim left
+        self.trim_right = trim_data.get("trim_right", 0)  # trim right
         self.file_name = self.shared.file_name  # File name
         self.offset_top = self.shared.offset_top  # offset top
         self.offset_bottom = self.shared.offset_down  # offset bottom

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b26}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "valetudo-map-parser"
-version = "0.1.9.b25"
+version = "0.1.9.b26"
 description = "A Python library to parse Valetudo map data returning a PIL Image object."
 authors = ["Sandro Cantarella <gsca075@gmail.com>"]
 license = "Apache-2.0"