Corrections for Rand256 and updating the routines #229 from sca075/220-addig-on-off-for-map-trims

Corrections for Rand256 and updating the routines.

Author: sca075

custom_components/mqtt_vacuum_camera/manifest.json

@@ -7,6 +7,6 @@
     "documentation": "https://github.com/sca075/mqtt_vacuum_camera",
     "iot_class": "local_polling",
     "issue_tracker": "https://github.com/sca075/mqtt_vacuum_camera/issues",
-    "requirements": ["pillow==10.4.0", "numpy"],
-    "version": "2024.08.0b2"
+    "requirements": ["pillow", "numpy"],
+    "version": "2024.08.0b3"
 }

custom_components/mqtt_vacuum_camera/utils/img_data.py

@@ -3,7 +3,7 @@
 ImageData is part of the Image_Handler
 used functions to search data in the json
 provided for the creation of the new camera frame
-Version: v2024.06.1
+Version: v2024.08.0
 """
 
 from __future__ import annotations
@@ -173,7 +173,7 @@ def find_virtual_walls_recursive(obj):
         return virtual_walls
 
     @staticmethod
-    async def get_rooms_coordinates(
+    async def async_get_rooms_coordinates(
         pixels: list, pixel_size: int = 5, rand: bool = False
     ) -> tuple:
         """
@@ -463,10 +463,11 @@ def get_rrm_walls(json_data: JsonType) -> list:
         return img.get("pixels", {}).get("walls", [])
 
     @staticmethod
-    def get_rrm_segments(
+    async def async_get_rrm_segments(
         json_data, size_x, size_y, pos_top, pos_left, out_lines: bool = False
     ):
         """Get the segments data from the json."""
+
         img = ImageData.get_rrm_image(json_data)
         seg_data = img.get("segments", {})
         seg_ids = seg_data.get("id")
@@ -485,12 +486,11 @@ def get_rrm_segments(
                 )
             )
             if out_lines:
-                outlines.append(
-                    ImageData.get_rooms_coordinates(
-                        pixels=segments[count_seg], rand=True
-                    )
-                )
-            count_seg += 1
+                room_coords = await ImageData.async_get_rooms_coordinates(
+                    pixels=segments[count_seg],
+                    rand=True)
+                outlines.append(room_coords)
+                count_seg += 1
         if count_seg > 0:
             if out_lines:
                 return segments, outlines

custom_components/mqtt_vacuum_camera/valetudo/MQTT/connector.py

@@ -1,5 +1,5 @@
 """
-Version: v2024.08.0b0
+Version: v2024.08.0
 - Removed the PNG decode, the json is extracted from map-data instead of map-data-hass.
 - Tested no influence on the camera performance.
 - Added gzip library used in Valetudo RE data compression.
@@ -170,7 +170,7 @@ async def is_disconnect_vacuum(self) -> None:
         Disconnect the vacuum detected.
         Generate a Warning message if the vacuum is disconnected.
         """
-        if self._mqtt_vac_connect_state == "disconnected":
+        if self._mqtt_vac_connect_state == "disconnected" or self._mqtt_vac_connect_state == "lost":
             _LOGGER.debug(
                 f"{self._mqtt_topic}: Vacuum Disconnected from MQTT, waiting for connection."
             )
@@ -248,6 +248,9 @@ async def rand256_handle_destinations(self, msg) -> None:
         self._payload = msg.payload
         tmp_data = await self.async_decode_mqtt_payload(msg)
         self._rrm_destinations = tmp_data
+        if 'rooms' in tmp_data:
+            rooms_data = {str(room['id']): room['name'].strip('#') for room in tmp_data['rooms']}
+            await RoomStore().async_set_rooms_data(self._file_name, rooms_data)
         _LOGGER.info(
             f"{self._file_name}: Received vacuum destinations: {self._rrm_destinations}"
         )

custom_components/mqtt_vacuum_camera/valetudo/hypfer/image_handler.py

@@ -2,7 +2,7 @@
 Hypfer Image Handler Class.
 It returns the PIL PNG image frame relative to the Map Data extrapolated from the vacuum json.
 It also returns calibration, rooms data to the card and other images information to the camera.
-Version: 2024.07.2
+Version: 2024.08.0
 """
 
 from __future__ import annotations
@@ -270,7 +270,7 @@ async def async_extract_room_properties(self, json_data):
                     compressed_pixels = layer.get("compressedPixels", [])
                     pixels = self.data.sublist(compressed_pixels, 3)
                     # Calculate x and y min/max from compressed pixels
-                    x_min, y_min, x_max, y_max = await self.data.get_rooms_coordinates(
+                    x_min, y_min, x_max, y_max = await self.data.async_get_rooms_coordinates(
                         pixels, pixel_size
                     )
                     corners = [

custom_components/mqtt_vacuum_camera/valetudo/rand256/image_handler.py

@@ -2,12 +2,11 @@
 Image Handler Module for Valetudo Re Vacuums.
 It returns the PIL PNG image frame relative to the Map Data extrapolated from the vacuum json.
 It also returns calibration, rooms data to the card and other images information to the camera.
-Version: v2024.04.3
+Version: v2024.08.0
 """
 
 from __future__ import annotations
 
-import json
 import logging
 import uuid
 
@@ -37,6 +36,8 @@ class ReImageHandler(object):
 
     def __init__(self, camera_shared):
         self.auto_crop = None  # Auto crop flag
+        self.segment_data = None  # Segment data
+        self.outlines = None  # Outlines data
         self.calibration_data = None  # Calibration data
         self.charger_pos = None  # Charger position
         self.crop_area = None  # Crop area
@@ -153,7 +154,7 @@ async def auto_crop_and_trim_array(
         del image_array
         # Rotate the cropped image based on the given angle
         if rotate == 90:
-            rotated = np.rot90(trimmed, 1)
+            rotated = np.rot90(trimmed)
             self.crop_area = [
                 self.trim_left,
                 self.trim_up,
@@ -180,96 +181,104 @@ async def auto_crop_and_trim_array(
         _LOGGER.debug("Trimmed image size: %s", self.crop_img_size)
         return rotated
 
-    def extract_room_properties(
+    async def extract_room_properties(
         self, json_data: JsonType, destinations: JsonType
     ) -> RoomsProperties:
         """Extract the room properties."""
         unsorted_id = ImageData.get_rrm_segments_ids(json_data)
         size_x, size_y = ImageData.get_rrm_image_size(json_data)
         top, left = ImageData.get_rrm_image_position(json_data)
-        dummy_segments, outlines = ImageData.get_rrm_segments(
-            json_data, size_x, size_y, top, left, True
-        )
-        del dummy_segments  # free memory
-        dest_json = json.loads(destinations)
-        room_data = dict(dest_json).get("rooms", [])
-        zones_data = dict(dest_json).get("zones", [])
-        points_data = dict(dest_json).get("spots", [])
-        room_id_to_data = {room["id"]: room for room in room_data}
-        self.rooms_pos = []
-        room_properties = {}
-        zone_properties = {}
-        point_properties = {}
-        for id_x, room_id in enumerate(unsorted_id):
-            if room_id in room_id_to_data:
-                room_info = room_id_to_data[room_id]
-                name = room_info.get("name")
-                # Calculate x and y min/max from outlines
-                x_min = outlines[id_x][0][0]
-                x_max = outlines[id_x][1][0]
-                y_min = outlines[id_x][0][1]
-                y_max = outlines[id_x][1][1]
-                corners = [
-                    (x_min, y_min),
-                    (x_max, y_min),
-                    (x_max, y_max),
-                    (x_min, y_max),
-                ]
-                # rand256 vacuums accept int(room_id) or str(name)
-                # the card will soon support int(room_id) but the camera will send name
-                # this avoids the manual change of the values in the card.
-                self.rooms_pos.append(
-                    {
-                        "name": name,
-                        "corners": corners,
-                    }
-                )
-                room_properties[int(room_id)] = {
-                    "number": int(room_id),
-                    "outline": corners,
-                    "name": name,
-                    "x": (x_min + x_max) // 2,
-                    "y": (y_min + y_max) // 2,
-                }
-        id_count = 1
-        for zone in zones_data:
-            zone_name = zone.get("name")
-            coordinates = zone.get("coordinates")
-            if coordinates and len(coordinates) > 0:
-                coordinates[0].pop()
-                x1, y1, x2, y2 = coordinates[0]
-                zone_properties[zone_name] = {
-                    "zones": coordinates,
-                    "name": zone_name,
-                    "x": ((x1 + x2) // 2),
-                    "y": ((y1 + y2) // 2),
-                }
-                id_count += 1
-        id_count = 1
-        for point in points_data:
-            point_name = point.get("name")
-            coordinates = point.get("coordinates")
-            if coordinates and len(coordinates) > 0:
-                coordinates = point.get("coordinates")
-                x1, y1 = coordinates
-                point_properties[id_count] = {
-                    "position": coordinates,
-                    "name": point_name,
-                    "x": x1,
-                    "y": y1,
-                }
-                id_count += 1
-        if room_properties != {}:
-            if zone_properties != {}:
-                _LOGGER.debug("Rooms and Zones, data extracted!")
-            else:
-                _LOGGER.debug("Rooms, data extracted!")
-        elif zone_properties != {}:
-            _LOGGER.debug("Zones, data extracted!")
-        else:
-            self.rooms_pos = None
-            _LOGGER.debug("Rooms and Zones data not available!")
-        return room_properties, zone_properties, point_properties
+        if not self.segment_data or not self.outlines:
+            self.segment_data, self.outlines = await ImageData.async_get_rrm_segments(
+                json_data, size_x, size_y, top, left, True
+            )
+        try:
+            dest_json = destinations
+            room_data = dict(dest_json).get("rooms", [])
+            zones_data = dict(dest_json).get("zones", [])
+            points_data = dict(dest_json).get("spots", [])
+            room_id_to_data = {room["id"]: room for room in room_data}
+            self.rooms_pos = []
+            room_properties = {}
+            zone_properties = {}
+            point_properties = {}
+            if self.outlines:
+                for id_x, room_id in enumerate(unsorted_id):
+                    if room_id in room_id_to_data:
+                        room_info = room_id_to_data[room_id]
+                        name = room_info.get("name")
+                        # Calculate x and y min/max from outlines
+                        x_min = self.outlines[id_x][0][0]
+                        x_max = self.outlines[id_x][1][0]
+                        y_min = self.outlines[id_x][0][1]
+                        y_max = self.outlines[id_x][1][1]
+                        corners = [
+                            (x_min, y_min),
+                            (x_max, y_min),
+                            (x_max, y_max),
+                            (x_min, y_max),
+                        ]
+                        # rand256 vacuums accept int(room_id) or str(name)
+                        # the card will soon support int(room_id) but the camera will send name
+                        # this avoids the manual change of the values in the card.
+                        self.rooms_pos.append(
+                            {
+                                "name": name,
+                                "corners": corners,
+                            }
+                        )
+                        room_properties[int(room_id)] = {
+                            "number": int(room_id),
+                            "outline": corners,
+                            "name": name,
+                            "x": (x_min + x_max) // 2,
+                            "y": (y_min + y_max) // 2,
+                        }
+                id_count = 1
+                for zone in zones_data:
+                    zone_name = zone.get("name")
+                    coordinates = zone.get("coordinates")
+                    if coordinates and len(coordinates) > 0:
+                        coordinates[0].pop()
+                        x1, y1, x2, y2 = coordinates[0]
+                        zone_properties[zone_name] = {
+                            "zones": coordinates,
+                            "name": zone_name,
+                            "x": ((x1 + x2) // 2),
+                            "y": ((y1 + y2) // 2),
+                        }
+                        id_count += 1
+                id_count = 1
+                for point in points_data:
+                    point_name = point.get("name")
+                    coordinates = point.get("coordinates")
+                    if coordinates and len(coordinates) > 0:
+                        coordinates = point.get("coordinates")
+                        x1, y1 = coordinates
+                        point_properties[id_count] = {
+                            "position": coordinates,
+                            "name": point_name,
+                            "x": x1,
+                            "y": y1,
+                        }
+                        id_count += 1
+                if room_properties != {}:
+                    if zone_properties != {}:
+                        _LOGGER.debug("Rooms and Zones, data extracted!")
+                    else:
+                        _LOGGER.debug("Rooms, data extracted!")
+                elif zone_properties != {}:
+                    _LOGGER.debug("Zones, data extracted!")
+                else:
+                    self.rooms_pos = None
+                    _LOGGER.debug("Rooms and Zones data not available!")
+                return room_properties, zone_properties, point_properties
+        except Exception as e:
+            _LOGGER.warning(
+                f"{self.file_name} : Error in extract_room_properties: {e}",
+                exc_info=True,
+            )
+            return None, None, None
 
     async def get_image_from_rrm(
         self,
@@ -367,10 +376,12 @@ async def get_image_from_rrm(
                         image_left=pos_left,
                     )
                     # checking if there are segments too (sorted pixels in the raw data).
-                    segments = self.data.get_rrm_segments(
-                        m_json, size_x, size_y, pos_top, pos_left
-                    )
-                    if (segments and pixels) or pixels:
+                    if not self.segment_data:
+                        self.segment_data, self.outlines = await self.data.async_get_rrm_segments(
+                            m_json, size_x, size_y, pos_top, pos_left, True
+                        )
+                        
+                    if (self.segment_data and pixels) or pixels:
                         room_color = self.shared.rooms_colors[room_id]
                         # drawing floor
                         if pixels:
@@ -380,8 +391,9 @@ async def get_image_from_rrm(
                         # drawing segments floor
                         room_id = 0
                         rooms_list = [color_wall]
-                        if segments:
-                            for pixels in segments:
+                        if self.segment_data:
+                            _LOGGER.info(self.file_name + ": Drawing segments ")
+                            for pixels in self.segment_data:
                                 room_color = self.shared.rooms_colors[room_id]
                                 rooms_list.append(room_color)
                                 if (
@@ -573,7 +585,7 @@ async def get_rooms_attributes(
             return self.room_propriety
         if self.json_data and destinations:
             _LOGGER.debug("Checking for rooms data..")
-            self.room_propriety = self.extract_room_properties(
+            self.room_propriety = await self.extract_room_properties(
                 self.json_data, destinations
             )
             if self.room_propriety:

hacs.json

@@ -2,6 +2,6 @@
   "name": "MQTT Vacuum Camera",
   "zip_release": true,
   "render_readme": true,
-  "homeassistant": "2024.8.0b0",
+  "homeassistant": "2024.7.0b0",
   "filename": "mqtt_vacuum_camera.zip"
 }