From 8c981188600278219a3c419aa20527705fca8e42 Mon Sep 17 00:00:00 2001
From: Julia Dark <julia@tiledb.com>
Date: Wed, 20 Nov 2024 16:48:14 -0500
Subject: [PATCH 1/2] Add PointCloudDataFrame to SpatialData points model

---
 .../src/tiledbsoma/experimental/outgest.py    | 40 +++++++++++++++++++
 .../test_export_point_cloud_dataframe.py      | 35 ++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/apis/python/src/tiledbsoma/experimental/outgest.py b/apis/python/src/tiledbsoma/experimental/outgest.py
index cd2868b0aa..f8246f2d85 100644
--- a/apis/python/src/tiledbsoma/experimental/outgest.py
+++ b/apis/python/src/tiledbsoma/experimental/outgest.py
@@ -5,6 +5,7 @@
 from typing import Dict, Optional, Tuple, Union
 
 import geopandas as gpd
+import pandas as pd
 import somacore
 import spatialdata as sd
 import xarray as xr
@@ -80,6 +81,45 @@ def _transform_to_spatial_data(
     )
 
 
+def to_spatial_data_points(
+    points: PointCloudDataFrame,
+    *,
+    scene_id: str,
+    scene_dim_map: Dict[str, str],
+    transform: somacore.CoordinateTransform,
+    soma_joinid_name: str,
+) -> pd.DataFrame:
+    """Export a :class:`PointCloudDataFrame` to a :class:`spatialdata.ShapesModel.
+
+    Args:
+        points: The point cloud data frame to convert to SpatialData shapes.
+        scene_id: The ID of the scene this point cloud dataframe is from.
+        scene_dim_map: A mapping from the axis names of the scene to the corresponding
+            SpatialData dimension names.
+        transform: The transformation from the coordinate space of the scene this point
+            cloud is in to the coordinate space of the point cloud.
+        soma_joinid: The name to use for the SOMA joinid.
+    """
+
+    # Get the axis names for the spatial data shapes.
+    orig_axis_names = points.coordinate_space.axis_names
+    new_axis_names, points_dim_map = _convert_axis_names(orig_axis_names)
+
+    # Create the SpatialData transform from the points to the Scene (inverse of the
+    # transform SOMA stores).
+    transforms = {
+        scene_id: _transform_to_spatial_data(
+            transform.inverse_transform(), points_dim_map, scene_dim_map
+        )
+    }
+
+    # Read the pandas dataframe, rename SOMA_JOINID, add metadata, and return.
+    df: pd.DataFrame = points.read().concat().to_pandas()
+    df.rename(columns={SOMA_JOINID: soma_joinid_name}, inplace=True)
+    df.attrs["transform"] = transforms
+    return df
+
+
 def to_spatial_data_shapes(
     points: PointCloudDataFrame,
     *,
diff --git a/apis/python/tests/test_export_point_cloud_dataframe.py b/apis/python/tests/test_export_point_cloud_dataframe.py
index 15c441291e..d816f3c227 100644
--- a/apis/python/tests/test_export_point_cloud_dataframe.py
+++ b/apis/python/tests/test_export_point_cloud_dataframe.py
@@ -1,6 +1,7 @@
 from urllib.parse import urljoin
 
 import numpy as np
+import pandas as pd
 import pyarrow as pa
 import pytest
 import shapely
@@ -68,3 +69,37 @@ def test_export_to_shapes_2d(sample_point_cloud_dataframe_2d):
         print(f"{key}: {val}")
     assert len(metadata) == 1
     assert metadata["transform"] == {"scene0": spatialdata.transformations.Identity()}
+
+
+def test_export_to_points_2d(sample_point_cloud_dataframe_2d):
+    """Test exporting a simple point cloud to a SpatialData shape model."""
+    # Export PointCloudDataFrame to shapes.
+    points = soma_outgest.to_spatial_data_points(
+        sample_point_cloud_dataframe_2d,
+        scene_id="scene0",
+        scene_dim_map={"x_scene": "x", "y_scene": "y"},
+        soma_joinid_name="obs_id",
+        transform=somacore.IdentityTransform(
+            ("x_scene", "y_scene"), ("x_points", "y_points")
+        ),
+    )
+
+    # Validate that this is validate storage for the SpatialData "Shapes"
+    spatialdata.models.PointsModel.validate(points)
+
+    # Check the dataframe.
+    expected = pd.DataFrame.from_dict(
+        {
+            "x": [0, 0, 0.5, 0.5],
+            "y": [0, 0.5, 0, 0.5],
+            "obs_id": np.arange(4),
+        }
+    )
+    assert all(points == expected)
+
+    # Check the metadata.
+    metadata = dict(points.attrs)
+    for key, val in metadata.items():
+        print(f"{key}: {val}")
+    assert len(metadata) == 1
+    assert metadata["transform"] == {"scene0": spatialdata.transformations.Identity()}

From e504a5de83edce3c8eac7c49fc9dfde27e5130a1 Mon Sep 17 00:00:00 2001
From: Julia Dark <julia@tiledb.com>
Date: Thu, 21 Nov 2024 14:59:51 -0500
Subject: [PATCH 2/2] Fix grammar in test comments.

---
 apis/python/tests/test_export_point_cloud_dataframe.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apis/python/tests/test_export_point_cloud_dataframe.py b/apis/python/tests/test_export_point_cloud_dataframe.py
index d816f3c227..337f6b6779 100644
--- a/apis/python/tests/test_export_point_cloud_dataframe.py
+++ b/apis/python/tests/test_export_point_cloud_dataframe.py
@@ -48,7 +48,7 @@ def test_export_to_shapes_2d(sample_point_cloud_dataframe_2d):
         ),
     )
 
-    # Validate that this is validate storage for the SpatialData "Shapes"
+    # Check this is valid storage for the SpatialData "Shapes" model.
     spatialdata.models.ShapesModel.validate(shape)
 
     # Check the dataframe.
@@ -84,7 +84,7 @@ def test_export_to_points_2d(sample_point_cloud_dataframe_2d):
         ),
     )
 
-    # Validate that this is validate storage for the SpatialData "Shapes"
+    # Check this is valid storage for the SpatialData "Points" model.
     spatialdata.models.PointsModel.validate(points)
 
     # Check the dataframe.