diff --git a/components/Apps/FixedPositionBox/FixedTrainBox.tsx b/components/Apps/FixedPositionBox/FixedTrainBox.tsx index 431953c..86b1ce3 100644 --- a/components/Apps/FixedPositionBox/FixedTrainBox.tsx +++ b/components/Apps/FixedPositionBox/FixedTrainBox.tsx @@ -34,7 +34,7 @@ export const FixedTrain: FC = ({ displaySize, setDisplaySize, }) => { - const { setFixedPosition, currentTrain, getCurrentStationData, getPosition } = + const {fixedPosition, setFixedPosition, currentTrain, getCurrentStationData, getPosition } = useCurrentTrain(); const { mapSwitch } = useTrainMenu(); @@ -51,9 +51,14 @@ export const FixedTrain: FC = ({ }, [currentTrain, trainID]); useEffect(() => { const stationData = getCurrentStationData(trainID); + console.log(stationData); if (stationData) { setTrain(stationData); } + else{ + alert("追跡していた列車が消えました。追跡を終了します。"); + setFixedPosition({ type: null, value: null }); + } }, [trainID, currentTrain]); const { getStationDataFromName, stationList, originalStationList } = diff --git a/stateBox/useStationList.tsx b/stateBox/useStationList.tsx index faf8662..9b3e737 100644 --- a/stateBox/useStationList.tsx +++ b/stateBox/useStationList.tsx @@ -74,10 +74,15 @@ export const StationListProvider: FC = ({ children }) => { Object.keys(originalStationList).forEach((key) => { originalStationList[key].forEach((station) => { if (!station.StationNumber) return; - if (typeof station.StationNumber === "string" && station.StationNumber.includes(name)) { + if ( + typeof station.StationNumber === "string" && + station.StationNumber.includes(name) + ) { if (!!station.jslodApi) returnArray.push(station); - } - else if (typeof station.Station_JP === "string" && station.Station_JP.includes(name)) { + } else if ( + typeof station.Station_JP === "string" && + station.Station_JP.includes(name) + ) { if (!!station.jslodApi) returnArray.push(station); } }); @@ -122,6 +127,7 @@ export const StationListProvider: FC = ({ children }) => { }); } }); + if (bootStationList[0].line === undefined) return ""; return `MoveDisplayStation('${bootStationList[0].line}_${bootStationList[0].station.MyStation}_${bootStationList[0].station.Station_JP}');document.getElementById("disp").insertAdjacentHTML("afterbegin", "
");setReload();`; };