added new annotation types

data_store/repositories/annotation_repository.py

@@ -11,10 +11,13 @@ from python_repositories.adapters import MinioAdapter
 from data_store.interfaces import AnnotationRepositoryInterface
 from data_store.dto import (
     Annotation,
-    DistanceEnum,
     AngleEnum,
-    PointOfViewEnum,
+    ColourEnum,
     ContactEnum,
+    DepthEnum,
+    DistanceEnum,
+    LightingEnum,
+    PointOfViewEnum,
 )
 
 
@@ -55,10 +58,20 @@ class AnnotationRepository(MinioAdapter, AnnotationRepositoryInterface):
             data_str = buffer.read().decode(self.encoding)
             data = json.loads(data_str)
             annotation = Annotation(
-                distance=DistanceEnum(data["distance"]),
                 angle=AngleEnum(data["angle"]),
-                point_of_view=PointOfViewEnum(data["point_of_view"]),
+                angle_uncertainty=bool(data["angle_uncertainty"]),
+                colour=ColourEnum(data["colour"]),
+                colour_uncertainty=bool(data["colour_uncertainty"]),
                 contact=ContactEnum(data["contact"]),
+                contact_uncertainty=bool(data["contact_uncertainty"]),
+                depth=DepthEnum(data["depth"]),
+                depth_uncertainty=bool(data["depth_uncertainty"]),
+                distance=DistanceEnum(data["distance"]),
+                distance_uncertainty=bool(data["distance_uncertainty"]),
+                lighting=LightingEnum(data["lighting"]),
+                lighting_uncertainty=bool(data["lighting_uncertainty"]),
+                point_of_view=PointOfViewEnum(data["point_of_view"]),
+                point_of_view_uncertainty=bool(data["point_of_view_uncertainty"]),
             )
         except (KeyError, ValueError) as e:
             self.logger.error(