diff --git a/lib/getStringConfig.ts b/lib/getStringConfig.ts
index 5295f04..327c533 100644
--- a/lib/getStringConfig.ts
+++ b/lib/getStringConfig.ts
@@ -9,6 +9,7 @@ type typeID =
| "SPCL_Normal"
| "SPCL_Rapid"
| "SPCL_EXP"
+ | "Party"
| "Freight"
| "Forwarding"
| "FreightForwarding"
@@ -36,6 +37,8 @@ export const getStringConfig: types = (type, id) => {
return ["臨時快速", true, false];
case "SPCL_EXP":
return ["臨時特急", true, false];
+ case "Party":
+ return ["団体臨時", true, false];
case "Freight":
return ["貨物", false, false];
case "Forwarding":
diff --git a/lib/getTrainType.ts b/lib/getTrainType.ts
index a0a76b6..6c2d3e6 100644
--- a/lib/getTrainType.ts
+++ b/lib/getTrainType.ts
@@ -5,7 +5,7 @@ type nameString =
| "SPCL"
| "Normal"
| string;
-type colorString = "aqua" | "red" | "#297bff" | "white" | "pink";
+type colorString = "aqua" | "red" | "#297bff" | "#ff7300ff" | "white" | "pink";
type trainTypeString =
| "快速"
| "特急"
@@ -15,6 +15,7 @@ type trainTypeString =
| "普通列車(ワンマン)"
| "臨時快速"
| "臨時特急"
+ | "団体臨時"
| "その他";
type trainTypeDataString = "rapid" | "express" | "normal";
type getTrainType = (d: nameString) => {
@@ -42,6 +43,8 @@ export const getTrainType: getTrainType = (nameString) => {
return { color: "#297bff", name: "臨時快速", data: "normal" };
case "SPCL_EXP":
return { color: "#297bff", name: "臨時特急", data: "normal" };
+ case "Party":
+ return { color: "#ff7300ff", name: "団体臨時", data: "normal" };
default:
return { color: "white", name: "その他", data: "normal" };
}
diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts
index c629bb1..c38f321 100644
--- a/lib/webViewInjectjavascript.ts
+++ b/lib/webViewInjectjavascript.ts
@@ -634,39 +634,6 @@ 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,isLeft) =>{
let isWanman = false;
let trainName = "";
@@ -724,15 +691,6 @@ export const injectJavascriptData: InjectJavascriptData = (
trainName = "臨時列車";
}
-
- let JRF = true;
- const JRFTemp = getJRF(列番データ);
-
- if(JRFTemp){
- trainName = JRFTemp;
- JRF = false;
- }
-
const getThrew = num =>{
switch(num){
@@ -833,30 +791,6 @@ export const injectJavascriptData: InjectJavascriptData = (
viaData = "ごめん・なはり線[快速]";
ToData = "(後免にて解結)\\n土佐山田/奈半利";
break;
- case "9395D":
- viaData = "[臨時]普通";
- ToData = "三本松";
- break;
- case "9174M":
- viaData = "[臨時]マリンライナー94号";
- ToData = "岡山";
- break;
- case "9662D":
- viaData = "[臨時]れんげ号";
- ToData = "八幡浜";
- break;
- case "9665D":
- viaData = "[臨時]れんげ号";
- ToData = "宇和島";
- break;
- case "9664D":
- viaData = "[臨時]わらぐろ号";
- ToData = "八幡浜";
- break;
- case "9663D":
- viaData = "[臨時]わらぐろ号";
- ToData = "卯之町";
- break;
default:
if(new RegExp(/^58[1-3][1,3,5,7,9][DM]$/).test(列番データ)){
viaData = "ごめん・なはり線[快速]";
@@ -882,61 +816,77 @@ export const injectJavascriptData: InjectJavascriptData = (
if(trainDataList.find(e => e.id === 列番データ) !== undefined){
const data = trainDataList.find(e => e.id === 列番データ);
//{id,trainName,viaData,ToData,TrainNumber,TrainNumberOverride,type,infoUrl,trainNumDistance,info,infogram,isEdit}
- trainType = (()=>{
- switch(data.type){
- case "Normal":
- trainTypeColor = "black";
- isWanman = false;
- return "普通";
- case "OneMan":
- trainTypeColor = "black";
- isWanman = true;
- return "普通";
- case "Rapid":
- trainTypeColor = "rgba(0, 140, 255, 1)";
- isWanman = false;
- return "快速";
- case "OneManRapid":
- trainTypeColor = "rgba(0, 140, 255, 1)";
- isWanman = true;
- return "快速";
- case "LTDEXP":
- trainTypeColor = "red";
- isWanman = false;
- return "特急";
- case "NightLTDEXP":
- trainTypeColor = "#d300b0ff";
- isWanman = false;
- return "寝台特急";
- case "SPCL":
- case "SPCL_Normal":
- trainTypeColor = "#008d07ff";
- isWanman = false;
- return "臨時";
- case "SPCL_Rapid":
- trainTypeColor = "rgba(0, 81, 255, 1)";
- isWanman = false;
- return "臨時快速";
- case "SPCL_EXP":
- trainTypeColor = "#a52e2eff";
- isWanman = false;
- return "臨時特急";
- case "Freight":
- trainTypeColor = "#00869ecc";
- isWanman = false;
- return "貨物";
- case "Forwarding":
- trainTypeColor = "#727272cc";
- isWanman = false;
- return "回送";
- case "FreightForwarding":
- trainTypeColor = "#727272cc";
- isWanman = false;
- return "単機回送";
- default:
- return "";
- }
- })();
+
+ switch(data.type){
+ case "Normal":
+ trainTypeColor = "black";
+ isWanman = false;
+ trainType = "普通";
+ break;
+ case "OneMan":
+ trainTypeColor = "black";
+ isWanman = true;
+ trainType = "普通";
+ break;
+ case "Rapid":
+ trainTypeColor = "rgba(0, 140, 255, 1)";
+ isWanman = false;
+ trainType = "快速";
+ break;
+ case "OneManRapid":
+ trainTypeColor = "rgba(0, 140, 255, 1)";
+ isWanman = true;
+ trainType = "快速";
+ break;
+ case "LTDEXP":
+ trainTypeColor = "red";
+ isWanman = false;
+ trainType = "特急";
+ break;
+ case "NightLTDEXP":
+ trainTypeColor = "#d300b0ff";
+ isWanman = false;
+ trainType = "寝台特急";
+ break;
+ case "SPCL":
+ case "SPCL_Normal":
+ trainTypeColor = "#008d07ff";
+ isWanman = false;
+ trainType = "臨時";
+ break;
+ case "SPCL_Rapid":
+ trainTypeColor = "rgba(0, 81, 255, 1)";
+ isWanman = false;
+ trainType = "臨時快速";
+ break;
+ case "SPCL_EXP":
+ trainTypeColor = "#a52e2eff";
+ isWanman = false;
+ trainType = "臨時特急";
+ break;
+ case "Party":
+ trainTypeColor = "#ff7300ff";
+ isWanman = false;
+ trainType = "団体臨時";
+ break;
+ case "Freight":
+ trainTypeColor = "#00869ecc";
+ isWanman = false;
+ trainType = "貨物";
+ break;
+ case "Forwarding":
+ trainTypeColor = "#727272cc";
+ isWanman = false;
+ trainType = "回送";
+ break;
+ case "FreightForwarding":
+ trainTypeColor = "#727272cc";
+ isWanman = false;
+ trainType = "単機回送";
+ break;
+ default:
+ break;
+ }
isEdit = data.isEdit;
isSeason = data.isSeason;
if(data.trainName != ""){
@@ -1003,7 +953,7 @@ export const injectJavascriptData: InjectJavascriptData = (
const gradient = getColors.length > 1 ? "linear-gradient(130deg, " + getColors[0] + " 0%, "+ getColors[0]+"50%, "+ getColors[1]+"50%, " + getColors[1] + " 100%)" : getColors[0];
- 行き先情報.insertAdjacentHTML('beforebegin', ""+( isEdit ? "
" : isSeason ? "
" : "")+"
" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "
" + (isWanman ? "ワンマン " : "") + "
" + viaData + "
" + trainName + "
" + (ToData ? ToData + "行" : ToData) + "
" + (hasProblem ? "‼️停止中‼️" : "") + "
" + ( isEdit ? "
" : isSeason ? "
" : "") + "
" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "
" + (isWanman ? "ワンマン " : "") + "
" + viaData + "
" + trainName + "
" + (ToData ? ToData + "行" : ToData) + "
" + (hasProblem ? "‼️停止中‼️" : "") + "
" + returnText1 + "
");
行き先情報.insertAdjacentHTML('beforebegin', "" + (ToData ? ToData + "行 " : ToData) + "
" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "