Merge pull request #226 from mapswipe/fix/add-image-validate

fix:Add image validate

Author: AdityaKhatri

public/locales/en/data.json

@@ -4,6 +4,7 @@
   "build-area": "Find",
   "footprint": "Validate",
   "change-detection": "Compare",
+  "validate-image": "Validate Image",
   "project-card-progress-text": "{{progress, number}}% completed",
   "project-card-last-update": "{{date, datetime}}",
   "project-card-contributors-text": "{{contributors}}",

public/locales/en/project.json

@@ -24,6 +24,7 @@
   "build-area": "Find",
   "footprint": "Validate",
   "change-detection": "Compare",
+  "validate-image": "Validate Image",
   "project-tab-head": "{{projectTitle}} | MapSwipe",
   "Location": "Location",
   "requesting-organization": "Requesting organization",

src/components/ProjectTypeIcon/index.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { _cs } from '@togglecorp/fujs';
+import { IoImagesOutline } from 'react-icons/io5';
 
 import styles from './styles.module.css';
 
@@ -15,7 +16,7 @@ const sizeToStyleMap: {
 
 export interface Props {
     className?: string;
-    type: '1' | '2' | '3';
+    type: '1' | '2' | '3' | '10';
     size?: SizeTypes;
 }
 function ProjectTypeIcon(props: Props) {
@@ -72,6 +73,9 @@ function ProjectTypeIcon(props: Props) {
                     </g>
                 </svg>
             )}
+            {type === '10' && (
+                <IoImagesOutline />
+            )}
         </>
     );
 }

src/pages/[locale]/data/index.tsx

@@ -340,6 +340,13 @@ function Data(props: Props) {
                 <ProjectTypeIcon type="3" size="small" />
             ),
         },
+        {
+            key: '10',
+            label: t('validate-image'),
+            icon: (
+                <ProjectTypeIcon type="10" size="small" />
+            ),
+        },
     ]), [t]);
 
     const projectTypeOptionsMap = useMemo(() => (

src/pages/[locale]/projects/[id].tsx

@@ -269,6 +269,13 @@ function Project(props: Props) {
                 <ProjectTypeIcon type="3" size="small" />
             ),
         },
+        10: {
+            key: '10',
+            label: t('validate-image'),
+            icon: (
+                <ProjectTypeIcon type="10" size="small" />
+            ),
+        },
     }), [t]);
 
     return (

src/utils/common.ts

@@ -6,6 +6,8 @@ import {
 
 export const graphqlEndpoint = process.env.MAPSWIPE_COMMUNITY_API_ENDPOINT as string;
 
+export const supportedProjectTypes = [1, 2, 3, 10];
+
 export interface Stats {
     communityStats: {
         totalContributors: number | null | undefined;
@@ -84,7 +86,7 @@ export function memoize<A extends Array<any>, R>(func: (...args: A) => R) {
 
 export type ProjectStatus = 'private_active' | 'private_inactive' | 'private_finished' | 'active' | 'inactive' | 'finished' | 'archived' | 'tutorial';
 
-export type ProjectType = 1 | 2 | 3 | 4;
+export type ProjectType = 1 | 2 | 3 | 4 | 10;
 
 export interface ProjectStatusOption {
     key: ProjectStatus;
@@ -105,6 +107,7 @@ export const projectNameMapping: {
     2: 'Footprint',
     3: 'Change Detection',
     4: 'Completeness',
+    10: 'Validate Image',
 };
 
 const mb = 1024 * 1024;

src/utils/requests/projectCentroids.ts

@@ -7,6 +7,7 @@ import {
     ProjectStatus,
     ProjectType,
     parseProjectName,
+    supportedProjectTypes,
 } from 'utils/common';
 
 const readFile = util.promisify(fs.readFile);
@@ -81,10 +82,10 @@ const getProjectCentroids = memoize(async (): Promise<ProjectResponse> => {
     const filteredProjects = {
         ...projects,
         features: projects.features.filter((feature) => {
-            if (!feature.geometry) {
+            if (!supportedProjectTypes.includes(feature.properties.project_type)) {
                 return false;
             }
-            if (feature.properties.project_type > 3) {
+            if (feature.properties.project_type !== 10 && !feature.geometry) {
                 return false;
             }
             return (

src/utils/requests/projectGeometries.ts

@@ -7,6 +7,7 @@ import {
     ProjectType,
     timeIt,
     parseProjectName,
+    supportedProjectTypes,
 } from 'utils/common';
 
 const readFile = util.promisify(fs.readFile);
@@ -77,7 +78,7 @@ const getProjectGeometries = memoize(async (): Promise<ProjectGeometryResponse>
             if (!feature.geometry) {
                 return false;
             }
-            if (feature.properties.project_type > 3) {
+            if (!supportedProjectTypes.includes(feature.properties.project_type)) {
                 return false;
             }
             return (