Refactor computeROI to aggregateROI

Author: Suhayb-A

mapmanagercore/lazy_geo_pd_images/__init__.py

@@ -1,4 +1,4 @@
-from .store import LazyImagesGeoPandas, computeROI
+from .store import LazyImagesGeoPandas, aggregateROI
 from .loader import ImageLoader
 from .image_slices import ImageSlice
 from .metadata import Metadata, VoxelMetadata, MetadataPhysicalSize

mapmanagercore/lazy_geo_pd_images/store.py

@@ -175,7 +175,7 @@ def getShapePixels(self, shapes: gp.GeoDataFrame, channel: Union[int, List[int]]
         return self._images.getShapePixels(shapes, channel=channel, zSpread=zSpread, time=time, z=z)
 
 
-def computeROI(dependencies: Union[List[str], dict[str, list[str]]] = {}, aggregate: list[str] = [], **attributes: Unpack[ImageColumnAttributes]):
+def aggregateROI(dependencies: Union[List[str], dict[str, list[str]]] = {}, aggregate: list[str] = [], **attributes: Unpack[ImageColumnAttributes]):
     """A decorator that adds image based computed column to the schema.
 
     Args:

mapmanagercore/schemas/spine.py

@@ -1,14 +1,12 @@
-from shapely.geometry import Point
 import numpy as np
 from mapmanagercore.benchmark import timer
 from mapmanagercore.utils import union
 from ..layers.line import calcSubLine, extend, getSpineSide, getSpineAngle
 import shapely
 from ..lazy_geo_pandas import schema, compute, LazyGeoFrame
 import geopandas as gp
-from shapely.geometry import LineString, MultiPolygon, Polygon
-from ..lazy_geo_pd_images import computeROI
-
+from shapely.geometry import LineString, MultiPolygon, Polygon, Point
+from ..lazy_geo_pd_images import aggregateROI
 
 @schema(
     index=["spineID", "t"],
@@ -250,12 +248,12 @@ def roiBg(frame: LazyGeoFrame) -> gp.GeoSeries:
 
     # Image based ROI computed stats
 
-    @computeROI(title="Roi", dependencies=["roi", "z"], aggregate=['sum', 'max'], group="ROI")
+    @aggregateROI(title="Roi", dependencies=["roi", "z"], aggregate=['sum', 'max'], group="ROI")
     @timer
     def roiStats(frame: LazyGeoFrame):
         return frame[["roi", "z"]]
 
-    @computeROI(title="Background Roi", dependencies=["roiBg", "z"], aggregate=['sum', 'max'], group="ROI Background")
+    @aggregateROI(title="Background Roi", dependencies=["roiBg", "z"], aggregate=['sum', 'max'], group="ROI Background")
     @timer
     def roiStatsBg(frame: LazyGeoFrame):
         return frame[["roiBg", "z"]]