feat:connecting trawl lines between linked buoys

src/BuoyTrawlLineLayer/index.js

@@ -0,0 +1,70 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+import { getMapSubjectFeatureCollectionWithVirtualPositioning } from '../selectors/subjects';
+import { lineString } from '@turf/turf';
+import useMapLayers from '../hooks/useMapLayers';
+import useMapSources from '../hooks/useMapSources';
+
+const lineLayout = {
+  'line-join': 'round',
+  'line-cap': 'round',
+};
+
+const linePaint = {
+  'line-color': 'black',
+  'line-opacity': 0.7,
+  'line-gap-width': 1,
+  'line-width': 2,
+};
+
+const subjectIsBuoyLineEligible = (subjectFeature = {}, _index, allSubjects = []) => {
+  const subject = subjectFeature.properties;
+
+  const is_buoy = subject.subject_subtype === 'ropeless_buoy_device';
+  if (!is_buoy) return false;
+
+  const devices = subject.additional?.devices ?? [];
+  const is_line = devices.length > 1;
+
+  if (!is_line) return false;
+
+  const line_contains_valid_subjects = devices.every(({ device_id }) => allSubjects.find(({ properties }) => properties.name === device_id));
+
+  return line_contains_valid_subjects;
+};
+
+const createTrawlLineGeoJSON = (buoySubjectFeatures) => {
+  return buoySubjectFeatures.reduce((accumulator, { properties }) => {
+    const coordinates =
+      properties.additional.devices.map(({ device_id }) =>
+        buoySubjectFeatures.find(({ properties }) =>
+          properties.name === device_id)?.geometry?.coordinates ?? []
+      );
+
+    accumulator.features.push(lineString(coordinates));
+    return accumulator;
+
+  }, { type: 'FeatureCollection', features: [] });
+};
+
+const BuoyLineLayer = (_props) => {
+  const mapSubjects = useSelector(getMapSubjectFeatureCollectionWithVirtualPositioning);
+
+  const buoySubjects = mapSubjects.features.filter(subjectIsBuoyLineEligible);
+  const trawlLineGeoJSON = createTrawlLineGeoJSON(buoySubjects);
+
+  useMapSources([{ id: 'trawl-lines-source', data: trawlLineGeoJSON }]);
+  useMapLayers([{
+    id: 'trawl-lines-layer',
+    type: 'line',
+    sourceId: 'trawl-lines-source',
+    layout: lineLayout,
+    paint: linePaint,
+  }]);
+
+  return null;
+
+};
+
+export default BuoyLineLayer;

src/BuoyTrawlLineLayer/index.test.js

@@ -0,0 +1,127 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { useSelector } from 'react-redux';
+import BuoyLineLayer from './';
+import useMapLayers from '../hooks/useMapLayers';
+import useMapSources from '../hooks/useMapSources';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../hooks/useMapLayers', () => jest.fn());
+jest.mock('../hooks/useMapSources', () => jest.fn());
+
+const createMockSubject = (name, subtype, devices, coordinates) => ({
+  type: 'Feature',
+  properties: {
+    name,
+    subject_subtype: subtype,
+    additional: { devices },
+  },
+  geometry: {
+    type: 'Point',
+    coordinates,
+  },
+});
+
+describe('BuoyLineLayer', () => {
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('should not render any lines when no buoy subjects are present', () => {
+    useSelector.mockReturnValue({
+      features: [],
+    });
+
+    render(<BuoyLineLayer />);
+
+    expect(useMapSources).toHaveBeenCalledWith([
+      {
+        id: 'trawl-lines-source',
+        data: { type: 'FeatureCollection', features: [] },
+      },
+    ]);
+    expect(useMapLayers).toHaveBeenCalled();
+  });
+
+  test('should filter out non-buoy subjects', () => {
+    const mockFeatures = [
+      createMockSubject('buoy1', 'other_type', [], [10, 20]),
+      createMockSubject('buoy2', 'ropeless_buoy_device', [{ device_id: 'device1' }], [30, 40]),
+    ];
+
+    useSelector.mockReturnValue({
+      features: mockFeatures,
+    });
+
+    render(<BuoyLineLayer />);
+
+    expect(useMapSources).toHaveBeenCalledWith([
+      {
+        id: 'trawl-lines-source',
+        data: { type: 'FeatureCollection', features: [] },
+      },
+    ]);
+  });
+
+  test('should create trawl lines for valid buoy subjects', () => {
+    const device1 = createMockSubject('device1', 'ropeless_buoy_device', [{ device_id: 'device1' }, { device_id: 'device2' }], [10, 20]);
+    const device2 = createMockSubject('device2', 'ropeless_buoy_device', [{ device_id: 'device1' }, { device_id: 'device2' }], [30, 40]);
+
+    const mockFeatures = [
+      device1,
+      device2,
+    ];
+
+    useSelector.mockReturnValue({
+      features: mockFeatures,
+    });
+
+    render(<BuoyLineLayer />);
+
+    expect(useMapSources).toHaveBeenCalledWith([
+      {
+        id: 'trawl-lines-source',
+        data: {
+          type: 'FeatureCollection',
+          features: expect.arrayContaining([
+            {
+              type: 'Feature',
+              properties: {},
+              geometry: {
+                type: 'LineString',
+                coordinates: [[10, 20], [30, 40]]
+              }
+            }
+          ])
+        }
+      }
+    ]);
+  });
+
+  test('should handle invalid device references', () => {
+    const mockFeatures = [
+      createMockSubject('device1', 'ropeless_buoy_device', [], [10, 20]),
+      createMockSubject('buoy1', 'ropeless_buoy_device', [
+        { device_id: 'device1' },
+        { device_id: 'device2' }, // invalid reference
+      ], [50, 60]),
+    ];
+
+    useSelector.mockReturnValue({
+      features: mockFeatures,
+    });
+
+    render(<BuoyLineLayer />);
+
+    expect(useMapSources).toHaveBeenCalledWith([
+      {
+        id: 'trawl-lines-source',
+        data: { type: 'FeatureCollection', features: [] },
+      },
+    ]);
+  });
+});

src/Map/index.js

@@ -45,6 +45,7 @@ import DelayedUnmount from '../DelayedUnmount';
 import EarthRangerMap, { withMap } from '../EarthRangerMap';
 import EventsLayer from '../EventsLayer';
 import SubjectsLayer from '../SubjectsLayer';
+import BuoyTrawlLineLayer from '../BuoyTrawlLineLayer';
 import StaticSensorsLayer from '../StaticSensorsLayer';
 import TracksLayer from '../TracksLayer';
 import PatrolStartStopLayer from '../PatrolStartStopLayer';
@@ -150,7 +151,7 @@ const Map = ({
   const timeSliderActive = timeSliderState.active;
 
   const isDrawingEventGeometry = mapLocationSelection.isPickingLocation
-    && mapLocationSelection.mode  === MAP_LOCATION_SELECTION_MODES.EVENT_GEOMETRY;
+    && mapLocationSelection.mode === MAP_LOCATION_SELECTION_MODES.EVENT_GEOMETRY;
 
   const isSelectingEventLocation = mapLocationSelection.isPickingLocation
     && mapLocationSelection.event
@@ -216,7 +217,7 @@ const Map = ({
       .then((latestMapSubjects) => timeSliderActive
         ? fetchMapSubjectTracksForTimeslider(latestMapSubjects)
         : Promise.resolve(latestMapSubjects))
-      .catch(() => {});
+      .catch(() => { });
   },
   [
     dispatch,
@@ -363,8 +364,8 @@ const Map = ({
     );
   }, [dispatch]);
 
-  const onCloseReportHeatmap = useCallback(()  => {
-    dispatch (
+  const onCloseReportHeatmap = useCallback(() => {
+    dispatch(
       setReportHeatmapVisibility(false)
     );
   }, [dispatch]);
@@ -547,7 +548,7 @@ const Map = ({
         hidePopup(popup.id);
       }
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [map, timeSliderState.virtualDate]);
 
   useEffect(() => {
@@ -612,10 +613,10 @@ const Map = ({
       <ClustersLayer onShowClusterSelectPopup={onShowClusterSelectPopup} />
 
       <EventsLayer
-          mapImages={mapImages}
-          onEventClick={onSelectEvent}
-          bounceEventIDs={bounceEventIDs}
-        />
+        mapImages={mapImages}
+        onEventClick={onSelectEvent}
+        bounceEventIDs={bounceEventIDs}
+      />
 
       <SubjectsLayer mapImages={mapImages} onSubjectClick={onSelectSubject} />
 
@@ -629,7 +630,7 @@ const Map = ({
 
       <DelayedUnmount isMounted={!currentTab && !mapLocationSelection.isPickingLocation}>
         <div className='floating-report-filter'>
-          <EventFilter className='report-filter'/>
+          <EventFilter className='report-filter' />
         </div>
       </DelayedUnmount>
 
@@ -657,6 +658,8 @@ const Map = ({
       {subjectTracksVisible && <TracksLayer onPointClick={onTimepointClick} showTimepoints={showTrackTimepoints} />}
       {patrolTracksVisible && <PatrolStartStopLayer />}
 
+      <BuoyTrawlLineLayer />
+
       {patrolTracksVisible && <PatrolTracks onPointClick={onTimepointClick} />}
 
       <FeatureLayer