Merge commit 'c3646a97d4f2d6cb70de5b4c629bf99131cffe88' into develop

components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx

@@ -56,28 +56,32 @@ export const HeaderText: FC<Props> = ({
       );
       const [type, fontAvailable, isOneMan] = (() => {
         switch (customTrainData.type) {
-          case "LTDEXP":
-            return ["特急", true, false];
-          case "Rapid":
-            return ["快速", true, false];
           case "Normal":
             return ["普通", true, false];
-          case "OneManRapid":
-            return ["快速", true, true];
           case "OneMan":
             return ["普通", true, true];
+          case "Rapid":
+            return ["快速", true, false];
+          case "OneManRapid":
+            return ["快速", true, true];
+          case "LTDEXP":
+            return ["特急", true, false];
           case "NightLTDEXP":
             return ["特急", true, false];
           case "SPCL":
-            return ["臨時", false, false];
+            return ["臨時", true, false];
-          case "SPCL_EXP":
-            return ["臨時特急", false, false];
-          case "SPCL_Rapid":
-            return ["臨時快速", true, false];
           case "SPCL_Normal":
             return ["臨時", true, false];
+          case "SPCL_Rapid":
+            return ["臨時快速", true, false];
+          case "SPCL_EXP":
+            return ["臨時特急", true, false];
           case "Freight":
             return ["貨物", false, false];
+          case "Forwarding":
+            return ["回送", false, false];
+          case "FreightForwarding":
+            return ["単機回送", false, false];
           case "Other":
             switch (true) {
               case !!trainNum.includes("T"):

lib/getTrainType.ts

@@ -13,6 +13,8 @@ type trainTypeString =
   | "臨時"
   | "普通列車"
   | "普通列車(ワンマン)"
+  | "臨時快速"
+  | "臨時特急"
   | "その他";
 type trainTypeDataString = "rapid" | "express" | "normal";
 type getTrainType = (d: nameString) => {
@@ -22,6 +24,10 @@ type getTrainType = (d: nameString) => {
 };
 export const getTrainType: getTrainType = (nameString) => {
   switch (nameString) {
+    case "Normal":
+      return { color: "white", name: "普通列車", data: "normal" };
+    case "OneMan":
+      return { color: "white", name: "普通列車(ワンマン)", data: "normal" };
     case "Rapid":
     case "OneManRapid":
       return { color: "aqua", name: "快速", data: "rapid" };
@@ -30,14 +36,12 @@ export const getTrainType: getTrainType = (nameString) => {
     case "NightLTDEXP":
       return { color: "pink", name: "寝台特急", data: "express" };
     case "SPCL":
-    case "SPCL_Rapid":
-    case "SPCL_EXP":
     case "SPCL_Normal":
       return { color: "#297bff", name: "臨時", data: "normal" };
-    case "OneMan":
+    case "SPCL_Rapid":
-      return { color: "white", name: "普通列車(ワンマン)", data: "normal" };
+      return { color: "#297bff", name: "臨時快速", data: "normal" };
-    case "Normal":
+    case "SPCL_EXP":
-      return { color: "white", name: "普通列車", data: "normal" };
+      return { color: "#297bff", name: "臨時特急", data: "normal" };
     default:
       return { color: "white", name: "その他", data: "normal" };
   }

lib/webViewInjectjavascript.ts

@@ -1274,30 +1274,37 @@ export const injectJavascriptData: InjectJavascriptData = (
           case "OneMan":
             trainTypeColor = "black";
             return "普通";
-          case "Freight":
+          case "Rapid":
-            trainTypeColor = "black";
+            trainTypeColor = "rgba(0, 140, 255, 1)";
-            return "貨物";
+            return "快速";
-          case "SPCL_Normal":
+          case "OneManRapid":
-            trainTypeColor = "#297bff";
+            trainTypeColor = "rgba(0, 140, 255, 1)";
-            return "臨時";
+            return "快速";
-          case "SPCL_Rapid":
-            trainTypeColor = "#297bff";
-            return "臨時快速";
-          case "SPCL_LTDEXP":
-            trainTypeColor = "#297bff";
-            return "臨時特急";
           case "LTDEXP":
             trainTypeColor = "red";
             return "特急";
           case "NightLTDEXP":
-            trainTypeColor = "rgb(211, 0, 176)";
+            trainTypeColor = "#d300b0ff";
             return "寝台特急";
-          case "OneManRapid":
+          case "SPCL":
-            trainTypeColor = "rgba(0, 140, 255, 1)";
+          case "SPCL_Normal":
-            return "快速";
+            trainTypeColor = "#000000ff";
-          case "Rapid":
+            return "臨時";
-            trainTypeColor = "rgba(0, 140, 255, 1)";
+          case "SPCL_Rapid":
-            return "快速";
+            trainTypeColor = "rgba(0, 81, 255, 1)";
+            return "臨時快速";
+          case "SPCL_EXP":
+            trainTypeColor = "#a52e2eff";
+            return "臨時特急";
+          case "Freight":
+            trainTypeColor = "#00869ecc";
+            return "貨物";
+          case "Forwarding":
+            trainTypeColor = "black";
+            return "回送";
+          case "FreightForwarding":
+            trainTypeColor = "black";
+            return "単機回送";
           default:
             return "";
         }
@@ -1337,11 +1344,27 @@ export const injectJavascriptData: InjectJavascriptData = (
         getColors = stationLines.map(e => GetLineBarColor(e));
       }
       let yosan2Color = undefined;
-      if(viaData == "(内子経由)"){
+      switch(viaData){
-        yosan2Color ="#F5AC13";
+        case "(内子経由)":
-      }
+          yosan2Color = "#F5AC13";
-      else if(viaData == "(海経由)"){
+          break;
-        yosan2Color = "#9AA7D7";
+        case "(海経由)":
+          yosan2Color = "#9AA7D7";
+          break;
+        case "牟岐線直通":
+          yosan2Color = "#00b8bb";
+          break;
+        case "徳島線直通":
+          yosan2Color = "#2d506e";
+          break;
+        case "高徳線直通":
+          yosan2Color = "#87CA3B";
+          break;
+        case "鳴門線直通":
+          yosan2Color = "#881F61";
+          break;
+        default:
+          break;
       }
 
       const gradient = getColors.length > 1 ? "linear-gradient(130deg, " + getColors[0] + " 0%, "+ getColors[0]+"50%, "+ getColors[1]+"50%, " + getColors[1] + " 100%)" : getColors[0];
@@ -1359,17 +1382,63 @@ export const injectJavascriptData: InjectJavascriptData = (
     `
 
 
-const setNewTrainItem = (element,hasProblem)=>{
+const setNewTrainItem = (element,hasProblem,type)=>{
   var 列番データ = element.getAttribute('offclick').split('"')[1];
   const JRFTemp = getJRF(列番データ);
-  if(element.getAttribute('offclick').includes("express")){
+  if(trainDataList.find(e => e.id === 列番データ) !== undefined){
-    element.style.borderColor = 'rgba(255, 0, 0, 1)';
+    const data = trainDataList.find(e => e.id === 列番データ);
-  }else if(element.getAttribute('offclick').includes("rapid")){
+    switch (data.type) {
-    element.style.borderColor = 'rgba(0, 140, 255, 1)';
+      case "Normal":
-  }else if(JRFTemp){
+        element.style.borderColor = "black";
-    element.style.borderColor = 'rgba(0, 134, 158, 0.8)';
+        break;
+      case "OneMan":
+        element.style.borderColor = "black";
+        break;
+      case "Rapid":
+        element.style.borderColor = "rgba(0, 140, 255, 1)";
+        break;
+      case "OneManRapid":
+        element.style.borderColor = "rgba(0, 140, 255, 1)";
+        break;
+      case "LTDEXP":
+        element.style.borderColor = "red";
+        break;
+      case "NightLTDEXP":
+        element.style.borderColor = "#d300b0ff";
+        break;
+      case "SPCL":
+      case "SPCL_Normal":
+        element.style.borderColor = "#000000ff";
+        break;
+      case "SPCL_Rapid":
+        element.style.borderColor = "rgba(0, 81, 255, 1)";
+        break;
+      case "SPCL_EXP":
+        element.style.borderColor = "#a52e2eff";
+        break;
+      case "Freight":
+        element.style.borderColor = "#00869ecc";
+        break;
+      case "Forwarding":
+        element.style.borderColor = "black";
+        break;
+      case "FreightForwarding":
+        element.style.borderColor = "black";
+        break;
+      default:
+        element.style.borderColor = 'black';
+        break;
+    }
   }else{
-    element.style.borderColor = 'black';
+    if(element.getAttribute('offclick').includes("express")){
+      element.style.borderColor = '#ff0000ff';
+    }else if(element.getAttribute('offclick').includes("rapid")){
+      element.style.borderColor = '#008cffff';
+    }else if(JRFTemp){
+      element.style.borderColor = '#00869ecc';
+    }else{
+      element.style.borderColor = 'black';
+    }
   }
   element.style.borderWidth = '2px';
   element.style.borderStyle = 'solid';

stateBox/useBusAndTrainData.js

@@ -101,9 +101,6 @@ export const BusAndTrainDataProvider = ({ children }) => {
       case "4452D":
         returnArray.push("4545D");
         break;
-      case "4456D":
-        returnArray.push("4549D");
-        break;
       case "4466D":
         returnArray.push("561D");
         break;
@@ -144,9 +141,6 @@ export const BusAndTrainDataProvider = ({ children }) => {
       case "4545D":
         returnArray.push("4452D");
         break;
-      case "4549D":
-        returnArray.push("4456D");
-        break;
       case "561D":
         returnArray.push("4466D");
         break;
@@ -278,6 +272,12 @@ export const BusAndTrainDataProvider = ({ children }) => {
       case "4368D":
         returnArray.push("576D");
         break;
+      case "3710D":
+        returnArray.push("710D");
+        break;
+      case "710D":
+        returnArray.push("3710D");
+        break;
     }
     if (new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum)) {
       if (allTrainDiagram["5" + trainNum.substring(1)])