diff --git a/components/発車時刻表/EachData.tsx b/components/発車時刻表/EachData.tsx index 024380b..6feb5e5 100644 --- a/components/発車時刻表/EachData.tsx +++ b/components/発車時刻表/EachData.tsx @@ -101,20 +101,16 @@ export const EachData: FC = (props) => { else return Pos.Pos == "" ? "" : `現在地:${Pos.Pos}`; }; -const [platformNumber, setPlatformNumber] = useState(); -useEffect(()=>{ - fetch("https://n8n.haruk.in/webhook/JR-shikoku-PosID?num="+currentTrainData?.PosNum) - .then(res=>res.json()) - .then(data=>{ - if(data?.type == "Station"){ - setPlatformNumber(data?.platform); - } - else{ - setPlatformNumber(undefined); - } - }) -},[currentTrainData,currentTrain]) - + const [platformNumber, setPlatformNumber] = useState(); + useEffect(() => { + fetch( + `https://n8n.haruk.in/webhook/JR-shikoku-PosID?PosNum=${currentTrainData?.PosNum}&Line=${currentTrainData?.Line}` + ) + .then((res) => res.json()) + .then((data) => + setPlatformNumber(data?.type == "Station" ? data?.platform : undefined) + ); + }, [currentTrainData, currentTrain]); return ( <> @@ -147,7 +143,7 @@ useEffect(()=>{ trainIDSwitch ? currentTrainData?.PosNum : trainPositionText(currentTrainData) - } ${platformNumber? platformNumber+"番線":""}`} + } ${platformNumber ? platformNumber + "番線" : ""}`} onLongClick={() => { Linking.openURL( "https://nexcloud.haruk.in/apps/forms/s/TEkBQW5WLcYjLyAzGxncQLtw" diff --git a/lib/checkDuplicateTrainData.js b/lib/checkDuplicateTrainData.ts similarity index 63% rename from lib/checkDuplicateTrainData.js rename to lib/checkDuplicateTrainData.ts index e8b3813..881db65 100644 --- a/lib/checkDuplicateTrainData.js +++ b/lib/checkDuplicateTrainData.ts @@ -1,4 +1,6 @@ -export const checkDuplicateTrainData = (currentTrainArray) => { +import { trainDataType } from "./trainPositionTextArray"; + +export const checkDuplicateTrainData = (currentTrainArray: trainDataType[]) => { const notNyujoData = currentTrainArray.filter((d) => d.delay !== "入線"); if (currentTrainArray.length == 1) return currentTrainArray[0]; if (notNyujoData.length == 0) return currentTrainArray[0]; diff --git a/lib/getTrainDelayStatus.ts b/lib/getTrainDelayStatus.ts index af7e163..9fe76c3 100644 --- a/lib/getTrainDelayStatus.ts +++ b/lib/getTrainDelayStatus.ts @@ -1,5 +1,7 @@ +import { trainDataType } from "./trainPositionTextArray"; + type getTrainDelayStatus = ( - current: { delay: number | "入線" | string; Pos: string }, + current: trainDataType, Station_JP: string ) => string | number; export const getTrainDelayStatus: getTrainDelayStatus = ( diff --git a/lib/trainPositionTextArray.ts b/lib/trainPositionTextArray.ts index 22366d9..b9d89c3 100644 --- a/lib/trainPositionTextArray.ts +++ b/lib/trainPositionTextArray.ts @@ -14,6 +14,12 @@ type returnCurrentType = { export type trainDataType = { Pos?: string; Direction?: number; + Index?: number; + Line?: string; + PosNum?: number; + Type?: string; + delay?: string | number; + num?: string; }; type trainData = ( trainData: trainDataType