貨物の表示を追加

lib/webViewInjectjavascript.ts

@@ -1000,6 +1000,39 @@ export const injectJavascriptData: InjectJavascriptData = (
     `;
 
   const normal_train_name = `
+  const getJRF = num =>{
+    switch(num){
+      case "71":
+        return "東京(タ)→高松(タ)";
+      case "73":
+      case "75":
+        return "大阪(タ)→高松(タ)";
+      case "3079":
+        return "高松(タ)→伊予三島";
+      case "3071":
+      case "3077":
+        return "高松(タ)→新居浜";
+      case "3073":
+        return "高松(タ)→松山貨物";
+      case "70":
+        return "高松(タ)→東京(タ)";
+      case "74":
+      case "76":
+        return "高松(タ)→大阪(タ)";
+      case "3078":
+        return "伊予三島→高松(タ)";
+      case "3070":
+        return "新居浜→高松(タ)";
+      case "3076":
+        return "新居浜→高松(タ)";
+      case "3072":
+        return "松山貨物→高松(タ)";
+      case "9070":
+        return "臨時貨物";
+      default:
+        return undefined;
+    }
+  }
   const nameReplace = (列車名データ,列番データ,行き先情報,hasProblem) =>{
     let isWanman = false;
     let trainName = "";
@@ -1055,37 +1088,6 @@ export const injectJavascriptData: InjectJavascriptData = (
     }
 
 
-    const getJRF = num =>{
-      switch(num){
-        case "71":
-          return "東京(タ)→高松(タ)";
-        case "73":
-        case "75":
-          return "大阪(タ)→高松(タ)";
-        case "3079":
-          return "高松(タ)→伊予三島";
-        case "3071":
-        case "3077":
-          return "高松(タ)→新居浜";
-        case "3073":
-          return "高松(タ)→松山貨物";
-        case "70":
-          return "高松(タ)→東京(タ)";
-        case "74":
-        case "76":
-          return "高松(タ)→大阪(タ)";
-        case "3078":
-          return "伊予三島→高松(タ)";
-        case "3070":
-          return "新居浜→高松(タ)";
-        case "3076":
-          return "新居浜→高松(タ)";
-        case "3072":
-          return "松山貨物→高松(タ)";
-        case "9070":
-          return "臨時貨物";
-      }
-    }
     let JRF = true;
     const JRFTemp = getJRF(列番データ);
 
@@ -1259,11 +1261,11 @@ export const injectJavascriptData: InjectJavascriptData = (
     const returnText2 = (ToData ? ToData+"行 " : ToData)+ TrainNumber;
     行き先情報.innerText = "";
     ${uiSetting === "tokyo" ? `
-      行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;color:black;text-align:center;'>" + (ToData ? ToData + "行 " : ToData) + "</p>");
-      行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:8px;font-weight:bold;padding:0;color: black;text-align:center;'>" + (isWanman ? "ワンマン " : "")  + "</p>");
-      行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:8px;font-weight:bold;padding:0;color: black;text-align:center;'>" + trainName + "</p>");
-      行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:6px;font-weight:bold;padding:0;color: black;text-align:center;'>" + viaData + "</p>");
       行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:6px;padding:0;color:black;text-align:center;'>" + TrainNumber + (JRF ? "":"レ") + "</p>");
+      行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:8px;font-weight:bold;padding:0;color: black;text-align:center;'>" + (isWanman ? "ワンマン " : "")  + "</p>");
+      行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:6px;font-weight:bold;padding:0;color: black;text-align:center;'>" + viaData + "</p>");
+      行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:8px;font-weight:bold;padding:0;color: black;text-align:center;'>" + trainName + "</p>");
+      行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;color:black;text-align:center;'>" + (ToData ? ToData + "行 " : ToData) + "</p>");
       行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:8px;font-weight:bold;padding:0;text-align:center;color: "+(hasProblem ? "red":"black")+";'>" + (hasProblem ? "‼️停止中‼️" : "") + "</p>");
       `: `
       行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;color: black;'>" + returnText1 + "</p>");
@@ -1278,23 +1280,27 @@ export const injectJavascriptData: InjectJavascriptData = (
 
 
 const setNewTrainItem = (element,hasProblem)=>{
+  var 列番データ = element.getAttribute('offclick').split('"')[1];
+  const JRFTemp = getJRF(列番データ);
   if(element.getAttribute('offclick').includes("express")){
     element.style.borderColor = 'rgba(255, 0, 0, 1)';
   }else if(element.getAttribute('offclick').includes("rapid")){
     element.style.borderColor = 'rgba(0, 140, 255, 1)';
-  }else {
+  }else if(JRFTemp){
+    element.style.borderColor = 'rgba(0, 134, 158, 0.8)';
+  }else{
     element.style.borderColor = 'white';
   }
   element.style.borderWidth = '2px';
   element.style.borderStyle = 'solid';
   element.style.borderRadius = '10%';
-  var 列番データ = element.getAttribute('offclick').split('"')[1];
   switch(true){
     case 列番データ.indexOf("H") != -1:
     case 列番データ.indexOf("R") != -1:
     case 列番データ.indexOf("E") != -1:
     case 列番データ.indexOf("A") != -1:
     case 列番データ.indexOf("B") != -1:
+    case !!JRFTemp:
       element.style.backgroundColor = 'rgba(199, 199, 199, 0.8)';
       break;
     default: