getStationListの整理

components/ActionSheetComponents/EachTrainInfo/TrainDataView.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import { View, TouchableOpacity, useWindowDimensions } from "react-native";
 import { StateBox } from "./StateBox";
 import { useDeviceOrientationChange } from "../../../stateBox/useDeviceOrientationChange";
-import { getStationList2 } from "../../../lib/getStationList2";
+import { getStationList2 } from "../../../lib/getStationList";
 import { useCurrentTrain } from "../../../stateBox/useCurrentTrain";
 import { SheetManager } from "react-native-actions-sheet";
 import { trainPosition } from "../../../lib/trainPositionTextArray";

components/ActionSheetComponents/EachTrainInfoCore.js

@@ -12,7 +12,7 @@ import {
 import { SheetManager } from "react-native-actions-sheet";
 import { useScrollHandlers } from "react-native-actions-sheet";
 import { AS } from "../../storageControl";
-import { lineListPair } from "../../lib/getStationList";
+import { lineListPair, stationIDPair } from "../../lib/getStationList";
 import { useCurrentTrain } from "../../stateBox/useCurrentTrain";
 import { checkDuplicateTrainData } from "../../lib/checkDuplicateTrainData";
 import { getTrainType } from "../../lib/getTrainType";
@@ -33,7 +33,6 @@ import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain";
 import { useTrainMenu } from "../../stateBox/useTrainMenu";
 import { HeaderText } from "./EachTrainInfoCore/HeaderText";
 import { useStationList } from "../../stateBox/useStationList";
-import { stationIDPair } from "../../lib/getStationList2";
 import { useAllTrainDiagram } from "@/stateBox/useAllTrainDiagram";
 
 export const EachTrainInfoCore = ({

components/ActionSheetComponents/TrainMenuLineSelector.js

@@ -11,8 +11,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useTrainMenu } from "../../stateBox/useTrainMenu";
 import { useCurrentTrain } from "../../stateBox/useCurrentTrain";
 import lineColorList from "../../assets/originData/lineColorList";
-import { stationIDPair } from "../../lib/getStationList2";
+import { stationIDPair, lineListPair } from "../../lib/getStationList";
-import { lineListPair } from "../../lib/getStationList";
 
 export const TrainMenuLineSelector = () => {
   const {
@@ -55,7 +54,7 @@ export const TrainMenuLineSelector = () => {
           onPress={() => {
             SheetManager.hide("TrainMenuLineSelector");
             const s = selectedLine == d ? undefined : d;
-            if(!s) return;
+            if (!s) return;
             setSelectedLine(s);
             Object.keys(stationData).forEach((data, indexBase) => {
               stationData[data].forEach((D, index) => {
@@ -66,7 +65,7 @@ export const TrainMenuLineSelector = () => {
                   ""
                 ).split(",");
                 if (latlng.length == 0) return null;
-                if (index == 0 ) {
+                if (index == 0) {
                   webview.current
                     ?.injectJavaScript(`MoveDisplayStation('${data}_${D.MyStation}_${D.Station_JP}');
                       document.getElementById("disp").insertAdjacentHTML("afterbegin", "<div />");`);

components/Apps/WebView.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Platform, LayoutAnimation } from "react-native";
 import { WebView } from "react-native-webview";
 
-import { lineList } from "../../lib/getStationList";
+import { lineList, stationNamePair } from "../../lib/getStationList";
 import { checkDuplicateTrainData } from "../../lib/checkDuplicateTrainData";
 import { useFavoriteStation } from "../../stateBox/useFavoriteStation";
 import { useCurrentTrain } from "../../stateBox/useCurrentTrain";
@@ -11,7 +11,6 @@ import { SheetManager } from "react-native-actions-sheet";
 
 import { useNavigation } from "@react-navigation/native";
 import { useTrainMenu } from "../../stateBox/useTrainMenu";
-import { stationNamePair } from "../../lib/getStationList2";
 import { useStationList } from "../../stateBox/useStationList";
 export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
   const { webview, currentTrain } = useCurrentTrain();

components/trainMenu.js

@@ -4,8 +4,7 @@ import MapView from "react-native-maps";
 import { useCurrentTrain } from "../stateBox/useCurrentTrain";
 import { useNavigation } from "@react-navigation/native";
 import lineColorList from "../assets/originData/lineColorList";
-import { stationIDPair } from "../lib/getStationList2";
+import { lineListPair, stationIDPair } from "../lib/getStationList";
-import { lineListPair } from "../lib/getStationList";
 import { SheetManager } from "react-native-actions-sheet";
 import { useTrainMenu } from "../stateBox/useTrainMenu";
 import { MapPin } from "./TrainMenu/MapPin";

components/trainMenu.web.js

@@ -4,8 +4,7 @@ import { View, Text, TouchableOpacity, Linking } from "react-native";
 import { useCurrentTrain } from "../stateBox/useCurrentTrain";
 import { useNavigation } from "@react-navigation/native";
 import lineColorList from "../assets/originData/lineColorList";
-import { stationIDPair } from "../lib/getStationList2";
+import { lineListPair, stationIDPair } from "../lib/getStationList";
-import { lineListPair } from "../lib/getStationList";
 import { SheetManager } from "react-native-actions-sheet";
 import { useTrainMenu } from "../stateBox/useTrainMenu";
 //import { MapPin } from "./TrainMenu/MapPin";

components/発車時刻表/LED_inside_Component/TrainPosition.tsx

@@ -5,7 +5,6 @@ import {
   trainDataType,
   trainPosition,
 } from "../../../lib/trainPositionTextArray";
-import { lineList } from "../../../lib/getStationList";
 import { getStationID } from "../../../lib/eachTrainInfoCoreLib/getStationData";
 import { useCurrentTrain } from "../../../stateBox/useCurrentTrain";
 

lib/checkDuplicateTrainData.ts

@@ -1,6 +1,5 @@
 import { trainDataType } from "./trainPositionTextArray";
-import { getStationID } from "./eachTrainInfoCoreLib/getStationData";
+import { stationIDPair } from "../lib/getStationList";
-import { stationIDPair } from "../lib/getStationList2";
 
 export const checkDuplicateTrainData = (
   currentTrainArray: trainDataType[],

lib/getStationList.ts

@@ -40,6 +40,41 @@ export const lineListPair = {
   N: "鳴門線(池谷-鳴門間)[N]",
   M: "瀬戸大橋線(児島-宇多津間)[M]",
 };
+export const getStationList2 = async () => {
+  return {
+    yosan,
+    uwajima,
+    uwajima2,
+    dosan,
+    dosan2,
+    koutoku,
+    tokushima,
+    naruto,
+    seto,
+  };
+};
+export const stationIDPair = {
+  yosan: "Y",
+  uwajima: "U",
+  uwajima2: "S",
+  dosan: "D",
+  dosan2: "K",
+  koutoku: "T",
+  tokushima: "B",
+  naruto: "N",
+  seto: "M",
+};
+export const stationNamePair = {
+  "予讃線(高松 - 松山)": "yosan",
+  "予讃線・内子線(松山 - 内子 - 宇和島)": "uwajima",
+  "予讃線・伊予灘線(向井原 - 伊予大洲)": "uwajima2",
+  "土讃線(多度津 - 高知)": "dosan",
+  "土讃線(高知 - 窪川)": "dosan2",
+  "高徳線(高松 - 徳島)": "koutoku",
+  "徳島線(徳島 - 阿波池田)": "tokushima",
+  "鳴門線(池谷 - 鳴門)": "naruto",
+  "瀬戸大橋線(児島 - 宇多津)": "seto",
+};
 
 export const getStationList = async () => {
   if (status) return status;

lib/getStationList2.ts

@@ -1,46 +0,0 @@
-import yosan from "../assets/originData/yosan";
-import uwajima from "../assets/originData/uwajima";
-import uwajima2 from "../assets/originData/uwajima2";
-import dosan from "../assets/originData/dosan";
-import dosan2 from "../assets/originData/dosan2";
-import koutoku from "../assets/originData/koutoku";
-import tokushima from "../assets/originData/tokushima";
-import naruto from "../assets/originData/naruto";
-import seto from "../assets/originData/seto";
-export const getStationList2 = async () => {
-  return {
-    yosan,
-    uwajima,
-    uwajima2,
-    dosan,
-    dosan2,
-    koutoku,
-    tokushima,
-    naruto,
-    seto,
-  };
-};
-
-export const stationIDPair = {
-  yosan: "Y",
-  uwajima: "U",
-  uwajima2: "S",
-  dosan: "D",
-  dosan2: "K",
-  koutoku: "T",
-  tokushima: "B",
-  naruto: "N",
-  seto: "M",
-};
-
-export const stationNamePair = {
-  "予讃線(高松 - 松山)": "yosan",
-  "予讃線・内子線(松山 - 内子 - 宇和島)": "uwajima",
-  "予讃線・伊予灘線(向井原 - 伊予大洲)": "uwajima2",
-  "土讃線(多度津 - 高知)": "dosan",
-  "土讃線(高知 - 窪川)": "dosan2",
-  "高徳線(高松 - 徳島)": "koutoku",
-  "徳島線(徳島 - 阿波池田)": "tokushima",
-  "鳴門線(池谷 - 鳴門)": "naruto",
-  "瀬戸大橋線(児島 - 宇多津)": "seto",
-};

stateBox/useStationList.tsx

@@ -5,8 +5,7 @@ import React, {
   useEffect,
   FC,
 } from "react";
-import { getStationList } from "../lib/getStationList";
+import { lineList, getStationList } from "../lib/getStationList";
-import { lineList } from "../lib/getStationList";
 
 type initialStateType = {
   originalStationList: any[][];

stateBox/useTrainMenu.js

@@ -2,7 +2,7 @@ import React, { createContext, useContext, useState, useEffect } from "react";
 
 import { ASCore } from "../storageControl";
 
-import { getStationList2 } from "../lib/getStationList2";
+import { getStationList2 } from "../lib/getStationList";
 import { injectJavascriptData } from "../lib/webViewInjectjavascript";
 
 const initialState = {