This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sedona.git
The following commit(s) were added to refs/heads/master by this push:
new b6326061ff [GH-2194] Move sedona.geopandas to sedona.spark.geopandas
(#2225)
b6326061ff is described below
commit b6326061ff77c1f09c3e70e831fd7a51a5332583
Author: Peter Nguyen <[email protected]>
AuthorDate: Mon Aug 4 20:43:36 2025 -0700
[GH-2194] Move sedona.geopandas to sedona.spark.geopandas (#2225)
* move sedona/geopandas to sedona/spark/geopandas
* Fix all import paths in source code and tests
* Add import files in old location for backwards compatibility
* Revert "Add import files in old location for backwards compatibility"
This reverts commit 1ffb3a2e09a2750d70aaf6eb4be222fb1e734ff9.
---
python/sedona/{ => spark}/geopandas/__init__.py | 8 ++--
python/sedona/{ => spark}/geopandas/_typing.py | 0
python/sedona/{ => spark}/geopandas/base.py | 54 +++++++++++-----------
.../sedona/{ => spark}/geopandas/geodataframe.py | 36 +++++++--------
python/sedona/{ => spark}/geopandas/geoseries.py | 46 +++++++++---------
python/sedona/{ => spark}/geopandas/io.py | 4 +-
python/sedona/{ => spark}/geopandas/sindex.py | 0
.../sedona/{ => spark}/geopandas/tools/__init__.py | 0
python/sedona/{ => spark}/geopandas/tools/sjoin.py | 2 +-
python/tests/geopandas/test_geodataframe.py | 6 +--
python/tests/geopandas/test_geopandas_base.py | 2 +-
python/tests/geopandas/test_geoseries.py | 4 +-
python/tests/geopandas/test_io.py | 2 +-
.../geopandas/test_match_geopandas_dataframe.py | 2 +-
.../tests/geopandas/test_match_geopandas_series.py | 2 +-
python/tests/geopandas/test_sindex.py | 4 +-
python/tests/geopandas/test_sjoin.py | 2 +-
17 files changed, 87 insertions(+), 87 deletions(-)
diff --git a/python/sedona/geopandas/__init__.py
b/python/sedona/spark/geopandas/__init__.py
similarity index 79%
rename from python/sedona/geopandas/__init__.py
rename to python/sedona/spark/geopandas/__init__.py
index 989f268c31..736fa3e939 100644
--- a/python/sedona/geopandas/__init__.py
+++ b/python/sedona/spark/geopandas/__init__.py
@@ -20,9 +20,9 @@
geopandas API on Sedona
"""
-from sedona.geopandas.geoseries import GeoSeries
-from sedona.geopandas.geodataframe import GeoDataFrame
+from sedona.spark.geopandas.geoseries import GeoSeries
+from sedona.spark.geopandas.geodataframe import GeoDataFrame
-from sedona.geopandas.tools import sjoin
+from sedona.spark.geopandas.tools import sjoin
-from sedona.geopandas.io import read_file, read_parquet
+from sedona.spark.geopandas.io import read_file, read_parquet
diff --git a/python/sedona/geopandas/_typing.py
b/python/sedona/spark/geopandas/_typing.py
similarity index 100%
rename from python/sedona/geopandas/_typing.py
rename to python/sedona/spark/geopandas/_typing.py
diff --git a/python/sedona/geopandas/base.py
b/python/sedona/spark/geopandas/base.py
similarity index 98%
rename from python/sedona/geopandas/base.py
rename to python/sedona/spark/geopandas/base.py
index 36d444391d..7bbc048651 100644
--- a/python/sedona/geopandas/base.py
+++ b/python/sedona/spark/geopandas/base.py
@@ -37,7 +37,7 @@ from pyspark.pandas._typing import (
)
from pyspark.sql import Column
-from sedona.geopandas._typing import GeoFrameLike
+from sedona.spark.geopandas._typing import GeoFrameLike
bool_type = bool
@@ -67,7 +67,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
>>> from shapely.geometry import Point, box
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>>
>>> s = GeoSeries([Point(x, x) for x in range(5)])
>>> s.sindex.query(box(1, 1, 3, 3))
@@ -128,7 +128,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
>>> from shapely.geometry import Polygon
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> gs = GeoSeries([Polygon([(0, 0), (1, 0), (1, 1), (0, 1)]),
Polygon([(0, 0), (2, 0), (2, 2), (0, 2)])])
>>> gs.area
@@ -153,7 +153,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
>>> from shapely.geometry import Polygon, Point
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> gs = GeoSeries([Polygon([(0, 0), (1, 0), (1, 1), (0, 1)]),
Point(0, 0)])
>>> gs.geom_type
@@ -185,7 +185,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
>>> from shapely.geometry import Polygon
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> gs = GeoSeries([Point(0, 0), LineString([(0, 0), (1, 1)]),
Polygon([(0, 0), (1, 0), (1, 1)]), GeometryCollection([Point(0, 0),
LineString([(0, 0), (1, 1)]), Polygon([(0, 0), (1, 0), (1, 1)])])])
>>> gs.length
@@ -208,7 +208,7 @@ class GeoFrame(metaclass=ABCMeta):
An example with one invalid polygon (a bowtie geometry crossing itself)
and one missing geometry:
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon
>>> s = GeoSeries(
... [
@@ -248,7 +248,7 @@ class GeoFrame(metaclass=ABCMeta):
An example with one invalid polygon (a bowtie geometry crossing itself)
and one missing geometry:
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon
>>> s = GeoSeries(
... [
@@ -292,7 +292,7 @@ class GeoFrame(metaclass=ABCMeta):
An example of a GeoDataFrame with one empty point, one point and one
missing
value:
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point
>>> geoseries = GeoSeries([Point(), Point(2, 1), None],
crs="EPSG:4326")
>>> geoseries
@@ -330,7 +330,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import LineString
>>> s = GeoSeries(
... [
@@ -374,7 +374,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point
>>> s = GeoSeries(
... [
@@ -480,7 +480,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -518,7 +518,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -570,7 +570,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point, MultiPoint
>>> s = GeoSeries(
... [
@@ -676,7 +676,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import MultiPolygon, Polygon, LineString,
Point
>>> s = GeoSeries(
... [
@@ -725,7 +725,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString
>>> s = GeoSeries(
... [
@@ -779,7 +779,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import box
>>> s = GeoSeries([box(0, 0, 1, 1), box(0, 0, 2, 2)])
>>> s
@@ -820,7 +820,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -924,7 +924,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -1033,7 +1033,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, MultiPoint, Point
>>> s = GeoSeries(
... [
@@ -1546,7 +1546,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -1635,7 +1635,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -1755,7 +1755,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -1889,7 +1889,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -1990,7 +1990,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -2110,7 +2110,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon, LineString, Point
>>> s = GeoSeries(
... [
@@ -2233,7 +2233,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
>>> from shapely.geometry import Point
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>>
>>> data = {
... 'geometry': [Point(0, 0), Point(1, 1)],
@@ -2297,7 +2297,7 @@ class GeoFrame(metaclass=ABCMeta):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point, LineString
>>> s = GeoSeries(
... [Point(0, 0).buffer(1), LineString([(0, 0), (1, 10), (0, 20)])]
diff --git a/python/sedona/geopandas/geodataframe.py
b/python/sedona/spark/geopandas/geodataframe.py
similarity index 98%
rename from python/sedona/geopandas/geodataframe.py
rename to python/sedona/spark/geopandas/geodataframe.py
index 328634d115..466f59406f 100644
--- a/python/sedona/geopandas/geodataframe.py
+++ b/python/sedona/spark/geopandas/geodataframe.py
@@ -27,13 +27,13 @@ import shapely
import geopandas as gpd
import pandas as pd
import pyspark.pandas as pspd
-import sedona.geopandas as sgpd
+import sedona.spark.geopandas as sgpd
from pyspark.pandas import Series as PandasOnSparkSeries
from pyspark.pandas.frame import DataFrame as PandasOnSparkDataFrame
from pyspark.pandas.utils import log_advice
-from sedona.geopandas._typing import Label
-from sedona.geopandas.base import GeoFrame
+from sedona.spark.geopandas._typing import Label
+from sedona.spark.geopandas.base import GeoFrame
from pandas.api.extensions import register_extension_dtype
from geopandas.geodataframe import crs_mismatch_error
@@ -211,7 +211,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
>>> from shapely.geometry import Point, Polygon
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> import pandas as pd
>>>
>>> # Create from dictionary with geometry
@@ -272,7 +272,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
See Also
--------
geopandas.GeoDataFrame : The GeoPandas equivalent
- sedona.geopandas.GeoSeries : Series with geometry data
+ sedona.spark.geopandas.GeoSeries : Series with geometry data
"""
def __getitem__(self, key: Any) -> Any:
@@ -294,7 +294,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
>>> from shapely.geometry import Point
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>>
>>> data = {'geometry': [Point(0, 0), Point(1, 1)], 'value': [1, 2]}
>>> gdf = GeoDataFrame(data)
@@ -343,7 +343,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
self._anchor: GeoDataFrame
self._col_label: Label
- from sedona.geopandas import GeoSeries
+ from sedona.spark.geopandas import GeoSeries
from pyspark.sql import DataFrame as SparkDataFrame
if isinstance(data, (GeoDataFrame, GeoSeries)):
@@ -536,7 +536,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> from shapely.geometry import Point
>>> d = {'col1': ['name1', 'name2'], 'geometry': [Point(1, 2),
Point(2, 1)]}
>>> gdf = GeoDataFrame(d, crs="EPSG:4326")
@@ -691,7 +691,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> from shapely.geometry import Point
>>> d = {'col1': ['name1', 'name2'], 'geometry': [Point(1, 2),
Point(2, 1)]}
>>> df = GeoDataFrame(d, crs="EPSG:4326")
@@ -802,7 +802,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
>>> from shapely.geometry import Point
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> gdf = GeoDataFrame([{"geometry": Point(1, 1), "value1": 2,
"value2": 3}])
>>> gdf_copy = gdf.copy()
@@ -870,7 +870,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> from shapely.geometry import Point
>>> d = {'col1': ['name1', 'name2'], 'geometry': [Point(1, 2),
Point(2, 1)]}
>>> gdf = GeoDataFrame(d)
@@ -1090,7 +1090,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> import geoarrow.pyarrow as ga
>>> import pyarrow as pa
>>> table = pa.Table.from_arrays([
@@ -1158,7 +1158,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> from shapely.geometry import Point
>>> d = {'col1': ['name1', 'name2'], 'geometry': [Point(1, 2),
Point(2, 1)]}
>>> gdf = GeoDataFrame(d, crs="EPSG:3857")
@@ -1252,7 +1252,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
GeoArrow.
Examples
--------
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> from shapely.geometry import Point
>>> data = {'col1': ['name1', 'name2'], 'geometry': [Point(1, 2),
Point(2, 1)]}
>>> gdf = GeoDataFrame(data)
@@ -1484,7 +1484,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
>>> from shapely.geometry import Point, Polygon
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> polygons = GeoDataFrame({
... 'geometry': [Polygon([(0, 0), (0, 1), (1, 1), (1, 0)])],
@@ -1496,7 +1496,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
... })
>>> joined = points.sjoin(polygons)
"""
- from sedona.geopandas.tools.sjoin import sjoin as sjoin_tool
+ from sedona.spark.geopandas.tools.sjoin import sjoin as sjoin_tool
return sjoin_tool(
self,
@@ -1603,7 +1603,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
>>> from shapely.geometry import Point, LineString
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> gdf = GeoDataFrame({
... "geometry": [Point(0, 0), LineString([(0, 0), (1, 1)])],
@@ -1637,7 +1637,7 @@ class GeoDataFrame(GeoFrame, pspd.DataFrame):
Examples
--------
>>> from shapely.geometry import Point
- >>> from sedona.geopandas import GeoDataFrame
+ >>> from sedona.spark.geopandas import GeoDataFrame
>>> gdf = GeoDataFrame({"geometry": [Point(0, 0), Point(1, 1)],
"value": [1, 2]})
>>> gdf.to_parquet("output.parquet")
"""
diff --git a/python/sedona/geopandas/geoseries.py
b/python/sedona/spark/geopandas/geoseries.py
similarity index 98%
rename from python/sedona/geopandas/geoseries.py
rename to python/sedona/spark/geopandas/geoseries.py
index f92c9a6090..c9dc7b7f3b 100644
--- a/python/sedona/geopandas/geoseries.py
+++ b/python/sedona/spark/geopandas/geoseries.py
@@ -20,7 +20,7 @@ from typing import Any, Union, Literal, List
import numpy as np
import geopandas as gpd
-import sedona.geopandas as sgpd
+import sedona.spark.geopandas as sgpd
import pandas as pd
import pyspark.pandas as pspd
import pyspark
@@ -43,10 +43,10 @@ from pyspark.sql import functions as F
import shapely
from shapely.geometry.base import BaseGeometry
-from sedona.geopandas._typing import Label
-from sedona.geopandas.base import GeoFrame
-from sedona.geopandas.geodataframe import GeoDataFrame
-from sedona.geopandas.sindex import SpatialIndex
+from sedona.spark.geopandas._typing import Label
+from sedona.spark.geopandas.base import GeoFrame
+from sedona.spark.geopandas.geodataframe import GeoDataFrame
+from sedona.spark.geopandas.sindex import SpatialIndex
from packaging.version import parse as parse_version
from pyspark.pandas.internal import (
@@ -252,7 +252,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
>>> from shapely.geometry import Point, Polygon
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>>
>>> # Create from geometries
>>> s = GeoSeries([Point(0, 0), Point(1, 1)], crs='EPSG:4326')
@@ -290,7 +290,7 @@ class GeoSeries(GeoFrame, pspd.Series):
See Also
--------
geopandas.GeoSeries : The GeoPandas equivalent
- sedona.geopandas.GeoDataFrame : DataFrame with geometry column
+ sedona.spark.geopandas.GeoDataFrame : DataFrame with geometry column
"""
def __getitem__(self, key: Any) -> Any:
@@ -322,7 +322,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples:
>>> from shapely.geometry import Point
>>> import geopandas as gpd
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
# Example 1: Initialize with GeoDataFrame
>>> gdf = gpd.GeoDataFrame({'geometry': [Point(1, 1), Point(2, 2)]})
@@ -548,7 +548,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point
>>> s = GeoSeries([Point(1, 1), Point(2, 2), Point(3, 3)])
>>> s
@@ -772,7 +772,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
>>> from shapely.geometry import Point
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> gs = GeoSeries([Point(1, 1), Point(2, 2)])
>>> gs_copy = gs.copy()
>>> print(gs_copy)
@@ -1564,7 +1564,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point
>>> s = GeoSeries([Point(1, 1), Point(2, 2), Point(3, 3)])
>>> s.x
@@ -1598,7 +1598,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point
>>> s = GeoSeries([Point(1, 1), Point(2, 2), Point(3, 3)])
>>> s.y
@@ -1633,7 +1633,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point
>>> s = GeoSeries([Point(1, 1, 1), Point(2, 2, 2), Point(3, 3, 3)])
>>> s.z
@@ -1830,7 +1830,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> wkts = [
... 'POINT (1 1)',
... 'POINT (2 2)',
@@ -1989,7 +1989,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> import geoarrow.pyarrow as ga
>>> array = ga.as_geoarrow([None, "POLYGON ((0 0, 1 1, 0 1, 0 0))",
"LINESTRING (0 0, -1 1, 0 -1)"])
>>> geoseries = GeoSeries.from_arrow(array)
@@ -2058,7 +2058,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon
>>> s = GeoSeries(
... [Polygon([(0, 0), (1, 1), (0, 1)]), None, Polygon([])]
@@ -2105,7 +2105,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon
>>> s = GeoSeries(
... [Polygon([(0, 0), (1, 1), (0, 1)]), None, Polygon([])]
@@ -2167,7 +2167,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Polygon
>>> s = GeoSeries(
... [
@@ -2310,7 +2310,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
>>> from shapely.geometry import Point
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> geoseries = GeoSeries([Point(1, 1), Point(2, 2), Point(3, 3)],
crs=4326)
>>> geoseries.crs
<Geographic 2D CRS: EPSG:4326>
@@ -2566,7 +2566,7 @@ class GeoSeries(GeoFrame, pspd.Series):
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point
>>> s = GeoSeries([Point(1, 1), Point(2, 2), Point(3, 3)])
>>> s
@@ -2731,7 +2731,7 @@ e": "Feature", "properties": {}, "geometry": {"type":
"Point", "coordinates": [3
Examples
--------
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> from shapely.geometry import Point
>>> gser = GeoSeries([Point(1, 2), Point(2, 1)])
>>> gser
@@ -2808,7 +2808,7 @@ e": "Feature", "properties": {}, "geometry": {"type":
"Point", "coordinates": [3
Examples
--------
>>> from shapely.geometry import Point, LineString
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> # Note: Examples write to temporary files for demonstration
>>> import tempfile
>>> import os
@@ -2846,7 +2846,7 @@ e": "Feature", "properties": {}, "geometry": {"type":
"Point", "coordinates": [3
Examples
--------
>>> from shapely.geometry import Point
- >>> from sedona.geopandas import GeoSeries
+ >>> from sedona.spark.geopandas import GeoSeries
>>> import tempfile
>>> import os
>>> gs = GeoSeries([Point(1, 1), Point(2, 2)])
diff --git a/python/sedona/geopandas/io.py b/python/sedona/spark/geopandas/io.py
similarity index 99%
rename from python/sedona/geopandas/io.py
rename to python/sedona/spark/geopandas/io.py
index cbc5c136b8..e18c586ce3 100644
--- a/python/sedona/geopandas/io.py
+++ b/python/sedona/spark/geopandas/io.py
@@ -19,7 +19,7 @@ import os
from typing import Union
import warnings
import pyspark.pandas as ps
-from sedona.geopandas import GeoDataFrame
+from sedona.spark.geopandas import GeoDataFrame
from pyspark.pandas.utils import default_session, scol_for
from pyspark.pandas.internal import SPARK_DEFAULT_INDEX_NAME,
NATURAL_ORDER_COLUMN_NAME
from pyspark.pandas.frame import InternalFrame
@@ -269,7 +269,7 @@ def read_parquet(
Examples
--------
- from sedona.geopandas import read_parquet
+ from sedona.spark.geopandas import read_parquet
>>> df = read_parquet("data.parquet") # doctest: +SKIP
Specifying columns to read:
diff --git a/python/sedona/geopandas/sindex.py
b/python/sedona/spark/geopandas/sindex.py
similarity index 100%
rename from python/sedona/geopandas/sindex.py
rename to python/sedona/spark/geopandas/sindex.py
diff --git a/python/sedona/geopandas/tools/__init__.py
b/python/sedona/spark/geopandas/tools/__init__.py
similarity index 100%
rename from python/sedona/geopandas/tools/__init__.py
rename to python/sedona/spark/geopandas/tools/__init__.py
diff --git a/python/sedona/geopandas/tools/sjoin.py
b/python/sedona/spark/geopandas/tools/sjoin.py
similarity index 99%
rename from python/sedona/geopandas/tools/sjoin.py
rename to python/sedona/spark/geopandas/tools/sjoin.py
index 5e4a6184a6..8f137bc9cf 100644
--- a/python/sedona/geopandas/tools/sjoin.py
+++ b/python/sedona/spark/geopandas/tools/sjoin.py
@@ -20,7 +20,7 @@ from pyspark.pandas.internal import SPARK_DEFAULT_INDEX_NAME,
InternalFrame
from pyspark.pandas.utils import scol_for
from pyspark.sql.functions import expr
-from sedona.geopandas import GeoDataFrame, GeoSeries
+from sedona.spark.geopandas import GeoDataFrame, GeoSeries
# Pre-compiled regex pattern for suffix validation
SUFFIX_PATTERN = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_]*$")
diff --git a/python/tests/geopandas/test_geodataframe.py
b/python/tests/geopandas/test_geodataframe.py
index bc50673d55..47b5eb388b 100644
--- a/python/tests/geopandas/test_geodataframe.py
+++ b/python/tests/geopandas/test_geodataframe.py
@@ -30,12 +30,12 @@ from shapely.geometry import (
)
import shapely
-from sedona.geopandas import GeoDataFrame, GeoSeries
+from sedona.spark.geopandas import GeoDataFrame, GeoSeries
from tests.geopandas.test_geopandas_base import TestGeopandasBase
import pyspark.pandas as ps
import pandas as pd
import geopandas as gpd
-import sedona.geopandas as sgpd
+import sedona.spark.geopandas as sgpd
import pytest
from pandas.testing import assert_frame_equal, assert_series_equal
from packaging.version import parse as parse_version
@@ -326,7 +326,7 @@ class TestGeoDataFrame(TestGeopandasBase):
self.check_sgpd_equals_gpd(result.geometry, expected)
def test_set_geometry(self):
- from sedona.geopandas.geodataframe import MissingGeometryColumnError
+ from sedona.spark.geopandas.geodataframe import
MissingGeometryColumnError
points1 = [Point(x, x) for x in range(3)]
points2 = [Point(x + 5, x + 5) for x in range(3)]
diff --git a/python/tests/geopandas/test_geopandas_base.py
b/python/tests/geopandas/test_geopandas_base.py
index 05f29e5ce6..10b9a9271e 100644
--- a/python/tests/geopandas/test_geopandas_base.py
+++ b/python/tests/geopandas/test_geopandas_base.py
@@ -17,7 +17,7 @@
from typing import Union
from tests.test_base import TestBase
-from sedona.geopandas import GeoDataFrame, GeoSeries
+from sedona.spark.geopandas import GeoDataFrame, GeoSeries
import pyspark.sql
import geopandas as gpd
import pandas as pd
diff --git a/python/tests/geopandas/test_geoseries.py
b/python/tests/geopandas/test_geoseries.py
index 89831fff79..d12a2afd18 100644
--- a/python/tests/geopandas/test_geoseries.py
+++ b/python/tests/geopandas/test_geoseries.py
@@ -21,8 +21,8 @@ import pytest
import pandas as pd
import geopandas as gpd
import pyspark.pandas as ps
-import sedona.geopandas as sgpd
-from sedona.geopandas import GeoSeries, GeoDataFrame
+import sedona.spark.geopandas as sgpd
+from sedona.spark.geopandas import GeoSeries, GeoDataFrame
from tests.geopandas.test_geopandas_base import TestGeopandasBase
from shapely import wkt
from shapely.geometry import (
diff --git a/python/tests/geopandas/test_io.py
b/python/tests/geopandas/test_io.py
index 052216e15b..e025fb0403 100644
--- a/python/tests/geopandas/test_io.py
+++ b/python/tests/geopandas/test_io.py
@@ -23,7 +23,7 @@ import pandas as pd
import geopandas as gpd
import pyspark.pandas as ps
from functools import partial
-from sedona.geopandas import GeoDataFrame, GeoSeries, read_file, read_parquet
+from sedona.spark.geopandas import GeoDataFrame, GeoSeries, read_file,
read_parquet
from tests import tests_resource
from tests.geopandas.test_geopandas_base import TestGeopandasBase
from shapely.geometry import (
diff --git a/python/tests/geopandas/test_match_geopandas_dataframe.py
b/python/tests/geopandas/test_match_geopandas_dataframe.py
index 8b80f9c7dc..b411065035 100644
--- a/python/tests/geopandas/test_match_geopandas_dataframe.py
+++ b/python/tests/geopandas/test_match_geopandas_dataframe.py
@@ -31,7 +31,7 @@ from shapely.geometry import (
)
from packaging.version import parse as parse_version
-from sedona.geopandas import GeoDataFrame, GeoSeries
+from sedona.spark.geopandas import GeoDataFrame, GeoSeries
import geopandas as gpd
from tests.geopandas.test_geopandas_base import TestGeopandasBase
import pyspark.pandas as ps
diff --git a/python/tests/geopandas/test_match_geopandas_series.py
b/python/tests/geopandas/test_match_geopandas_series.py
index 6420643ed1..aa4ae6d238 100644
--- a/python/tests/geopandas/test_match_geopandas_series.py
+++ b/python/tests/geopandas/test_match_geopandas_series.py
@@ -35,7 +35,7 @@ from shapely.geometry import (
LinearRing,
)
-from sedona.geopandas import GeoSeries
+from sedona.spark.geopandas import GeoSeries
from tests.geopandas.test_geopandas_base import TestGeopandasBase
import pyspark.pandas as ps
from packaging.version import parse as parse_version
diff --git a/python/tests/geopandas/test_sindex.py
b/python/tests/geopandas/test_sindex.py
index 2c08eb8c67..83c308fdbb 100644
--- a/python/tests/geopandas/test_sindex.py
+++ b/python/tests/geopandas/test_sindex.py
@@ -22,8 +22,8 @@ from pyspark.sql.functions import expr
from shapely.geometry import Point, Polygon, LineString
from tests.test_base import TestBase
-from sedona.geopandas import GeoSeries
-from sedona.geopandas.sindex import SpatialIndex
+from sedona.spark.geopandas import GeoSeries
+from sedona.spark.geopandas.sindex import SpatialIndex
from packaging.version import parse as parse_version
diff --git a/python/tests/geopandas/test_sjoin.py
b/python/tests/geopandas/test_sjoin.py
index 669869326b..18a21edc7c 100644
--- a/python/tests/geopandas/test_sjoin.py
+++ b/python/tests/geopandas/test_sjoin.py
@@ -22,7 +22,7 @@ import pandas as pd
import geopandas as gpd
from shapely.geometry import Polygon, Point, LineString
-from sedona.geopandas import GeoDataFrame, sjoin
+from sedona.spark.geopandas import GeoDataFrame, sjoin
from tests.geopandas.test_geopandas_base import TestGeopandasBase
from packaging.version import parse as parse_version
