小規模なコード整理
This commit is contained in:
@@ -17,7 +17,7 @@ export const useBusAndTrainData = () => {
|
||||
};
|
||||
|
||||
export const BusAndTrainDataProvider = ({ children }) => {
|
||||
const { allTrainDiagram: trainList } = useAllTrainDiagram();
|
||||
const { allTrainDiagram } = useAllTrainDiagram();
|
||||
const [busAndTrainData, setBusAndTrainData] = useState([]);
|
||||
const [trainPairData, setTrainPairData] = useState([]);
|
||||
useEffect(() => {
|
||||
@@ -280,11 +280,11 @@ export const BusAndTrainDataProvider = ({ children }) => {
|
||||
break;
|
||||
}
|
||||
if (new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum)) {
|
||||
if (trainList["5" + trainNum.substring(1)])
|
||||
if (allTrainDiagram["5" + trainNum.substring(1)])
|
||||
returnArray.push("5" + trainNum.substring(1));
|
||||
}
|
||||
if (new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum)) {
|
||||
if (trainList["4" + trainNum.substring(1)])
|
||||
if (allTrainDiagram["4" + trainNum.substring(1)])
|
||||
returnArray.push("4" + trainNum.substring(1));
|
||||
}
|
||||
if (
|
||||
@@ -292,21 +292,21 @@ export const BusAndTrainDataProvider = ({ children }) => {
|
||||
new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum) ||
|
||||
new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum)
|
||||
) {
|
||||
if (trainList[trainNum.substring(1)]) {
|
||||
if (allTrainDiagram[trainNum.substring(1)]) {
|
||||
returnArray.push(trainNum.substring(1));
|
||||
}
|
||||
}
|
||||
if (new RegExp(/^[1-9]\d\d[DM]$/).test(trainNum)) {
|
||||
// 列番がxxDの場合は4xxDと5xxDの列番を検索
|
||||
if (trainList["4" + trainNum]) returnArray.push("4" + trainNum);
|
||||
if (trainList["5" + trainNum]) returnArray.push("5" + trainNum);
|
||||
if (allTrainDiagram["4" + trainNum]) returnArray.push("4" + trainNum);
|
||||
if (allTrainDiagram["5" + trainNum]) returnArray.push("5" + trainNum);
|
||||
}
|
||||
|
||||
if (!returnArray.length) return [];
|
||||
const TDArray = returnArray
|
||||
.filter((d) => trainList.hasOwnProperty(d))
|
||||
.filter((d) => allTrainDiagram.hasOwnProperty(d))
|
||||
.map((d) => {
|
||||
const TD = trainList[d];
|
||||
const TD = allTrainDiagram[d];
|
||||
if (!TD) return;
|
||||
return { id: d, TrainData: TD.split("#").filter((d) => d != "") };
|
||||
});
|
||||
|
Reference in New Issue
Block a user