minor updates

Author: jtsodapop

labelbox/data/annotation_types/geometry/line.py

@@ -31,7 +31,7 @@ def geometry(self) -> geojson.MultiLineString:
     def from_shapely(cls, shapely_obj: SLineString) -> Line:
         """Transforms a shapely object."""
         if not isinstance(shapely_obj, SLineString):
-            raise ValueError(
+            raise TypeError(
                 f"Expected Shapely Line. Got {shapely_obj.geom_type}")
 
         obj_coords = shapely_obj.__geo_interface__['coordinates']

labelbox/data/annotation_types/geometry/point.py

@@ -30,7 +30,7 @@ def geometry(self) -> geojson.Point:
     def from_shapely(cls, shapely_obj: SPoint) -> Point:
         """Transforms a shapely object."""
         if not isinstance(shapely_obj, SPoint):
-            raise ValueError(
+            raise TypeError(
                 f"Expected Shapely Point. Got {shapely_obj.geom_type}")
 
         obj_coords = shapely_obj.__geo_interface__['coordinates']

labelbox/data/annotation_types/geometry/polygon.py

@@ -36,10 +36,10 @@ def geometry(self) -> geojson.Polygon:
     def from_shapely(cls, shapely_obj: SPolygon) -> Polygon:
         """Transforms a shapely object."""
         #we only consider 0th index because we only allow for filled polygons
-        obj_coords = shapely_obj.__geo_interface__['coordinates'][0]
         if not isinstance(shapely_obj, SPolygon):
-            raise ValueError(
+            raise TypeError(
                 f"Expected Shapely Polygon. Got {shapely_obj.geom_type}")
+        obj_coords = shapely_obj.__geo_interface__['coordinates'][0]
         return Polygon(
             points=[Point(x=coords[0], y=coords[1]) for coords in obj_coords])
 

labelbox/data/annotation_types/geometry/rectangle.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Optional, Union, Tuple
+from typing import Optional, Type, Union, Tuple
 
 import cv2
 import geojson
@@ -39,14 +39,10 @@ def from_shapely(cls, shapely_obj: SPolygon) -> Rectangle:
         If the provided shape is a non-rectangular polygon, a rectangle will be
         returned based on the min and max x,y values."""
         if not isinstance(shapely_obj, SPolygon):
-            raise ValueError(
+            raise TypeError(
                 f"Expected Shapely Polygon. Got {shapely_obj.geom_type}")
 
-        #we only consider 0th index because we only allow for filled polygons
-        obj_coords = np.array(shapely_obj.__geo_interface__['coordinates'][0])
-
-        min_x, max_x = np.min(obj_coords[:, 0]), np.max(obj_coords[:, 0])
-        min_y, max_y = np.min(obj_coords[:, 1]), np.max(obj_coords[:, 1])
+        min_x, min_y, max_x, max_y = shapely_obj.bounds
 
         start = [min_x, min_y]
         end = [max_x, max_y]