Merged in fix/GFW-1478_overlapping_alerts_DR (pull request #495)

Normal: Fix/GFW-1478 overlapping alerts DR (medium) Approved-by: Kevin Borrill Approved-by: Ri
forest-watcher · Feb 17, 2023 · 9137722 · 9137722
2 parents 8f1fba3 + 3524286
commit 9137722
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/components/ui/Map/components/cards/AlertSelection.tsx b/src/components/ui/Map/components/cards/AlertSelection.tsx
@@ -45,7 +45,7 @@ const AlertSelectionCard: FC<IProps> = props => {
             setValue("overlappedSelect", undefined);
             handleSelectedPointsConfirm(overlappedSelect);
           }}
-          disabled={overlappedSelect?.length === 0}
+          disabled={!overlappedSelect || overlappedSelect.length === 0}
         >
           <FormattedMessage id="alerts.deforestation.multiple.continue" />
         </Button>

diff --git a/src/components/ui/Map/components/layers/SquareClusterMarkers.tsx b/src/components/ui/Map/components/layers/SquareClusterMarkers.tsx
@@ -31,6 +31,7 @@ export interface IProps {
   points: IPoint[];
   pointStyle?: Record<any, any>;
   onSquareSelect?: (ids: string[], point: mapboxgl.Point) => void;
+  forceHoveredSquareIds?: string[] | null;
   selectedSquareIds?: string[] | null;
   mapRef: MapInstance | null;
   goToPoints?: boolean;
@@ -48,6 +49,7 @@ const SquareClusterMarkers: FC<IProps> = props => {
     pointDataType = EPointDataTypes.Reports,
     points,
     onSquareSelect,
+    forceHoveredSquareIds,
     selectedSquareIds,
     mapRef,
     pointStyle = defaultPointStyle,
@@ -85,7 +87,7 @@ const SquareClusterMarkers: FC<IProps> = props => {
             id: point.id,
             icon: iconGenerator(
               point.type || "",
-              point.id === hoveredPoint,
+              point.id === hoveredPoint || forceHoveredSquareIds?.includes(point.id),
               selectedPoints?.length
                 ? canMultiSelect
                   ? selectedPoints.includes(point.id)
@@ -96,7 +98,7 @@ const SquareClusterMarkers: FC<IProps> = props => {
           })
         )
       ),
-    [hoveredPoint, iconGenerator, points, selectedPoints, canMultiSelect]
+    [hoveredPoint, iconGenerator, points, selectedPoints, forceHoveredSquareIds, canMultiSelect]
   );
 
   useEffect(() => {

diff --git a/src/pages/reports/investigation/components/AreaAlertSource.tsx b/src/pages/reports/investigation/components/AreaAlertSource.tsx
@@ -110,6 +110,7 @@ const AreaAlertMapSource: FC<IProps> = props => {
         id="alerts"
         pointDataType={EPointDataTypes.Alerts}
         points={alertPoints}
+        forceHoveredSquareIds={multipleAlertsToPick}
         selectedSquareIds={selectedAlertIds}
         pointStyle={{
           ...pointStyle,