From 9e6390c908161b219dcebd13deedc10add8d89f4 Mon Sep 17 00:00:00 2001 From: CommandBlocktt <145857754+CommandBlocktt@users.noreply.github.com> Date: Sat, 8 Mar 2025 01:08:33 +0000 Subject: [PATCH] #1768 Resources: New templates of Guangzhou Metro --- .../resources/templates/gzmtr/00config.json | 9 +- public/resources/templates/gzmtr/gz2.json | 310 ++++++++++-------- public/resources/templates/gzmtr/gz3.json | 20 +- public/resources/templates/gzmtr/gz5.json | 3 +- 4 files changed, 202 insertions(+), 140 deletions(-) diff --git a/public/resources/templates/gzmtr/00config.json b/public/resources/templates/gzmtr/00config.json index de9f6ace..0571b63a 100644 --- a/public/resources/templates/gzmtr/00config.json +++ b/public/resources/templates/gzmtr/00config.json @@ -21,7 +21,8 @@ "ko": "2호선" }, "authors": [ - "wongchito" + "wongchito", + "CommandBlocktt" ] }, { @@ -35,7 +36,8 @@ "authors": [ "wongchito", "LekkerLin", - "Sun-Cheong" + "Sun-Cheong", + "CommandBlocktt" ] }, { @@ -63,7 +65,8 @@ "wongchito", "Bachongshenzi1453", "LekkerLin", - "Sun-Cheong" + "Sun-Cheong", + "CommandBlocktt" ] }, { diff --git a/public/resources/templates/gzmtr/gz2.json b/public/resources/templates/gzmtr/gz2.json index 6d76d743..a4a2007d 100644 --- a/public/resources/templates/gzmtr/gz2.json +++ b/public/resources/templates/gzmtr/gz2.json @@ -18,10 +18,6 @@ "children": [ "w2zj" ], - "name": [ - "路綫左端", - "LEFT END" - ], "transfer": { "tick_direc": "r", "paid_area": true, @@ -35,17 +31,18 @@ "num": "00", "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "路綫左端", + "en": "LEFT END" + }, + "character_spacing": 75 }, "lineend": { "parents": [ "iwf6" ], "children": [], - "name": [ - "路綫右端", - "RIGHT END" - ], "transfer": { "tick_direc": "r", "paid_area": true, @@ -59,7 +56,12 @@ "num": "00", "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "路綫右端", + "en": "RIGHT END" + }, + "character_spacing": 75 }, "l1mz": { "parents": [ @@ -68,10 +70,6 @@ "children": [ "iwf6" ], - "name": [ - "石壁", - "Shibi" - ], "num": "02", "transfer": { "tick_direc": "r", @@ -100,7 +98,12 @@ ], "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "石壁", + "en": "Shibi" + }, + "character_spacing": 75 }, "iwf6": { "children": [ @@ -109,10 +112,6 @@ "parents": [ "l1mz" ], - "name": [ - "广州南站", - "Guangzhou South\\Railway Station" - ], "num": "01", "transfer": { "tick_direc": "r", @@ -136,7 +135,7 @@ "theme": [ "guangzhou", "gz22", - "#CD5228", + "#d24c1e", "#fff" ], "name": [ @@ -148,7 +147,7 @@ "theme": [ "foshan", "fs2", - "#F5333F", + "#f6112e", "#fff" ], "name": [ @@ -166,7 +165,12 @@ "facility": "hsr", "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "广州南站", + "en": "Guangzhou South\\Railway Station" + }, + "character_spacing": 75 }, "2gc5": { "parents": [ @@ -175,10 +179,6 @@ "children": [ "l1mz" ], - "name": [ - "会江", - "Huijiang" - ], "num": "03", "services": [ "local" @@ -192,7 +192,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "会江", + "en": "Huijiang" + }, + "character_spacing": 75 }, "tr5a": { "parents": [ @@ -201,10 +206,6 @@ "children": [ "2gc5" ], - "name": [ - "南浦", - "Nanpu" - ], "num": "04", "services": [ "local" @@ -218,7 +219,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "南浦", + "en": "Nanpu" + }, + "character_spacing": 75 }, "hxak": { "parents": [ @@ -227,10 +233,6 @@ "children": [ "tr5a" ], - "name": [ - "洛溪", - "Luoxi" - ], "num": "05", "services": [ "local" @@ -244,7 +246,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "洛溪", + "en": "Luoxi" + }, + "character_spacing": 75 }, "lcmc": { "parents": [ @@ -253,10 +260,6 @@ "children": [ "hxak" ], - "name": [ - "南洲", - "Nanzhou" - ], "num": "06", "services": [ "local" @@ -285,7 +288,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "南洲", + "en": "Nanzhou" + }, + "character_spacing": 75 }, "u3eo": { "parents": [ @@ -294,10 +302,6 @@ "children": [ "lcmc" ], - "name": [ - "东晓南", - "Dongxiaonan" - ], "num": "07", "services": [ "local" @@ -311,7 +315,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "东晓南", + "en": "Dongxiaonan" + }, + "character_spacing": 75 }, "fkbi": { "parents": [ @@ -320,10 +329,6 @@ "children": [ "u3eo" ], - "name": [ - "江泰路", - "Jiangtai Lu" - ], "num": "08", "services": [ "local" @@ -332,12 +337,32 @@ "tick_direc": "r", "paid_area": true, "groups": [ - {} + { + "lines": [ + { + "theme": [ + "guangzhou", + "gz11", + "#ffb00a", + "#000" + ], + "name": [ + "11号线", + "Line 11" + ] + } + ] + } ] }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "江泰路", + "en": "Jiangtai Road" + }, + "character_spacing": 75 }, "fsbx": { "parents": [ @@ -346,10 +371,6 @@ "children": [ "fkbi" ], - "name": [ - "昌岗", - "Changgang" - ], "num": "09", "services": [ "local" @@ -378,7 +399,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "昌岗", + "en": "Changgang" + }, + "character_spacing": 75 }, "ss50": { "parents": [ @@ -387,10 +413,6 @@ "children": [ "fsbx" ], - "name": [ - "江南西", - "Jiangnanxi" - ], "num": "10", "services": [ "local" @@ -404,7 +426,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "江南西", + "en": "Jiangnanxi" + }, + "character_spacing": 75 }, "0p39": { "parents": [ @@ -413,10 +440,6 @@ "children": [ "ss50" ], - "name": [ - "市二宫", - "The 2nd Workers'\\Cultural Palace" - ], "num": "11", "services": [ "local" @@ -430,7 +453,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "市二宫", + "en": "The 2nd Workers'\\Cultural Palace" + }, + "character_spacing": 75 }, "z5ux": { "parents": [ @@ -439,10 +467,6 @@ "children": [ "0p39" ], - "name": [ - "海珠广场", - "Haizhu Square" - ], "num": "12", "services": [ "local" @@ -471,7 +495,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "海珠广场", + "en": "Haizhu Square" + }, + "character_spacing": 75 }, "4ozz": { "parents": [ @@ -480,10 +509,6 @@ "children": [ "z5ux" ], - "name": [ - "公园前", - "Gongyuanqian" - ], "num": "13", "services": [ "local" @@ -512,7 +537,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "公园前", + "en": "Gongyuanqian" + }, + "character_spacing": 75 }, "jepx": { "parents": [ @@ -521,10 +551,6 @@ "children": [ "4ozz" ], - "name": [ - "纪念堂", - "Sun Yat-sen\\Memorial Hall" - ], "num": "14", "services": [ "local" @@ -538,7 +564,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "纪念堂", + "en": "Sun Yat-sen\\Memorial Hall" + }, + "character_spacing": 75 }, "uo7r": { "parents": [ @@ -547,10 +578,6 @@ "children": [ "jepx" ], - "name": [ - "越秀公园", - "Yuexiu Park" - ], "num": "15", "services": [ "local" @@ -564,7 +591,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "越秀公园", + "en": "Yuexiu Park" + }, + "character_spacing": 75 }, "6c5q": { "parents": [ @@ -573,10 +605,6 @@ "children": [ "uo7r" ], - "name": [ - "广州火车站", - "Guangzhou Railway Station" - ], "num": "16", "services": [ "local" @@ -605,7 +633,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "广州火车站", + "en": "Guangzhou Railway Station" + }, + "character_spacing": 75 }, "bgb9": { "parents": [ @@ -614,10 +647,6 @@ "children": [ "6c5q" ], - "name": [ - "三元里", - "Sanyuanli" - ], "num": "17", "services": [ "local" @@ -631,7 +660,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "三元里", + "en": "Sanyuanli" + }, + "character_spacing": 75 }, "hcuk": { "parents": [ @@ -640,10 +674,6 @@ "children": [ "bgb9" ], - "name": [ - "飞翔公园", - "Feixiang Park" - ], "num": "18", "services": [ "local" @@ -657,7 +687,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "飞翔公园", + "en": "Feixiang Park" + }, + "character_spacing": 75 }, "tems": { "parents": [ @@ -666,10 +701,6 @@ "children": [ "hcuk" ], - "name": [ - "白云公园", - "Baiyun Park" - ], "num": "19", "services": [ "local" @@ -683,7 +714,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "白云公园", + "en": "Baiyun Park" + }, + "character_spacing": 75 }, "e8u2": { "parents": [ @@ -692,10 +728,6 @@ "children": [ "tems" ], - "name": [ - "白云文化广场", - "Baiyun Culture Square" - ], "num": "20", "services": [ "local" @@ -709,7 +741,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "白云文化广场", + "en": "Baiyun Culture Square" + }, + "character_spacing": 75 }, "8bjm": { "parents": [ @@ -718,10 +755,6 @@ "children": [ "e8u2" ], - "name": [ - "萧岗", - "Xiao-gang" - ], "num": "21", "services": [ "local" @@ -735,7 +768,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "萧岗", + "en": "Xiao-gang" + }, + "character_spacing": 75 }, "yx7a": { "parents": [ @@ -744,10 +782,6 @@ "children": [ "8bjm" ], - "name": [ - "江夏", - "Jiangxia" - ], "num": "22", "services": [ "local" @@ -761,7 +795,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "江夏", + "en": "Jiangxia" + }, + "character_spacing": 75 }, "i86o": { "parents": [ @@ -770,10 +809,6 @@ "children": [ "yx7a" ], - "name": [ - "黄边", - "Huangbian" - ], "num": "23", "services": [ "local" @@ -787,7 +822,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "黄边", + "en": "Huangbian" + }, + "character_spacing": 75 }, "w2zj": { "parents": [ @@ -796,10 +836,6 @@ "children": [ "i86o" ], - "name": [ - "嘉禾望岗", - "Jiahewanggang" - ], "num": "24", "services": [ "local" @@ -840,7 +876,12 @@ }, "loop_pivot": false, "one_line": false, - "int_padding": 355 + "int_padding": 355, + "localisedName": { + "zh": "嘉禾望岗", + "en": "Jiahewanggang" + }, + "character_spacing": 75 } }, "line_name": [ @@ -860,7 +901,8 @@ "destination": 1200, "runin": 1200, "railmap": 2100, - "indoor": 2100 + "indoor": 2100, + "platform": 1200 }, "namePosMTR": { "isStagger": true, diff --git a/public/resources/templates/gzmtr/gz3.json b/public/resources/templates/gzmtr/gz3.json index 633c32ae..b67a990e 100644 --- a/public/resources/templates/gzmtr/gz3.json +++ b/public/resources/templates/gzmtr/gz3.json @@ -303,7 +303,22 @@ "tick_direc": "r", "paid_area": true, "groups": [ - {} + { + "lines": [ + { + "theme": [ + "guangzhou", + "gz11", + "#ffb00a", + "#000" + ], + "name": [ + "11号线", + "Line 11" + ] + } + ] + } ] }, "services": [ @@ -1291,5 +1306,6 @@ }, "branchSpacingPct": 39, "version": "5.16.21", - "coachNum": "1" + "coachNum": "1", + "spanLineNum": true } \ No newline at end of file diff --git a/public/resources/templates/gzmtr/gz5.json b/public/resources/templates/gzmtr/gz5.json index 69ac5d63..123067be 100644 --- a/public/resources/templates/gzmtr/gz5.json +++ b/public/resources/templates/gzmtr/gz5.json @@ -1087,5 +1087,6 @@ "left_and_right_factor": 1, "bottom_factor": 1 }, - "version": "5.16.21" + "version": "5.16.21", + "spanLineNum": true } \ No newline at end of file