土讃線問題の対策

Apps.js

@@ -16,6 +16,7 @@ import { StationDeteilView } from "./components/ActionSheetComponents/StationDet
 import { injectJavascriptData } from "./lib/webViewInjectjavascript";
 import { getStationList2 } from "./lib/getStationList2";
 import { EachTrainInfo } from "./components/ActionSheetComponents/EachTrainInfo";
+import { checkDuplicateTrainData } from "./lib/checkDuplicateTrainData";
 /* 
 import StatusbarDetect from './StatusbarDetect';
 var Status = StatusbarDetect(); */
@@ -160,7 +161,9 @@ export default function Apps({
         setTrainInfo({
           trainNum,
           limited,
-          trainData: currentTrain.filter((t) => t.num == trainNum)[0],
+          trainData: checkDuplicateTrainData(
+            currentTrain.filter((a) => a.num == trainNum)
+          ),
         }); //遅延情報は未実装
         EachTrainInfoAsSR.current?.show();
         return;

components/発車時刻表/LED_vidion.js

@@ -10,6 +10,7 @@ import { objectIsEmpty } from "../../lib/objectIsEmpty";
 import { getTrainType } from "../../lib/getTrainType";
 import { HeaderConfig } from "../../lib/HeaderConfig";
 import { getTrainDelayStatus } from "../../lib/getTrainDelayStatus";
+import { checkDuplicateTrainData } from "../../lib/checkDuplicateTrainData";
 
 let diagramData = undefined;
 
@@ -289,7 +290,9 @@ const EachData = ({
       limited: `${getTrainType(train.type).data}:${
         train.trainName
       }${TrainNumber}`,
-      trainData: currentTrain.filter((t) => t.num == d.train)[0],
+      trainData: checkDuplicateTrainData(
+        currentTrain.filter((a) => a.num == d.train)
+      ),
     });
     EachTrainInfoAsSR.current?.show();
   };
@@ -393,13 +396,6 @@ const DependTime = ({ time }) => (
   </View>
 );
 
-const checkDuplicateTrainData = (currentTrainArray) => {
-  const notNyujoData = currentTrainArray.filter((d) => d.delay !== "入線");
-  if (currentTrainArray.length == 1) return currentTrainArray[0];
-  if (notNyujoData.length == 0) return currentTrainArray[0];
-  else return notNyujoData[0];
-};
-
 const StatusAndDelay = ({ trainDelayStatus }) => {
   return (
     <View style={{ flex: 4 }}>

lib/checkDuplicateTrainData.js

@@ -0,0 +1,6 @@
+export const checkDuplicateTrainData = (currentTrainArray) => {
+  const notNyujoData = currentTrainArray.filter((d) => d.delay !== "入線");
+  if (currentTrainArray.length == 1) return currentTrainArray[0];
+  if (notNyujoData.length == 0) return currentTrainArray[0];
+  else return notNyujoData[0];
+};