enabling display of BSMs without MAP and SPAT

usdot-jpo-ode · Aug 14, 2024 · 9e3392f · 9e3392f
1 parent 43d562f
commit 9e3392f
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 84 deletions.
diff --git a/gui/src/apis/events-api.ts b/gui/src/apis/events-api.ts
@@ -95,7 +95,7 @@ class EventsApi {
     intersectionId: number;
     startTime: Date;
     endTime: Date;
-    test: boolean;
+    test?: boolean;
     abortController?: AbortController;
   }): Promise<MessageMonitor.MinuteCount[]> {
     const queryParams = {

diff --git a/gui/src/components/map/map-component.tsx b/gui/src/components/map/map-component.tsx
@@ -874,13 +874,12 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
           queryParams.roadRegulatorId
         );
         return;
-        // } else if (queryParams.intersectionId === -1) {
-        //   console.error("Intersection ID is -1. Not attempting to pull initial map data.");
-        //   cleanUpMappedData();
-        //   return;
+      } else if (queryParams.intersectionId === -1 && props.sourceDataType !== "exact") {
+        console.error("Intersection ID is -1. Not attempting to pull initial map data.");
+        resetMapView();
+        return;
       }
       console.debug("Pulling Initial Data");
-      cleanUpMappedData();
       pullInitialDataAbortControllers.forEach((abortController) => abortController.abort());
       let rawMap: ProcessedMap[] = [];
       let rawSpat: ProcessedSpat[] = [];
@@ -954,6 +953,14 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
         rawSpat = importedMessageData.spatData.sort((a, b) => a.utcTimeStamp - b.utcTimeStamp);
         rawBsm = importedMessageData.bsmData;
       }
+      if (props.sourceDataType == "exact") {
+        let bsmGeojson = parseBsmToGeojson(rawBsm);
+        bsmGeojson = {
+          ...bsmGeojson,
+          features: [...bsmGeojson.features.sort((a, b) => b.properties.odeReceivedAt - a.properties.odeReceivedAt)],
+        };
+        renderEntireMap([], [], bsmGeojson);
+      }
       if (!rawMap || rawMap.length == 0) {
         console.info("NO MAP MESSAGES WITHIN TIME");
         return;
@@ -1086,8 +1093,24 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
       currentSpatData: ProcessedSpat[],
       currentBsmData: BsmFeatureCollection
     ) => {
-      if (currentMapData.length == 0 && props.sourceDataType != "exact") {
-        console.error("Did not attempt to render map, no map messages available:", currentMapData);
+      if (props.sourceDataType == "exact") {
+        const uniqueIds = new Set(currentBsmData.features.map((bsm) => bsm.properties?.id).sort());
+        // generate equally spaced unique colors for each uniqueId
+        const colors = generateColorDictionary(uniqueIds);
+        setMapLegendColors((prevValue) => ({
+          ...prevValue,
+          bsmColors: colors,
+        }));
+        // add color to each feature
+        const bsmLayerStyle = generateMapboxStyleExpression(colors);
+        setBsmLayerStyle((prevValue) => ({
+          ...prevValue,
+          paint: { ...prevValue.paint, "circle-color": bsmLayerStyle },
+        }));
+        setBsmData(currentBsmData);
+      }
+      if (currentMapData.length == 0) {
+        console.log("Did not attempt to render map, no map messages available:", currentMapData);
         return;
       }
       // ######################### MAP Data #########################
@@ -1113,17 +1136,6 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
       const spatSignalGroupsLocal = parseSpatSignalGroups(currentSpatData);
 
       setSpatSignalGroups(spatSignalGroupsLocal);
-      const uniqueIds = new Set(currentBsmData.features.map((bsm) => bsm.properties?.id).sort());
-      // generate equally spaced unique colors for each uniqueId
-      const colors = generateColorDictionary(uniqueIds);
-      setMapLegendColors((prevValue) => ({
-        ...prevValue,
-        bsmColors: colors,
-      }));
-      // add color to each feature
-      const bsmLayerStyle = generateMapboxStyleExpression(colors);
-      setBsmLayerStyle((prevValue) => ({ ...prevValue, paint: { ...prevValue.paint, "circle-color": bsmLayerStyle } }));
-      setBsmData(currentBsmData);
 
       // ######################### Message Data #########################
       rawData["map"] = currentMapData;
@@ -1146,6 +1158,7 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
         )
       );
     };
+
     // Increment sliderValue by 1 every second when playbackModeActive is true
     useEffect(() => {
       if (playbackModeActive) {
@@ -1184,6 +1197,7 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
       setFilteredSurroundingNotifications([]);
       setBsmData({ type: "FeatureCollection", features: [] });
       setCurrentBsms({ type: "FeatureCollection", features: [] });
+      console.log("1191 setCurrentBsms", { type: "FeatureCollection", features: [] });
       setMapSpatTimes({ mapTime: 0, spatTime: 0 });
       setRawData({});
       setSliderValue(0);
@@ -1380,6 +1394,11 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
     }, [queryParams]);
 
     useEffect(() => {
+      if (props.sourceDataType == "exact") {
+        // In "exact" mode, always show all BSMs. Timestamps are meaningless.
+        setCurrentBsms(bsmData);
+        console.log("1391 setCurrentBsms", bsmData);
+      }
       if (!mapSignalGroups || !spatSignalGroups) {
         console.debug("BSM Loading: No map or SPAT data", mapSignalGroups, spatSignalGroups);
         return;
@@ -1408,10 +1427,7 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
         setSignalStateData(undefined);
       }
 
-      if (props.sourceDataType == "exact") {
-        // In "exact" mode, always show all BSMs. Timestamps are meaningless.
-        setCurrentBsms(bsmData);
-      } else {
+      if (props.sourceDataType !== "exact") {
         // retrieve filtered BSMs
         const filteredBsms: BsmFeature[] = bsmData?.features?.filter(
           (feature) =>
@@ -1445,6 +1461,7 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
           }
         }
         setCurrentBsms({ ...bsmData, features: lastBsms });
+        console.log("1455 setCurrentBsms", { ...bsmData, features: lastBsms });
       }
 
       const filteredEvents: MessageMonitor.Event[] = surroundingEvents.filter(
@@ -1678,26 +1695,6 @@ const MapTab = forwardRef<MAP_REFERENCE_TYPE | undefined, MapProps>(
       setTimeWindowSeconds(60);
     };
 
-    const cleanUpMappedData = () => {
-      setMapData(undefined);
-      setMapSignalGroups(undefined);
-      setSpatSignalGroups(undefined);
-      setConnectingLanes(undefined);
-      setSignalStateData(undefined);
-      setRawData({});
-      setFilteredSurroundingEvents([]);
-      setFilteredSurroundingNotifications([]);
-      setBsmData({ type: "FeatureCollection", features: [] });
-      setCurrentBsms({ type: "FeatureCollection", features: [] });
-      setCurrentSignalGroups(undefined);
-      setMapSpatTimes({ mapTime: 0, spatTime: 0 });
-      setSliderValue(0);
-      setPlaybackModeActive(false);
-      setCurrentSpatData([]);
-      setCurrentProcessedSpatData([]);
-      setCurrentBsmData({ type: "FeatureCollection", features: [] });
-    };
-
     useEffect(() => {
       console.log("Live Data Restart:", liveDataRestart, liveDataActive);
       if (liveDataRestart != -1 && liveDataRestart < 5 && liveDataActive) {

diff --git a/gui/src/models/MapCommandTypes.d.ts b/gui/src/models/MapCommandTypes.d.ts
@@ -21,25 +21,4 @@ type MAP_REFERENCE_TYPE = {
     heading?: number;
     animationDurationMs?: number;
   }) => void;
-
-  /**
-   * Render specified MAP data on map
-   *
-   * @param mapData - MAPs to be rendered
-   */
-  setRenderedMapData: (mapData: ProcessedMap) => void;
-
-  /**
-   * Render specified SPAT data on map
-   *
-   * @param spatData - SPATs to be rendered
-   */
-  setRenderedSpatData: (spatData: ProcessedSpat[]) => void;
-
-  /**
-   * Render specified BSM data on map
-   *
-   * @param bsmData - BSMs to be rendered
-   */
-  setRenderedBsmData: (bsmData: OdeBsmData[]) => void;
 };
diff --git a/gui/src/pages/decoder.tsx b/gui/src/pages/decoder.tsx
@@ -19,7 +19,6 @@ const DecoderPage = () => {
   );
   const [selectedBsms, setSelectedBsms] = useState([] as string[]);
   const mapRef = useRef<MAP_REFERENCE_TYPE | null>(null);
-  const [trigger, setTrigger] = useState(0); // Trigger state
 
   console.log("Data", data);
 
@@ -42,7 +41,6 @@ const DecoderPage = () => {
       });
     }
     setData(freshData.reduce((acc, entry) => ({ ...acc, [entry.id]: entry }), {}));
-    setTrigger((prev) => prev + 1);
   }, []);
 
   const submitDecoderRequest = (data: string, type: DECODER_MESSAGE_TYPE) => {
@@ -75,7 +73,6 @@ const DecoderPage = () => {
             },
           };
         });
-        setTrigger((prev) => prev + 1);
       });
       let newEntry = {};
       if (prevData[id].text != undefined) {
@@ -89,7 +86,6 @@ const DecoderPage = () => {
           isGreyedOut: false,
           decodedResponse: undefined,
         };
-        setTrigger((prev) => prev + 1);
       }
       return {
         ...prevData,
@@ -113,7 +109,6 @@ const DecoderPage = () => {
         delete prevData[id];
         return { ...prevData };
       });
-      setTrigger((prev) => prev + 1);
     }
   };
 
@@ -125,7 +120,6 @@ const DecoderPage = () => {
         const rsuIp = data[id]?.decodedResponse?.processedMap?.properties?.originIp;
         if (intersectionId) {
           setSelectedMapMessage({ id, intersectionId, rsuIp: rsuIp! });
-          setTrigger((prev) => prev + 1);
         }
         return;
       case "BSM":
@@ -136,7 +130,6 @@ const DecoderPage = () => {
             return [...prevBsms, id];
           }
         });
-        setTrigger((prev) => prev + 1);
         return;
     }
   };
@@ -195,7 +188,7 @@ const DecoderPage = () => {
     });
   };
 
-  const getIntersectionId = (decodedResponse: DecoderApiResponseGeneric | undefined) => {
+  const getIntersectionId = (decodedResponse: DecoderApiResponseGeneric | undefined): number | undefined => {
     if (!decodedResponse) {
       return undefined;
     }
@@ -207,9 +200,8 @@ const DecoderPage = () => {
       case "SPAT":
         const spatPayload = decodedResponse.processedSpat;
         return spatPayload?.intersectionId;
-      case "BSM":
-        const bsmPayload = decodedResponse.bsm;
-        return bsmPayload?.metadata.originIp;
+      default:
+        return undefined;
     }
   };
 
@@ -221,15 +213,6 @@ const DecoderPage = () => {
     return (selectedMapMessage?.rsuIp === undefined || rsuIp !== selectedMapMessage?.rsuIp) && rsuIp != "";
   };
 
-  useEffect(() => {
-    mapRef.current?.setRenderedBsmData(
-      Object.values(data)
-        .filter((v) => v.type === "BSM" && v.status == "COMPLETED" && selectedBsms.includes(v.id))
-        .map((v) => v.decodedResponse?.bsm!)
-    );
-    console.log("Setting rendered BSM data", Object.values(data));
-  }, [data, trigger, selectedBsms]);
-
   return (
     <>
       <Head>