伊予大洲で表示に失敗していた問題を修正
This commit is contained in:
@@ -34,8 +34,13 @@ export const FixedTrain: FC<props> = ({
|
||||
displaySize,
|
||||
setDisplaySize,
|
||||
}) => {
|
||||
const {fixedPosition, setFixedPosition, currentTrain, getCurrentStationData, getPosition } =
|
||||
useCurrentTrain();
|
||||
const {
|
||||
fixedPosition,
|
||||
setFixedPosition,
|
||||
currentTrain,
|
||||
getCurrentStationData,
|
||||
getPosition,
|
||||
} = useCurrentTrain();
|
||||
|
||||
const { mapSwitch } = useTrainMenu();
|
||||
const { allCustomTrainData, allTrainDiagram } = useAllTrainDiagram();
|
||||
@@ -53,8 +58,7 @@ export const FixedTrain: FC<props> = ({
|
||||
const stationData = getCurrentStationData(trainID);
|
||||
if (stationData) {
|
||||
setTrain(stationData);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
alert("追跡していた列車が消えました。追跡を終了します。");
|
||||
setFixedPosition({ type: null, value: null });
|
||||
}
|
||||
@@ -133,22 +137,27 @@ export const FixedTrain: FC<props> = ({
|
||||
});
|
||||
setTrainDataWithThrough(mainArray);
|
||||
}, [allTrainDiagram, stationList, trainID]);
|
||||
const stopStationIDList = trainDataWidhThrough.map((i) => {
|
||||
const [station, se, time] = i.split(",");
|
||||
const Stations = stationList.map((a) =>
|
||||
a.filter((d) => d.StationName == station)
|
||||
);
|
||||
const StationNumbers =
|
||||
Stations &&
|
||||
Stations.reduce((newArray, e) => {
|
||||
return newArray.concat(e);
|
||||
}, []).map((d) => d.StationNumber);
|
||||
return StationNumbers;
|
||||
});
|
||||
const [stopStationIDList, setStopStationList] = useState([]);
|
||||
useEffect(() => {
|
||||
const x = trainDataWidhThrough.map((i) => {
|
||||
const [station, se, time] = i.split(",");
|
||||
const Stations = stationList.map((a) =>
|
||||
a.filter((d) => d.StationName == station)
|
||||
);
|
||||
const StationNumbers =
|
||||
Stations &&
|
||||
Stations.reduce((newArray, e) => {
|
||||
return newArray.concat(e);
|
||||
}, []).map((d) => d.StationNumber);
|
||||
return StationNumbers;
|
||||
});
|
||||
setStopStationList(x);
|
||||
}, [trainDataWidhThrough]);
|
||||
const [currentPosition, setCurrentPosition] = useState<string[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
let position = getPosition(train);
|
||||
if (stopStationIDList.length == 0) return;
|
||||
if (position) {
|
||||
if (position.length > 1) {
|
||||
if (position[0] == "-Iyo") {
|
||||
@@ -177,7 +186,7 @@ export const FixedTrain: FC<props> = ({
|
||||
|
||||
setCurrentPosition(position);
|
||||
}
|
||||
}, [train]);
|
||||
}, [train,stopStationIDList]);
|
||||
|
||||
const [nextStationData, setNextStationData] = useState<StationProps[]>([]);
|
||||
const [untilStationData, setUntilStationData] = useState<StationProps[]>([]);
|
||||
|
||||
Reference in New Issue
Block a user