path修正

components/Apps/FixedPositionBox/FixedStationBox.tsx

@@ -1,17 +1,21 @@
 import lineColorList from "@/assets/originData/lineColorList";
-import { customTrainDataDetector } from "@/components/custom-train-data";
 import { StationNumberMaker } from "@/components/駅名表/StationNumberMaker";
 import { checkDuplicateTrainData } from "@/lib/checkDuplicateTrainData";
-import { CustomTrainData, trainTypeID } from "@/lib/CommonTypes";
+import {
+  CustomTrainData,
+  eachTrainDiagramType,
+  StationProps,
+} from "@/lib/CommonTypes";
 import { getCurrentTrainData } from "@/lib/getCurrentTrainData";
 import { getTrainDelayStatus } from "@/lib/getTrainDelayStatus";
 import { getTrainType } from "@/lib/getTrainType";
 import { objectIsEmpty } from "@/lib/objectIsEmpty";
-import { trainPosition } from "@/lib/trainPositionTextArray";
+import { getTime, trainTimeFiltering } from "@/lib/trainTimeFiltering";
 import { useAllTrainDiagram } from "@/stateBox/useAllTrainDiagram";
 import { useAreaInfo } from "@/stateBox/useAreaInfo";
 import { useCurrentTrain } from "@/stateBox/useCurrentTrain";
-import { useStationList, StationProps } from "@/stateBox/useStationList";
+import { useStationList } from "@/stateBox/useStationList";
+
 import dayjs from "dayjs";
 import { useEffect, useState } from "react";
 import { Text, TouchableOpacity, View } from "react-native";
@@ -30,112 +34,6 @@ export const FixedStation = ({ stationID }) => {
       : "white";
   ////
 
-  const timeFiltering = (d) => {
-    const baseTime = 2;
-    if (currentTrain.filter((t) => t.num == d.train).length == 0) {
-      const date = dayjs();
-      const trainTime = date
-        .hour(parseInt(d.time.split(":")[0]))
-        .minute(parseInt(d.time.split(":")[1]));
-
-      if (date.isAfter(trainTime)) {
-        return false;
-      } else if (trainTime.diff(date) < baseTime * 60 * 60 * 1000) {
-        return true;
-      }
-      return false;
-    } else {
-      const Pos = trainPosition(
-        currentTrain.filter((t) => t.num == d.train)[0]
-      );
-      const nextPos = Pos.isBetween ? Pos.Pos.to : Pos.Pos.Pos;
-      const PrePos = Pos.isBetween ? Pos.Pos.from : "";
-      if (station[0].Station_JP == nextPos) {
-        if (d.lastStation != station[0].Station_JP) return true;
-      } else if (station[0].Station_JP == PrePos) {
-        return false;
-      }
-      let [h, m] = d.time.split(":");
-      let delay = isNaN(currentTrain.filter((t) => t.num == d.train)[0].delay)
-        ? 0
-        : currentTrain.filter((t) => t.num == d.train)[0].delay;
-      const date = dayjs();
-      let targetHour = parseInt(h);
-
-      // 4時を日付変更線として処理
-      if (targetHour < 4) {
-        targetHour += 24;
-      }
-
-      let currentHour = date.hour();
-      if (currentHour < 4) {
-        currentHour += 24;
-      }
-
-      const db = dayjs()
-        .hour(targetHour)
-        .minute(parseInt(m) + parseInt(delay));
-      const currentTime = dayjs().hour(currentHour);
-
-      return !currentTime.isAfter(db);
-    }
-  };
-  type trainDataProps = {
-    train?: string;
-    lastStation?: string;
-    time?: string;
-    isThrough?: boolean;
-  };
-  const getTime = (stationDiagram, station) => {
-    const returnData = Object.keys(stationDiagram)
-      .map((trainNum) => {
-        let trainData: trainDataProps = {};
-        stationDiagram[trainNum].split("#").forEach((data) => {
-          if (data.match("着")) {
-            trainData.lastStation = data.split(",着,")[0];
-          }
-          if (data.match("着編")) {
-            trainData.lastStation = data.split(",着編,")[0];
-          }
-          if (data.split(",")[0] === station.Station_JP) {
-            if (data.match(",発,")) {
-              trainData.time = data.split(",発,")[1];
-            } else if (data.match(",発編,")) {
-              trainData.time = data.split(",発編,")[1];
-            } else if (data.match(",通編,")) {
-              trainData.time = data.split(",通編,")[1];
-              trainData.isThrough = true;
-            } else if (data.match(",着,")) {
-              trainData.time = data.split(",着,")[1];
-            } else if (data.match(",着編,")) {
-              trainData.time = data.split(",着編,")[1];
-            }
-          }
-        });
-        return {
-          train: trainNum,
-          time: trainData.time,
-          lastStation: trainData.lastStation,
-          isThrough: trainData.isThrough,
-        };
-      })
-      .filter((d) => d.time);
-    return returnData.sort((a, b) => {
-      switch (true) {
-        case parseInt(a.time.split(":")[0]) < parseInt(b.time.split(":")[0]):
-          return -1;
-        case parseInt(a.time.split(":")[0]) > parseInt(b.time.split(":")[0]):
-          return 1;
-        case parseInt(a.time.split(":")[1]) < parseInt(b.time.split(":")[1]):
-          return -1;
-        case parseInt(a.time.split(":")[1]) > parseInt(b.time.split(":")[1]):
-          return 1;
-        default:
-          return 0;
-      }
-    });
-  };
-
   const { allTrainDiagram } = useAllTrainDiagram();
   const { areaInfo, areaStationID } = useAreaInfo();
   const [stationDiagram, setStationDiagram] = useState({}); //当該駅の全時刻表
@@ -162,7 +60,9 @@ export const FixedStation = ({ stationID }) => {
     setIsInfoArea(station.some((s) => areaStationID.includes(s.StationNumber)));
   }, [allTrainDiagram, station]);
 
-  const [trainTimeAndNumber, setTrainTimeAndNumber] = useState([]);
+  const [trainTimeAndNumber, setTrainTimeAndNumber] = useState<
+    eachTrainDiagramType[]
+  >([]);
 
   useEffect(() => {
     //現在の駅に停車する列車から時刻を切り出してLEDベースにフォーマット
@@ -170,20 +70,15 @@ export const FixedStation = ({ stationID }) => {
     const getTimeData = getTime(stationDiagram, station[0]);
     setTrainTimeAndNumber(getTimeData);
   }, [stationDiagram]);
-  const [selectedTrain, setSelectedTrain] = useState<
-    {
-      isThrough?: boolean;
-      train?: string;
-      lastStation?: string;
-      time?: string;
-    }[]
-  >([]);
+  const [selectedTrain, setSelectedTrain] = useState<eachTrainDiagramType[]>(
+    []
+  );
   useEffect(() => {
     if (!trainTimeAndNumber) return () => {};
     if (!currentTrain) return () => {};
     const data = trainTimeAndNumber
       .filter((d) => currentTrain.map((m) => m.num).includes(d.train)) //現在の列車に絞る[ToDo]
-      .filter(timeFiltering)
+      .filter((d) => trainTimeFiltering({ d, currentTrain, station })) //時間フィルター
       .filter((d) => !d.isThrough)
       .filter((d) => d.lastStation != station[0].Station_JP); //最終列車表示設定
     setSelectedTrain(data);
@@ -302,9 +197,11 @@ const FixedStationBoxEachTrain = ({ d, station }) => {
     currentTrainData,
     station.Station_JP
   )}`;
-  const [train, setTrain] = useState<CustomTrainData>(getCurrentTrainData(d.train,currentTrain,allCustomTrainData));
+  const [train, setTrain] = useState<CustomTrainData>(
+    getCurrentTrainData(d.train, currentTrain, allCustomTrainData)
+  );
   useEffect(() => {
-    setTrain(getCurrentTrainData(d.train,currentTrain,allCustomTrainData));
+    setTrain(getCurrentTrainData(d.train, currentTrain, allCustomTrainData));
   }, [currentTrain, d.train]);
   const { name, color } = getTrainType({ type: train.type, whiteMode: true });
   return (