getCurrentTrainDataを移動

components/Apps/FixedPositionBox/FixedStationBox.tsx

@@ -3,6 +3,7 @@ import { customTrainDataDetector } from "@/components/custom-train-data";
 import { StationNumberMaker } from "@/components/駅名表/StationNumberMaker";
 import { checkDuplicateTrainData } from "@/lib/checkDuplicateTrainData";
 import { CustomTrainData, trainTypeID } from "@/lib/CommonTypes";
+import { getCurrentTrainData } from "@/lib/getCurrentTrainData";
 import { getTrainDelayStatus } from "@/lib/getTrainDelayStatus";
 import { getTrainType } from "@/lib/getTrainType";
 import { objectIsEmpty } from "@/lib/objectIsEmpty";
@@ -301,35 +302,9 @@ const FixedStationBoxEachTrain = ({ d, station }) => {
     currentTrainData,
     station.Station_JP
   )}`;
-  const getTrainDataFromCurrentTrain = (trainNum: string) => {
-    const customTrainData = customTrainDataDetector(
-      d.train,
-      allCustomTrainData
-    );
-    switch (customTrainData.type) {
-      case "Normal":
-      case "OneMan":
-        const currentTrainData = currentTrain.filter((a) => a.num == trainNum);
-        if (currentTrainData.length == 0) return customTrainData;
-        else if (currentTrainData[0].Type.includes("rapid:")) {
-          const typeText = currentTrainData[0].Type.split(":");
-          const returnData = {
-            type: "Rapid" as trainTypeID,
-            trainName: typeText[1].replace("\r", ""),
-            trainIcon: null,
-            trainNumDistance: null,
-            info: "",
-          };
-          return returnData;
-        }
-        return customTrainData;
-      default:
-        return customTrainData;
-    }
-  };
-  const [train, setTrain] = useState<CustomTrainData>(getTrainDataFromCurrentTrain(d.train));
+  const [train, setTrain] = useState<CustomTrainData>(getCurrentTrainData(d.train,currentTrain,allCustomTrainData));
   useEffect(() => {
-    setTrain(getTrainDataFromCurrentTrain(d.train));
+    setTrain(getCurrentTrainData(d.train,currentTrain,allCustomTrainData));
   }, [currentTrain, d.train]);
   const { name, color } = getTrainType({ type: train.type, whiteMode: true });
   return (