Merge branch 'marker-str'

Author: PeterJCLaw

robot/markers.py

@@ -178,3 +178,12 @@ def spherical(self) -> SphericalCoord:
         space is different to the usual representation of a spherical space.
         """
         return SphericalCoord(*self._raw_data['spherical'])
+
+    def __str__(self):
+        bearing = self.spherical.rot_y_degrees
+        return "<Marker {}: {:.0f}° {}, {:.2f}m away>".format(
+            self.id,
+            abs(bearing),
+            "right" if bearing > 0 else "left",
+            self.distance_metres,
+        )

tests/test_markers.py

@@ -1,7 +1,7 @@
 import math
 import unittest
 
-from robot.markers import Metres, Radians, SphericalCoord
+from robot.markers import Marker, Metres, Radians, SphericalCoord
 
 
 class SphericalCoordTest(unittest.TestCase):
@@ -23,3 +23,33 @@ def test_conversion_to_degrees(self):
             coords.rot_y_degrees,
             "Wrong y rotation",
         )
+
+
+class MarkerTest(unittest.TestCase):
+    def test_str_left(self):
+        data = {
+            'id': 13,
+            'spherical': [
+                0,  # rot_x
+                -0.21467549799530256,  # rot_y, -12.3 degrees
+                0.12,  # distance
+            ],
+        }
+        self.assertEqual(
+            str(Marker(data)),
+            "<Marker 13: 12° left, 0.12m away>",
+        )
+
+    def test_str_right(self):
+        data = {
+            'id': 13,
+            'spherical': [
+                0,  # rot_x
+                0.21467549799530256,  # rot_y, 12.3 degrees
+                0.12,  # distance
+            ],
+        }
+        self.assertEqual(
+            str(Marker(data)),
+            "<Marker 13: 12° right, 0.12m away>",
+        )