Merge commit '40fb55c8cf5462a40a499ddcc69cb5313e559f84'
This commit is contained in:
commit
ea677b4da5
@ -448,10 +448,18 @@ const DependTime = ({ d }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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 = ({ currentTrain, d, props, trainDescriptionSwitch }) => {
|
const StatusAndDelay = ({ currentTrain, d, props, trainDescriptionSwitch }) => {
|
||||||
const [status, setStatus] = useState("");
|
const [status, setStatus] = useState("");
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const current = currentTrain.filter((a) => a.num == d.train)[0];
|
const array = currentTrain.filter((a) => a.num == d.train);
|
||||||
|
const current = checkDuplicateTrainData(array);
|
||||||
|
// 土讃線複数存在対策
|
||||||
if (!current) return () => {};
|
if (!current) return () => {};
|
||||||
const delay = current.delay;
|
const delay = current.delay;
|
||||||
switch (true) {
|
switch (true) {
|
||||||
|
Loading…
Reference in New Issue
Block a user