From 98b22db4dbea611907c4d7a6a60b7323dbec7a76 Mon Sep 17 00:00:00 2001
From: harukin-DeskMini <harukin@haruk.in>
Date: Mon, 27 Mar 2023 01:02:33 +0900
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B4=E3=83=80=E3=82=A4=E3=83=A4?=
 =?UTF-8?q?=E6=94=B9=E6=AD=A3=E6=83=85=E5=A0=B1=E3=82=92=E6=9B=B8=E3=81=8D?=
 =?UTF-8?q?=E6=8F=9B=E3=81=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/custom-train-data.js | 81 +++++++++++++++++++++++----------
 config/newsUpdate.js            |  2 +-
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/components/custom-train-data.js b/components/custom-train-data.js
index 2290532..9cd6dec 100644
--- a/components/custom-train-data.js
+++ b/components/custom-train-data.js
@@ -2,7 +2,6 @@ export const customTrainDataDetector = (TrainNumber) => {
   switch (TrainNumber) {
     //しおかぜメイン
     //8000 ノーマル
-    case "2M":
     case "4M":
     case "6M":
     case "14M":
@@ -27,10 +26,18 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainNumDistance: 0,
         info: "いしづちと併結 / 8000系で運転",
       };
+    case "2M":
+      return {
+        type: "LTDEXP",
+        trainName: "しおかぜ",
+        trainIcon: "http://www.trainfrontview.net/b/s8000nr.png",
+        trainNumDistance: 0,
+        info: "8000系で運転",
+      };
     //8000 アンパン
-    case "10M":
     case "22M":
     case "9M":
+    case "10M":
     case "21M":
       return {
         type: "LTDEXP",
@@ -158,22 +165,36 @@ export const customTrainDataDetector = (TrainNumber) => {
 
     //南風 2700ノーマル
     case "34D":
+    case "58D":
+    case "31D":
+    case "51D":
+      return {
+        type: "LTDEXP",
+        trainName: "南風",
+        trainIcon: "http://www.trainfrontview.net/b/s2700.png",
+        trainNumDistance: 30,
+        info: "しまんとと併結 / 2700系で運転",
+      };
+    case "52D":
+    case "53D":
+      return {
+        type: "LTDEXP",
+        trainName: "南風",
+        trainIcon: "http://www.trainfrontview.net/b/s2700.png",
+        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",
@@ -182,14 +203,22 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainNumDistance: 30,
         info: "2700系で運転",
       };
+
     //2700アンパン
-    case "32D":
     case "36D":
+    case "37D":
+      return {
+        type: "LTDEXP",
+        trainName: "南風",
+        trainIcon: "http://www.trainfrontview.net/f/s2700apr.png",
+        trainNumDistance: 30,
+        info: "うずしおと連結 / アンパンマン列車で運転",
+      };
+    case "32D":
     case "44D":
     case "48D":
     case "56D":
     case "33D":
-    case "37D":
     case "45D":
     case "49D":
     case "57D":
@@ -200,7 +229,6 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainNumDistance: 30,
         info: "アンパンマン列車で運転",
       };
-      break;
 
     //うずしお
     //2700
@@ -213,7 +241,7 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainName: "うずしお",
         trainIcon: "http://www.trainfrontview.net/b/s2700_uzu.png",
         trainNumDistance: 5000,
-        info: "南風と宇多津で併結 / 高松-宇多津間進行方向逆転 / 2700系で運転",
+        info: "南風と併結 / 高松-宇多津間進行方向逆転 / 2700系で運転",
       };
     case "3002D":
     case "3004D":
@@ -388,18 +416,14 @@ export const customTrainDataDetector = (TrainNumber) => {
     case "1070D":
     case "1074D":
     case "1076D":
-    case "1078D":
     case "1080D":
     case "1082D":
     case "1051D":
     case "1059D":
     case "1065D":
-    case "1069D":
     case "1071D":
-    case "1073D":
     case "1075D":
     case "1077D":
-    case "1079D":
     case "1053D":
       return {
         type: "LTDEXP",
@@ -415,11 +439,15 @@ export const customTrainDataDetector = (TrainNumber) => {
     case "1066D":
     case "1068D":
     case "1072D":
+    case "1078D":
     case "1055D":
     case "1057D":
     case "1061D":
     case "1063D":
     case "1067D":
+    case "1069D":
+    case "1073D":
+    case "1079D":
     case "1081D":
       return {
         type: "LTDEXP",
@@ -430,13 +458,9 @@ export const customTrainDataDetector = (TrainNumber) => {
       };
     //しまんと
     case "2002D":
-    case "2004D":
-    case "2006D":
     case "2008D":
     case "2001D":
-    case "2003D":
     case "2005D":
-    case "2007D":
       return {
         type: "LTDEXP",
         trainName: "しまんと",
@@ -444,6 +468,17 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainNumDistance: 2000,
         info: "2700系で運転",
       };
+    case "2004D":
+    case "2006D":
+    case "2003D":
+    case "2007D":
+      return {
+        type: "LTDEXP",
+        trainName: "しまんと",
+        trainIcon: "http://www.trainfrontview.net/b/s2700_smn.png",
+        trainNumDistance: 2000,
+        info: "南風と併結 / 2700系で運転",
+      };
 
     //あしずり 2000
     case "2074D":
@@ -537,10 +572,10 @@ export const customTrainDataDetector = (TrainNumber) => {
       };
 
     //伊予灘ものがたり
-    case "8901D":
-    case "8903D":
-    case "8902D":
-    case "8904D":
+    case "8091D":
+    case "8093D":
+    case "8092D":
+    case "8094D":
       return {
         type: "LTDEXP",
         trainName: "伊予灘ものがたり",
diff --git a/config/newsUpdate.js b/config/newsUpdate.js
index c807ca8..50d9ba0 100644
--- a/config/newsUpdate.js
+++ b/config/newsUpdate.js
@@ -1 +1 @@
-export const news = "2022-9-30";
+export const news = "2023-3-27";