pymammotion 0.0.42__tar.gz → 0.0.44__tar.gz

{pymammotion-0.0.42 → pymammotion-0.0.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.0.42
+Version: 0.0.44
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

pymammotion-0.0.44/pymammotion/data/model/hash_list.py

@@ -0,0 +1,40 @@
+from dataclasses import dataclass
+
+from pymammotion.proto.mctrl_nav import NavGetCommDataAck
+
+
+@dataclass
+class FrameList:
+    total_frame: int
+    data: list[NavGetCommDataAck]
+
+
+@dataclass
+class HashList:
+    """stores our map data.
+    [hashID, FrameList].
+    """
+
+    area: dict  # type 0
+    path: dict  # type 2
+    obstacle: dict  # type 1
+
+    def update(self, hash_data: NavGetCommDataAck):
+        """Update the map data."""
+        if hash_data.type == 0:
+            self._add_hash_data(self.area, hash_data)
+
+        if hash_data.type == 1:
+            self._add_hash_data(self.obstacle, hash_data)
+
+        if hash_data.type == 2:
+            self._add_hash_data(self.path, hash_data)
+
+    @staticmethod
+    def _add_hash_data(hash_dict: dict, hash_data: NavGetCommDataAck) -> None:
+        if hash_dict.get(hash_data.hash) is None:
+            hash_dict[hash_data.hash] = FrameList(total_frame=hash_data.total_frame, data=[hash_data])
+
+        hash_values = [item.hash for item in hash_dict[hash_data.hash].data]
+        if hash_data not in hash_values:
+            hash_dict[hash_data.hash].data.append(hash_data)

{pymammotion-0.0.42 → pymammotion-0.0.44}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.0.42"
+version     = "0.0.44"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"

pymammotion-0.0.42/pymammotion/data/model/hash_list.py

@@ -1,37 +0,0 @@
-from dataclasses import dataclass
-
-from pymammotion.proto.mctrl_nav import NavGetCommDataAck
-
-
-@dataclass
-class FrameList:
-    total_frame: int
-    data: list[NavGetCommDataAck]
-
-
-@dataclass
-class HashList:
-    """stores our map data.
-    [hashID, FrameList].
-    """
-
-    area: dict  # type 0
-    path: dict  # type 2
-    obstacle: dict  # type 1
-
-    def update(self, hash_data: NavGetCommDataAck):
-        """Update the map data."""
-        if hash_data.type == 0:
-            if self.area.get(hash_data.hash) is None:
-                self.area[hash_data.hash] = FrameList(total_frame=hash_data.total_frame, data=[hash_data])
-            self.area[hash_data.hash].data.append(hash_data)
-
-        if hash_data.type == 1:
-            if self.obstacle.get(hash_data.hash) is None:
-                self.obstacle[hash_data.hash] = FrameList(total_frame=hash_data.total_frame, data=[hash_data])
-            self.obstacle[hash_data.hash].data.append(hash_data)
-
-        if hash_data.type == 2:
-            if self.path.get(hash_data.hash) is None:
-                self.path[hash_data.hash] = FrameList(total_frame=hash_data.total_frame, data=[hash_data])
-            self.path[hash_data.hash].data.append(hash_data)