Refactored the structure of tests

Author: chay0112

python/sedona/spark/geopandas/base.py

@@ -955,6 +955,10 @@ def force_3d(self, z=0.0):
         2D geometries will get the provided Z coordinate; 3D geometries
         are unchanged (unless their Z coordinate is ``np.nan``).
 
+        Note: Sedona's behavior may differ from Geopandas' for M and ZM geometries.
+        For M geometries, Sedona will replace the M coordinate and add the Z coordinate.
+        For ZM geometries, Sedona will drop the M coordinate and retain the Z coordinate.
+
         Parameters
         ----------
         z : float | array_like (default 0)

python/tests/geopandas/test_geoseries.py

@@ -1594,6 +1594,22 @@ def test_force_3d(self):
         result = s.force_3d(z)
         self.check_sgpd_equals_gpd(result, expected)
 
+        # 4. Ensure M and ZM geometries are handled correctly
+        s = sgpd.GeoSeries(
+            [
+                shapely.wkt.loads("POINT M (1 2 3)"),
+                shapely.wkt.loads("POINT ZM (1 2 3 4)"),
+            ]
+        )
+        result = s.force_3d(7.5)
+        expected = gpd.GeoSeries(
+            [
+                shapely.wkt.loads("POINT Z (1 2 7.5)"),
+                shapely.wkt.loads("POINT Z (1 2 3)"),
+            ]
+        )
+        self.check_sgpd_equals_gpd(result, expected)
+
     def test_line_merge(self):
         pass
 

python/tests/geopandas/test_match_geopandas_series.py

@@ -883,7 +883,7 @@ def test_force_3d(self):
             pytest.skip("geopandas force_3d requires version 1.0.0 or higher")
         # 1) Promote 2D to 3D with z = 4
         for geom in self.geoms:
-            if isinstance(geom[0], (LinearRing, GeometryCollection, MultiPolygon)):
+            if isinstance(geom[0], (LinearRing)):
                 continue
             sgpd_result = GeoSeries(geom).force_3d(4)
             gpd_result = gpd.GeoSeries(geom).force_3d(4)