Merge commit '45500e7a4ae614debd93404339958465db88f71d'

This commit is contained in:
harukin-expo-dev-env 2025-03-19 15:49:36 +00:00
commit ff7a5624e6
4 changed files with 80 additions and 46 deletions

View File

@ -921,4 +921,9 @@
"581D":"徳島,発,20:30#阿波富田,発,20:33#二軒屋,発,20:36#文化の森,発,20:39#地蔵橋,発,20:42#中田,発,20:47#南小松島,発,20:51#阿波赤石,発,20:55#立江,発,20:58#羽ノ浦,発,21:07#西原,発,21:10#阿波中島,発,21:14#阿南,着,21:18#",
"583D":"徳島,発,21:30#阿波富田,発,21:33#二軒屋,発,21:36#文化の森,発,21:38#地蔵橋,発,21:42#中田,発,21:46#南小松島,発,21:50#阿波赤石,発,21:54#立江,発,21:57#羽ノ浦,発,22:14#西原,発,22:17#阿波中島,発,22:20#阿南,発,22:26#見能林,発,22:29#阿波橘,発,22:32#桑野,発,22:37#新野,発,22:41#阿波福井,発,22:45#由岐,発,22:54#木岐,発,22:58#北河内,発,23:03#日和佐,発,23:06#山河内,発,23:14#辺川,発,23:23#牟岐,着,23:29#",
"585D":"徳島,発,22:55#阿波富田,発,22:58#二軒屋,発,23:01#文化の森,発,23:03#地蔵橋,発,23:07#中田,発,23:11#南小松島,発,23:15#阿波赤石,発,23:19#立江,発,23:22#羽ノ浦,発,23:26#西原,発,23:29#阿波中島,発,23:32#阿南,着,23:36#",
// 臨時列車
"9395D":"高松,発,22:10#昭和町,発,22:12#栗林公園北口,発,22:15#栗林,発,22:18#木太町,発,22:22#屋島,発,22:26#古高松南,発,22:38#八栗口,発,22:41#讃岐牟礼,発,22:44#志度,発,22:48#オレンジタウン,発,22:52#造田,発,22:56#神前,発,22:59#讃岐津田,発,23:05#鶴羽,発,23:09#丹生,発,23:14#三本松,着,23:18#WEST LIVE TOUR 2025臨/三本松,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#普通 三本松行,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#",
"9174M":"高松,発,22:00#坂出,発,22:16#児島,発,22:39#茶屋町,発,22:55#早島,発,22:59#妹尾,発,23:03#岡山,着,23:12#WEST LIVE TOUR 2025臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#快速マリンライナー94号 岡山行,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#",
}

View File

@ -612,7 +612,24 @@ export const customTrainDataDetector = (TrainNumber: string) => {
trainNumDistance: null,
info: "",
};
case "9174M":
return {
type: "SPCL",
trainName: "[快速]マリンライナー94号",
trainIcon: "https://storage.haruk.in/s5001.png",
infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html",
trainNumDistance: null,
info: "WEST LIVE TOUR 2025臨 3/21,22のみ運転",
};
case "9395D":
return {
type: "SPCL",
trainName: "普通列車",
trainIcon: "",
infoUrl: "",
trainNumDistance: null,
info: "WEST LIVE TOUR 2025臨 3/21,22のみ運転",
};
default:
if (
new RegExp(/^4[1-9]\d\d[DM]$/).test(TrainNumber) ||

View File

@ -465,53 +465,53 @@ export const injectJavascriptData: InjectJavascriptData = (
setStationIcon(e.querySelector("img"),'https://storage.haruk.in/ef210a.png');
break;
// 普通列車系統、6000系運用
//61運用
case "1213M":
case "1214M":
case "143M":
case "147M":
//62運用
case "114M":
//961運用
case "143M":
case "147M":
//962運用
case "114M":
setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s6000p.png');
break;
// // 普通列車系統、6000系運用
// //61運用
// case "1213M":
// case "1214M":
// case "143M":
// case "147M":
// //62運用
// case "114M":
// //961運用
// case "143M":
// case "147M":
// //962運用
// case "114M":
// setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s6000p.png');
// break;
// 土讃線普通列車系統(include ごな線)
// ごな線
case "5851D": //219D併結 [ToDo: 219Dとの分割対策]
case "5854D":
setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640jgr.png');
break;
// // 土讃線普通列車系統(include ごな線)
// // ごな線
// case "5851D": //219D併結 [ToDo: 219Dとの分割対策]
// case "5854D":
// setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640jgr.png');
// break;
//JR車両乗り入れ運用
case "5858D":
case "5869D":
setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
break;
//併結運用の併結される側 [ToDo: 分割対策]
case "5845D":
case "5851D":
case "5818D":
case "5820D":
setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640.png');
break;
// 土讃線単体列車のキハ32運用
case "715D":
case "718D":
setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32ns.png');
break;
// //JR車両乗り入れ運用
// case "5858D":
// case "5869D":
// setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
// break;
// //併結運用の併結される側 [ToDo: 分割対策]
// case "5845D":
// case "5851D":
// case "5818D":
// case "5820D":
// setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640.png');
// break;
// // 土讃線単体列車のキハ32運用
// case "715D":
// case "718D":
// setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32ns.png');
// break;
// サンライズに伴う気動車代走
case "6219D":
case "6222D":
setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
break;
// // サンライズに伴う気動車代走
// case "6219D":
// case "6222D":
// setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
// break;
// // それ以外の土讃線ごな線直通列車
// case "5811D":
// case "5813D":
@ -1179,7 +1179,7 @@ export const injectJavascriptData: InjectJavascriptData = (
case "4334D":
case "4342D":
case "4350D":
case "4360D":
case "4368D":
viaData = "牟岐線直通";
isWanman = true;
break;
@ -1228,6 +1228,14 @@ export const injectJavascriptData: InjectJavascriptData = (
viaData = "ごめん・なはり線[快速]";
ToData = "(後免にて解結)土佐山田/奈半利";
break;
case "9395D":
viaData = "[臨時]普通";
ToData = "三本松";
break;
case "9174M":
viaData = "[臨時]マリンライナー94号";
ToData = "岡山";
break;
default:
if(new RegExp(/^58[1-3][1,3,5,7,9][DM]$/).test()){
viaData = "ごめん・なはり線[快速]";

View File

@ -15,7 +15,11 @@ export const AllTrainDiagramProvider = ({ children }) => {
() => allTrainDiagram && setKeyList(Object.keys(allTrainDiagram)),
[allTrainDiagram]
);
const customData = {};
const customData = {
"9395D":"高松,発,22:10#昭和町,発,22:12#栗林公園北口,発,22:15#栗林,発,22:18#木太町,発,22:22#屋島,発,22:26#古高松南,発,22:38#八栗口,発,22:41#讃岐牟礼,発,22:44#志度,発,22:48#オレンジタウン,発,22:52#造田,発,22:56#神前,発,22:59#讃岐津田,発,23:05#鶴羽,発,23:09#丹生,発,23:14#三本松,着,23:18#WEST LIVE TOUR 2025臨/三本松,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#普通 三本松行,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#",
"9174M":"高松,発,22:00#坂出,発,22:16#児島,発,22:39#茶屋町,発,22:55#早島,発,22:59#妹尾,発,23:03#岡山,着,23:12#WEST LIVE TOUR 2025臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#快速マリンライナー94号 岡山行,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#",
};
useEffect(() => {
fetch(
"https://n8n.haruk.in/webhook/CrowdTh%E2%82%AC71m3Ra7!ngLead%E2%82%ACr$"