openeo-gfmap 0.3.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

openeo_gfmap/backend.py

@@ -109,7 +109,7 @@ def fed_connection() -> openeo.Connection:
     """Performs a connection to the OpenEO federated backend using the oidc
     authentication."""
     return _create_connection(
-        url="http://openeofed.dataspace.copernicus.eu/",
+        url="openeofed.dataspace.copernicus.eu/",
         env_var_suffix="FED",
     )
 

openeo_gfmap/manager/job_splitters.py

@@ -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.")
@@ -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)

{openeo_gfmap-0.3.0.dist-info → openeo_gfmap-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openeo_gfmap
-Version: 0.3.0
+Version: 0.4.1
 Summary: OpenEO General Framework for Mapping
 Project-URL: Homepage, https://github.com/Open-EO/openeo-gfmap
 Project-URL: Bug Tracker, https://github.com/Open-EO/openeo-gfmap/issues

{openeo_gfmap-0.3.0.dist-info → openeo_gfmap-0.4.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openeo_gfmap/__init__.py,sha256=2MxLAx_1KB9ApeAxZpxeSw_Rj1XYwOH2-XXiZoiF5Ps,595
-openeo_gfmap/backend.py,sha256=XVM-QDk_t_R3SWptYjlwu-8YYROx-SwF4WIW7WW7hOg,4058
+openeo_gfmap/backend.py,sha256=nQCIYtTLG1vlWj-SB-ozlkGZWMz5MiD073MAMY1hBtk,4051
 openeo_gfmap/metadata.py,sha256=WlJ3zy78ff1E65HDbw7kOuYamqyvfV0BCNrv_ZvXX4Y,762
 openeo_gfmap/spatial.py,sha256=y1Gk9yM1j2eod127Pthn7SKxY37EFbzvPX0znqHgnMw,1353
 openeo_gfmap/temporal.py,sha256=qhKCgSoOc0CrscPTru-d7acaxsCVhftyYrb_8UVU1S4,583
@@ -15,7 +15,7 @@ openeo_gfmap/inference/__init__.py,sha256=M6NnKGYCpHNYmRL9OkHi5GmfCtWoJ0wCNR6VXR
 openeo_gfmap/inference/model_inference.py,sha256=0qPUgrjI1hy5ZnyGwuuvvw5oxnMGdgvvu9Go6-e9LZQ,12550
 openeo_gfmap/manager/__init__.py,sha256=2bckkPiDQBgoBWD9spk1BKXy2UGkWKe50A3HmIwmqrA,795
 openeo_gfmap/manager/job_manager.py,sha256=-MZJBfF_wV94FejoYbFPNviEQx3jLmJXb6XLeHg7egE,27221
-openeo_gfmap/manager/job_splitters.py,sha256=FU-1Wuwr1Xu8vEwuEZACPRrgBhgeLm2DLx6E6QSNkdg,10826
+openeo_gfmap/manager/job_splitters.py,sha256=kkGxgiudY3LrA40Ro_9q2eFW_Pjdm5a5VaNOXk2w5qo,10694
 openeo_gfmap/preprocessing/__init__.py,sha256=-kJAy_WY4o8oqziRozcUuXtuGIM0IOvTCF6agTUgRWA,619
 openeo_gfmap/preprocessing/cloudmasking.py,sha256=d280H5fByjNbCVZHjPn_dUatNI-ejphu4A75sUVoRqo,10029
 openeo_gfmap/preprocessing/compositing.py,sha256=Jp9Ku5JpU7TJ4DYGc6YuqMeP1Ip7zns7NguC17BtFyA,2526
@@ -34,7 +34,7 @@ openeo_gfmap/utils/intervals.py,sha256=V6l3ofww50fN_pvWC4NuGQ2ZsyGdhAlTZTiRcC0fo
 openeo_gfmap/utils/netcdf.py,sha256=KkAAxnq-ZCMjDMd82638noYwxqNpMsnpiU04Q-qX26A,698
 openeo_gfmap/utils/split_stac.py,sha256=asjT0jx6ic8GJFqqAisaWxOvQ_suSRv4sxyFOyHFvpI,3895
 openeo_gfmap/utils/tile_processing.py,sha256=QZ9bi5tPmyTVyyNvFZgd26s5dSnMl1grTKq2veK1C90,2068
-openeo_gfmap-0.3.0.dist-info/METADATA,sha256=9khjPclTO13jDj2FFvOiaznGb60XCWYN8D-TdK1-mjE,4322
-openeo_gfmap-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-openeo_gfmap-0.3.0.dist-info/licenses/LICENSE,sha256=aUuGpjieWiscTNtyLcSaeVsJ4pb6J9c4wUq1bR0e4t4,11349
-openeo_gfmap-0.3.0.dist-info/RECORD,,
+openeo_gfmap-0.4.1.dist-info/METADATA,sha256=vGOWtETT4FZjDKLj2DV4hCZVOZbYDmeH6NB6VmqV0O0,4322
+openeo_gfmap-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+openeo_gfmap-0.4.1.dist-info/licenses/LICENSE,sha256=aUuGpjieWiscTNtyLcSaeVsJ4pb6J9c4wUq1bR0e4t4,11349
+openeo_gfmap-0.4.1.dist-info/RECORD,,