datastake-daf 0.6.757 → 0.6.759

package/src/@daf/core/components/Graphs/components/BaseGraph.jsx

@@ -86,7 +86,7 @@ const BaseGraph = forwardRef(function BaseGraph(
 					fitView={true} // zoom out on default
 					fitViewOptions={{
 						padding: 0.2, //zoom out on default
-						duration: withDuration ? 300 : undefined,
+						// duration: withDuration ? 300 : undefined,
 					}}
 					{...props}
 				>

package/src/@daf/core/components/Icon/configs/SpacingHeight.js

@@ -0,0 +1,8 @@
+const config = {    
+    viewBox: "0 0 12 12",
+    children: (
+        <path d="M5.6875 9.1875L5.6875 2.1875M5.6875 9.1875L3.9375 8.02083M5.6875 9.1875L7.4375 8.02083M5.6875 2.1875L3.9375 3.35417M5.6875 2.1875L7.4375 3.35417M10.9375 0.4375H0.4375M10.9375 10.9375H0.4375" stroke="currentColor" strokeWidth="0.875" strokeLinecap="round" strokeLinejoin="round"/>
+    ),
+}
+
+export default config;

package/src/@daf/core/components/Icon/configs/SpacingWidth.js

@@ -0,0 +1,8 @@
+const config = {
+    viewBox: "0 0 12 12",
+    children: (
+        <path d="M2.1875 5.6875H9.1875M2.1875 5.6875L3.35417 3.9375M2.1875 5.6875L3.35417 7.4375M9.1875 5.6875L8.02083 3.9375M9.1875 5.6875L8.02083 7.4375M10.9375 10.9375V0.437501M0.4375 10.9375V0.4375" stroke="currentColor" strokeWidth="0.875" strokeLinecap="round" strokeLinejoin="round"/>
+    ),
+}
+
+export default config;

package/src/@daf/core/components/Icon/configs/index.js

@@ -223,7 +223,9 @@ import Bear from "./Bear";
 import Security from "./Security";
 import Minus from "./Minus";
 import ClockPlus from "./ClockPlus";
-import WaziDarkIcon from "./WaziDarkIcon";
+import WaziDarkIcon from "./WaziDarkIcon";	
+import SpacingHeight from "./SpacingHeight";
+import SpacingWidth from "./SpacingWidth";
 
 const config = {
 	AppAdmin,
@@ -452,6 +454,8 @@ const config = {
 	Minus,
 	ClockPlus,
 	WaziDarkIcon,
+	SpacingHeight,
+	SpacingWidth,
 };
 
 export default config;

package/src/@daf/hooks/useMapHelper.js

@@ -15,9 +15,23 @@ export const filterValidGPS = (data) => {
   const latCheck = (lat) => lat > -90 || lat < 90;
   const lngCheck = (lng) => lng > -180 || lng < 180;
   return data.filter(item => {
-    return item.marker &&
+    // Check if item has valid GPS coordinates
+    const hasValidGPS = item.marker &&
       latCheck(Number(item.marker.lat)) &&
       lngCheck(Number(item.marker.lng));
+    
+    const hasValidArea = item.area &&
+      Array.isArray(item.area) &&
+      item.area.length >= 3 &&
+      item.area.every(coord => 
+        Array.isArray(coord) && 
+        coord.length >= 2 &&
+        !isNaN(coord[0]) && !isNaN(coord[1]) &&
+        isFinite(coord[0]) && isFinite(coord[1])
+      );
+    
+    // Include item if it has either valid GPS or valid area
+    return hasValidGPS || hasValidArea;
   });
 }
 

package/src/@daf/pages/Dashboards/SupplyChain/index.jsx

@@ -20,7 +20,7 @@ function SupplyChain({
     setSelectedPartners, 
     informationSources,
     hardcodedData,
-    breadcrumbs = [],
+    breadCrumbs = [],
 }) {
 
     const sourceOptions = useMemo(() => {
@@ -69,7 +69,7 @@ function SupplyChain({
                             />
                         </div>
                     }
-                    breadcrumbs={breadcrumbs}
+                    breadcrumbs={breadCrumbs}
                 />
             }
         >

package/src/@daf/pages/Documents/index.jsx

@@ -34,7 +34,6 @@ const DocumentsTable = ({
     form = {},
     applications = [],
     subjectClear = () => {},
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -50,6 +49,8 @@ const DocumentsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
+    const breadCrumbs = [];
+
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
     useEffect(() => {
@@ -90,7 +91,7 @@ const DocumentsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Documents")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Events/Activities/index.jsx

@@ -35,7 +35,6 @@ const ActivitiesTable = ({
     extendingFilters = {},
     createDefaultValues = {},
     applications = [],
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -53,6 +52,8 @@ const ActivitiesTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
+    const breadCrumbs = [];
+
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
     const filters = useMemo(() => {
@@ -94,7 +95,7 @@ const ActivitiesTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Activities")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Events/Incidents/index.jsx

@@ -35,7 +35,6 @@ const IncidentsTable = ({
     extendingFilters = {},
     createDefaultValues = {},
     applications = [],
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -53,6 +52,8 @@ const IncidentsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
+    const breadCrumbs = [];
+
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
     const filters = useMemo(() => {
@@ -94,7 +95,7 @@ const IncidentsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Incidents")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Events/index.jsx

@@ -35,7 +35,6 @@ const EventsTable = ({
     extendingFilters = {},
     applications = [],
     subjectClear = () => {},
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -53,6 +52,8 @@ const EventsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
+    const breadCrumbs = [];
+
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
     const filters = useMemo(() => {
@@ -100,7 +101,7 @@ const EventsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("events")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -4,9 +4,7 @@ import { findOptions } from '../../../../helpers/StringHelper.js';
 import { renderDateFormatted } from '../../../../helpers/Forms.js';
 import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
-import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
 import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
-
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
     return linkingObject?.[value]?.name;
@@ -14,7 +12,7 @@ const getLinkValue = (value, linkingObject) => {
   return null;
 }
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -131,15 +129,15 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     
       {
         title: t("Sources"),
-        dataIndex: 'sources',
+        dataIndex: 'source',
         ellipsis: true,
         show: activeTab !== "own",
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
           }
-          const sources = sourceAvatarConfig(v, user, applications);
-          return <AvatarGroup items={sources}></AvatarGroup>;
+          const source = findOptions(v, data?.options?.sourceOptions);
+          return source ? <Tooltip title={source}>{source}</Tooltip> : '-';
         },
       },
       {
@@ -151,7 +149,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />;
           }
           const onClick = () => {
-            let link = `/app/view/${subject}/${all.datastakeId}`;
+            const link = `/app/view/${subject}/${all.datastakeId}`;
             if (activeTab === "shared") {
               link += `?sourceId=${all?.authorId?.id}`;
             }

package/src/@daf/pages/Locations/MineSite/index.jsx

@@ -34,8 +34,6 @@ const ProductionSitesTable = ({
     form = {},
     extendingFilters = {},
     createDefaultValues = {},
-    applications = [],
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState('own');
@@ -50,8 +48,9 @@ const ProductionSitesTable = ({
         theme,
         subject: 'production-sites',
         data,
-        applications,   
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
+
+    const breadCrumbs = [];
 
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
@@ -94,7 +93,7 @@ const ProductionSitesTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("production-sites")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Locations/index.jsx

@@ -34,7 +34,6 @@ const LocationsTable = ({
     form = {},
     applications = [],
     subjectClear = () => {},
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -52,6 +51,8 @@ const LocationsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
+    const breadCrumbs = [];
+
     const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
 
     useEffect(() => {
@@ -91,7 +92,7 @@ const LocationsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Locations")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Stakeholders/Operators/index.jsx

@@ -35,7 +35,6 @@ const OperatorsTable = ({
     extendingFilters = {},
     createDefaultValues = {},
     applications = [],
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState('own');
@@ -53,6 +52,7 @@ const OperatorsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
+    const breadCrumbs = [];
 
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
@@ -95,7 +95,7 @@ const OperatorsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Operators")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Stakeholders/Workers/index.jsx

@@ -35,7 +35,6 @@ const WorkersTable = ({
     extendingFilters = {},
     createDefaultValues = {},
     applications = [],
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState('own');
@@ -53,6 +52,8 @@ const WorkersTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
+    const breadCrumbs = [];
+
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
     const filters = useMemo(() => {
@@ -94,7 +95,7 @@ const WorkersTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Workers")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Stakeholders/index.jsx

@@ -35,7 +35,6 @@ const StakeholdersTable = ({
     form = {},
     applications = [],
     subjectClear = () => {},
-    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -51,6 +50,8 @@ const StakeholdersTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
+    const breadCrumbs = [];
+
     const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
 
     useEffect(() => {
@@ -88,7 +89,7 @@ const StakeholdersTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Stakeholders")}
-           breadCrumbs={breadcrumbs}
+           breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Summary/Activities/Restoration/helper.js

@@ -1,16 +1,8 @@
-// ============================================================================
-// REGION: Photo/Image Extraction
-// ============================================================================
+import L from "leaflet";
 
-/**
- * Normalize URL by removing trailing colon if present
- */
 const normalizeUrl = (url) => url?.endsWith(':') ? url.slice(0, -1) : url;
 
-/**
- * Extract images from a photo document
- * Handles both documents with pictures arrays and direct image objects
- */
+
 export const extractFromPhotoDoc = (photoDoc, label, docIndex) => {
     const photos = photoDoc?.pictures?.filter(p => p?.url) || (photoDoc?.url ? [photoDoc] : []);
     
@@ -20,13 +12,6 @@ export const extractFromPhotoDoc = (photoDoc, label, docIndex) => {
     }));
 };
 
-/**
- * Extract and process images from activity data
- * Processes group photos and activity photos (start, during, end) into a flat array
- * 
- * @param {Object} activityData - Activity data object containing photo arrays
- * @returns {Array} - Flat array of image objects with src and alt properties
- */
 export const getActivityImages = (activityData) => {
     const photoArrays = [
         { data: activityData?.groupPhotos, label: 'Group Photo' },
@@ -43,17 +28,8 @@ export const getActivityImages = (activityData) => {
         );
 };
 
-// ============================================================================
-// REGION: Gender Distribution
-// ============================================================================
-
-// Gender distribution colors for pie chart
-const GENDER_COLORS = ['#016C6E', '#00AEB1']; // Male (dark teal), Female (light teal)
+const GENDER_COLORS = ['#016C6E', '#00AEB1'];
 
-/**
- * Get gender distribution data from activityData
- * Maps genderDistributionMale and genderDistributionFemale to a structured object
- */
 export const getGenderDistributionData = (activityData) => {
     return {
         Male: activityData?.genderDistributionMale || 0,
@@ -61,18 +37,11 @@ export const getGenderDistributionData = (activityData) => {
     };
 };
 
-/**
- * Check if gender distribution is empty
- * Returns true if all values are 0 or falsy
- */
+
 export const isGenderDistributionEmpty = (genderDistributionData) => {
     return Object.values(genderDistributionData).every(val => !val || val === 0);
 };
 
-/**
- * Calculate pie chart data from gender distribution
- * Computes percentages and assigns colors based on gender distribution values
- */
 export const calculateGenderPieData = (genderDistributionData) => {
     const total = Object.values(genderDistributionData).reduce((all, val) => all + (val || 0), 0);
 
@@ -89,10 +58,6 @@ export const calculateGenderPieData = (genderDistributionData) => {
     });
 };
 
-/**
- * Get tooltip children for gender distribution pie chart
- * Generates tooltip content showing gender label and value
- */
 export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData, t, renderTooltipJsx) => {
     if (isEmpty) {
         if (!Object.keys(genderDistributionData).length) {
@@ -120,16 +85,6 @@ export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData,
     });
 };
 
-// ============================================================================
-// REGION: Activity Indicators
-// ============================================================================
-
-/**
- * Maps activityData value to indicator type
- * "yes" or true → "compliant"
- * "no" or false → "notCompliant"
- * null or undefined → "empty"
- */
 export const getIndicatorType = (value) => {
     if (value === "yes" || value === true) return "compliant";
     if (value === "no" || value === false) return "notCompliant";
@@ -137,34 +92,7 @@ export const getIndicatorType = (value) => {
     return "empty"; // default fallback
 };
 
-/**
- * Special case: Children presence indicator configuration
- * Children presence is compliant if answered 'no', not compliant if answered 'yes'
- * Custom icons: "no" (compliant) → X icon with green badge, "yes" (notCompliant) → Check icon with red badge
- * 
- * @param {string|boolean|null} value - The presenceOfChildren value from activityData
- * @returns {Object} - Configuration object with type and optional statusIcon
- */
-export const getChildrenPresenceConfig = (value) => {
-    if (value === "no" || value === false) {
-        return { type: "compliant", statusIcon: "Close" }; // X icon with green badge
-    }
-    if (value === "yes" || value === true) {
-        return { type: "notCompliant", statusIcon: "Check" }; // Check icon with red badge
-    }
-    return { type: "empty" }; // empty state
-};
-
-/**
- * Get activity indicators configuration from activityData
- * Maps activityData fields to indicator config objects with icon, label, type, and optional statusIcon
- * 
- * @param {Object} activityData - Activity data object
- * @param {Function} t - Translation function
- * @returns {Array} - Array of indicator config objects
- */
 export const getActivityIndicatorsConfig = (activityData, t) => {
-    const childrenPresenceConfig = getChildrenPresenceConfig(activityData?.presenceOfChildren);
     
     return [
         { icon: "Aid", label: t("Aid kit availability"), type: getIndicatorType(activityData?.aidKitAccessible) },
@@ -172,11 +100,137 @@ export const getActivityIndicatorsConfig = (activityData, t) => {
         { icon: "Users", label: t("Workers safe pairing"), type: getIndicatorType(activityData?.duosFormed) },
         { 
             icon: "Bear", 
-            label: t("Children presence"), 
-            type: childrenPresenceConfig.type,
-            ...(childrenPresenceConfig.statusIcon && { statusIcon: childrenPresenceConfig.statusIcon })
+            label: t("No children"), 
+            type: getIndicatorType(activityData?.presenceOfChildren),
         },
         { icon: "Security", label: t("Security presence"), type: getIndicatorType(activityData?.focalPointPresent) },
         { icon: "UserCircle", label: t("Relay presence"), type: getIndicatorType(activityData?.relayPresent) },
     ];
+};
+
+export const getMapDataFromActivity = (activityData, t) => {
+
+    const location = activityData?.location;
+    const perimeter = location?.perimeter;
+
+    const area = Array.isArray(perimeter) && perimeter.length > 0
+        ? perimeter
+            .filter((coord) => Array.isArray(coord) && coord.length >= 2)
+            .map((coord) => {
+                const first = typeof coord[0] === 'number' ? coord[0] : parseFloat(coord[0]);
+                const second = typeof coord[1] === 'number' ? coord[1] : parseFloat(coord[1]);
+                
+                if (isNaN(first) || isNaN(second) || !isFinite(first) || !isFinite(second)) {
+                    return null;
+                }
+                
+                // Try both formats and use Leaflet to validate
+                // First try as [lat, lng]
+                try {
+                    const latLng1 = L.latLng(first, second);
+                    if (latLng1.lat >= -90 && latLng1.lat <= 90 && 
+                        latLng1.lng >= -180 && latLng1.lng <= 180) {
+                        return [latLng1.lat, latLng1.lng];
+                    }
+                } catch (e) {
+                    // Not valid as [lat, lng], try swapping
+                }
+                
+                // Try as [lng, lat] (GeoJSON format) - swap them
+                try {
+                    const latLng2 = L.latLng(second, first);
+                    if (latLng2.lat >= -90 && latLng2.lat <= 90 && 
+                        latLng2.lng >= -180 && latLng2.lng <= 180) {
+                        return [latLng2.lat, latLng2.lng];
+                    }
+                } catch (e) {
+                    // Invalid coordinates
+                }
+                
+                return null;
+            })
+            .filter((coord) => coord !== null)
+        : null;
+
+    // Don't return early - we need to check for markers even if there's no perimeter
+
+    const mapData = [];
+    const baseColor = '#15FFFFB2';
+    const locationName = location?.name || activityData?.name || t("Activity Location");
+    const datastakeId = location?.datastakeId || activityData?.datastakeId;
+
+    // Helper to validate coordinates
+    const isValidCoordinate = (coord) => {
+        const num = typeof coord === 'number' ? coord : parseFloat(coord);
+        return !isNaN(num) && isFinite(num);
+    };
+
+    // Entry 1: Perimeter polygon (independent - show if it exists)
+    if (area && area.length >= 3) {
+        mapData.push({
+            _id: {},
+            id: `${activityData?.id || activityData?.datastakeId || 'perimeter'}-perimeter`,
+            area: area,
+            color: baseColor,
+            // No gps property - this will display only the polygon without markers
+            name: locationName,
+            plotName: locationName,
+            territoryTitle: t("Associated Plot"),
+            subTitle: t("Activity Location"),
+            type: t("Activity Location"),
+            datastakeId: datastakeId,
+            sources: null,
+            link: null,
+        });
+    }
+
+    // Entry 2: Arrival marker (independent - show if it exists)
+    const arrivalLat = activityData?.locationCheckArrival?.latitude;
+    const arrivalLng = activityData?.locationCheckArrival?.longitude;
+    if (isValidCoordinate(arrivalLat) && isValidCoordinate(arrivalLng)) {
+        mapData.push({
+            _id: {},
+            id: `${activityData?.id || activityData?.datastakeId || 'arrival'}-arrival`,
+            // Include area if it exists, so marker can show on top of polygon
+            area: area && area.length >= 3 ? area : null,
+            color: baseColor,
+            gps: {
+                latitude: typeof arrivalLat === 'number' ? arrivalLat : parseFloat(arrivalLat),
+                longitude: typeof arrivalLng === 'number' ? arrivalLng : parseFloat(arrivalLng),
+            },
+            name: t("Activity Start"),
+            plotName: locationName,
+            territoryTitle: t("Associated Plot"), 
+            datastakeId: `${datastakeId}-arrival`,
+            sources: null,
+            link: null,
+        });
+    }
+
+    // Entry 3: Departure marker (independent - show if it exists)
+    const departureLat = activityData?.locationCheckDeparture?.latitude;
+    const departureLng = activityData?.locationCheckDeparture?.longitude;
+    if (isValidCoordinate(departureLat) && isValidCoordinate(departureLng)) {
+        mapData.push({
+            _id: {},
+            id: `${activityData?.id || activityData?.datastakeId || 'departure'}-departure`,
+            // Include area if it exists, so marker can show on top of polygon
+            area: area && area.length >= 3 ? area : null,
+            color: baseColor,
+            gps: {
+                latitude: typeof departureLat === 'number' ? departureLat : parseFloat(departureLat),
+                longitude: typeof departureLng === 'number' ? departureLng : parseFloat(departureLng),
+            },
+            name: t("Activity End"),
+            plotName: locationName, 
+            territoryTitle: t("Associated Plot"), 
+            datastakeId: `${datastakeId}-departure`,
+            markerColor: "#FF7A45", 
+            sources: null,
+            link: null,
+        });
+    }
+
+    // Return mapData even if empty - let the map component handle empty arrays
+    return mapData;
 };