Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SEDONA-456] Fix kepler.gl integration for geopandas >= 0.13 #1163

Merged
merged 1 commit into from
Dec 29, 2023
Merged

[SEDONA-456] Fix kepler.gl integration for geopandas >= 0.13 #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/sedona/maps/SedonaMapUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def __convert_to_gdf__(cls, df, rename=True, geometry_col=None):
pandas_df = df.toPandas()
geo_df = gpd.GeoDataFrame(pandas_df, geometry=geometry_col)
if geometry_col != "geometry" and rename is True:
geo_df = geo_df.rename(columns={geometry_col: "geometry"})
geo_df.rename_geometry("geometry", inplace=True)
return geo_df

@classmethod
Expand Down
8 changes: 4 additions & 4 deletions python/tests/maps/test_sedonakepler_visualization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def test_map_creation_with_df(self):
polygon_wkt_df.createOrReplaceTempView("polygontable")
polygon_df = self.spark.sql("select ST_GeomFromWKT(polygontable._c0) as countyshape from polygontable")
polygon_gdf = gpd.GeoDataFrame(data=polygon_df.toPandas(), geometry="countyshape")
polygon_gdf_renamed = polygon_gdf.rename(columns={"countyshape": "geometry"})
polygon_gdf_renamed = polygon_gdf.rename_geometry("geometry")

sedona_kepler_map = SedonaKepler.create_map(df=polygon_df, name="data_1")
kepler_map = KeplerGl()
Expand All @@ -59,7 +59,7 @@ def test_df_addition(self):

polygon_df = self.spark.sql("select ST_GeomFromWKT(polygontable._c0) as countyshape from polygontable")
polygon_gdf = gpd.GeoDataFrame(data=polygon_df.toPandas(), geometry="countyshape")
polygon_gdf_renamed = polygon_gdf.rename(columns={"countyshape": "geometry"})
polygon_gdf_renamed = polygon_gdf.rename_geometry("geometry")

sedona_kepler_empty_map = SedonaKepler.create_map()
SedonaKepler.add_df(sedona_kepler_empty_map, polygon_df, name="data_1")
Expand Down Expand Up @@ -188,9 +188,9 @@ def test_adding_multiple_datasets(self):
SedonaKepler.add_df(sedona_kepler_map, point_df, name="data_2")

polygon_gdf = gpd.GeoDataFrame(data=polygon_df.toPandas(), geometry="countyshape")
polygon_gdf_renamed = polygon_gdf.rename(columns={"countyshape": "geometry"})
polygon_gdf_renamed = polygon_gdf.rename_geometry("geometry")
point_gdf = gpd.GeoDataFrame(data=point_df.toPandas(), geometry="arealandmark")
point_gdf_renamed = point_gdf.rename(columns={"arealandmark": "geometry"})
point_gdf_renamed = point_gdf.rename_geometry("geometry")

kepler_map = KeplerGl(config=config)
kepler_map.add_data(polygon_gdf_renamed, "data_1")
Expand Down
Loading