diff --git a/components/custom-train-data.ts b/components/custom-train-data.ts index 7a8f364..abe540f 100644 --- a/components/custom-train-data.ts +++ b/components/custom-train-data.ts @@ -25,7 +25,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "しおかぜ", trainIcon: "https://storage.haruk.in/s8000nr.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/shiokaze.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/shiokaze.html", trainNumDistance: 0, info: "いしづちと併結 / 8000系で運転", infogram: "G" @@ -36,7 +36,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "しおかぜ", trainIcon: "https://storage.haruk.in/s8000nr.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/shiokaze.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/shiokaze.html", trainNumDistance: 0, info: "8000系で運転", infogram: "G" @@ -69,7 +69,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "しおかぜ", trainIcon: "https://storage.haruk.in/s8600.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/shiokaze.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/shiokaze.html", trainNumDistance: 0, info: "いしづちと併結 / 8600系で運転", infogram: "G" @@ -100,7 +100,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "いしづち", trainIcon: "https://storage.haruk.in/s8000no.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/ishizuchi.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/ishizuchi.html", trainNumDistance: 1000, info: "しおかぜと併結 / 8000系で運転", infogram: "" @@ -135,7 +135,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "いしづち", trainIcon: "https://storage.haruk.in/s8600_isz.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/ishizuchi.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/ishizuchi.html", trainNumDistance: 1000, info: "しおかぜと併結 / 8600系で運転", infogram: "" @@ -149,7 +149,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "モーニングEXP高松", trainIcon: "https://storage.haruk.in/s8000nr.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/morning.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/morning.html", trainNumDistance: null, info: "8000系で運転", infogram: "G" @@ -161,7 +161,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "モーニングEXP松山", trainIcon: "https://storage.haruk.in/s8600_isz.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/morning.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/morning.html", trainNumDistance: null, info: "8600系で運転", infogram: "G" @@ -187,7 +187,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "いしづち", trainIcon: "https://storage.haruk.in/s8600_isz.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/ishizuchi.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/ishizuchi.html", trainNumDistance: 940, info: "8600系で運転", infogram: "" @@ -198,7 +198,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "いしづち", trainIcon: "https://storage.haruk.in/s8600_isz.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/ishizuchi.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/ishizuchi.html", trainNumDistance: 940, info: "8600系で運転", infogram: "G" @@ -227,7 +227,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { type: "LTDEXP", trainName: "南風", trainIcon: "https://storage.haruk.in/s2700.png", - infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/nanpu.html", + infoUrl: "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/nanpu.html", trainNumDistance: 30, info: "2700系で運転", infogram: "G" @@ -276,7 +276,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "うずしお", trainIcon: "https://storage.haruk.in/s2700_uzu.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/uzushio.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/uzushio.html", trainNumDistance: 3000, info: "2700系で運転", infogram: "" @@ -298,7 +298,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "うずしお", trainIcon: "https://storage.haruk.in/s2700_uzu.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/uzushio.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/uzushio.html", trainNumDistance: 3000, info: "2700系で運転", infogram: "" @@ -320,7 +320,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "うずしお", trainIcon: "https://storage.haruk.in/s2600.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/uzushio.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/uzushio.html", trainNumDistance: 3000, info: "2600系で運転", infogram: "" @@ -400,7 +400,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { type: "Rapid", trainName: "マリンライナー", trainIcon: "https://storage.haruk.in/s5001.png", - infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html", + infoUrl: "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html", trainNumDistance: 3100, info: "", infogram: "G" @@ -414,7 +414,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { type: "Rapid", trainName: "マリンライナー", trainIcon: "https://storage.haruk.in/s5001k.png", - infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html", + infoUrl: "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html", trainNumDistance: 3100, info: "", infogram: "" @@ -574,7 +574,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { type: "LTDEXP", trainName: "宇和海", trainIcon: "https://storage.haruk.in/s2000_uwa.png", - infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/uwakai.html", + infoUrl: "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/uwakai.html", trainNumDistance: 1050, info: "2000系で運転", infogram: "" @@ -605,7 +605,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "しまんと", trainIcon: "https://storage.haruk.in/s2700_smn.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/shimanto.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/shimanto.html", trainNumDistance: 2000, info: "2700系で運転", infogram: "" @@ -625,7 +625,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "あしずり", trainIcon: "https://storage.haruk.in/s2000_asi.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/ashizuri.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/ashizuri.html", trainNumDistance: 2070, info: "2000系で運転", infogram: "" @@ -641,7 +641,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "あしずり", trainIcon: "https://storage.haruk.in/s2700_asi.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/ashizuri.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/ashizuri.html", trainNumDistance: 2070, info: "2700系で運転", infogram: "" @@ -653,7 +653,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "あしずり", trainIcon: "https://storage.haruk.in/s2700_asi.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/ashizuri.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/ashizuri.html", trainNumDistance: 2070, info: "2700系で運転", infogram: "G" @@ -672,7 +672,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "剣山", trainIcon: "https://storage.haruk.in/s185tu.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/tsurugisan.html", + "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/tsurugisan.html", trainNumDistance: 4000, info: "キハ185系で運転", infogram: "" @@ -686,7 +686,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainName: "よしのがわトロッコ", trainIcon: "https://storage.haruk.in/s185to_ai.png", infoUrl: - "http://jr-shikoku.co.jp/01_trainbus/event_train/yoshino_torokko.html", + "https://www.jr-shikoku.co.jp/01_trainbus/event_train/yoshino_torokko.html", trainNumDistance: null, info: "", infogram: "" @@ -765,7 +765,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { type: "SPCL_Rapid", trainName: "マリンライナー94号", trainIcon: "https://storage.haruk.in/s5001.png", - infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html", + infoUrl: "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html", trainNumDistance: null, info: "WEST LIVE TOUR 2025臨 3/21,22のみ運転", infogram: "G" @@ -809,6 +809,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { else if ( new RegExp(/^[1-9]\d\d[DM]$/).test(TrainNumber) || new RegExp(/^1[26]\d\d[DM]$/).test(TrainNumber) || + new RegExp(/^58\d\d[DM]$/).test(TrainNumber) || new RegExp(/^6\d\d\d[DM]$/).test(TrainNumber) ){ return { diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index cdb4533..2ed049a 100644 --- a/lib/webViewInjectjavascript.ts +++ b/lib/webViewInjectjavascript.ts @@ -394,6 +394,7 @@ export const injectJavascriptData: InjectJavascriptData = ( case "2084D": case "2075D": case "2077D": + case "2083D": setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700_asi.png'); break; //剣山