Merge pull request #819 from hotosm/feat-projectlist-map

feat: data extract custom
hotosm · Sep 10, 2023 · fab9515 · fab9515
2 parents c064166 + 9b97657
commit fab9515
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/frontend/main/src/api/CreateProjectService.ts b/src/frontend/main/src/api/CreateProjectService.ts
@@ -323,15 +323,21 @@ const GetIndividualProjectDetails: Function = (url: string, payload: any) => {
   };
 };
 
-const TaskSplittingPreviewService: Function = (url: string, fileUpload: any, no_of_buildings: string) => {
+const TaskSplittingPreviewService: Function = (
+  url: string,
+  fileUpload: any,
+  no_of_buildings: string,
+  isCustomDataExtract: boolean,
+) => {
   return async (dispatch) => {
     dispatch(CreateProjectActions.GetTaskSplittingPreviewLoading(true));
 
-    const getTaskSplittingGeojson = async (url, fileUpload) => {
+    const getTaskSplittingGeojson = async (url, fileUpload, isCustomDataExtract) => {
       try {
         const taskSplittingFileFormData = new FormData();
         taskSplittingFileFormData.append('upload', fileUpload);
         taskSplittingFileFormData.append('no_of_buildings', no_of_buildings);
+        taskSplittingFileFormData.append('has_data_extracts', isCustomDataExtract);
 
         const getTaskSplittingResponse = await axios.post(url, taskSplittingFileFormData);
         const resp: OrganisationListModel = getTaskSplittingResponse.data;
@@ -344,7 +350,7 @@ const TaskSplittingPreviewService: Function = (url: string, fileUpload: any, no_
       }
     };
 
-    await getTaskSplittingGeojson(url, fileUpload);
+    await getTaskSplittingGeojson(url, fileUpload, isCustomDataExtract);
   };
 };
 const PatchProjectDetails: Function = (url: string, payload: any) => {

diff --git a/src/frontend/main/src/components/createproject/DefineTasks.tsx b/src/frontend/main/src/components/createproject/DefineTasks.tsx
@@ -88,6 +88,7 @@ const DefineTasks: React.FC<any> = ({ geojsonFile, setGeojsonFile, dataExtractFi
           `${enviroment.baseApiUrl}/projects/task_split`,
           drawnGeojsonFile,
           formValues?.no_of_buildings,
+          dataExtractFile ? true : false,
         ),
       );
     } else {
@@ -96,6 +97,7 @@ const DefineTasks: React.FC<any> = ({ geojsonFile, setGeojsonFile, dataExtractFi
           `${enviroment.baseApiUrl}/projects/task_split`,
           geojsonFile,
           formValues?.no_of_buildings,
+          dataExtractFile ? true : false,
         ),
       );
     }

diff --git a/src/frontend/main/src/components/editproject/UpdateProjectArea.tsx b/src/frontend/main/src/components/editproject/UpdateProjectArea.tsx
@@ -34,12 +34,12 @@ const UpdateProjectArea = ({ projectId }) => {
     };
   }, [uploadAOI]);
 
-  useEffect(() => {
-    if (!outline_geojson) return;
-    setGeojsonAOI(outline_geojson);
-    if (!dividedTaskGeojson) return;
-    setGeojsonAOI(dividedTaskGeojson);
-  }, [dividedTaskGeojson, outline_geojson]);
+  // useEffect(() => {
+  //   if (!outline_geojson) return;
+  //   setGeojsonAOI(outline_geojson);
+  //   if (!dividedTaskGeojson) return;
+  //   setGeojsonAOI(dividedTaskGeojson);
+  // }, [dividedTaskGeojson, outline_geojson]);
 
   const generateTasksOnMap = () => {
     dispatch(