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

Update split_job_s2grid #194

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −13
Open

Update split_job_s2grid #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3f5a22
split_job_s2 grid splits geometries based on intersection with vorono…
VincentVerelst Jan 21, 2025
5fa101b
changed local file paths for s2 grids #192
VincentVerelst Jan 22, 2025
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
19 changes: 9 additions & 10 deletions src/openeo_gfmap/manager/job_splitters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ def load_s2_grid(web_mercator: bool = False) -> gpd.GeoDataFrame:
"""Returns a geo data frame from the S2 grid."""
# Builds the path where the geodataframe should be
if not web_mercator:
gdf_path = Path.home() / ".openeo-gfmap" / "s2grid_bounds_4326_v2.geoparquet"
url = "https://artifactory.vgt.vito.be/artifactory/auxdata-public/gfmap/s2grid_bounds_4326_v2.geoparquet"
gdf_path = Path.home() / ".openeo-gfmap" / "s2grid_voronoi_4326.parquet"
url = "https://artifactory.vgt.vito.be/artifactory/auxdata-public/gfmap/s2grid_voronoi_4326.parquet"
else:
gdf_path = Path.home() / ".openeo-gfmap" / "s2grid_bounds_3857_v2.geoparquet"
url = "https://artifactory.vgt.vito.be/artifactory/auxdata-public/gfmap/s2grid_bounds_3857_v2.geoparquet"
gdf_path = Path.home() / ".openeo-gfmap" / "s2grid_voronoi_3857.parquet"
url = "https://artifactory.vgt.vito.be/artifactory/auxdata-public/gfmap/s2grid_voronoi_3857.parquet"

if not gdf_path.exists():
_log.info("S2 grid not found, downloading it from artifactory.")
Expand Down Expand Up @@ -112,13 +112,12 @@ def split_job_s2grid(

polygons["centroid"] = polygons.geometry.centroid

# Dataset containing all the S2 tile centroids, find the nearest S2 tile for each point
s2_grid = load_s2_grid_centroids(web_mercator)
s2_grid = load_s2_grid(web_mercator)

s2_grid = s2_grid[s2_grid.cdse_valid]

polygons = gpd.sjoin_nearest(
polygons.set_geometry("centroid"), s2_grid[["tile", "geometry"]]
polygons = gpd.sjoin(
polygons.set_geometry("centroid"),
s2_grid[["tile", "geometry"]],
predicate="intersects",
).drop(columns=["index_right", "centroid"])

polygons = polygons.set_geometry("geometry").to_crs(original_crs)
Expand Down
6 changes: 3 additions & 3 deletions tests/tests_unit/manager/test_managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ def test_split_job_s2grid():
"geometry": [
Point(60.02, 4.57),
Point(59.6, 5.04),
Point(59.92, 3.37),
Point(59.46, 3.71),
Point(59.07, 4.11),
Point(58.77, 4.87),
Point(59.1, 3.61),
],
}
polygons = gpd.GeoDataFrame(data, crs="EPSG:4326")
Expand All @@ -32,7 +32,7 @@ def test_split_job_s2grid():
result = split_job_s2grid(polygons, max_points)

assert (
len(result) == 3
len(result) == 4
), "The number of GeoDataFrames returned should match the number of splits needed."

# Check if the geometries are preserved
Expand Down
Loading