From acacd4f2069126c8bd9f32f310793d5df5b27b49 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 9 Sep 2024 12:07:06 +0545
Subject: [PATCH 01/20] feat(project-dashboard): show project id insted of slug
 on project cards

---
 src/frontend/src/components/Projects/ProjectCard/index.tsx | 5 ++---
 src/frontend/src/views/Projects/index.tsx                  | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/frontend/src/components/Projects/ProjectCard/index.tsx b/src/frontend/src/components/Projects/ProjectCard/index.tsx
index 57019075..11a6e677 100644
--- a/src/frontend/src/components/Projects/ProjectCard/index.tsx
+++ b/src/frontend/src/components/Projects/ProjectCard/index.tsx
@@ -4,7 +4,6 @@ interface IProjectCardProps {
   id: number;
   title: string;
   description: string;
-  slug: string;
   imageUrl: string | null;
 }
 
@@ -12,7 +11,7 @@ export default function ProjectCard({
   id,
   title,
   description,
-  slug,
+
   imageUrl,
 }: IProjectCardProps) {
   const navigate = useNavigate();
@@ -40,7 +39,7 @@ export default function ProjectCard({
         )}
       </p>
       <p className="naxatw-mt-2 naxatw-line-clamp-1 naxatw-text-body-sm">
-        {slug}
+        #{id}
       </p>
       <p className="naxatw-line-clamp-1 naxatw-text-body-btn naxatw-text-grey-800">
         {title}
diff --git a/src/frontend/src/views/Projects/index.tsx b/src/frontend/src/views/Projects/index.tsx
index 0431554e..8786db87 100644
--- a/src/frontend/src/views/Projects/index.tsx
+++ b/src/frontend/src/views/Projects/index.tsx
@@ -46,7 +46,6 @@ const Projects = () => {
                   imageUrl={project?.image_url}
                   title={project.name}
                   description={project.description}
-                  slug={project?.slug}
                 />
               ),
             )

From fabdbf62a6e288468273286ce3d3fafe627785d2 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 9 Sep 2024 12:09:00 +0545
Subject: [PATCH 02/20] fix(project-dashboard): map crash issue on 0 project

---
 .../components/Projects/MapSection/index.tsx  | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/frontend/src/components/Projects/MapSection/index.tsx b/src/frontend/src/components/Projects/MapSection/index.tsx
index 559d84cd..8ac709dd 100644
--- a/src/frontend/src/components/Projects/MapSection/index.tsx
+++ b/src/frontend/src/components/Projects/MapSection/index.tsx
@@ -26,37 +26,38 @@ const ProjectsMapSection = () => {
     },
     disableRotation: true,
   });
-  const { data: projectsList, isLoading } = useGetProjectsListQuery({
-    select: (data: any) => {
-      // find all polygons centroid and set to geojson save to single geojson
-      const combinedGeojson = data?.data?.reduce(
-        (acc: Record<string, any>, current: Record<string, any>) => {
-          return {
-            ...acc,
-            features: [
-              ...acc.features,
-              {
-                ...centroid(current.outline),
-                properties: {
-                  id: current?.id,
-                  name: current?.name,
-                  slug: current?.slug,
+  const { data: projectsList, isLoading }: Record<string, any> =
+    useGetProjectsListQuery({
+      select: (data: any) => {
+        // find all polygons centroid and set to geojson save to single geojson
+        const combinedGeojson = data?.data?.reduce(
+          (acc: Record<string, any>, current: Record<string, any>) => {
+            return {
+              ...acc,
+              features: [
+                ...acc.features,
+                {
+                  ...centroid(current.outline),
+                  properties: {
+                    id: current?.id,
+                    name: current?.name,
+                    slug: current?.slug,
+                  },
                 },
-              },
-            ],
-          };
-        },
-        {
-          type: 'FeatureCollection',
-          features: [],
-        },
-      );
-      return combinedGeojson;
-    },
-  });
+              ],
+            };
+          },
+          {
+            type: 'FeatureCollection',
+            features: [],
+          },
+        );
+        return combinedGeojson;
+      },
+    });
 
   useEffect(() => {
-    if (!projectsList) return;
+    if (!projectsList || !projectsList?.features?.length) return;
     const bbox = getBbox(projectsList as FeatureCollection);
     map?.fitBounds(bbox as LngLatBoundsLike, { padding: 100 });
   }, [projectsList, map]);

From d2bd55ae914e96b4540f58a124913fba9ba6a035 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Tue, 10 Sep 2024 13:19:25 +0545
Subject: [PATCH 03/20] feat(project-creation): add task dimension limitation
 to 50-700

---
 .../FormContents/GenerateTask/index.tsx             | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/components/CreateProject/FormContents/GenerateTask/index.tsx b/src/frontend/src/components/CreateProject/FormContents/GenerateTask/index.tsx
index 6f1a015c..36cf3f57 100644
--- a/src/frontend/src/components/CreateProject/FormContents/GenerateTask/index.tsx
+++ b/src/frontend/src/components/CreateProject/FormContents/GenerateTask/index.tsx
@@ -1,4 +1,6 @@
 import { useMutation } from '@tanstack/react-query';
+import { useState } from 'react';
+import ErrorMessage from '@Components/common/ErrorMessage';
 import { useTypedDispatch, useTypedSelector } from '@Store/hooks';
 import { FormControl, Label, Input } from '@Components/common/FormUI';
 import { Button } from '@Components/RadixComponents/Button';
@@ -11,6 +13,7 @@ import MapSection from './MapSection';
 
 export default function GenerateTask({ formProps }: { formProps: any }) {
   const dispatch = useTypedDispatch();
+  const [error, setError] = useState('');
 
   const { register, watch } = formProps;
   const dimension = watch('task_split_dimension');
@@ -53,11 +56,15 @@ export default function GenerateTask({ formProps }: { formProps: any }) {
               type="number"
               className="naxatw-mt-1"
               value={dimension}
+              min={50}
+              max={700}
               {...register('task_split_dimension', {
                 required: 'Required',
                 valueAsNumber: true,
               })}
+              onFocus={() => setError('')}
             />
+            {error && <ErrorMessage message={error} />}
           </FormControl>
           <Button
             withLoader
@@ -66,14 +73,16 @@ export default function GenerateTask({ formProps }: { formProps: any }) {
             disabled={!dimension}
             className="naxatw-mt-4 naxatw-bg-red"
             onClick={() => {
-              if (!projectArea) return;
+              if (!projectArea) return () => {};
+              if (dimension < 50 || dimension > 700)
+                return setError('Dimension must in between 50-700');
               dispatch(
                 setCreateProjectState({
                   splitGeojson: null,
                   capturedProjectMap: false,
                 }),
               );
-              mutate(payload);
+              return mutate(payload);
             }}
           >
             Generate Task

From 7113fd06d1e05cee49f0b5f48ac1013624f42b4e Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Tue, 10 Sep 2024 13:24:15 +0545
Subject: [PATCH 04/20] feat: add InfoMessage component

---
 .../common/FormUI/InfoMessage/index.tsx          | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/frontend/src/components/common/FormUI/InfoMessage/index.tsx

diff --git a/src/frontend/src/components/common/FormUI/InfoMessage/index.tsx b/src/frontend/src/components/common/FormUI/InfoMessage/index.tsx
new file mode 100644
index 00000000..cb34b6f4
--- /dev/null
+++ b/src/frontend/src/components/common/FormUI/InfoMessage/index.tsx
@@ -0,0 +1,16 @@
+interface IInfoMessageProp {
+  message: string;
+}
+
+const InfoMessage = ({ message }: IInfoMessageProp) => {
+  return (
+    <span
+      role="alert"
+      className="naxatw-px-1 naxatw-pt-0 naxatw-text-sm naxatw-text-[#17A2B8]"
+    >
+      {message}
+    </span>
+  );
+};
+
+export default InfoMessage;

From 038e45072ecb2035c3cd3a715cb3a0a8e489385f Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Tue, 10 Sep 2024 13:57:35 +0545
Subject: [PATCH 05/20] feat: create utils function `gsdToAltitude` and
 `altitudeToGsd`

---
 src/frontend/src/utils/index.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/frontend/src/utils/index.ts b/src/frontend/src/utils/index.ts
index 0d131e44..b471bfe4 100644
--- a/src/frontend/src/utils/index.ts
+++ b/src/frontend/src/utils/index.ts
@@ -33,3 +33,14 @@ export const m2ToKm2 = (m2: number) => {
   if (m2 >= 1000 * 1000) return `${m2 / (1000 * 1000)} km²`;
   return `${m2} m²`;
 };
+
+const GsdToAltConst = 29.7;
+export const gsdToAltitude = (gsd: number): number => {
+  if (!gsd) return 0;
+  return gsd * GsdToAltConst;
+};
+
+export const altitudeToGsd = (altitude: number): number => {
+  if (!altitude) return 0;
+  return altitude / GsdToAltConst;
+};

From 80a98a7a3b3c79f578d489eb098d16ef3c95f64b Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Tue, 10 Sep 2024 14:00:22 +0545
Subject: [PATCH 06/20] feat(project-creation): show entered gsd/altitude
 equivalent values as a info text

---
 .../FormContents/KeyParameters/index.tsx      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx b/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
index 46276b11..f7bd92a1 100644
--- a/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
+++ b/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
@@ -14,6 +14,8 @@ import {
   FinalOutputOptions,
   measurementTypeOptions,
 } from '@Constants/createProject';
+import InfoMessage from '@Components/common/FormUI/InfoMessage';
+import { altitudeToGsd, gsdToAltitude } from '@Utils/index';
 import { Controller } from 'react-hook-form';
 import OutputOptions from './OutputOptions';
 
@@ -22,6 +24,8 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
 
   const { register, errors, watch, control, setValue } = formProps;
   const final_output = watch('final_output');
+  const gsdInputValue = watch('gsd_cm_px');
+  const altitudeInputValue = watch('altitude_from_ground');
 
   const keyParamOption = useTypedSelector(
     state => state.createproject.keyParamOption,
@@ -83,6 +87,13 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                   },
                 })}
               />
+              {gsdInputValue ? (
+                <InfoMessage
+                  message={`Equivalent altitude is ${gsdToAltitude(Number(gsdInputValue))}`}
+                />
+              ) : (
+                <></>
+              )}
               <ErrorMessage message={errors?.gsd_cm_px?.message as string} />
             </FormControl>
           ) : (
@@ -91,11 +102,29 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
               <Input
                 placeholder="Enter Altitude From Ground in meter"
                 type="number"
+                max={300}
+                min={0}
                 {...register('altitude_from_ground', {
                   required: 'Altitude From Round is Required',
                   valueAsNumber: true,
+                  max: {
+                    value: 300,
+                    message: 'Altitude is too high',
+                  },
+                  min: {
+                    value: 0,
+                    message: 'Altitude cannot be negative',
+                  },
                 })}
               />
+              {altitudeInputValue ? (
+                <InfoMessage
+                  message={`Equivalent gsd is ${altitudeToGsd(Number(altitudeInputValue))}`}
+                />
+              ) : (
+                <></>
+              )}
+
               <ErrorMessage
                 message={errors?.altitude_from_ground?.message as string}
               />

From 820e6b3155eb8529861e3c6254e3d86ae73a7fed Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Tue, 10 Sep 2024 15:22:42 +0545
Subject: [PATCH 07/20] feat: create utils function `getForwardSpacing`,
 `getSideSpacing`, `getSideOverlap` and `getFrontOverlap`

---
 src/frontend/src/utils/index.ts | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/frontend/src/utils/index.ts b/src/frontend/src/utils/index.ts
index b471bfe4..1015a4fc 100644
--- a/src/frontend/src/utils/index.ts
+++ b/src/frontend/src/utils/index.ts
@@ -44,3 +44,35 @@ export const altitudeToGsd = (altitude: number): number => {
   if (!altitude) return 0;
   return altitude / GsdToAltConst;
 };
+
+// constant values
+const VerticalFOV = 0.71;
+const HorizontalFOV = 1.26;
+
+export const getForwardSpacing = (agl: number, frontOverlap: number) => {
+  const forwardPhotoHeight = agl * VerticalFOV;
+  const frontOverlapDistance = (forwardPhotoHeight * frontOverlap) / 100;
+  const forwardSpacing = forwardPhotoHeight - frontOverlapDistance;
+  return forwardSpacing;
+};
+
+export const getSideSpacing = (agl: number, sideOverlap: number) => {
+  const sidePhotoWidth = agl * HorizontalFOV;
+  const sideOverlapDistance = (sidePhotoWidth * sideOverlap) / 100;
+  const sideSpacing = sidePhotoWidth - sideOverlapDistance;
+  return sideSpacing;
+};
+
+export const getSideOverlap = (agl: number, sideSpacing: number) => {
+  const sidePhotoWidth = agl * HorizontalFOV;
+  const sideOverlapDistance = sidePhotoWidth - sideSpacing;
+  const sideOverlap = (sideOverlapDistance * 100) / sidePhotoWidth;
+  return sideOverlap;
+};
+
+export const getFrontOverlap = (agl: number, forwardSpacing: number) => {
+  const frontPhotoHeight = agl * VerticalFOV;
+  const frontOverlapDistance = frontPhotoHeight - forwardSpacing;
+  const frontOverlap = (frontOverlapDistance * 100) / frontPhotoHeight;
+  return frontOverlap;
+};

From 36c9033d8662c15dddb57049d81a64ef5e5950a8 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Tue, 10 Sep 2024 15:29:06 +0545
Subject: [PATCH 08/20] feat(project-creation): add radio button to choose to
 input image overlap or image spacing and show input fields accordingly

---
 .../FormContents/KeyParameters/index.tsx      | 159 +++++++++++-------
 src/frontend/src/constants/createProject.tsx  |  13 ++
 .../src/store/slices/createproject.ts         |   2 +
 3 files changed, 115 insertions(+), 59 deletions(-)

diff --git a/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx b/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
index f7bd92a1..734fa99f 100644
--- a/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
+++ b/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
@@ -12,6 +12,7 @@ import Switch from '@Components/RadixComponents/Switch';
 import FileUpload from '@Components/common/UploadArea';
 import {
   FinalOutputOptions,
+  imageMergeTypeOptions,
   measurementTypeOptions,
 } from '@Constants/createProject';
 import InfoMessage from '@Components/common/FormUI/InfoMessage';
@@ -36,9 +37,9 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
   const isTerrainFollow = useTypedSelector(
     state => state.createproject.isTerrainFollow,
   );
-  // const isFollowTheTerrain = useTypedSelector(
-  //   state => state.createproject.isFollowTheTerrain,
-  // );
+  const imageMergeType = useTypedSelector(
+    state => state.createproject.imageMergeType,
+  );
 
   return (
     <div className="naxatw-h-fit naxatw-px-10 naxatw-py-5">
@@ -130,46 +131,102 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
               />
             </FormControl>
           )}
-          <FlexRow className="naxatw-grid naxatw-grid-cols-2 naxatw-gap-3">
-            <FormControl className="naxatw-mt-4 naxatw-gap-1">
-              <Label required>Front Overlap in (%)</Label>
-              <Input
-                placeholder="Image Overlap"
-                type="number"
-                max={100}
-                min={0}
-                {...register('front_overlap', {
-                  required: 'Front Overlap is required',
-                  valueAsNumber: true,
-                  max: 100,
-                  min: 0,
-                })}
-              />
-              <ErrorMessage
-                message={errors?.forward_overlap_percent?.message as string}
-              />
-              <p className="naxatw-text-[#68707F]">Recommended : 75%</p>
-            </FormControl>
-            <FormControl className="naxatw-mt-4 naxatw-gap-1">
-              <Label required>Side Overlap in (%)</Label>
-              <Input
-                placeholder="Image Overlap"
-                type="number"
-                max={100}
-                min={0}
-                {...register('side_overlap', {
-                  required: 'Side Overlap is required',
-                  valueAsNumber: true,
-                  min: 0,
-                  max: 100,
-                })}
-              />
-              <ErrorMessage
-                message={errors?.side_overlap_percent?.message as string}
-              />
-              <p className="naxatw-text-[#68707F]">Recommended : 60%</p>
-            </FormControl>
-          </FlexRow>
+          <FormControl className="naxatw-mt-5">
+            {/* <Label>Measurement Type</Label> */}
+            <RadioButton
+              options={imageMergeTypeOptions}
+              direction="row"
+              onChangeData={val => {
+                dispatch(setCreateProjectState({ imageMergeType: val }));
+                setValue('front_overlap', '');
+                setValue('side_overlap', '');
+                setValue('forward_spacing', '');
+                setValue('side_spacing', '');
+              }}
+              value={imageMergeType}
+            />
+          </FormControl>
+          {imageMergeType === 'overlap' ? (
+            <FlexRow className="naxatw-grid naxatw-grid-cols-2 naxatw-gap-3">
+              <FormControl className="naxatw-mt-2 naxatw-gap-1">
+                <Label required>Front Overlap in (%)</Label>
+                <Input
+                  placeholder="Image Overlap"
+                  type="number"
+                  max={100}
+                  min={0}
+                  {...register('front_overlap', {
+                    required: 'Front Overlap is required',
+                    valueAsNumber: true,
+                    max: 100,
+                    min: 0,
+                  })}
+                />
+                <ErrorMessage
+                  message={errors?.forward_overlap_percent?.message as string}
+                />
+                <p className="naxatw-text-[#68707F]">Recommended : 75%</p>
+              </FormControl>
+              <FormControl className="naxatw-mt-2 naxatw-gap-1">
+                <Label required>Side Overlap in (%)</Label>
+                <Input
+                  placeholder="Image Overlap"
+                  type="number"
+                  max={100}
+                  min={0}
+                  {...register('side_overlap', {
+                    required: 'Side Overlap is required',
+                    valueAsNumber: true,
+                    min: 0,
+                    max: 100,
+                  })}
+                />
+                <ErrorMessage
+                  message={errors?.side_overlap_percent?.message as string}
+                />
+                <p className="naxatw-text-[#68707F]">Recommended : 60%</p>
+              </FormControl>
+            </FlexRow>
+          ) : (
+            <FlexRow className="naxatw-grid naxatw-grid-cols-2 naxatw-gap-3">
+              <FormControl className="naxatw-mt-4 naxatw-gap-1">
+                <Label required>Forward spacing in (m)</Label>
+                <Input
+                  placeholder="Image Spacing"
+                  type="number"
+                  max={100}
+                  min={0}
+                  {...register('forward_spacing', {
+                    required: 'Forward Spacing is required',
+                    valueAsNumber: true,
+                    max: 100,
+                    min: 0,
+                  })}
+                />
+                <ErrorMessage
+                  message={errors?.forward_spacing?.message as string}
+                />
+              </FormControl>
+              <FormControl className="naxatw-mt-4 naxatw-gap-1">
+                <Label required>Side Overlap in (m)</Label>
+                <Input
+                  placeholder="Image Spacing"
+                  type="number"
+                  max={100}
+                  min={0}
+                  {...register('side_spacing', {
+                    required: 'Side Spacing is required',
+                    valueAsNumber: true,
+                    min: 0,
+                    max: 100,
+                  })}
+                />
+                <ErrorMessage
+                  message={errors?.side_spacing?.message as string}
+                />
+              </FormControl>
+            </FlexRow>
+          )}
           <FormControl className="naxatw-mt-4 naxatw-gap-1">
             <Label>Final Output</Label>
             <div className="naxatw-my-4 naxatw-grid naxatw-grid-cols-4 naxatw-gap-3">
@@ -187,22 +244,6 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
             </div>
           </FormControl>
 
-          {/* <FormControl className="naxatw-mt-4 naxatw-gap-1">
-            <RadioButton
-              options={terrainOptions}
-              topic="Choose terrain"
-              direction="column"
-              onChangeData={val => {
-                dispatch(
-                  setCreateProjectState({
-                    isTerrainFollow: val,
-                  }),
-                );
-              }}
-              value={isTerrainFollow}
-            />
-          </FormControl> */}
-
           <FormControl className="naxatw-mt-4">
             <FlexRow className="naxatw-mb-4 naxatw-items-center naxatw-gap-[10px]">
               <p className="naxatw-text-body-md">Follow the Terrain</p>
diff --git a/src/frontend/src/constants/createProject.tsx b/src/frontend/src/constants/createProject.tsx
index 010facf1..f84d77fe 100644
--- a/src/frontend/src/constants/createProject.tsx
+++ b/src/frontend/src/constants/createProject.tsx
@@ -188,6 +188,19 @@ export const measurementTypeOptions = [
   },
 ];
 
+export const imageMergeTypeOptions = [
+  {
+    name: 'Overlap',
+    value: 'overlap',
+    label: 'Overlap',
+  },
+  {
+    name: 'Spacing',
+    value: 'spacing',
+    label: 'Spacing',
+  },
+];
+
 export const contributionsInfo = [
   {
     key: 'Instructions for Drone Operators',
diff --git a/src/frontend/src/store/slices/createproject.ts b/src/frontend/src/store/slices/createproject.ts
index 4eae0b36..d8d042fb 100644
--- a/src/frontend/src/store/slices/createproject.ts
+++ b/src/frontend/src/store/slices/createproject.ts
@@ -22,6 +22,7 @@ export interface CreateProjectState {
   requireApprovalFromManagerForLocking: string;
   capturedProjectMap: boolean;
   projectMapImage: any;
+  imageMergeType: string;
 }
 
 const initialState: CreateProjectState = {
@@ -43,6 +44,7 @@ const initialState: CreateProjectState = {
   requireApprovalFromManagerForLocking: 'not_required',
   capturedProjectMap: true,
   projectMapImage: null,
+  imageMergeType: 'overlap',
 };
 
 const setCreateProjectState: CaseReducer<

From 5d6bede3bdd2e315f4d55b0a75f2406bb6d2d710 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Tue, 10 Sep 2024 16:06:12 +0545
Subject: [PATCH 09/20] feat: roundoff to two decimal values on sideOverlap and
 frontOverlap values

---
 src/frontend/src/utils/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/utils/index.ts b/src/frontend/src/utils/index.ts
index 1015a4fc..5927772a 100644
--- a/src/frontend/src/utils/index.ts
+++ b/src/frontend/src/utils/index.ts
@@ -67,12 +67,12 @@ export const getSideOverlap = (agl: number, sideSpacing: number) => {
   const sidePhotoWidth = agl * HorizontalFOV;
   const sideOverlapDistance = sidePhotoWidth - sideSpacing;
   const sideOverlap = (sideOverlapDistance * 100) / sidePhotoWidth;
-  return sideOverlap;
+  return sideOverlap.toFixed(2);
 };
 
 export const getFrontOverlap = (agl: number, forwardSpacing: number) => {
   const frontPhotoHeight = agl * VerticalFOV;
   const frontOverlapDistance = frontPhotoHeight - forwardSpacing;
   const frontOverlap = (frontOverlapDistance * 100) / frontPhotoHeight;
-  return frontOverlap;
+  return frontOverlap.toFixed(2);
 };

From 793a005e85e9ab3edf47325f89a289d813f686a7 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Tue, 10 Sep 2024 16:41:22 +0545
Subject: [PATCH 10/20] feat(project-creation): convert front and side space
 into front and side overlap on project creation payload

---
 .../CreateprojectLayout/index.tsx             | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/frontend/src/components/CreateProject/CreateprojectLayout/index.tsx b/src/frontend/src/components/CreateProject/CreateprojectLayout/index.tsx
index 00852b06..475a9a90 100644
--- a/src/frontend/src/components/CreateProject/CreateprojectLayout/index.tsx
+++ b/src/frontend/src/components/CreateProject/CreateprojectLayout/index.tsx
@@ -25,6 +25,7 @@ import {
 import { convertGeojsonToFile } from '@Utils/convertLayerUtils';
 import prepareFormData from '@Utils/prepareFormData';
 import hasErrorBoundary from '@Utils/hasErrorBoundary';
+import { getFrontOverlap, getSideOverlap, gsdToAltitude } from '@Utils/index';
 
 /**
  * This function looks up the provided map of components to find and return
@@ -86,6 +87,9 @@ const CreateprojectLayout = () => {
   const capturedProjectMap = useTypedSelector(
     state => state.createproject.capturedProjectMap,
   );
+  const imageMergeType = useTypedSelector(
+    state => state.createproject.imageMergeType,
+  );
 
   const initialState: FieldValues = {
     name: '',
@@ -214,13 +218,29 @@ const CreateprojectLayout = () => {
       return;
     }
 
+    // get altitude
+    const agl =
+      measurementType === 'gsd'
+        ? gsdToAltitude(data?.gsd_cm_px)
+        : data?.altitude_from_ground;
+
     const refactoredData = {
       ...data,
       is_terrain_follow: isTerrainFollow,
       requires_approval_from_manager_for_locking:
         requireApprovalFromManagerForLocking === 'required',
       deadline_at: data?.deadline_at ? data?.deadline_at : null,
+      front_overlap:
+        imageMergeType === 'spacing'
+          ? getFrontOverlap(agl, data?.forward_spacing)
+          : data?.front_overlap,
+      side_overlap:
+        imageMergeType === 'spacing'
+          ? getSideOverlap(agl, data?.side_spacing)
+          : data?.side_overlap,
     };
+    delete refactoredData?.forward_spacing;
+    delete refactoredData?.side_spacing;
 
     // remove key
     if (isNoflyzonePresent === 'no')

From f60d7e9908d85ef3d84f8af01397062722d7ce52 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Wed, 11 Sep 2024 10:05:24 +0545
Subject: [PATCH 11/20] feat(project-creation): show equivalent overlap and
 spacing value of entered value as a info text

---
 .../FormContents/KeyParameters/index.tsx      | 49 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx b/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
index 734fa99f..4be20b0c 100644
--- a/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
+++ b/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
@@ -16,7 +16,14 @@ import {
   measurementTypeOptions,
 } from '@Constants/createProject';
 import InfoMessage from '@Components/common/FormUI/InfoMessage';
-import { altitudeToGsd, gsdToAltitude } from '@Utils/index';
+import {
+  altitudeToGsd,
+  getForwardSpacing,
+  getFrontOverlap,
+  getSideOverlap,
+  getSideSpacing,
+  gsdToAltitude,
+} from '@Utils/index';
 import { Controller } from 'react-hook-form';
 import OutputOptions from './OutputOptions';
 
@@ -27,6 +34,10 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
   const final_output = watch('final_output');
   const gsdInputValue = watch('gsd_cm_px');
   const altitudeInputValue = watch('altitude_from_ground');
+  const frontOverlapInputValue = watch('front_overlap');
+  const sideOverlapInputValue = watch('side_overlap');
+  const forwardSpacingInputValue = watch('forward_spacing');
+  const sideSpacingInputValue = watch('side_spacing');
 
   const keyParamOption = useTypedSelector(
     state => state.createproject.keyParamOption,
@@ -41,6 +52,12 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
     state => state.createproject.imageMergeType,
   );
 
+  // get altitude
+  const agl =
+    measurementType === 'gsd'
+      ? gsdToAltitude(gsdInputValue)
+      : altitudeInputValue;
+
   return (
     <div className="naxatw-h-fit naxatw-px-10 naxatw-py-5">
       {/* <RadioButton
@@ -162,6 +179,13 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                     min: 0,
                   })}
                 />
+                {frontOverlapInputValue && agl ? (
+                  <InfoMessage
+                    message={`Equivalent forward spacing is ${getForwardSpacing(agl, frontOverlapInputValue)}`}
+                  />
+                ) : (
+                  <></>
+                )}
                 <ErrorMessage
                   message={errors?.forward_overlap_percent?.message as string}
                 />
@@ -181,6 +205,13 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                     max: 100,
                   })}
                 />
+                {sideOverlapInputValue && agl ? (
+                  <InfoMessage
+                    message={`Equivalent side spacing is ${getSideSpacing(agl, sideOverlapInputValue)}`}
+                  />
+                ) : (
+                  <></>
+                )}
                 <ErrorMessage
                   message={errors?.side_overlap_percent?.message as string}
                 />
@@ -203,12 +234,19 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                     min: 0,
                   })}
                 />
+                {forwardSpacingInputValue && agl ? (
+                  <InfoMessage
+                    message={`Equivalent front overlap is ${getFrontOverlap(agl, forwardSpacingInputValue)}`}
+                  />
+                ) : (
+                  <></>
+                )}
                 <ErrorMessage
                   message={errors?.forward_spacing?.message as string}
                 />
               </FormControl>
               <FormControl className="naxatw-mt-4 naxatw-gap-1">
-                <Label required>Side Overlap in (m)</Label>
+                <Label required>Side Spacing in (m)</Label>
                 <Input
                   placeholder="Image Spacing"
                   type="number"
@@ -221,6 +259,13 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                     max: 100,
                   })}
                 />
+                {sideSpacingInputValue && agl ? (
+                  <InfoMessage
+                    message={`Equivalent side overlap is ${getSideOverlap(agl, sideSpacingInputValue)}`}
+                  />
+                ) : (
+                  <></>
+                )}
                 <ErrorMessage
                   message={errors?.side_spacing?.message as string}
                 />

From 2eef4c1d9c351480a987ea9e4c9ade3c1c98f032 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Wed, 11 Sep 2024 14:36:55 +0545
Subject: [PATCH 12/20] feat: add counts for total tasks and ongoing tasks in
 project retrieval

---
 src/backend/app/projects/project_schemas.py | 37 ++++++++++++++++-----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/backend/app/projects/project_schemas.py b/src/backend/app/projects/project_schemas.py
index a292278f..c49f746d 100644
--- a/src/backend/app/projects/project_schemas.py
+++ b/src/backend/app/projects/project_schemas.py
@@ -283,18 +283,38 @@ async def all(
         limit: int = 100,
     ):
         """
-        Get all projects. Optionally filter by the project creator (user).
+        Get all projects, count total tasks and task states (ongoing, completed, etc.).
+        Optionally filter by the project creator (user).
         """
         async with db.cursor(row_factory=dict_row) as cur:
             await cur.execute(
                 """
                 SELECT
-                    id, slug, name, description, per_task_instructions,
-                    ST_AsGeoJSON(outline)::jsonb AS outline,
-                    requires_approval_from_manager_for_locking
-                FROM projects
-                WHERE (author_id = COALESCE(%(user_id)s, author_id))
-                ORDER BY created_at DESC
+                    p.id, p.slug, p.name, p.description, p.per_task_instructions,
+                    ST_AsGeoJSON(p.outline)::jsonb AS outline,
+                    p.requires_approval_from_manager_for_locking,
+
+                    -- Count total tasks for each project
+                    COUNT(t.id) AS total_task_count,
+
+                    -- Count based on the latest state of tasks
+                    COUNT(CASE WHEN te.state = 'LOCKED_FOR_MAPPING' THEN 1 END) AS ongoing_task_count
+
+                FROM projects p
+                LEFT JOIN tasks t ON t.project_id = p.id
+                LEFT JOIN (
+                    -- Get the latest event per task
+                    SELECT DISTINCT ON (te.task_id)
+                        te.task_id,
+                        te.state,
+                        te.created_at
+                    FROM task_events te
+                    ORDER BY te.task_id, te.created_at DESC
+                ) AS te ON te.task_id = t.id
+
+                WHERE (p.author_id = COALESCE(%(user_id)s, p.author_id))
+                GROUP BY p.id
+                ORDER BY p.created_at DESC
                 OFFSET %(skip)s
                 LIMIT %(limit)s
                 """,
@@ -417,9 +437,10 @@ class ProjectOut(BaseModel):
     outline: Optional[Polygon | Feature | FeatureCollection]
     no_fly_zones: Optional[Polygon | Feature | FeatureCollection | MultiPolygon] = None
     requires_approval_from_manager_for_locking: bool
-    task_count: int = 0
+    total_task_count: int = 0
     tasks: Optional[list[TaskOut]] = []
     image_url: Optional[str] = None
+    ongoing_task_count: Optional[int] = 0
 
     @model_validator(mode="after")
     def set_image_url(cls, values):

From 2726788f408382d28aa57da35d08a5e0c4d2c533 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Wed, 11 Sep 2024 15:57:37 +0545
Subject: [PATCH 13/20] feat: add SwitchTab component

---
 .../src/components/common/SwitchTab/index.tsx | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 src/frontend/src/components/common/SwitchTab/index.tsx

diff --git a/src/frontend/src/components/common/SwitchTab/index.tsx b/src/frontend/src/components/common/SwitchTab/index.tsx
new file mode 100644
index 00000000..2a596bea
--- /dev/null
+++ b/src/frontend/src/components/common/SwitchTab/index.tsx
@@ -0,0 +1,54 @@
+/* eslint-disable no-unused-vars */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
+import { cn } from '@Utils/index';
+import { FlexRow } from '@Components/common/Layouts';
+
+interface ISwitchTabProps {
+  wrapperClassName?: string;
+  options: Record<string, any>[];
+  selectedValue: string | number;
+  onChange: any;
+  valueKey?: string;
+  labelKey?: string;
+  activeClassName?: string;
+}
+const SwitchTab = ({
+  wrapperClassName,
+  options,
+  selectedValue,
+  onChange,
+  valueKey = 'id',
+  labelKey = 'label',
+  activeClassName,
+}: ISwitchTabProps) => {
+  return (
+    <FlexRow
+      className={cn(
+        'naxatw-w-fit naxatw-items-center naxatw-rounded-lg naxatw-bg-[#F4F7FE] naxatw-p-1',
+        wrapperClassName,
+      )}
+    >
+      {options?.map((option: Record<string, any>) => (
+        <span
+          role="button"
+          tabIndex={0}
+          key={option[labelKey]}
+          className={`naxatw-body-sm naxatw-cursor-pointer naxatw-select-none naxatw-rounded-lg naxatw-px-[0.5rem] naxatw-py-[0.4rem] naxatw-capitalize${
+            option[valueKey] === selectedValue
+              ? cn(
+                  `naxatw-bg-red naxatw-text-white naxatw-shadow-[0px_0px_5px_0px_rgba(0,0,0,0.16)]`,
+                  activeClassName,
+                )
+              : 'naxatw-text-matt-200 hover:naxatw-text-primary-700'
+          } naxatw-duration-300`}
+          onClick={() => {
+            onChange(option);
+          }}
+        >
+          {option[labelKey]}
+        </span>
+      ))}
+    </FlexRow>
+  );
+};
+export default SwitchTab;

From fbd6197ad6b972f68c6c98694a4788b42b307eac Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Wed, 11 Sep 2024 16:39:20 +0545
Subject: [PATCH 14/20] feat(project-creation): replace switchTab with radio
 button to choose value type (altitude/gsd, overlap/spacing)

---
 .../FormContents/KeyParameters/index.tsx      | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx b/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
index 4be20b0c..3dcbefe0 100644
--- a/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
+++ b/src/frontend/src/components/CreateProject/FormContents/KeyParameters/index.tsx
@@ -1,7 +1,6 @@
 /* eslint-disable camelcase */
 import { useTypedDispatch, useTypedSelector } from '@Store/hooks';
 import { FormControl, Label, Input } from '@Components/common/FormUI';
-import RadioButton from '@Components/common/RadioButton';
 import ErrorMessage from '@Components/common/FormUI/ErrorMessage';
 import { UseFormPropsType } from '@Components/common/FormUI/types';
 import { setCreateProjectState } from '@Store/actions/createproject';
@@ -24,6 +23,7 @@ import {
   getSideSpacing,
   gsdToAltitude,
 } from '@Utils/index';
+import SwitchTab from '@Components/common/SwitchTab';
 import { Controller } from 'react-hook-form';
 import OutputOptions from './OutputOptions';
 
@@ -72,20 +72,23 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
         <>
           <FormControl>
             <Label>Measurement Type</Label>
-            <RadioButton
+            <SwitchTab
               options={measurementTypeOptions}
-              direction="row"
-              onChangeData={val => {
-                dispatch(setCreateProjectState({ measurementType: val }));
+              valueKey="value"
+              selectedValue={measurementType}
+              activeClassName="naxatw-bg-red naxatw-text-white"
+              onChange={(selected: any) => {
                 setValue('gsd_cm_px', '');
                 setValue('altitude_from_ground', '');
+                dispatch(
+                  setCreateProjectState({ measurementType: selected.value }),
+                );
               }}
-              value={measurementType}
             />
           </FormControl>
 
           {measurementType === 'gsd' ? (
-            <FormControl className="naxatw-mt-4 naxatw-gap-1">
+            <FormControl className="naxatw-mt-2 naxatw-gap-1">
               <Label required>Ground Sampling Distance (cm/pixel)</Label>
               <Input
                 placeholder="Enter GSD in cm/pixel"
@@ -107,7 +110,7 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
               />
               {gsdInputValue ? (
                 <InfoMessage
-                  message={`Equivalent altitude is ${gsdToAltitude(Number(gsdInputValue))}`}
+                  message={`Equivalent altitude is ${gsdToAltitude(Number(gsdInputValue))?.toFixed(2)?.replace(/\.00$/, '')} m`}
                 />
               ) : (
                 <></>
@@ -137,7 +140,7 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
               />
               {altitudeInputValue ? (
                 <InfoMessage
-                  message={`Equivalent gsd is ${altitudeToGsd(Number(altitudeInputValue))}`}
+                  message={`Equivalent gsd is ${altitudeToGsd(Number(altitudeInputValue))?.toFixed(2)?.replace(/\.00$/, '')} cm/pixel`}
                 />
               ) : (
                 <></>
@@ -149,18 +152,22 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
             </FormControl>
           )}
           <FormControl className="naxatw-mt-5">
-            {/* <Label>Measurement Type</Label> */}
-            <RadioButton
+            <Label>Merge Type</Label>
+
+            <SwitchTab
               options={imageMergeTypeOptions}
-              direction="row"
-              onChangeData={val => {
-                dispatch(setCreateProjectState({ imageMergeType: val }));
+              valueKey="value"
+              selectedValue={imageMergeType}
+              activeClassName="naxatw-bg-red naxatw-text-white"
+              onChange={(selected: any) => {
                 setValue('front_overlap', '');
                 setValue('side_overlap', '');
                 setValue('forward_spacing', '');
                 setValue('side_spacing', '');
+                dispatch(
+                  setCreateProjectState({ imageMergeType: selected.value }),
+                );
               }}
-              value={imageMergeType}
             />
           </FormControl>
           {imageMergeType === 'overlap' ? (
@@ -181,7 +188,7 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                 />
                 {frontOverlapInputValue && agl ? (
                   <InfoMessage
-                    message={`Equivalent forward spacing is ${getForwardSpacing(agl, frontOverlapInputValue)}`}
+                    message={`Equivalent forward spacing is ${getForwardSpacing(agl, frontOverlapInputValue)?.replace(/\.00$/, '')} m`}
                   />
                 ) : (
                   <></>
@@ -207,7 +214,7 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                 />
                 {sideOverlapInputValue && agl ? (
                   <InfoMessage
-                    message={`Equivalent side spacing is ${getSideSpacing(agl, sideOverlapInputValue)}`}
+                    message={`Equivalent side spacing is ${getSideSpacing(agl, sideOverlapInputValue)?.replace(/\.00$/, '')} m`}
                   />
                 ) : (
                   <></>
@@ -236,7 +243,7 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                 />
                 {forwardSpacingInputValue && agl ? (
                   <InfoMessage
-                    message={`Equivalent front overlap is ${getFrontOverlap(agl, forwardSpacingInputValue)}`}
+                    message={`Equivalent front overlap is ${getFrontOverlap(agl, forwardSpacingInputValue)?.replace(/\.00$/, '')}%`}
                   />
                 ) : (
                   <></>
@@ -261,7 +268,7 @@ const KeyParameters = ({ formProps }: { formProps: UseFormPropsType }) => {
                 />
                 {sideSpacingInputValue && agl ? (
                   <InfoMessage
-                    message={`Equivalent side overlap is ${getSideOverlap(agl, sideSpacingInputValue)}`}
+                    message={`Equivalent side overlap is ${getSideOverlap(agl, sideSpacingInputValue)?.replace(/\.00$/, '')}%`}
                   />
                 ) : (
                   <></>

From 33528f0079f9f36c839d78426ab6b5b9b49f5d42 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Wed, 11 Sep 2024 16:40:29 +0545
Subject: [PATCH 15/20] feat: round off to 2 decimal values the return value of
 side/front spacing converter function

---
 src/frontend/src/utils/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/utils/index.ts b/src/frontend/src/utils/index.ts
index 5927772a..a413c1a8 100644
--- a/src/frontend/src/utils/index.ts
+++ b/src/frontend/src/utils/index.ts
@@ -53,14 +53,14 @@ export const getForwardSpacing = (agl: number, frontOverlap: number) => {
   const forwardPhotoHeight = agl * VerticalFOV;
   const frontOverlapDistance = (forwardPhotoHeight * frontOverlap) / 100;
   const forwardSpacing = forwardPhotoHeight - frontOverlapDistance;
-  return forwardSpacing;
+  return forwardSpacing.toFixed(2);
 };
 
 export const getSideSpacing = (agl: number, sideOverlap: number) => {
   const sidePhotoWidth = agl * HorizontalFOV;
   const sideOverlapDistance = (sidePhotoWidth * sideOverlap) / 100;
   const sideSpacing = sidePhotoWidth - sideOverlapDistance;
-  return sideSpacing;
+  return sideSpacing.toFixed(2);
 };
 
 export const getSideOverlap = (agl: number, sideSpacing: number) => {

From 6c8c9777d3fa1faa88eb05ba43c9f40f67773ea7 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Wed, 11 Sep 2024 17:11:29 +0545
Subject: [PATCH 16/20] feat(landing-page): add jamaicaFlyingLab on client
 section

---
 .../LandingPage/JamaicaFlyingLabs_Logo.png      | Bin 0 -> 12184 bytes
 .../LandingPage/ClientsAndPartners/index.tsx    |   7 ++++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 src/frontend/src/assets/images/LandingPage/JamaicaFlyingLabs_Logo.png

diff --git a/src/frontend/src/assets/images/LandingPage/JamaicaFlyingLabs_Logo.png b/src/frontend/src/assets/images/LandingPage/JamaicaFlyingLabs_Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4fd78e33a5e145ce07553a916b0c8bda9c1ea34
GIT binary patch
literal 12184
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

literal 0
HcmV?d00001

diff --git a/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx b/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx
index 291ddce0..23b1a33d 100644
--- a/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx
+++ b/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx
@@ -3,6 +3,7 @@ import { motion } from 'framer-motion';
 import worldBankLogo from '@Assets/images/LandingPage/WorldbankLogo.png';
 import { fadeUpVariant } from '@Constants/animations';
 import gfdrrLogo from '@Assets/images/GFDRR-logo.png';
+import JamaicaFlyingLabsLogo from '@Assets/images/LandingPage/JamaicaFlyingLabs_Logo.png';
 import { FlexRow } from '@Components/common/Layouts';
 
 export default function ClientAndPartners() {
@@ -27,9 +28,13 @@ export default function ClientAndPartners() {
             transition={{ duration: 0.7 }}
             viewport={{ once: true }}
           >
-            <FlexRow gap={10}>
+            <FlexRow
+              className="naxatw-flex naxatw-items-center naxatw-justify-center"
+              gap={10}
+            >
               <Image src={worldBankLogo} alt="world bank logo" />
               <Image src={gfdrrLogo} alt="gfdrrLogo" width={260} />
+              <Image src={JamaicaFlyingLabsLogo} alt="gfdrrLogo" width={200} />
             </FlexRow>
           </motion.div>
         </div>

From 5454f57ff8ccfc977f3097027a5767abce01a95d Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Wed, 11 Sep 2024 17:13:38 +0545
Subject: [PATCH 17/20] feat(landing-page): remove unused links

---
 src/frontend/src/components/LandingPage/Footer/index.tsx | 4 ++--
 src/frontend/src/components/LandingPage/Navbar/index.tsx | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/src/components/LandingPage/Footer/index.tsx b/src/frontend/src/components/LandingPage/Footer/index.tsx
index 31d3c41e..741b6bd4 100644
--- a/src/frontend/src/components/LandingPage/Footer/index.tsx
+++ b/src/frontend/src/components/LandingPage/Footer/index.tsx
@@ -50,13 +50,13 @@ export default function Footer() {
               <Image src={naxaLogo} />
             </FlexRow>
           </div>
-          <div className="naxatw-flex naxatw-w-1/3 naxatw-flex-col naxatw-justify-between naxatw-gap-4 naxatw-text-center naxatw-font-medium md:naxatw-flex-row">
+          {/* <div className="naxatw-flex naxatw-w-1/3 naxatw-flex-col naxatw-justify-between naxatw-gap-4 naxatw-text-center naxatw-font-medium md:naxatw-flex-row">
             <span className="naxatw-cursor-pointer">Impacts</span>
             <span className="naxatw-cursor-pointer">Privacy Policy</span>
             <span className="naxatw-cursor-pointer">Partners</span>
             <span className="naxatw-cursor-pointer">FAQs</span>
             <span className="naxatw-cursor-pointer">Cookies</span>
-          </div>
+          </div> */}
         </motion.div>
         <p className="naxatw-mt-2 naxatw-text-center naxatw-text-base naxatw-text-landing-grey">
           © Drone Arial Tasking Manager. All Rights Reserved 2024
diff --git a/src/frontend/src/components/LandingPage/Navbar/index.tsx b/src/frontend/src/components/LandingPage/Navbar/index.tsx
index c726c05a..6abbfa0a 100644
--- a/src/frontend/src/components/LandingPage/Navbar/index.tsx
+++ b/src/frontend/src/components/LandingPage/Navbar/index.tsx
@@ -11,10 +11,10 @@ export default function Navbar() {
           gap={5}
           className="naxatw-h-fit naxatw-text-xs naxatw-leading-none"
         >
-          <p className="naxatw-border-r naxatw-pr-3">About</p>
-          <p className="naxatw-border-r naxatw-pr-3">FAQs</p>
+          {/* <p className="naxatw-border-r naxatw-pr-3">About</p>
+          <p className="naxatw-border-r naxatw-pr-3">FAQs</p> */}
           <a href="https://hotosm.github.io/drone-tm/ ">
-            <p className="naxatw-border-r naxatw-pr-3">Documentations</p>
+            <p className="naxatw-pr-3">Documentations</p>
           </a>
         </FlexRow>
       </FlexRow>

From 9ef959d531a04a37372ddcd88f09c70c878e29e6 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Wed, 11 Sep 2024 17:33:43 +0545
Subject: [PATCH 18/20] fix:typo

---
 src/frontend/src/constants/landingPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/constants/landingPage.tsx b/src/frontend/src/constants/landingPage.tsx
index e87fb1b3..5f7f3ceb 100644
--- a/src/frontend/src/constants/landingPage.tsx
+++ b/src/frontend/src/constants/landingPage.tsx
@@ -111,7 +111,7 @@ export const ourRationaleData = [
   },
   {
     id: 2,
-    title: 'Limited Engagement Of Communitites',
+    title: 'Limited Engagement Of Communities',
     description:
       'Traditional mapping solutions involve professional consultants with expensive equipment who with communities only briefly, which can lead to delays and lack of locally relevant data.',
   },

From 0ec4ef9537c0e9efbb80137383b1c9ce7c7bc638 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Wed, 11 Sep 2024 17:51:23 +0545
Subject: [PATCH 19/20] fix(individual-project): show popup to lock task if
 there is no task status found

---
 .../src/components/IndividualProject/MapSection/index.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/components/IndividualProject/MapSection/index.tsx b/src/frontend/src/components/IndividualProject/MapSection/index.tsx
index 2d9035ca..fa9b4893 100644
--- a/src/frontend/src/components/IndividualProject/MapSection/index.tsx
+++ b/src/frontend/src/components/IndividualProject/MapSection/index.tsx
@@ -270,19 +270,21 @@ const MapSection = () => {
         fetchPopupData={(properties: Record<string, any>) => {
           dispatch(setProjectState({ selectedTaskId: properties.id }));
           setLockedUser({
-            id: properties?.locked_user_id || '',
-            name: properties?.locked_user_name || '',
+            id: properties?.locked_user_id || userDetails?.id || '',
+            name: properties?.locked_user_name || userDetails?.name || '',
           });
         }}
         hideButton={
           !(
+            !taskStatusObj?.[selectedTaskId] ||
             taskStatusObj?.[selectedTaskId] === 'UNLOCKED_TO_MAP' ||
             (taskStatusObj?.[selectedTaskId] === 'LOCKED_FOR_MAPPING' &&
               lockedUser?.id === userDetails?.id)
           )
         }
         buttonText={
-          taskStatusObj?.[selectedTaskId] === 'UNLOCKED_TO_MAP'
+          taskStatusObj?.[selectedTaskId] === 'UNLOCKED_TO_MAP' ||
+          !taskStatusObj?.[selectedTaskId]
             ? 'Lock Task'
             : 'Go To Task'
         }

From 15a487d64cdc4feb6782ed0d1ec0042745494291 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 12 Sep 2024 11:16:45 +0545
Subject: [PATCH 20/20] feat(project-creation): add task generation info text

---
 .../GenerateTask/index.tsx                    | 15 +++++++++++++
 src/frontend/src/constants/createProject.tsx  | 21 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/src/frontend/src/components/CreateProject/DescriptionContents/GenerateTask/index.tsx b/src/frontend/src/components/CreateProject/DescriptionContents/GenerateTask/index.tsx
index becbab36..b336b4ed 100644
--- a/src/frontend/src/components/CreateProject/DescriptionContents/GenerateTask/index.tsx
+++ b/src/frontend/src/components/CreateProject/DescriptionContents/GenerateTask/index.tsx
@@ -1,3 +1,5 @@
+import { taskGenerationGuidelines } from '@Constants/createProject';
+
 export default function GenerateTask() {
   return (
     <div className="naxatw-px-10 naxatw-py-5">
@@ -6,6 +8,19 @@ export default function GenerateTask() {
         Split the task into smaller chunks based on the given dimensions to
         ensure more efficient and precise data collection and analysis.
       </p>
+      <br />
+      <div>
+        <p className="naxatw-mt-2 naxatw-text-body-md">
+          {taskGenerationGuidelines?.title}
+        </p>
+        <ol className="naxatw-flex naxatw-list-decimal naxatw-flex-col naxatw-gap-1 naxatw-px-2 naxatw-py-2">
+          {taskGenerationGuidelines?.guidelines?.map(item => (
+            <li key={item} className="naxatw-text-left naxatw-text-body-md">
+              {item}
+            </li>
+          ))}
+        </ol>
+      </div>
     </div>
   );
 }
diff --git a/src/frontend/src/constants/createProject.tsx b/src/frontend/src/constants/createProject.tsx
index f84d77fe..80951f12 100644
--- a/src/frontend/src/constants/createProject.tsx
+++ b/src/frontend/src/constants/createProject.tsx
@@ -267,3 +267,24 @@ export const keyParametersInfo = [
       'The Digital Elevation Model (DEM) file that will be used to generate the terrain follow flight plan. This file should be in GeoTIFF format',
   },
 ];
+
+export const taskGenerationGuidelines = {
+  title: `When setting up your task area, please consider the following
+      recommendations based on the equipment and parameters used by the drone
+      operators:`,
+  guidelines: [
+    `If the drone operators are using the RC2 controller with the terrain
+  following parameter, it's recommended to create a square with dimensions
+  up to 300 meters, covering approximately 0.1 km².`,
+    `If the drone operators are using the RC-N2 controller with the
+    terrain following parameter or the RC2 controller without the terrain
+    following parameter, create a square with dimensions up to 550 meters,
+    covering approximately 0.3 km².`,
+    `If the drone operators are using the RC-N2 controller without the
+      terrain following parameter, the recommended square dimensions are up to
+      700 meters, covering approximately 0.5 km².`,
+  ],
+  conclusion: `These guidelines will help ensure that your task area is appropriately
+      sized based on the drone equipment and parameters being used. This will
+      also reduce the chances of RC lagging while flying the drone.`,
+};