Merge commit 'a785508b45aa296454cf19f5c95892703cdfaa6c' into develop

lib/webViewInjectjavascript.ts

@@ -26,21 +26,19 @@ export const injectJavascriptData: InjectJavascriptData = (
       document.querySelector('#headerStr').style.display = 'none';
       `;
 
-  // 何これ
+  // 上部ヘッダーの取り扱い、自動再読み込み、setStringsの実行
   const bootData = `
     const setReload = () =>{
       try{
         document.getElementById('refreshIcon').click();
         setStrings();
-      }catch{
-
-      }
+      }catch(error){}
       setTimeout(setReload, 10000);
     }
     setReload();
   `;
   // 左か右かを判定してアイコンを設置する
-  const trainIconMaker = `
+  const trainIcon = `
     const setStationIcon = (setIconElem,img) =>{
       if(setIconElem.getAttribute("style").includes("left")){
         setIconElem.insertAdjacentHTML('beforebegin', "<img src="+img+" style='float:left;height:20px;'>");
@@ -50,11 +48,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       }
       setIconElem.remove();
     }
-  `;
-
-  const trainIcon =
-    iconSetting == "true"
-      ? `
+    const setTrainIcon = (列番データ,e) =>{
       switch(列番データ){
       //しおかぜメイン
       //8000 ノーマル
@@ -76,14 +70,14 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "25M":
       case "27M":
       case "29M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8000nr.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8000nr.png');
         break;
       //8000 アンパン
       case "10M":
       case "22M":
       case "9M":
       case "21M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8000ap.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8000ap.png');
         break;
 
 
@@ -96,7 +90,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "11M":
       case "19M":
       case "23M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8600.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8600.png');
         break;
 
       //いしづちメイン
@@ -119,7 +113,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "1025M":
       case "1027M":
       case "1029M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8000no.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8000no.png');
         break;
 
       //8000 アンパン
@@ -127,7 +121,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "1022M":
       case "1009M":
       case "1021M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8000ap.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8000ap.png');
         break;
 
       //8600
@@ -139,29 +133,29 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "1011M":
       case "1019M":
       case "1023M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8600_isz.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8600_isz.png');
         break;
 
       //MEXP
       //8000
       case "1092M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8000nr.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8000nr.png');
         break;
       //8600
       case "1091M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8600_isz.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8600_isz.png');
         break;
       //三桁いしづち
       //8000 アンパン
       case "1041M":
       case "1044M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8000ap.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8000ap.png');
         break;
       //8600
       case "1043M":
       case "1042M":
       case "1046M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s8600_isz.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s8600_isz.png');
         break;
 
 
@@ -184,7 +178,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "51D":
       case "53D":
       case "55D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2700.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700.png');
         break;
       //2700アンパン
       case "32D":
@@ -197,7 +191,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "45D":
       case "49D":
       case "57D":
-      setStationIcon(element.querySelector("img"),'https://n8n.haruk.in/webhook/dosan-anpanman-pictures.png?trainNum='+列番データ);
+        setStationIcon(e.querySelector("img"),'https://n8n.haruk.in/webhook/dosan-anpanman-pictures.png?trainNum='+列番データ);
         break;
 
 
@@ -217,7 +211,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "3007D":
       case "3025D":
       case "3031D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2700_uzu.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700_uzu.png');
         break;
 
       //2700 二両編成
@@ -230,7 +224,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "3017D":
       case "3019D":
       case "3023D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2700_uzu.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700_uzu.png');
         break;
 
       //2600
@@ -244,13 +238,13 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "3021D":
       case "3027D":
       case "3033D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2600.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2600.png');
         break;
 
       //キハ185
       case "3001D":
       case "3008D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185tu_uzu.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185tu_uzu.png');
         break;
         
       //マリンライナー
@@ -322,14 +316,14 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "3167M":
       case "3169M":
       case "3175M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s5001.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s5001.png');
         break;
       case "3102M":
       case "3101M":
       case "3103M":
       case "3171M":
       case "3173M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s5001k.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s5001k.png');
         break;
 
       //サンライズ瀬戸
@@ -337,7 +331,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "5031M":
       case "8041M": //琴平延長高松迄
       case "8031M": //琴平延長高松以降
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/w285.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/w285.png');
         break;
 
       //宇和海
@@ -366,7 +360,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "1075D":
       case "1077D":
       case "1079D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2000_uwa.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2000_uwa.png');
       break;
       //2000 アンパン込み
       case "1054D":
@@ -377,7 +371,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "1061D":
       case "1067D":
       case "1081D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2002a.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2002a.png');
       break;
       //しまんと
       case "2002D":
@@ -388,7 +382,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "2003D":
       case "2005D":
       case "2007D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2700_smn.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700_smn.png');
       break;
 
       //あしずり 2000
@@ -400,7 +394,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "2073D":
       case "2079D":
       case "2081D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2000_asi.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2000_asi.png');
       break;
 
       //あしずり 2700
@@ -411,7 +405,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "2077D":
       case "2072D":
       case "2083D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s2700_asi.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700_asi.png');
       break;
       //剣山
       case "4002D":
@@ -425,19 +419,19 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "4007D":
       case "4009D":
       case "4011D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185tu.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185tu.png');
       break;
       //むろと
       case "8051D":
       case "8052D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185_mrt.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185_mrt.png');
       break;
 
 
       //よしのがわトロッコ
       case "8452D":
       case "8451D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185to_ai.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185to_ai.png');
       break;
 
       //岡山高松アントロ
@@ -446,14 +440,14 @@ export const injectJavascriptData: InjectJavascriptData = (
       //岡山琴平アントロ
       case "8277D":
       case "8278D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s32to4.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32to4.png');
       break;
 
 
       //千年ものがたり
       case "8021D":
       case "8022D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185mm1.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185mm1.png');
       break;
 
       //夜明けものがたり
@@ -461,18 +455,18 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "8083D":
       case "8073D":
       case "8074D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185ym1.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185ym1.png');
       break;
       //ラマルドボア
       case "9253M":
       case "9256M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/w213w.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/w213w.png');
         break;
 
       // 貨物
       case "74":
       case "75":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/ef65_rp0.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/ef65_rp0.png');
         break;
       case "70":
       case "71":
@@ -490,7 +484,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "8071":
       case "8072":
       case "8077":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/ef210a.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/ef210a.png');
         break;
 
       // 普通列車系統、6000系運用
@@ -506,7 +500,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "147M":
       //962運用
       case "114M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s6000p.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s6000p.png');
         break;
 
 
@@ -514,31 +508,31 @@ export const injectJavascriptData: InjectJavascriptData = (
       // ごな線
       case "5851D": //219D併結 [ToDo: 219Dとの分割対策]
       case "5854D": 
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/tosa9640jgr.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640jgr.png');
         break;
       
         //JR車両乗り入れ運用
       case "5858D": 
       case "5869D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1000.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
         break;
       //併結運用の併結される側  [ToDo: 分割対策]
       case "5845D":
       case "5851D":
       case "5818D":
       case "5820D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/tosa9640.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640.png');
         break;
       // 土讃線単体列車のキハ32運用
       case "715D":
       case "718D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s32ns.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32ns.png');
         break;
       
       // サンライズに伴う気動車代走
       case "6219D":
       case "6222D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1000.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
         break;
       // それ以外の土讃線ごな線直通列車
       case "5811D":
@@ -567,7 +561,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "5876D":
       case "5880D":
       case "5882D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/tosa9640.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640.png');
         break;
       // それ以外の土讃線普通列車(1000)
       case "4210D":
@@ -688,7 +682,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "757D":
       case "761D":
         
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1000.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
         break;
       // 予讃線/土讃線普通列車運用(7000,7200)
       // 下り列車(伊予西条-松山は全て7000系)
@@ -742,7 +736,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "155M":
       case "1263M":
       case "157M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7200.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
         break;
         // 下り7000系
       case "101M":
@@ -754,7 +748,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "555M":
       case "4565M":
       case "159M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7000.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
         break;
         // 上り列車 7200系
       case "5102M":
@@ -808,7 +802,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "1606M":
       case "5160M":
       case "5256M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7200.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
         break;
       // 上り7000系
       case "114M":
@@ -819,7 +813,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "4542M":
       case "162M":
       case "4166M":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7000.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
         break;
       // 松山界隈気動車運用
       // 上り下りの概念アリ
@@ -842,28 +836,28 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "4824D":
       case "4813D":
       case "4664D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s32s.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32s.png');
         break;
       // 河童うようよ号偶数
       case "4816D":
       case "4830D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s32kpuy2.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32kpuy2.png');
         break;
       // 河童うようよ号奇数
       case "4827D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s32kpuy1.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32kpuy1.png');
         break;
       // 新幹線偶数
       case "4810D":
       case "4822D":
       case "4826D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s32tht.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32tht.png');
         break;
       // 新幹線奇数
       case "4817D":
       case "4823D":
       case "4829D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s32thtk.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32thtk.png');
         break;
       // キハ54 通常運用
       case "4632D":
@@ -906,29 +900,29 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "4922D":
       case "4923D":
       case "4663D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s54s.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s54s.png');
         break;
       // 54しまんとろっこ
       case "4623D":
       case "8814D":
       case "8819D":
       case "4662D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s54to0ys.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s54to0ys.png');
         break;
       // キハ185 通常運用
       case "911D":
       case "628D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185cm.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185cm.png');
         break;
       // 伊予灘ものがたり 赤
       case "8091D":
       case "8093D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185iyor.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185iyor.png');
         break;
       // 伊予灘ものがたり 黄
       case "8092D":
       case "8094D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s185iyoy.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185iyoy.png');
         break;
       // 高徳線、徳島線、牟岐線、鳴門線普通列車系統
       // キハ40・47
@@ -955,7 +949,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "976D":
       case "980D":
       case "982D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s40.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s40.png');
         break;
       // 1000形
       case "4309D":
@@ -968,7 +962,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "473D":
       case "450D":
       case "480D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1000.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
         break;
       // 1200形
       case "4301D":
@@ -1016,117 +1010,154 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "4962D":
       case "4966D":
       case "4978D":
-      setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1200n.png');
+        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1200n.png');
         break;
 
         
       default: //指定車両でなく、Regexでの指定に移動
           // 琴平直通系普通電車  
         if(new RegExp(/^(1|4|5)2\\d\\dM$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7200.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
           break;
         }
         else if(new RegExp(/^(1|4|5)(1|5|6)\\d\\dM$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7000.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
           break;
         }
         else if(new RegExp(/^(1|5|6)\\d\\dM$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7000.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
           break;
         }// 高徳線 普通列車系統
         else if(new RegExp(/^(4|5)3\\d\\dD$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1500.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
           break;
         }
         else if(new RegExp(/^3\\d\\dD$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1500.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
           break;
         }// 徳島線 普通列車系統
         else if(new RegExp(/^(4|5)4\\d\\dD$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1500.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
           break;
         }
         else if(new RegExp(/^4\\d\\dD$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1500.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
           break;
         }// 鳴門線普通列車系統
         else if(new RegExp(/^(4|5)9(5|6|7|8)\\dD$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1500.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
           break;
         }
         else if(new RegExp(/^9(5|6|7|8)\\dD$/).test(列番データ)){
-        setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s1500.png');
+          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
           break;
         }
         // 牟岐線普通列車系統 一旦閉鎖
         // else if(new RegExp(/^(4|5)5\\d\\dD$/).test(列番データ)){
-      //   setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7200.png');
+        //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
         //   break;
         // }
         // else if(new RegExp(/^5\\d\\dD$/).test(列番データ)){
-      //   setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7000.png');
+        //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
         //   break;
         // }
         break;
       }
-    `
-      : ``;
+    }
+    `;
 
   const normal_train_name = `
+  const nameReplace = (列車名データ,列番データ,行き先情報) =>{
+    let isWanman = false;
+    let trainName = "";
+    let viaData = "";
+    let ToData = "";
+    let TrainNumber = 列番データ;
+    try{
+      const diagram = trainTimeInfo[列番データ];
+      if(diagram){
+        const diagramData = diagram.split("#");
+        ToData = diagramData[diagramData.length - 2].split(",")[0];
+      }
+
+    }catch(e){}
+    if(列車名データ.split(":")[1]){
+      const textBase = 列車名データ.split(":")[1].replace("\\r","");
+      
+      trainName = textBase;
+    }
     if(列車名データ.match("サンポート")){
-      const textBase = 列車名データ.split(":")[1];
+      const textBase = 列車名データ.split(":")[1].replace("\\r","");
       行き先情報.innerText = textBase+行き先情報.innerText;
+      trainName = textBase;
     }
     if(new RegExp(/^4[1-9]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^5[1-7]\\d\\d[DM]$/).test(列番データ) || 列番データ ==="3621D"){
       行き先情報.innerText = "ワンマン\\n"+行き先情報.innerText;
       flag=true;
+      isWanman = true;
     }
     if(new RegExp(/^49[0-4]\\dD$/).test(列番データ) || new RegExp(/^9[0-4]\\dD$/).test(列番データ)){
       行き先情報.innerText = "(海経由)"+(flag ? "" : "\\n")+行き先情報.innerText;
+      viaData = "(海経由)";
     }
     if(new RegExp(/^46\\d\\dD$/).test(列番データ) || new RegExp(/^6\\d\\dD$/).test(列番データ)){
       行き先情報.innerText = "(内子経由)"+(flag ? "" : "\\n")+行き先情報.innerText;
+      viaData = "(内子経由)";
     }
     if(列番データ.indexOf("H") != -1){
       行き先情報.innerText = 行き先情報.innerText+"試運転\\n";
+      trainName = "試運転";
     }
     else if(列番データ.indexOf("R") != -1){
       行き先情報.innerText = 行き先情報.innerText+"回送\\n";
+      trainName = "回送";
     }
     else if(列番データ.indexOf("S") != -1){
       行き先情報.innerText = 行き先情報.innerText+"臨時列車\\n";
+      trainName = "臨時列車";
     }
-  `;
-  const JRF_name = `
+
     let JRF = false;
     const getJRF = num =>{
       switch(num){
         case "71":
+          trainName = "東京(タ)→高松(タ)";
           return "東京(タ)→高松(タ)"+"\\n";
         case "73":
         case "75":
+          trainName = "大阪(タ)→高松(タ)";
           return "大阪(タ)→高松(タ)"+"\\n";
         case "3079":
+          trainName = "高松(タ)→伊予三島";
           return "高松(タ)→伊予三島"+"\\n";
         case "3071":
         case "3077":
+          trainName = "高松(タ)→新居浜";
           return "高松(タ)→新居浜"+"\\n";
         case "3073":
+          trainName = "高松(タ)→松山貨物";
           return "高松(タ)→松山貨物"+"\\n";
         case "70":
+          trainName = "高松(タ)→東京(タ)";
           return "高松(タ)→東京(タ)"+"\\n";
         case "74":
         case "76":
+          trainName = "高松(タ)→大阪(タ)";
           return "高松(タ)→大阪(タ)"+"\\n";
         case "3078":
+          trainName = "伊予三島→高松(タ)";
           return "伊予三島→高松(タ)"+"\\n";
         case "3070":
+          trainName = "新居浜→高松(タ)";
           return "新居浜→高松(タ)"+"\\n";
         case "3076":
+          trainName = "新居浜→高松(タ)";
           return "新居浜→高松(タ)"+"\\n";
         case "3072":
+          trainName = "松山貨物→高松(タ)";
           return "松山貨物→高松(タ)"+"\\n";
         case "9070":
+          trainName = "臨時貨物";
           return "臨時貨物"+"\\n";
         default:
           JRF = true;
@@ -1136,9 +1167,6 @@ const getJRF = num =>{
     const data = getJRF(列番データ);
     行き先情報.innerText = data != null ?  data+行き先情報.innerText : 行き先情報.innerText;
 
-`;
-
-  const Other_Name = `
     const getThrew = num =>{
     
       switch(num){
@@ -1146,56 +1174,92 @@ const data = getJRF(列番データ);
       case "351D":
       case "468D":
       case "484D":
+        viaData = "牟岐線直通";
+        ToData = "牟岐";
         return "牟岐線直通\\n牟岐行";
       case "951D":
+        viaData = "牟岐線直通";
+        ToData = "桑野";
         return "牟岐線直通\\n桑野行";
       case "4430D":
       case "4472D":
+        viaData = "牟岐線直通";
+        isWanman = true;
+        ToData = "牟岐";
         return "牟岐線直通\\nワンマン 牟岐行";
       case "434D":
       case "474D":
       case "478D":
       case "480D":
+        viaData = "牟岐線直通";
+        ToData = "阿南";
         return "牟岐線直通\\n阿南行";
       case "5444D":
       case "4452D":
       case "4458D":
       case "4460D":
       case "4466D":
+        viaData = "牟岐線直通";
+        isWanman = true;
+        ToData = "阿南";
         return "牟岐線直通\\nワンマン 阿南行";
       case "4464D":
+        viaData = "牟岐線直通";
+        isWanman = true;
+        ToData = "阿波海南"
         return "牟岐線直通\\nワンマン 阿波海南行";
       
       //安芸行と併結列車を個別に表示、それ以外をdefaultで下りなら既定の行き先を、上りなら奈半利行を設定
       case "5814D":
       case "5816D":
+        viaData = "ごめん・なはり線[快速]";
+        ToData = "奈半利";
         return "ごめん・なはり線直通\\n快速 奈半利行";
       case "5812D":
+        viaData = "ごめん・なはり線[快速]";
+        ToData = "安芸";
         return "ごめん・なはり線直通\\n快速 安芸行";
       case "5874D":
       case "5882D":
       case "5878D":
+        viaData = "ごめん・なはり線[各停]";
+        ToData = "安芸";
         return "ごめん・なはり線直通\\n各停 安芸行";
       case "246D":
       case "750D":
+        viaData = "ごめん・なはり線[快速]";
+        ToData = "(後免にて解結)土佐山田/奈半利";
         return "土佐山田/奈半利行\\n(後免にて解結)\\nごめん・なはり線快速";
       default:
         if(new RegExp(/^58[1-3][1,3,5,7,9][DM]$/).test(列番データ)){
+          viaData = "ごめん・なはり線[快速]";
           return "ごめん・なはり線直通\\n快速 "+行き先情報.innerText;
         }
         else if(new RegExp(/^58[4-9][1,3,5,7,9][DM]$/).test(列番データ)){
+          viaData = "ごめん・なはり線[各停]";
           return "ごめん・なはり線直通\\n各停 "+行き先情報.innerText;
         }
         else if(new RegExp(/^58[3-4][0,2,4,6,8][DM]$/).test(列番データ)){
+          viaData = "ごめん・なはり線[快速]";
+          ToData = "奈半利";
           return "ごめん・なはり線直通\\n快速 奈半利行";
         }
         else if(new RegExp(/^58[5-9][0,2,4,6,8][DM]$/).test(列番データ)){
+          viaData = "ごめん・なはり線[各停]";
+          ToData = "奈半利";
           return "ごめん・なはり線直通\\n各停 奈半利行";
         }
       }
     }
     行き先情報.innerText = getThrew(列番データ) || 行き先情報.innerText;
-
+    //列番付与
+    行き先情報.innerText = 行き先情報.innerText+列番データ+(JRF ? "":"レ");
+    const returnText1 = (isWanman ? "ワンマン " : "") + trainName + viaData;
+    const returnText2 = (ToData ? ToData+"行 " : ToData)+ TrainNumber;
+    行き先情報.innerText = "";
+    行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;'>" + returnText1 + "</p>");
+    行き先情報.insertAdjacentHTML('beforebegin', "<div style='display:inline-flex;flex-direction:row;'><p style='font-size:10px;font-weight: bold;padding:0;'>" + (ToData ? ToData + "行 " : ToData) + "</p><p style='font-size:10px;padding:0;'>" + TrainNumber + (JRF ? "":"レ") + "</p></div>");
+  }
   `;
 
   const textInsert =
@@ -1205,24 +1269,18 @@ const setStrings = () =>{
   try {
     const elements = document.querySelectorAll('#disp > div > div > div[onclick]');
     for (let element of elements) {
-      if(!element.getAttribute('offclick')){
+      if(element.getAttribute('offclick')){ continue; }
       element.setAttribute('offclick',element.getAttribute('onclick'))
-      }
+      
       var 行き先情報 = element.getElementsByTagName("p")[0];
       var 列番データ = element.getAttribute('offclick').split('"')[1];
       var 列車名データ = element.getAttribute('offclick').split('"')[3];
       var flag=false;
       var TrainType = undefined;
       setTrainMenuDialog(element)
-      if(行き先情報.innerText.includes(列番データ))continue; //回避
-      ` +
-    trainIcon +
-    normal_train_name +
-    JRF_name +
-    Other_Name +
-    `
-      //列番付与
-      行き先情報.innerText = 行き先情報.innerText+列番データ+(JRF ? "":"レ");
+     
+      ${iconSetting == "true" ? "setTrainIcon(列番データ,element);" : ""}
+      nameReplace(列車名データ,列番データ,行き先情報); 
     }
     try{
       for(let d of document.getElementById('disp').childNodes){
@@ -1319,16 +1377,14 @@ textInsert.observe(document.getElementById('disp'), {
 });
 `;
 
+// 列車メニュー表示の起動用スクリプト
   const makeTrainView = `
-
     const makeTrainView = new MutationObserver( (mutations) => {
-
       for(let d of modal_content.getElementsByTagName("button") ){
         const data = d.onclick.toString().split("\\"")[1];
         d.onclick = () => window.ReactNativeWebView.postMessage(data)
       }
     });
-
     // 監視を開始
     makeTrainView.observe(document.getElementById('modal_content'), {
       //attributes: true, // 属性変化の監視
@@ -1415,8 +1471,9 @@ setStationMenuDialog.observe(document.querySelector('#disp'), {
   return (
     bootData +
     topMenu +
+    trainIcon +
+    normal_train_name +
     makeTrainView +
-    trainIconMaker +
     makeTrainMenu +
     textInsert +
     makeStationMenu