datastake-daf 0.6.775 → 0.6.777

package/dist/pages/index.js

@@ -5322,7 +5322,7 @@ const getMetaPlaceholer = (inputMeta, t) => inputMeta.notApplicable ? t("Not app
  * @param {string} [filterCond=null] - Filter condition.
  * @returns {Object[]} - Filtered options.
  */
-function filterOptions(options, filters, formsValue = {}, repeatValues = {}, filterCond = null) {
+function filterOptions$1(options, filters, formsValue = {}, repeatValues = {}, filterCond = null) {
   const isOrCond = filterCond !== "and";
   const objFilter = {};
   filters.forEach(f => {
@@ -7570,8 +7570,6 @@ const Style$f = styled__default["default"].div`
   width: 100%;
   height: 472px;
 
-  
-
   .filter-cont {
     position: absolute; 
     top: 24px;
@@ -7674,24 +7672,11 @@ const Style$f = styled__default["default"].div`
       align-items: center;
     }
 
-    .marker-chain {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .animated-polyline {
-      stroke-dasharray: 10 10;
-      animation: dash-flow 1.5s linear infinite;
-      stroke-linecap: round;
-    }
-
-    @keyframes dash-flow {
-      to {
-        stroke-dashoffset: -20;
-      }
-    }
-
+	.marker-chain {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
     
   }
 
@@ -8215,15 +8200,18 @@ const VILLAGE = "village";
 const EXPORTER = "exporter";
 const PROCESSOR = "mineralProcessor";
 const DEPOT = "depot";
-const OPERATOR = "miningOperator";
 const MAX_EXTRA_SMALL_ZOOM_THRESHOLD = 2;
 const MAX_SMALL_ZOOM_THRESHOLD = 3;
 const MAX_MEDIUM_ZOOM_THRESHOLD = 6;
 const LOCATION_TYPES = [MINE_SITE, VILLAGE];
-const STAKEHOLDER_TYPES = [EXPORTER, PROCESSOR, DEPOT, OPERATOR];
+const STAKEHOLDER_TYPES = [EXPORTER, PROCESSOR, DEPOT];
 const RADIUS_SMALL = 15;
 const RADIUS_MEDIUM = 35;
 const RADIUS_LARGE = 60;
+const RADIUS_CURVE_SMALL = 10;
+const RADIUS_CURVE_MEDIUM = 15;
+const RADIUS_CURVE_LARGE = 20;
+const TENSION = 0.2;
 function isLocation(type) {
   return LOCATION_TYPES.includes(type);
 }
@@ -8280,6 +8268,7 @@ function getStakeholderPosition({
   const isLarge = isLargeMarker(zoom);
   let radius;
   let center = {
+    // NOT BEING USED FOR NOW AND MAYBE NEVER
     left: 0,
     top: 0
   };
@@ -8303,25 +8292,6 @@ function getStakeholderPosition({
     angleDeg
   };
 }
-function applyAnimationDirect(el, isShortLink) {
-  if (!(el instanceof SVGElement) || isShortLink) return;
-  el.style.strokeDasharray = "10, 10";
-  el.style.strokeDashoffset = "0";
-  el.style.animation = "dash-flow 1.2s linear infinite";
-  el.classList.add('animated-polyline');
-}
-function removeAnimationFromElement(element) {
-  if (!element) return;
-  element.classList.remove('animated-polyline');
-  element.style.animation = '';
-  element.style.strokeDasharray = '';
-}
-function applyAnimationToPolyline(polyline, isShortLink) {
-  const element = polyline.getElement();
-  if (element) {
-    applyAnimationDirect(element, isShortLink);
-  }
-}
 function createPolyline({
   L,
   startLatLng,
@@ -8331,48 +8301,110 @@ function createPolyline({
   zoom,
   listOfPolylines = [],
   isFromStakeholder = false,
-  isForceOpen = false,
-  stakeholderType = null,
-  animated = false,
-  mapRef
+  isForceOpen = false
 }) {
-  const lineWidth = isFromStakeholder && isExtraSmallMarker(zoom) && !isForceOpen ? 0 : 1.2;
-  const isShortLink = stakeholderType === OPERATOR || isFromStakeholder;
-  const shouldAnimate = animated;
-  const lineCoordinates = [[startLatLng.lat, startLatLng.lng], [endLatLng.lat, endLatLng.lng]];
-  const polylineStyle = {
+  const width = isFromStakeholder && isExtraSmallMarker(zoom) && !isForceOpen ? 0 : 1.2;
+  const coordinates = [[startLatLng.lat, startLatLng.lng], [endLatLng.lat, endLatLng.lng]];
+  const style = {
     color: "var(--base-gray-70)",
-    weight: lineWidth,
-    opacity: isSelected ? 1 : 0.5,
-    smoothFactor: 0,
+    weight: width,
+    opacity: 0.5,
+    smoothFactor: 1,
     id,
-    dashArray: isShortLink ? "0, 0" : shouldAnimate ? "10, 10" : !isSelected ? "5, 5" : "10, 10",
-    renderer: L.svg()
+    dashArray: !isSelected ? "5, 5" : "0, 0"
   };
-  const existingPolyline = listOfPolylines.find(p => p.options.id === id);
-  if (existingPolyline) {
-    removeAnimationFromElement(existingPolyline.getElement());
-    existingPolyline.setLatLngs(lineCoordinates);
-    existingPolyline.setStyle(polylineStyle);
-    if (shouldAnimate && isSelected) {
-      existingPolyline.once('add', () => {
-        applyAnimationToPolyline(existingPolyline, isShortLink);
-      });
-      applyAnimationToPolyline(existingPolyline, isShortLink);
-    }
-    return existingPolyline;
-  }
-  const newPolyline = L.polyline(lineCoordinates, polylineStyle);
-  newPolyline.addTo(mapRef);
-  listOfPolylines.push(newPolyline);
-  if (shouldAnimate && isSelected) {
-    newPolyline.once('add', () => {
-      applyAnimationToPolyline(newPolyline, isShortLink);
-    });
-    applyAnimationToPolyline(newPolyline, isShortLink);
+  const newPolyline = L.polyline(coordinates, style);
+  if (listOfPolylines.find(p => p.options.id === id)) {
+    const polylineToUpdateCoordinates = listOfPolylines.find(p => p.options.id === id);
+    polylineToUpdateCoordinates.setLatLngs(coordinates);
+    polylineToUpdateCoordinates.setStyle(style);
+  } else {
+    listOfPolylines.push(newPolyline);
   }
   return newPolyline;
 }
+function createCurvePath({
+  zoom,
+  totalMarkers,
+  markerIndex
+}) {
+  const radius = getCurvePointRadius(zoom);
+  const {
+    x,
+    y,
+    angleDeg
+  } = getAngleDeg(totalMarkers, markerIndex, radius);
+  return {
+    x,
+    y,
+    angleDeg
+  };
+}
+function getCurvePointRadius(zoom) {
+  const isSmall = isSmallMarker(zoom) || isExtraSmallMarker(zoom);
+  const isMedium = isMediumMarker(zoom);
+  if (isSmall) {
+    return RADIUS_SMALL + RADIUS_CURVE_SMALL;
+  } else if (isMedium) {
+    return RADIUS_MEDIUM + RADIUS_CURVE_MEDIUM;
+  } else {
+    return RADIUS_LARGE + RADIUS_CURVE_LARGE;
+  }
+}
+function buildSmoothCurve(layerPoints, mapRef) {
+  const path = [];
+  for (let i = 0; i < layerPoints.length - 1; i++) {
+    const p0 = layerPoints[i];
+    const p1 = layerPoints[i + 1];
+    const pPrev = layerPoints[i - 1] || p0;
+    const pNext = layerPoints[i + 2] || p1;
+    const cp1 = L__namespace.point(p0.x + (p1.x - pPrev.x) * TENSION, p0.y + (p1.y - pPrev.y) * TENSION);
+    const cp2 = L__namespace.point(p1.x - (pNext.x - p0.x) * TENSION, p1.y - (pNext.y - p0.y) * TENSION);
+    if (i === 0) {
+      path.push("M", [mapRef.layerPointToLatLng(p0).lat, mapRef.layerPointToLatLng(p0).lng]);
+    }
+    path.push("C", [mapRef.layerPointToLatLng(cp1).lat, mapRef.layerPointToLatLng(cp1).lng], [mapRef.layerPointToLatLng(cp2).lat, mapRef.layerPointToLatLng(cp2).lng], [mapRef.layerPointToLatLng(p1).lat, mapRef.layerPointToLatLng(p1).lng]);
+  }
+  return path;
+}
+function getSiblingCurveStrength(zoom) {
+  if (isExtraSmallMarker(zoom)) return RADIUS_CURVE_SMALL / 2;
+  if (isSmallMarker(zoom)) return RADIUS_CURVE_MEDIUM;
+  if (isMediumMarker(zoom)) return RADIUS_CURVE_LARGE;
+  return RADIUS_CURVE_LARGE;
+}
+function buildCurveWIthTwoSiblings({
+  mapRef,
+  startLatLng,
+  endLatLng,
+  zoom,
+  isSelected,
+  id
+}) {
+  const fromPoint = mapRef.latLngToLayerPoint(startLatLng);
+  const toPoint = mapRef.latLngToLayerPoint(endLatLng);
+  const midX = (fromPoint.x + toPoint.x) / 2;
+  const midY = (fromPoint.y + toPoint.y) / 2 + (isSmallMarker(zoom) ? RADIUS_CURVE_SMALL / 2 : 0);
+  const dx = toPoint.x - fromPoint.x;
+  const dy = toPoint.y - fromPoint.y;
+  const normal = L__namespace.point(-dy, dx);
+  const length = Math.sqrt(normal.x ** 2 + normal.y ** 2) || 1;
+  const normalized = normal.multiplyBy(1 / length);
+  const curveStrength = getSiblingCurveStrength(zoom);
+  const controlPoint = L__namespace.point(midX, midY).add(normalized.multiplyBy(curveStrength));
+  const latlngs = [startLatLng, mapRef.layerPointToLatLng(controlPoint), endLatLng];
+  const layerPoints = latlngs.map(latlng => mapRef.latLngToLayerPoint(latlng));
+  const path = buildSmoothCurve(layerPoints, mapRef);
+  const curve = L__namespace.curve(path, {
+    color: "var(--base-gray-70)",
+    weight: isExtraSmallMarker(zoom) ? 0 : 1.2,
+    opacity: 0.5,
+    smoothFactor: 1,
+    id,
+    dashArray: !isSelected ? "5, 5" : "0, 0"
+  });
+  mapRef.addLayer(curve);
+}
 
 const StakeholderMarker = styled__default["default"].div`
 	background-color: var(--blue-50);
@@ -8673,9 +8705,6 @@ function StakeholderIcon$1({
     return null;
   }, [parentId, allData]);
   React.useEffect(() => {
-    if (selectedMarkersId.length === 0 || !isSelected) {
-      return;
-    }
     linkNodesData.map(node => {
       const isConnectingToStakeholder = node.isStakeholder;
       const id = `${data.datastakeId}-${node.stakeholderId || node.datastakeId}`;
@@ -8687,6 +8716,8 @@ function StakeholderIcon$1({
       const stakeholderPoint = centerPoint.add(L__namespace.point(x, y));
       const stakeholderLatLng = mapRef.layerPointToLatLng(stakeholderPoint);
       let endLatLng = L__namespace.latLng(node.gps.latitude, node.gps.longitude);
+      const areNextToEachOther = targetMarkerIndex === index + 1 || targetMarkerIndex === index - 1 || index === 0 && targetMarkerIndex === node.totalStakeholders - 1 || targetMarkerIndex === 0 && index === node.totalStakeholders - 1;
+      const areOnlyTwoSiblings = node.totalStakeholders === 2;
       if (isExtraSmallMarker(zoom) && !isForceOpen) {
         createPolyline({
           L: L__namespace,
@@ -8696,8 +8727,7 @@ function StakeholderIcon$1({
           zoom,
           isSelected,
           id,
-          listOfPolylines: polylinesRef.current,
-          animated: true
+          listOfPolylines: polylinesRef.current
         });
         return;
       }
@@ -8715,8 +8745,61 @@ function StakeholderIcon$1({
         const nodePoint = mapRef.latLngToLayerPoint(nodeLatLng);
         const endPoint = L__namespace.point(x + nodePoint.x + center.left, y + nodePoint.y + center.top);
         endLatLng = mapRef.layerPointToLatLng(endPoint);
+        if (isSibling && (!areNextToEachOther || areOnlyTwoSiblings)) {
+          if (areOnlyTwoSiblings) {
+            buildCurveWIthTwoSiblings({
+              mapRef,
+              startLatLng: stakeholderLatLng,
+              endLatLng,
+              zoom,
+              isSelected,
+              id
+            });
+            return;
+          }
+          const total = node.totalStakeholders;
+          let from = index;
+          let to = targetMarkerIndex;
+          let flip = false;
+          const forwardDistance = (to - from + total) % total;
+          const backwardDistance = (from - to + total) % total;
+          if (backwardDistance < forwardDistance) {
+            [from, to] = [to, from];
+            flip = true;
+          }
+          const intermediateIndices = [];
+          for (let i = 1; i < (to - from + total) % total; i++) {
+            intermediateIndices.push((from + i) % total);
+          }
+          const indices = [from, ...intermediateIndices, to];
+          const intermediatePoints = [];
+          for (const i of indices) {
+            const {
+              x,
+              y
+            } = createCurvePath({
+              zoom,
+              totalMarkers: node.totalStakeholders,
+              markerIndex: i
+            });
+            const point = centerPoint.add(L__namespace.point(x, y));
+            const latlng = mapRef.layerPointToLatLng(point);
+            intermediatePoints.push(latlng);
+          }
+          const latlngs = flip ? [endLatLng, ...intermediatePoints, stakeholderLatLng] : [stakeholderLatLng, ...intermediatePoints, endLatLng];
+          const layerPoints = latlngs.map(latlng => mapRef.latLngToLayerPoint(latlng));
+          const path = buildSmoothCurve(layerPoints, mapRef);
+          const curve = L__namespace?.curve?.(path, {
+            color: "var(--base-gray-70)",
+            weight: isExtraSmallMarker(zoom) ? 0 : 1,
+            opacity: isSelected ? 1 : 0.5,
+            smoothFactor: 1,
+            id
+          });
+          mapRef.addLayer(curve);
+          return;
+        }
       }
-      // Always use straight lines
       createPolyline({
         L: L__namespace,
         mapRef,
@@ -8726,11 +8809,10 @@ function StakeholderIcon$1({
         isFromStakeholder: false,
         isSelected,
         id,
-        listOfPolylines: polylinesRef.current,
-        animated: true
+        listOfPolylines: polylinesRef.current
       });
     });
-  }, [mapRef, x, y, parentData, linkNodesData, isSelected, zoom, isForceOpen, selectedMarkersId]);
+  }, [mapRef, x, y, parentData, linkNodesData, isSelected, zoom, isForceOpen]);
   return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Popover, {
       content: renderTooltipJsx({
@@ -8797,8 +8879,6 @@ function LocationIcon({
   const linkedNodesData = React.useMemo(() => {
     const nodes = [];
     const links = data.links || [];
-
-    // Add links from the location itself
     links.forEach(link => {
       allData.forEach(d => {
         if (d.datastakeId === link) {
@@ -8818,45 +8898,8 @@ function LocationIcon({
         }
       });
     });
-
-    // ADD: Also include links from this location's stakeholders
-    const stakeholders = data.stakeholders || [];
-    stakeholders.forEach(stakeholder => {
-      const stakeholderLinks = stakeholder.links || [];
-      stakeholderLinks.forEach(link => {
-        allData.forEach(d => {
-          // Check if it's a direct location link
-          if (d.datastakeId === link) {
-            // Avoid duplicates
-            if (!nodes.find(n => n.datastakeId === link && !n.isStakeholder)) {
-              nodes.push({
-                ...d,
-                fromStakeholderId: stakeholder.datastakeId
-              });
-            }
-          }
-          // Check if it's a stakeholder link
-          if (d.stakeholders && d.stakeholders.length > 0) {
-            d.stakeholders.forEach(targetStakeholder => {
-              if (targetStakeholder.datastakeId === link) {
-                // Avoid duplicates
-                if (!nodes.find(n => n.isStakeholder && n.datastakeId === d.datastakeId && n.stakeholdersIndex === d.stakeholders.indexOf(targetStakeholder))) {
-                  nodes.push({
-                    ...d,
-                    isStakeholder: true,
-                    totalStakeholders: d.stakeholders.length,
-                    stakeholdersIndex: d.stakeholders.indexOf(targetStakeholder),
-                    fromStakeholderId: stakeholder.datastakeId
-                  });
-                }
-              }
-            });
-          }
-        });
-      });
-    });
     return nodes;
-  }, [JSON.stringify(allData), JSON.stringify(data.links), JSON.stringify(data.stakeholders), zoom]);
+  }, [JSON.stringify(allData), JSON.stringify(data.links), zoom]);
   const stakeholdersOfLocation = React.useMemo(() => {
     return data?.stakeholders || [];
   }, [data.stakeholders, zoom]);
@@ -8874,13 +8917,7 @@ function LocationIcon({
     currentRoots.clear();
     markersRef.current = [];
 
-    // Only create stakeholder markers if this location or any of its stakeholders are selected
-    const shouldShowStakeholders = isSelected || stakeholdersOfLocation.some(stk => selectedMarkersId.includes(stk.datastakeId));
-    if (!shouldShowStakeholders || selectedMarkersId.length === 0) {
-      return;
-    }
-
-    // Create new markers only when selected
+    // Create new markers
     stakeholdersOfLocation.forEach((stakeholder, index) => {
       const markerId = `${stakeholder.datastakeId}`;
       const {
@@ -8966,9 +9003,7 @@ function LocationIcon({
         zoom,
         isFromStakeholder: true,
         isForceOpen,
-        listOfPolylines: polylinesRef.current,
-        stakeholderType: stakeholder.type,
-        animated: true
+        listOfPolylines: polylinesRef.current
       });
     });
     return () => {
@@ -8983,88 +9018,38 @@ function LocationIcon({
       rootsMapRef.current.clear();
       markersRef.current = [];
     };
-  }, [stakeholdersOfLocation, selectedMarkersId, activeMarker, zoom]);
-
-  // Only create polylines for linked nodes when something is selected
-  React.useEffect(() => {
-    if (selectedMarkersId.length === 0) {
-      return;
-    }
-
-    // IMPORTANT: Only draw links if this location is actually selected
-    // Not just highlighted as part of the chain
-    if (!isSelected) {
-      return;
-    }
-
-    // Filter linkedNodesData to only include nodes that are in the selected chain
-    const relevantLinks = linkedNodesData.filter(node => {
-      // Check if the target node (location) is in the selected markers
-      const targetLocationInSelection = selectedMarkersId.includes(node.datastakeId);
-
-      // If connecting to a stakeholder, check if that stakeholder is selected
-      if (node.isStakeholder) {
-        const stakeholderInSelection = node.stakeholdersIndex !== undefined && selectedMarkersId.includes(node.datastakeId);
-        return stakeholderInSelection;
-      }
-      return targetLocationInSelection;
-    });
-    relevantLinks.forEach(node => {
-      const id = node.fromStakeholderId ? `${node.fromStakeholderId}-${node.datastakeId}` : `${data.datastakeId}-${node.datastakeId}`;
-      const isConnectingToStakeholder = node.isStakeholder;
-
-      // If the link is from a stakeholder, start from the stakeholder position
-      let startLatLng;
-      if (node.fromStakeholderId) {
-        // Find the stakeholder index in this location's stakeholders
-        const stakeholderIndex = stakeholdersOfLocation.findIndex(s => s.datastakeId === node.fromStakeholderId);
-        if (stakeholderIndex !== -1) {
-          const {
-            x,
-            y
-          } = getStakeholderPosition({
-            zoom,
-            totalMarkers: stakeholdersOfLocation.length,
-            markerIndex: stakeholderIndex
-          });
-          const centerLatLng = L__namespace.latLng(data.gps.latitude, data.gps.longitude);
-          const centerPoint = mapRef.latLngToLayerPoint(centerLatLng);
-          const stakeholderPoint = centerPoint.add(L__namespace.point(x, y));
-          startLatLng = mapRef.layerPointToLatLng(stakeholderPoint);
-        } else {
-          startLatLng = L__namespace.latLng(data.gps.latitude, data.gps.longitude);
-        }
-      } else {
-        startLatLng = L__namespace.latLng(data.gps.latitude, data.gps.longitude);
-      }
-      let endLatLng = L__namespace.latLng(node.gps.latitude, node.gps.longitude);
-      const isConnectingToStakeholderSelected = selectedMarkersId.includes(node.datastakeId);
-      if (isConnectingToStakeholder && !isExtraSmallMarker(zoom)) {
-        const {
-          x,
-          y
-        } = getStakeholderPosition({
-          zoom,
-          totalMarkers: node.totalStakeholders,
-          markerIndex: node.stakeholdersIndex
-        });
-        const nodeLatLng = L__namespace.latLng(node.gps.latitude, node.gps.longitude);
-        const nodePoint = mapRef.latLngToLayerPoint(nodeLatLng);
-        const endPoint = L__namespace.point(x + nodePoint.x, y + nodePoint.y);
-        endLatLng = mapRef.layerPointToLatLng(endPoint);
-      }
-      createPolyline({
-        L: L__namespace,
-        mapRef,
-        startLatLng,
-        endLatLng,
-        isSelected: isConnectingToStakeholderSelected,
-        id,
+  }, [stakeholdersOfLocation, selectedMarkersId, activeMarker]);
+  linkedNodesData.map(node => {
+    const id = `${data.datastakeId}-${node.datastakeId}`;
+    const isConnectingToStakeholder = node.isStakeholder;
+    const centerLatLng = L__namespace.latLng(data.gps.latitude, data.gps.longitude);
+    let endLatLng = L__namespace.latLng(node.gps.latitude, node.gps.longitude);
+    const isConnectingToStakeholderSelected = selectedMarkersId.includes(node.datastakeId);
+    if (isConnectingToStakeholder && !isExtraSmallMarker(zoom)) {
+      const {
+        x,
+        y
+      } = getStakeholderPosition({
         zoom,
-        listOfPolylines: polylinesRef.current
+        totalMarkers: node.totalStakeholders,
+        markerIndex: node.stakeholdersIndex
       });
+      const nodeLatLng = L__namespace.latLng(node.gps.latitude, node.gps.longitude);
+      const nodePoint = mapRef.latLngToLayerPoint(nodeLatLng);
+      const endPoint = L__namespace.point(x + nodePoint.x, y + nodePoint.y);
+      endLatLng = mapRef.layerPointToLatLng(endPoint);
+    }
+    createPolyline({
+      L: L__namespace,
+      mapRef,
+      startLatLng: centerLatLng,
+      endLatLng,
+      isSelected: isConnectingToStakeholderSelected,
+      id,
+      zoom,
+      listOfPolylines: polylinesRef.current
     });
-  }, [linkedNodesData, selectedMarkersId, zoom, stakeholdersOfLocation, isSelected]);
+  });
   return /*#__PURE__*/jsxRuntime.jsx(antd.Popover, {
     content: renderTooltipJsx({
       title: data.name,
@@ -9580,8 +9565,7 @@ function useMapHelper$1({
           link: link,
           onClickLink: onClickLink,
           activeStakeholder: activeStakeholder,
-          setActiveStakeholder: setActiveStakeholder,
-          mapRef: mapRef
+          setActiveStakeholder: setActiveStakeholder
         }));
         roots.current.push(root);
       } else if (type === "location") {
@@ -9786,8 +9770,7 @@ const useMap = ({
     MAP_TOKEN
   } = useMapConfig({
     app,
-    isSatellite,
-    mapRef: container
+    isSatellite
   });
   const [initialMarkerSetIsDone, setInitialMarkerSetIsDone] = React.useState(false);
   const [mapCenter, setMapCenter] = React.useState([0, 0]);
@@ -9804,8 +9787,6 @@ const useMap = ({
     const graph = new Map();
     const stakeToLoc = new Map();
     const nodeTypes = new Map();
-
-    // Build the graph
     for (const loc of data) {
       const locId = loc.datastakeId;
       nodeTypes.set(locId, loc.type);
@@ -9830,45 +9811,26 @@ const useMap = ({
       }
     }
     const highlightTable = {};
-
-    // Perform BFS/DFS to find all connected nodes in the entire chain
     for (const [node] of graph) {
       const highlighted = new Set();
-      const queue = [node];
-      const visited = new Set([node]);
-      while (queue.length > 0) {
-        const current = queue.shift();
-        highlighted.add(current);
-
-        // Add parent location if current is stakeholder
-        const currentIsStakeholder = !isLocation(nodeTypes.get(current));
-        if (currentIsStakeholder && stakeToLoc.has(current)) {
-          const parentLoc = stakeToLoc.get(current);
-          if (!visited.has(parentLoc)) {
-            highlighted.add(parentLoc);
-            visited.add(parentLoc);
-            queue.push(parentLoc);
-          }
-        }
-
-        // Traverse all neighbors
-        for (const neighbor of graph.get(current) || []) {
-          if (!visited.has(neighbor)) {
-            visited.add(neighbor);
-            queue.push(neighbor);
+      highlighted.add(node);
+      const nodeIsStakeholder = !isLocation(nodeTypes.get(node));
+      if (nodeIsStakeholder && stakeToLoc.has(node)) {
+        const parentLoc = stakeToLoc.get(node);
+        highlighted.add(parentLoc);
+      }
+      for (const neighbor of graph.get(node) || []) {
+        const neighborIsStakeholder = !isLocation(nodeTypes.get(neighbor));
+        if (neighborIsStakeholder && stakeToLoc.has(neighbor)) {
+          const neighborParent = stakeToLoc.get(neighbor);
+          if (isLocation(nodeTypes.get(node)) && neighborParent === node || nodeIsStakeholder && stakeToLoc.get(node) === neighborParent) {
             highlighted.add(neighbor);
-
-            // If neighbor is stakeholder, add its parent location
-            const neighborIsStakeholder = !isLocation(nodeTypes.get(neighbor));
-            if (neighborIsStakeholder && stakeToLoc.has(neighbor)) {
-              const neighborParent = stakeToLoc.get(neighbor);
-              if (!visited.has(neighborParent)) {
-                highlighted.add(neighborParent);
-                visited.add(neighborParent);
-                queue.push(neighborParent);
-              }
-            }
+          } else {
+            highlighted.add(neighbor);
+            highlighted.add(neighborParent);
           }
+        } else {
+          highlighted.add(neighbor);
         }
       }
       highlightTable[node] = [...highlighted];
@@ -9933,29 +9895,19 @@ const useMap = ({
         });
       }
     }
-    if (type === "chain" && selectedMarkersId.length === 0) {
-      if (polylinesRef.current.length) {
-        polylinesRef.current.forEach(polyline => {
-          if (mapRef.hasLayer(polyline)) {
-            mapRef.removeLayer(polyline);
-          }
-        });
-        polylinesRef.current = [];
-      }
-    }
     clearMapMarkers();
     if (data) {
-      const filteredData = data?.filter(obj => obj.type === 'mineSite' || obj?.stakeholders?.length > 0 || data.some(other => other.datastakeId !== obj.datastakeId && (other.stakeholders || []).some(stk => (stk.links || []).includes(obj.datastakeId))));
+      // Filters out locations that are not connected to any stakeholders
+      const excludedType = ['village', 'town', 'area', 'territory'];
+      const filteredData = data?.filter(obj => !excludedType.includes(obj?.type) && (obj?.stakeholders?.length > 0 || data.some(other => other.datastakeId !== obj.datastakeId && (other.stakeholders || []).some(stk => (stk.links || []).includes(obj.datastakeId)))));
       const maxTotal = Math.max(...(data || []).map(d => d.total));
       const dataToRender = type === "chain" ? filteredData : data;
       dataToRender.forEach((d, i) => {
         addIconToMapInitialy([d?.marker?.lat, d?.marker?.lng], "location", d.category || "mineSite", d, maxTotal, i);
       });
-      if (selectedMarkersId.length > 0) {
-        polylinesRef.current.forEach(polyline => {
-          mapRef.addLayer(polyline);
-        });
-      }
+      polylinesRef.current.forEach(polyline => {
+        mapRef.addLayer(polyline);
+      });
       mapRef.invalidateSize();
       mapRef.fire("moveend");
     }
@@ -27313,7 +27265,7 @@ const inputTypeComponent = {
     opts = JSON.parse(JSON.stringify(opts));
     opts = opts.map(o => getSelectOptions(o, formsValue));
     if (optionsFilter && Array.isArray(optionsFilter)) {
-      opts = filterOptions(opts, optionsFilter, formsValue, repeatValues, filterCond);
+      opts = filterOptions$1(opts, optionsFilter, formsValue, repeatValues, filterCond);
     }
     if (propHasValue(value)) {
       const selectOption = opts.find(o => o.value === value);
@@ -27432,7 +27384,7 @@ const inputTypeComponent = {
     opts = JSON.parse(JSON.stringify(opts));
     opts = opts.map(o => getSelectOptions(o, formsValue));
     if (optionsFilter && Array.isArray(optionsFilter)) {
-      opts = filterOptions(opts, optionsFilter, formsValue, repeatValues, filterCond);
+      opts = filterOptions$1(opts, optionsFilter, formsValue, repeatValues, filterCond);
     }
     if (propHasValue(value) && Array.isArray(value) && value.length > 0 && !tags) {
       try {
@@ -43794,9 +43746,10 @@ const calculateHealthAndSafetyPieData = (healthAndSafetyDistributionData, t) =>
  * @param {Object} healthAndSafetyDistributionData - Distribution object
  * @param {Function} t - Translation function
  * @param {Function} renderTooltipJsx - Function to render tooltip JSX
+ * @param {string} tooltipTitle - Title to display in the tooltip (defaults to "Health and Safety")
  * @returns {JSX.Element|null} Tooltip content or null
  */
-const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx) => {
+const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx, tooltipTitle = "Health and Safety") => {
   // If empty or no data, return null to display nothing
   if (isEmpty || !Object.keys(healthAndSafetyDistributionData).length) {
     return null;
@@ -43833,25 +43786,39 @@ const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafetyDistrib
 
   // Show all items with their percentages
   return renderTooltipJsx({
-    title: t("Health and Safety"),
+    title: t(tooltipTitle),
     items: itemsWithData
   });
 };
 
+const filterOptions = [{
+  value: 'aidKitAccessible',
+  label: 'Aid kit availability'
+}, {
+  value: 'hsTrainingConfirmation',
+  label: 'H&S training delivery'
+}, {
+  value: 'duosFormed',
+  label: 'Workers safe pairing'
+}, {
+  value: 'presenceOfChildren',
+  label: 'No children'
+}];
 const HealthAndSafety = ({
   id,
   getSummaryDetail,
   loading = false,
   t = s => s
 }) => {
+  const [selectedField, setSelectedField] = React.useState('aidKitAccessible');
   const defaultConfig = React.useMemo(() => ({
     basepath: "planting-cycle",
     url: `/summary/${id}/filtered-piechart`,
     filters: {
-      field: 'duosFormed'
+      field: selectedField
     },
     stop: !id
-  }), [id]);
+  }), [id, selectedField]);
   const customGetData = React.useMemo(() => {
     if (getSummaryDetail && id) {
       return rest => {
@@ -43882,7 +43849,7 @@ const HealthAndSafety = ({
   });
 
   // Process the fetched pie chart data
-  // The API returns data in format: [{count: 1, duosFormed: "null"}, {count: 1, duosFormed: "no"}, {count: 1, duosFormed: "yes"}]
+  // The API returns data in format: [{count: 1, [field]: "null"}, {count: 1, [field]: "no"}, {count: 1, [field]: "yes"}]
   const healthAndSafetyDistributionData = React.useMemo(() => {
     if (!pieChartData) return {
       compliant: 0,
@@ -43895,7 +43862,7 @@ const HealthAndSafety = ({
       return pieChartData;
     }
 
-    // If it's an array, process it
+    // If it's an array, process it using the selected field
     if (Array.isArray(pieChartData)) {
       const distribution = {
         compliant: 0,
@@ -43903,15 +43870,15 @@ const HealthAndSafety = ({
         empty: 0
       };
       pieChartData.forEach(item => {
-        const duosFormedValue = item.duosFormed;
+        const fieldValue = item[selectedField];
         const count = item.count || 0;
 
-        // Map duosFormed values to distribution categories
-        if (duosFormedValue === "yes" || duosFormedValue === true) {
+        // Map field values to distribution categories
+        if (fieldValue === "yes" || fieldValue === true) {
           distribution.compliant += count;
-        } else if (duosFormedValue === "no" || duosFormedValue === false) {
+        } else if (fieldValue === "no" || fieldValue === false) {
           distribution.notCompliant += count;
-        } else if (duosFormedValue === "null" || duosFormedValue === null || duosFormedValue === undefined) {
+        } else if (fieldValue === "null" || fieldValue === null || fieldValue === undefined) {
           distribution.empty += count;
         }
       });
@@ -43920,16 +43887,41 @@ const HealthAndSafety = ({
 
     // Fallback: try to extract from activityData-like structure
     return getHealthAndSafetyDistributionData(pieChartData);
-  }, [pieChartData]);
+  }, [pieChartData, selectedField]);
   const isEmpty = React.useMemo(() => isHealthAndSafetyDistributionEmpty(healthAndSafetyDistributionData), [healthAndSafetyDistributionData]);
   const pieData = React.useMemo(() => calculateHealthAndSafetyPieData(healthAndSafetyDistributionData, t), [healthAndSafetyDistributionData, t]);
-  const getTooltipChildren = React.useCallback(item => getHealthAndSafetyTooltipChildren(item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx), [t, isEmpty, healthAndSafetyDistributionData]);
+
+  // Get the label for the selected field to use as tooltip title
+  const selectedFieldLabel = React.useMemo(() => {
+    const selectedOption = filterOptions.find(opt => opt.value === selectedField);
+    return selectedOption ? selectedOption.label : 'Health and Safety';
+  }, [selectedField]);
+  const getTooltipChildren = React.useCallback(item => getHealthAndSafetyTooltipChildren(item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx, selectedFieldLabel), [t, isEmpty, healthAndSafetyDistributionData, selectedFieldLabel]);
+  const handleFilterChange = React.useCallback(value => {
+    setSelectedField(value);
+  }, []);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     loading: loading || pieChartLoading,
     title: /*#__PURE__*/jsxRuntime.jsx("div", {
       children: t("Health and Safety")
     }),
     className: "with-border-header h-w-btn-header ",
+    addedHeader: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "flex-1"
+      }), /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
+        value: selectedField,
+        style: {
+          width: 180
+        },
+        onChange: handleFilterChange,
+        options: filterOptions.map(opt => ({
+          ...opt,
+          label: t(opt.label)
+        })),
+        popupMatchSelectWidth: 180
+      })]
+    }),
     children: /*#__PURE__*/jsxRuntime.jsx("div", {
       style: {
         marginTop: "auto",