feat(backend): update split-by-square to avoid creating tasks with no…

… features in it (#1642) * feat: update split-by-square to avoid creating tasks without any features in it * build: update fmtm-splitter to v1.3.0 for latest fixies * build: relock backend deps after rebase --------- Co-authored-by: spwoodcock <[email protected]>
hotosm · Jul 12, 2024 · a1665f2 · a1665f2
1 parent 5925424
commit a1665f2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/src/backend/app/projects/project_crud.py b/src/backend/app/projects/project_crud.py
@@ -398,7 +398,11 @@ async def create_tasks_from_geojson(
         raise HTTPException(HTTPStatus.UNPROCESSABLE_ENTITY, detail=e) from e
 
 
-async def preview_split_by_square(boundary: str, meters: int):
+async def preview_split_by_square(
+    boundary: str,
+    meters: int,
+    extract_geojson: Optional[FeatureCollection] = None,
+):
     """Preview split by square for a project boundary.
 
     Use a lambda function to remove the "z" dimension from each
@@ -409,6 +413,7 @@ async def preview_split_by_square(boundary: str, meters: int):
     return await run_in_threadpool(
         lambda: split_by_square(
             boundary,
+            osm_extract=extract_geojson,
             meters=meters,
         )
     )

diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
@@ -801,7 +801,9 @@ async def get_categories(current_user: AuthUser = Depends(login_required)):
 
 @router.post("/preview-split-by-square/")
 async def preview_split_by_square(
-    project_geojson: UploadFile = File(...), dimension: int = Form(100)
+    project_geojson: UploadFile = File(...),
+    extract_geojson: UploadFile = File(None),
+    dimension: int = Form(100),
 ):
     """Preview splitting by square.
 
@@ -820,9 +822,18 @@ async def preview_split_by_square(
 
     # Validatiing Coordinate Reference System
     await check_crs(boundary)
+    parsed_extract = None
+    if extract_geojson:
+        geojson_data = await extract_geojson.read()
+        parsed_extract = parse_and_filter_geojson(geojson_data, filter=False)
+        if parsed_extract:
+            await check_crs(parsed_extract)
+        else:
+            log.warning("Parsed geojson file contained no geometries")
 
-    result = await project_crud.preview_split_by_square(boundary, dimension)
-    return result
+    return await project_crud.preview_split_by_square(
+        boundary, dimension, parsed_extract
+    )
 
 
 @router.post("/generate-data-extract/")

diff --git a/src/backend/pdm.lock b/src/backend/pdm.lock
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
@@ -49,7 +49,7 @@ dependencies = [
     "osm-login-python==1.0.3",
     "osm-fieldwork==0.12.4",
     "osm-rawdata==0.3.0",
-    "fmtm-splitter==1.2.2",
+    "fmtm-splitter==1.3.0",
 ]
 requires-python = ">=3.10"
 readme = "../../README.md"

diff --git a/src/frontend/src/components/createnewproject/SplitTasks.tsx b/src/frontend/src/components/createnewproject/SplitTasks.tsx
@@ -172,6 +172,7 @@ const SplitTasks = ({ flag, geojsonFile, setGeojsonFile, customDataExtractUpload
       dispatch(
         GetDividedTaskFromGeojson(`${import.meta.env.VITE_API_URL}/projects/preview-split-by-square/`, {
           geojson: drawnGeojsonFile,
+          extract_geojson: formValues.dataExtractWays === 'osm_data_extract' ? null : dataExtractFile,
           dimension: formValues?.dimension,
         }),
       );