Nert 689 - Downloading masks from all list exports (#251)

api/src/paths/plan/list.ts

@@ -6,6 +6,7 @@ import { authorizeRequestHandler } from '../../request-handlers/security/authori
 import { PlanService } from '../../services/plan-service';
 import { PlanSearchCriteria, ProjectSearchCriteria, SearchService } from '../../services/search-service';
 import { getLogger } from '../../utils/logger';
+import { maskGateKeeper } from '../../utils/spatial-utils';
 
 const defaultLog = getLogger('paths/plan/list');
 
@@ -362,7 +363,6 @@ export function getPlansList(): RequestHandler {
         ha_from: searchCriteria.plan_ha_from
       };
 
-      console.log('projectSearchCriteria', projectSearchCriteria);
       // Fetch all planIds that match the search criteria
       const planIdsResponse = await searchService.findProjectIdsByCriteria(projectSearchCriteria);
 
@@ -373,6 +373,16 @@ export function getPlansList(): RequestHandler {
       // Get all plans data for the planIds
       const plans = await planService.getPlansByIds(planIds);
 
+      // Mask private geometries
+      plans.forEach((plan) => {
+        if (!plan.location?.geometry) return; // Skip if no geometry
+
+        const maskFilter = plan.location.geometry?.map((feature) => {
+          return maskGateKeeper(feature);
+        });
+        plan.location.geometry = maskFilter;
+      });
+
       await connection.commit();
 
       return res.status(200).json(plans);

api/src/paths/project/list.ts

@@ -6,6 +6,7 @@ import { authorizeRequestHandler } from '../../request-handlers/security/authori
 import { ProjectService } from '../../services/project-service';
 import { ProjectSearchCriteria, SearchService } from '../../services/search-service';
 import { getLogger } from '../../utils/logger';
+import { maskGateKeeper } from '../../utils/spatial-utils';
 
 const defaultLog = getLogger('paths/projects/list');
 
@@ -574,6 +575,15 @@ export function getProjectsPlansList(): RequestHandler {
       // Get all projects data for the projectIds
       const projects = await projectService.getProjectsByIds(projectIds);
 
+      // Mask private geometries
+      projects.forEach((project) => {
+        if (!project.location?.geometry) return; // Skip if no geometry
+        const maskFilter = project.location.geometry?.map((feature) => {
+          return maskGateKeeper(feature);
+        });
+        project.location.geometry = maskFilter;
+      });
+
       await connection.commit();
 
       return res.status(200).json(projects);

api/src/paths/public/plans.ts

@@ -5,6 +5,7 @@ import { geoJsonFeature } from '../../openapi/schemas/geoJson';
 import { PlanService } from '../../services/plan-service';
 import { PlanSearchCriteria, ProjectSearchCriteria, SearchService } from '../../services/search-service';
 import { getLogger } from '../../utils/logger';
+import { maskGateKeeper } from '../../utils/spatial-utils';
 
 const defaultLog = getLogger('paths/public/plans');
 
@@ -354,6 +355,16 @@ export function getPublicPlansList(): RequestHandler {
       // Get all projects data for the projectIds
       const projects = await planService.getPlansByIds(projectIds, true);
 
+      // Mask geometries that require it
+      projects.forEach((project) => {
+        if (!project.location?.geometry) return; // Skip if no geometry
+        const maskFilter = project.location.geometry?.map((feature) => {
+          return maskGateKeeper(feature);
+        });
+
+        project.location.geometry = maskFilter;
+      });
+
       await connection.commit();
 
       return res.status(200).json(projects);

api/src/paths/public/projects.ts

@@ -5,6 +5,7 @@ import { geoJsonFeature } from '../../openapi/schemas/geoJson';
 import { ProjectService } from '../../services/project-service';
 import { ProjectSearchCriteria, SearchService } from '../../services/search-service';
 import { getLogger } from '../../utils/logger';
+import { maskGateKeeper } from '../../utils/spatial-utils';
 
 const defaultLog = getLogger('paths/public/projects');
 
@@ -539,6 +540,17 @@ export function getPublicProjectsPlansList(): RequestHandler {
       // Get all projects data for the projectIds
       const projects = await projectService.getProjectsByIds(projectIds, true);
 
+      // Mask the geometries for all projects
+      projects.forEach((project) => {
+        if (!project.location?.geometry) return; // Skip if no geometry
+
+        const maskFilter = project.location.geometry?.map((feature) => {
+          return maskGateKeeper(feature);
+        });
+
+        project.location.geometry = maskFilter;
+      });
+
       await connection.commit();
 
       return res.status(200).json(projects);

app/src/components/map/MapContainer.tsx

@@ -1053,6 +1053,7 @@ const initializeMap = (
           size_ha={sizeHa}
           state_code={stateCode}
           thumbnail={thumbnail}
+          maskDisclaimer={true}
         />
       );
 
@@ -1100,6 +1101,7 @@ const initializeMap = (
           size_ha={sizeHa}
           state_code={stateCode}
           thumbnail={thumbnail}
+          maskDisclaimer={true}
         />
       );
 

app/src/components/map/components/Popup.tsx

@@ -11,6 +11,7 @@ export interface MapPopupProps {
   thumbnail?: string;
   maskedLocation?: boolean;
   hideButton?: boolean;
+  maskDisclaimer?: boolean;
 }
 
 const MapPopup = (props: any) => {
@@ -23,6 +24,7 @@ const MapPopup = (props: any) => {
   const thumbnail = props.thumbnail;
   const maskedLocation = props.maskedLocation || false;
   const hideButton = props.hideButton || false;
+  const maskDisclaimer = props.maskDisclaimer || false;
 
   // Project if true, Plan if false, Site if undefined/null
   const siteType = (isProject && 'Project') || (isProject === false && 'Plan') || 'Site';
@@ -108,6 +110,11 @@ const MapPopup = (props: any) => {
       {maskedLocation && (
         <div style={style.attention}>Location sensitive site - see FOIPPA 16, 17, 18 & 18.1.</div>
       )}
+      {maskDisclaimer && (
+        <div style={style.attention}>
+          Point location is approximate and does not represent the exact location of the site.
+        </div>
+      )}
       {!hideButton && (
         <div>
           <a href={`/${isProject ? 'projects' : 'plans'}/${id}`}>