Merge commit '0a520309e2f181b0a1b1780577dfdad15139cded' into patch/6.x

2025-03-15 04:22:57 +00:00 · 2025-03-15 04:22:57 +00:00 · 8a48bc48e6
commit 8a48bc48e6
parent 23fb2d715a 0a520309e2
4 changed files with 552 additions and 646 deletions
--- a/components/custom-train-data.ts
+++ b/components/custom-train-data.ts
@ -185,38 +185,22 @@ export const customTrainDataDetector = (TrainNumber: string) => {

    //南風 2700ノーマル
    case "34D":
-    case "58D":
-    case "31D":
-    case "51D":
-      return {
-        type: "LTDEXP",
-        trainName: "南風",
-        trainIcon: "https://storage.haruk.in/s2700.png",
-        infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/nanpu.html",
-        trainNumDistance: 30,
-        info: "しまんとと併結 / 2700系で運転",
-      };
-    case "52D":
-    case "53D":
-      return {
-        type: "LTDEXP",
-        trainName: "南風",
-        trainIcon: "https://storage.haruk.in/s2700.png",
-        infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/nanpu.html",
-        trainNumDistance: 30,
-        info: "うずしおと併結 / 2700系で運転",
-      };
    case "38D":
    case "40D":
    case "42D":
    case "46D":
    case "50D":
+    case "52D":
    case "54D":
+    case "58D":
+    case "31D":
    case "35D":
    case "39D":
    case "41D":
    case "43D":
    case "47D":
+    case "51D":
+    case "53D":
    case "55D":
      return {
        type: "LTDEXP",
@ -228,18 +212,6 @@ export const customTrainDataDetector = (TrainNumber: string) => {
      };

    //2700アンパン
-    case "36D":
-    case "37D":
-      return {
-        type: "LTDEXP",
-        trainName: "南風",
-        trainIcon: `https://n8n.haruk.in/webhook/dosan-anpanman-pictures.png?trainNum=${TrainNumber}&day=${dayjs().format(
-          "yyyy-MM-DD"
-        )}`,
-        infoUrl: "https://www.jr-eki.com/aptrain/naani/dosan/train.html",
-        trainNumDistance: 30,
-        info: "うずしおと連結 / アンパンマン列車で運転",
-      };
    case "32D":
    case "36D":
    case "44D":
@ -263,27 +235,18 @@ export const customTrainDataDetector = (TrainNumber: string) => {

    //うずしお
    //2700
-    case "5006D":
-    case "5022D":
-    case "5013D":
-    case "5029D":
-      return {
-        type: "LTDEXP",
-        trainName: "うずしお",
-        trainIcon: "https://storage.haruk.in/s2700_uzu.png",
-        infoUrl:
-          "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/uzushio.html",
-        trainNumDistance: 5000,
-        info: "南風と併結 / 高松-宇多津間進行方向逆転 / 2700系で運転",
-      };
    case "3004D":
+    case "3006D":
    case "3010D":
    case "3014D":
    case "3016D":
+    case "3022D":
    case "3028D":
    case "3003D":
    case "3007D":
+    case "3013D":
    case "3025D":
+    case "3029D":
    case "3031D":
      return {
        type: "LTDEXP",
@ -299,7 +262,6 @@ export const customTrainDataDetector = (TrainNumber: string) => {

    case "3020D":
    case "3026D":
-    case "3032D":
    case "3005D":
    case "3011D":
    case "3017D":
@ -467,21 +429,22 @@ export const customTrainDataDetector = (TrainNumber: string) => {
    //宇和海
    //2000 ノーマル
    case "1052D":
+    case "1054D":
    case "1056D":
-    case "1058D":
+    case "1060D":
    case "1062D":
    case "1064D":
    case "1068D":
    case "1070D":
-    case "1074D":
+    case "1072D":
    case "1076D":
    case "1078D":
    case "1080D":
    case "1082D":
    case "1051D":
-    case "1053D":
+    case "1055D":
    case "1057D":
-    case "1059D":
+    case "1061D":
    case "1063D":
    case "1065D":
    case "1069D":
@ -490,6 +453,7 @@ export const customTrainDataDetector = (TrainNumber: string) => {
    case "1075D":
    case "1077D":
    case "1079D":
+    case "1081D":
      return {
        type: "LTDEXP",
        trainName: "宇和海",
@ -499,14 +463,12 @@ export const customTrainDataDetector = (TrainNumber: string) => {
        info: "2000系で運転",
      };
    //2000 アンパン込み
-    case "1054D":
-    case "1060D":
+    case "1058D":
    case "1066D":
-    case "1072D":
-    case "1055D":
-    case "1061D":
+    case "1074D":
+    case "1053D":
+    case "1059D":
    case "1067D":
-    case "1081D":
      return {
        type: "LTDEXP",
        trainName: "宇和海",
@ -517,9 +479,9 @@ export const customTrainDataDetector = (TrainNumber: string) => {
      };
    //しまんと
    case "2002D":
-    case "2008D":
+    case "2004D":
    case "2001D":
-    case "2005D":
+    case "2003D":
      return {
        type: "LTDEXP",
        trainName: "しまんと",
@ -529,19 +491,6 @@ export const customTrainDataDetector = (TrainNumber: string) => {
        trainNumDistance: 2000,
        info: "2700系で運転",
      };
-    case "2004D":
-    case "2006D":
-    case "2003D":
-    case "2007D":
-      return {
-        type: "LTDEXP",
-        trainName: "しまんと",
-        trainIcon: "https://storage.haruk.in/s2700_smn.png",
-        infoUrl:
-          "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/shimanto.html",
-        trainNumDistance: 2000,
-        info: "南風と併結 / 2700系で運転",
-      };

    //あしずり 2000
    case "2074D":
@ -563,12 +512,11 @@ export const customTrainDataDetector = (TrainNumber: string) => {
      };

    //あしずり 2700
+    case "2072D":
    case "2078D":
    case "2084D":
-    case "2088D":
    case "2075D":
    case "2077D":
-    case "2072D":
    case "2083D":
      return {
        type: "LTDEXP",
@ -584,14 +532,10 @@ export const customTrainDataDetector = (TrainNumber: string) => {
    case "4002D":
    case "4004D":
    case "4006D":
-    case "4008D":
-    case "4010D":
    case "4001D":
    case "4003D":
    case "4005D":
    case "4007D":
-    case "4009D":
-    case "4011D":
      return {
        type: "LTDEXP",
        trainName: "剣山",
@ -602,18 +546,6 @@ export const customTrainDataDetector = (TrainNumber: string) => {
        info: "キハ185系で運転",
      };

-    //むろと
-    case "8051D":
-    case "8052D":
-      return {
-        type: "LTDEXP",
-        trainName: "むろと",
-        trainIcon: "https://storage.haruk.in/s185_mrt.png",
-        infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/muroto.html",
-        trainNumDistance: 5050,
-        info: "キハ185系で運転",
-      };
-
    //よしのがわトロッコ
    case "8452D":
    case "8451D":
@ -695,7 +627,7 @@ export const customTrainDataDetector = (TrainNumber: string) => {
      if (
        new RegExp(/^4[1-9]\d\d[DM]$/).test(TrainNumber) ||
        new RegExp(/^5[1-7]\d\d[DM]$/).test(TrainNumber) ||
-        TrainNumber === "3621D"
+        new RegExp(/^3[2-9]\d\d[DM]$/).test(TrainNumber)
      )
        return {
          type: "OneMan",
--- a/lib/webViewInjectjavascript.ts
+++ b/lib/webViewInjectjavascript.ts
--- a/stateBox/useBusAndTrainData.js
+++ b/stateBox/useBusAndTrainData.js
@ -37,20 +37,12 @@ export const BusAndTrainDataProvider = ({ children }) => {
      });
  }, []);
  useEffect(() => {
-    AS.getItem("trainPairData202503")
+    fetch(
+      "https://script.google.com/macros/s/AKfycbyoBH7_rBwzPmhU1ghRBNTAVuvGltIrZtWxE07gDdhGGlDL9Ip2qk3pFM5u2xtRBl8/exec"
+    )
+      .then((d) => d.json())
      .then((d) => {
-        const returnData = JSON.parse(d);
-        setTrainPairData(returnData);
-      })
-      .catch(() => {
-        fetch(
-          "https://script.google.com/macros/s/AKfycbyoBH7_rBwzPmhU1ghRBNTAVuvGltIrZtWxE07gDdhGGlDL9Ip2qk3pFM5u2xtRBl8/exec"
-        )
-          .then((d) => d.json())
-          .then((d) => {
-            setTrainPairData(d);
-            AS.setItem("trainPairData202503", JSON.stringify(d));
-          });
+        setTrainPairData(d);
      });
  }, []);
  const initializeTrainPairList = () => {
@ -304,7 +296,7 @@ export const BusAndTrainDataProvider = ({ children }) => {
    }

    if (!returnArray.length) return [];
-    const TDArray = returnArray.map((d) => {
+    const TDArray = returnArray.filter(d => trainList.hasOwnProperty(d)).map((d) => {
      const TD = trainList[d];
      if (!TD) return;
      return { id: d, TrainData: TD.split("#").filter((d) => d != "") };
--- a/stateBox/useTrainMenu.js
+++ b/stateBox/useTrainMenu.js
@ -65,7 +65,7 @@ export const TrainMenuProvider = ({ children }) => {
  //地図表示テキスト
  const injectJavascript = injectJavascriptData(
    mapSwitch,
-    "false",//iconSetting,
+    iconSetting,
    stationMenu,
    trainMenu
  );