add CRS and drop Z coordinate + tests (#473)

Author: 12rambau

geetools/ee_feature_collection.py

@@ -5,6 +5,7 @@
 
 import ee
 import geopandas as gpd
+import shapely
 from matplotlib import pyplot as plt
 from matplotlib.axes import Axes
 
@@ -711,7 +712,11 @@ def plot(
             gdf.plot(column=property, ax=ax, cmap=cmap)
 
     @classmethod
-    def fromGeoInterface(cls, data: dict | GeoInterface) -> ee.FeatureCollection:
+    def fromGeoInterface(
+        cls,
+        data: dict | GeoInterface,
+        crs: str = "EPSG:4326",
+    ) -> ee.FeatureCollection:
         """Create a :py:class:`ee.FeatureCollection` from a geo interface.
 
         The ``geo_interface`` is a protocol representing a vector collection as a python GeoJSON-like dictionary structure.
@@ -723,7 +728,7 @@ def fromGeoInterface(cls, data: dict | GeoInterface) -> ee.FeatureCollection:
 
         Parameters:
             data: The geo_interface to create the :py:class:`ee.FeatureCollection` from.
-            crs: The CRS to use for the FeatureCollection. Default to ``EPSG:4326``.
+            crs: The CRS of the input data. Defaults to "EPSG:4326".
 
         Returns:
             The created :py:class:`ee.FeatureCollection` from the geo_interface.
@@ -755,5 +760,10 @@ def fromGeoInterface(cls, data: dict | GeoInterface) -> ee.FeatureCollection:
         elif not isinstance(data, dict):
             raise ValueError("The data must be a geo_interface or a dictionary")
 
+        # ensure the geometries are 2D
+        gdf = gpd.GeoDataFrame.from_features(data["features"], crs=crs)
+        gdf.geometry = shapely.force_2d(gdf.geometry.values)
+        data = gdf.__geo_interface__
+
         # create the feature collection
         return ee.FeatureCollection(data)

tests/test_FeatureCollection.py

@@ -331,6 +331,10 @@ def test_error_from_geo_interface_(self):
         with pytest.raises(ValueError):
             ee.FeatureCollection.geetools.fromGeoInterface("toto")
 
+    def test_from_geo_interface_z(self, gdfZ, ee_feature_collection_regression):
+        fc = ee.FeatureCollection.geetools.fromGeoInterface(gdfZ)
+        ee_feature_collection_regression.check(fc, prescision=4)
+
     @pytest.fixture
     def gdf(self):
         data = {
@@ -344,3 +348,17 @@ def gdf(self):
             ],
         }
         return gpd.GeoDataFrame.from_features(data["features"])
+
+    @pytest.fixture
+    def gdfZ(self):
+        data = {
+            "type": "FeatureCollection",
+            "features": [
+                {
+                    "type": "Feature",
+                    "properties": {"name": "Coors Field"},
+                    "geometry": {"type": "Point", "coordinates": [-104.99404, 39.75621, 1000]},
+                }
+            ],
+        }
+        return gpd.GeoDataFrame.from_features(data["features"])

tests/test_FeatureCollection/serialized_test_from_geo_interface_z.yml

@@ -0,0 +1,24 @@
+result: '0'
+values:
+  '0':
+    functionInvocationValue:
+      arguments:
+        features:
+          arrayValue:
+            values:
+            - functionInvocationValue:
+                arguments:
+                  geometry:
+                    functionInvocationValue:
+                      arguments:
+                        coordinates:
+                          constantValue:
+                          - -104.99404
+                          - 39.75621
+                      functionName: GeometryConstructors.Point
+                  metadata:
+                    constantValue:
+                      name: Coors Field
+                      system:index: '0'
+                functionName: Feature
+      functionName: Collection

tests/test_FeatureCollection/test_from_geo_interface_z.yml

@@ -0,0 +1,11 @@
+features:
+- geometry:
+    coordinates:
+    - -104.994
+    - 39.7562
+    type: Point
+  id: '0'
+  properties:
+    name: Coors Field
+  type: Feature
+type: FeatureCollection