Merge pull request #1610 from CartoDB/jarroyo/ch66629/downloading-a-c…

…arto-table-may-return-two

Check empty geometries in Source

cartoframes/viz/source.py

@@ -88,6 +88,9 @@ def __init__(self, source, credentials=None, geom_col=None, encode_data=True):
                 raise ValueError('No valid geometry found. Please provide an input source with ' +
                                  'a valid geometry or specify the "geom_col" param with a geometry column.')
 
+            # Remove empty geometries
+            self.gdf = self.gdf[~self.gdf.geometry.is_empty]
+
             # Checking the uniqueness of the geometry type
             geometry_types = set(self.gdf.geom_type.unique())
             if geometry_types not in VALID_GEOMETRY_TYPES:

tests/unit/viz/test_source.py

@@ -73,6 +73,15 @@
     }
 }
 
+EMPTY = {
+    "type": "Feature",
+    "geometry": {
+        "type": "GeometryCollection",
+        "coordinates": None
+    },
+    "properties": {}
+}
+
 
 def setup_mocks(mocker):
     mocker.patch.object(ContextManager, 'compute_query')
@@ -126,7 +135,6 @@ def test_dates_in_source(self):
         gdf = gpd.GeoDataFrame(df, geometry=gpd.points_from_xy(df.lon, df.lat))
 
         assert df.dtypes['date_column'] == np.dtype('datetime64[ns]')
-
         source = Source(gdf)
 
         assert source.datetime_column_names == ['date_column']
@@ -171,3 +179,13 @@ def test_different_geometry_types_source_fail(self, features):
             Source(gdf)
 
         assert str(e.value).startswith('No valid geometry column types')
+
+    def test_empty_geometries(self):
+        geojson = {
+            "type": "FeatureCollection",
+            "features": [EMPTY, POINT, EMPTY, EMPTY, POINT, EMPTY]
+        }
+        gdf = gpd.GeoDataFrame.from_features(geojson)
+        source = Source(gdf)
+
+        assert len(source.gdf) == 2