From 05e91d78a583ebafb76ff134a9e7b57b1b6079fc Mon Sep 17 00:00:00 2001 From: HUQIUAN <139970605+HUQIUAN@users.noreply.github.com> Date: Fri, 28 Jun 2024 10:24:31 +0000 Subject: [PATCH 01/45] #1260 Resources: New palettes of Kobe --- public/resources/city-config.json | 11 +++++++++ public/resources/palettes/kobe.json | 38 +++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 public/resources/palettes/kobe.json diff --git a/public/resources/city-config.json b/public/resources/city-config.json index cc6a1d3c..7b961d62 100644 --- a/public/resources/city-config.json +++ b/public/resources/city-config.json @@ -773,6 +773,17 @@ "zh-Hant": "大吉隆坡/巴生谷" } }, + { + "id": "kobe", + "country": "JP", + "name": { + "en": "Kobe", + "zh-Hans": "神户", + "zh-Hant": "神户", + "ja": "神户", + "ko": "고베" + } + }, { "id": "kunming", "country": "CN", diff --git a/public/resources/palettes/kobe.json b/public/resources/palettes/kobe.json new file mode 100644 index 00000000..302f28ae --- /dev/null +++ b/public/resources/palettes/kobe.json @@ -0,0 +1,38 @@ +[ + { + "id": "sy", + "colour": "#13ae67", + "fg": "#fff", + "name": { + "en": "Seishin-Yamate Line", + "zh-Hans": "西神・山手线", + "zh-Hant": "西神・山手線", + "ja": "西神・山手線", + "ko": "세이신・야마테선" + } + }, + { + "id": "sh", + "colour": "#c89665", + "fg": "#fff", + "name": { + "en": "Hokushin Line", + "zh-Hans": "北神线", + "zh-Hant": "北神線", + "ja": "北神線", + "ko": "호쿠신선" + } + }, + { + "id": "k", + "colour": "#006ebd", + "fg": "#fff", + "name": { + "en": "Kaigan Line", + "zh-Hans": "海岸线", + "zh-Hant": "海岸線", + "ja": "海岸線", + "ko": "가이간선" + } + } +] From 39217313789ef2e7801dea8f699f11456f1b2674 Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Mon, 8 Jul 2024 11:30:53 +0000 Subject: [PATCH 02/45] #1265 Resources: New palettes of Qingdao --- public/resources/palettes/qingdao.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/resources/palettes/qingdao.json b/public/resources/palettes/qingdao.json index 55a6f165..5694998e 100644 --- a/public/resources/palettes/qingdao.json +++ b/public/resources/palettes/qingdao.json @@ -100,7 +100,7 @@ } }, { - "id": "qdlg", + "id": "qd11", "colour": "#304299", "fg": "#fff", "name": { @@ -120,7 +120,7 @@ } }, { - "id": "qdxha", + "id": "qd13", "colour": "#009c86", "fg": "#fff", "name": { From 88819a7f060c9411fb5fcecf766c75bd52b80024 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 8 Jul 2024 11:35:13 +0000 Subject: [PATCH 03/45] rmg-palette-0.16.12 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 56c16a06..b8e22a00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.11", + "version": "0.16.12", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.11", + "version": "0.16.12", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 17bcab82..2f771225 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.11" + "version": "0.16.12" } From 4cee58d32802d67a978c5d068b95cd33d6dea8c7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 8 Jul 2024 11:56:13 +0000 Subject: [PATCH 04/45] rmg-palette-0.16.13 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b8e22a00..79937c84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.12", + "version": "0.16.13", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.12", + "version": "0.16.13", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 2f771225..7d68e6a3 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.12" + "version": "0.16.13" } From 97c1ec81a4d51d548d557b968e7da1fea0448cbb Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Tue, 9 Jul 2024 07:17:18 +0000 Subject: [PATCH 05/45] #1269 Resources: New palettes of Greater KL/Klang Valley --- public/resources/palettes/klangvalley.json | 92 ++++++++++++++-------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/public/resources/palettes/klangvalley.json b/public/resources/palettes/klangvalley.json index e34aa6d1..f041066d 100644 --- a/public/resources/palettes/klangvalley.json +++ b/public/resources/palettes/klangvalley.json @@ -1,142 +1,170 @@ [ { "id": "kl1", + "colour": "#0032A0", + "fg": "#fff", + "pantone": "286 C", "name": { "en": "KTM Seremban Line", "ms": "KTM Laluan Seremban", "zh-Hans": "芙蓉线", "zh-Hant": "芙蓉線" - }, - "colour": "#3A5F9B" + } }, { "id": "kl2", + "colour": "#D22730", + "fg": "#fff", + "pantone": "1795 C", "name": { "en": "KTM Port Klang Line", "ms": "KTM Laluan Port Klang", "zh-Hans": "巴生港线", "zh-Hant": "巴生港線" - }, - "colour": "#E13B21" + } }, { "id": "kl3", + "colour": "#E57200", + "fg": "#fff", + "pantone": "152 C", "name": { "en": "LRT Ampang Line", "ms": "LRT Laluan Ampang", "zh-Hans": "安邦线", "zh-Hant": "安邦線" - }, - "colour": "#ED8B2D" + } }, { "id": "kl4", + "colour": "#76232F", + "fg": "#fff", + "pantone": "188 C", "name": { "en": "LRT Sri Petaling Line", "ms": "LRT Laluan Sri Petaling", "zh-Hans": "大城堡线", "zh-Hant": "大城堡線" - }, - "colour": "#802A1B" + } }, { "id": "kl5", + "colour": "#D50032", + "fg": "#fff", + "pantone": "199 C", "name": { "en": "LRT Kelana Jaya Line", "ms": "LRT Laluan Kelana Jaya", "zh-Hans": "格拉那再也线", "zh-Hant": "格拉那再也線" - }, - "colour": "#E32D4A" + } }, { "id": "kl6", + "colour": "#93328E", + "fg": "#fff", + "pantone": "513 C", "name": { "en": "ERL KLIA Ekspres Line", "ms": "ERL Laluan KLIA Ekspres", "zh-Hans": "吉隆坡机场快线", "zh-Hant": "吉隆坡機場快線" - }, - "colour": "#813B83" + } }, { "id": "kl7", + "colour": "#00A7B5", + "fg": "#fff", + "pantone": "7710 C", "name": { "en": "ERL KLIA Transit Line", "ms": "ERL Laluan KLIA Transit", "zh-Hans": "吉隆坡机场支线", "zh-Hant": "吉隆坡機場支線" - }, - "colour": "#009B93" + } }, { "id": "kl8", + "colour": "#84BD00", + "fg": "#fff", + "pantone": "376 C", "name": { "en": "KL Monorail Line", "ms": "Laluan Monorel KL", "zh-Hans": "吉隆坡单轨", "zh-Hant": "吉隆坡單軌" - }, - "colour": "#8DBB3B" + } }, { "id": "kl9", + "colour": "#007A33", + "fg": "#fff", + "pantone": "356 C", "name": { "en": "MRT Sungai Buloh-Kajang Line", "ms": "MRT Laluan Sungai Buloh-Kajang", "zh-Hans": "加影线", "zh-Hant": "加影線" - }, - "colour": "#007737" + } }, { "id": "kl10", + "colour": "#996017", + "fg": "#fff", + "pantone": "1395 C", "name": { "en": "KTM Skypark Line", "ms": "KTM Laluan Skypark", "zh-Hans": "天空花园线", "zh-Hant": "天空花園線" - }, - "colour": "#836F1A" + } }, { "id": "kl11", + "colour": "#41B6E6", + "fg": "#fff", + "pantone": "298 C", "name": { - "en": "LRT Bandar Utama-Klang Line", - "ms": "LRT Laluan Bandar Utama-Klang", - "zh-Hans": "万达镇-巴生线", - "zh-Hant": "萬達鎮-巴生線" - }, - "colour": "#0097CC" + "en": "LRT Shah Alam Line", + "ms": "LRT Laluan Shah Alam", + "zh-Hans": "莎阿南线", + "zh-Hant": "莎阿南線" + } }, { "id": "kl12", + "colour": "#FFCD00", + "fg": "#fff", + "pantone": "116 C", "name": { "en": "MRT Putrajaya Line", "ms": "MRT Laluan Putrajaya", "zh-Hans": "布城线", "zh-Hant": "布城線" - }, - "colour": "#F9C823" + } }, { "id": "kl13", + "colour": "#685BC7", + "fg": "#fff", + "pantone": "2725 C", "name": { "en": "MRT Circle Line", "ms": "MRT Laluan Lingkaran", "zh-Hans": "环状线", "zh-Hant": "環狀線" - }, - "colour": "#818181" + } }, { "id": "klb1", + "colour": "#154734", + "fg": "#fff", + "pantone": "3435 C", "name": { "en": "BRT Sunway Line", "ms": "BRT Laluan Sunway", "zh-Hans": "双威BRT", "zh-Hant": "雙威BRT" - }, - "colour": "#00513A" + } } ] From 165574f24219b34f4a5e59119a2644fd3c4d42fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 15 Jul 2024 10:17:49 +0000 Subject: [PATCH 06/45] rmg-palette-0.16.14 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 79937c84..9fd16e11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.13", + "version": "0.16.14", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.13", + "version": "0.16.14", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 7d68e6a3..284779af 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.13" + "version": "0.16.14" } From f576e6bb80a85b2eff36ab1fffee10da74cca945 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 16 Jul 2024 04:19:36 +0000 Subject: [PATCH 07/45] rmg-palette-0.16.15 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9fd16e11..2045e1da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.14", + "version": "0.16.15", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.14", + "version": "0.16.15", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 284779af..b8ccc56b 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.14" + "version": "0.16.15" } From 9adabfa80307ad3b1390a896f94da861f34d5721 Mon Sep 17 00:00:00 2001 From: 816R <140082406+816R@users.noreply.github.com> Date: Mon, 22 Jul 2024 08:11:23 +0000 Subject: [PATCH 08/45] #1280 Resources: New palettes of Auckland --- public/resources/city-config.json | 9 ++++++ public/resources/country-config.json | 9 ++++++ public/resources/palettes/auckland.json | 42 +++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 public/resources/palettes/auckland.json diff --git a/public/resources/city-config.json b/public/resources/city-config.json index 7b961d62..2c2f910d 100644 --- a/public/resources/city-config.json +++ b/public/resources/city-config.json @@ -48,6 +48,15 @@ "zh-Hant": "雅典" } }, + { + "id": "auckland", + "country": "NZ", + "name": { + "en": "Auckland", + "zh-Hans": "奥克兰", + "zh-Hant": "奧克蘭" + } + }, { "id": "baku", "country": "AZ", diff --git a/public/resources/country-config.json b/public/resources/country-config.json index 143fd856..1bd60c80 100644 --- a/public/resources/country-config.json +++ b/public/resources/country-config.json @@ -372,6 +372,15 @@ }, "language": "no" }, + { + "id": "NZ", + "name": { + "en": "New Zealand", + "zh-Hans": "新西兰", + "zh-Hant": "紐西蘭" + }, + "language": "en" + }, { "id": "PA", "name": { diff --git a/public/resources/palettes/auckland.json b/public/resources/palettes/auckland.json new file mode 100644 index 00000000..acdc4992 --- /dev/null +++ b/public/resources/palettes/auckland.json @@ -0,0 +1,42 @@ +[ + { + "id": "el", + "colour": "#fdba17", + "fg": "#000", + "name": { + "en": "Eastern Line", + "zh-Hans": "东线", + "zh-Hant": "東綫" + } + }, + { + "id": "sl", + "colour": "#ee302a", + "fg": "#fff", + "name": { + "en": "Southern Line", + "zh-Hans": "南线", + "zh-Hant": "南綫" + } + }, + { + "id": "wl", + "colour": "#9bc93e", + "fg": "#fff", + "name": { + "en": "Western Line", + "zh-Hans": "西线", + "zh-Hant": "西綫" + } + }, + { + "id": "ol", + "colour": "#00aeef", + "fg": "#fff", + "name": { + "en": "Onehunga Line", + "zh-Hans": "奥尼洪加线", + "zh-Hant": "奧尼洪加綫" + } + } +] From e3e90d937198aa29dbfaac1945970d0deb67b0ba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 22 Jul 2024 08:33:26 +0000 Subject: [PATCH 09/45] rmg-palette-0.16.16 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2045e1da..fd2e5ec5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.15", + "version": "0.16.16", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.15", + "version": "0.16.16", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index b8ccc56b..d00efb15 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.15" + "version": "0.16.16" } From 3ff94250b5031c00b3674c3d77df609fca3488ed Mon Sep 17 00:00:00 2001 From: Minwtraft <137034903+Minwtraft@users.noreply.github.com> Date: Mon, 22 Jul 2024 03:27:31 +0000 Subject: [PATCH 10/45] #1278 Resources: New palettes of Changsha --- public/resources/palettes/changsha.json | 30 ++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/public/resources/palettes/changsha.json b/public/resources/palettes/changsha.json index 895a6427..95aa0f5e 100644 --- a/public/resources/palettes/changsha.json +++ b/public/resources/palettes/changsha.json @@ -120,23 +120,23 @@ } }, { - "id": "maglev", - "colour": "#F891A5", + "id": "intercitytrain", + "colour": "#083d23", "fg": "#fff", "name": { - "en": "Maglev Express", - "zh-Hans": "磁浮快线", - "zh-Hant": "磁浮快線" + "en": "Changsha-Zhuzhou-Xiangtan Inter-city Train", + "zh-Hans": "长株潭城际（S1）", + "zh-Hant": "長株潭城際（S1）" } }, { - "id": "intercityrailway", - "colour": "#999999", + "id": "maglev", + "colour": "#F891A5", "fg": "#fff", "name": { - "en": "Intercity Railway", - "zh-Hans": "城际铁路", - "zh-Hant": "城際鐵路" + "en": "S2", + "zh-Hans": "S2线", + "zh-Hant": "S2線" } }, { @@ -148,5 +148,15 @@ "zh-Hans": "西环线", "zh-Hant": "西環線" } + }, + { + "id": "bus", + "colour": "#ec931f", + "fg": "#fff", + "name": { + "en": "Mango Bus", + "zh-Hans": "芒果巴士", + "zh-Hant": "芒果巴士" + } } ] From be9b09ad29052479cf84e2aa81e5c5c97f10baa8 Mon Sep 17 00:00:00 2001 From: aaronyz2007 <120014893+aaronyz2007@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:30:56 +0000 Subject: [PATCH 11/45] #1328 Resources: New palettes of Greater KL/Klang Valley --- public/resources/palettes/klangvalley.json | 39 ++++++++-------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/public/resources/palettes/klangvalley.json b/public/resources/palettes/klangvalley.json index f041066d..76f72ec7 100644 --- a/public/resources/palettes/klangvalley.json +++ b/public/resources/palettes/klangvalley.json @@ -1,9 +1,8 @@ [ { "id": "kl1", - "colour": "#0032A0", + "colour": "#0168b3", "fg": "#fff", - "pantone": "286 C", "name": { "en": "KTM Seremban Line", "ms": "KTM Laluan Seremban", @@ -13,9 +12,8 @@ }, { "id": "kl2", - "colour": "#D22730", + "colour": "#ee2e22", "fg": "#fff", - "pantone": "1795 C", "name": { "en": "KTM Port Klang Line", "ms": "KTM Laluan Port Klang", @@ -25,9 +23,8 @@ }, { "id": "kl3", - "colour": "#E57200", + "colour": "#f4901d", "fg": "#fff", - "pantone": "152 C", "name": { "en": "LRT Ampang Line", "ms": "LRT Laluan Ampang", @@ -37,9 +34,8 @@ }, { "id": "kl4", - "colour": "#76232F", + "colour": "#8b0a02", "fg": "#fff", - "pantone": "188 C", "name": { "en": "LRT Sri Petaling Line", "ms": "LRT Laluan Sri Petaling", @@ -49,9 +45,8 @@ }, { "id": "kl5", - "colour": "#D50032", + "colour": "#ed154e", "fg": "#fff", - "pantone": "199 C", "name": { "en": "LRT Kelana Jaya Line", "ms": "LRT Laluan Kelana Jaya", @@ -61,9 +56,8 @@ }, { "id": "kl6", - "colour": "#93328E", + "colour": "#a0218c", "fg": "#fff", - "pantone": "513 C", "name": { "en": "ERL KLIA Ekspres Line", "ms": "ERL Laluan KLIA Ekspres", @@ -73,9 +67,8 @@ }, { "id": "kl7", - "colour": "#00A7B5", + "colour": "#00a0b0", "fg": "#fff", - "pantone": "7710 C", "name": { "en": "ERL KLIA Transit Line", "ms": "ERL Laluan KLIA Transit", @@ -85,9 +78,8 @@ }, { "id": "kl8", - "colour": "#84BD00", + "colour": "#8bc63e", "fg": "#fff", - "pantone": "376 C", "name": { "en": "KL Monorail Line", "ms": "Laluan Monorel KL", @@ -97,9 +89,8 @@ }, { "id": "kl9", - "colour": "#007A33", + "colour": "#00843d", "fg": "#fff", - "pantone": "356 C", "name": { "en": "MRT Sungai Buloh-Kajang Line", "ms": "MRT Laluan Sungai Buloh-Kajang", @@ -109,9 +100,8 @@ }, { "id": "kl10", - "colour": "#996017", + "colour": "#827c00", "fg": "#fff", - "pantone": "1395 C", "name": { "en": "KTM Skypark Line", "ms": "KTM Laluan Skypark", @@ -121,9 +111,8 @@ }, { "id": "kl11", - "colour": "#41B6E6", + "colour": "#00a5e3", "fg": "#fff", - "pantone": "298 C", "name": { "en": "LRT Shah Alam Line", "ms": "LRT Laluan Shah Alam", @@ -133,9 +122,8 @@ }, { "id": "kl12", - "colour": "#FFCD00", + "colour": "#fed105", "fg": "#fff", - "pantone": "116 C", "name": { "en": "MRT Putrajaya Line", "ms": "MRT Laluan Putrajaya", @@ -157,9 +145,8 @@ }, { "id": "klb1", - "colour": "#154734", + "colour": "#00502e", "fg": "#fff", - "pantone": "3435 C", "name": { "en": "BRT Sunway Line", "ms": "BRT Laluan Sunway", From 9c1a87275686f151d05fd1119ade119eca728391 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 15 Aug 2024 04:19:20 +0000 Subject: [PATCH 12/45] rmg-palette-0.16.17 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd2e5ec5..01a771c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.16", + "version": "0.16.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.16", + "version": "0.16.17", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index d00efb15..c5dc662e 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.16" + "version": "0.16.17" } From ce555e6a265197a30f264595e49489d226639725 Mon Sep 17 00:00:00 2001 From: 816R <140082406+816R@users.noreply.github.com> Date: Thu, 22 Aug 2024 09:28:19 +0000 Subject: [PATCH 13/45] #1343 Resources: New palettes of Shanghai --- public/resources/palettes/shanghai.json | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/public/resources/palettes/shanghai.json b/public/resources/palettes/shanghai.json index 5ee3c321..068e37bc 100644 --- a/public/resources/palettes/shanghai.json +++ b/public/resources/palettes/shanghai.json @@ -181,8 +181,8 @@ }, { "id": "sh19", - "colour": "#40924F", - "fg": "#fff", + "colour": "#f4a570", + "fg": "#000", "name": { "en": "Line 19", "zh-Hans": "19号线", @@ -191,7 +191,7 @@ }, { "id": "sh20", - "colour": "#435B9E", + "colour": "#009f5d", "fg": "#fff", "name": { "en": "Line 20", @@ -201,7 +201,7 @@ }, { "id": "sh21", - "colour": "#D6C677", + "colour": "#eea900", "fg": "#000", "name": { "en": "Line 21", @@ -209,9 +209,19 @@ "zh-Hant": "21號線" } }, + { + "id": "sh22", + "colour": "#56426f", + "fg": "#fff", + "name": { + "en": "Line 22", + "zh-Hans": "22号线", + "zh-Hant": "22號線" + } + }, { "id": "sh23", - "colour": "#E98D60", + "colour": "#a8cc80", "fg": "#000", "name": { "en": "Line 23", @@ -229,16 +239,6 @@ "zh-Hant": "浦江線" } }, - { - "id": "chongming", - "colour": "#6BB392", - "fg": "#000", - "name": { - "en": "Chongming Line", - "zh-Hans": "崇明线", - "zh-Hant": "崇明線" - } - }, { "id": "jsr", "colour": "#000000", From dcff16d591cea0bc8a5d1723014d06cd94ee84f1 Mon Sep 17 00:00:00 2001 From: 816R <140082406+816R@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:14:47 +0000 Subject: [PATCH 14/45] #1343 Resources: New palettes of Shanghai --- public/resources/palettes/shanghai.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/resources/palettes/shanghai.json b/public/resources/palettes/shanghai.json index 068e37bc..8274aaa2 100644 --- a/public/resources/palettes/shanghai.json +++ b/public/resources/palettes/shanghai.json @@ -181,7 +181,7 @@ }, { "id": "sh19", - "colour": "#f4a570", + "colour": "#F6AF74", "fg": "#000", "name": { "en": "Line 19", From 075e5abad409217002b048a8da49b5d353c34964 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 22 Aug 2024 11:18:15 +0000 Subject: [PATCH 15/45] rmg-palette-0.16.18 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01a771c6..c758b6df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.17", + "version": "0.16.18", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.17", + "version": "0.16.18", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index c5dc662e..519da3f9 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.17" + "version": "0.16.18" } From c2e5de5d84c3a54ac0bb1ea640220159fb16badb Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:39:04 +0000 Subject: [PATCH 16/45] #1366 Resources: New palettes of Montreal --- public/resources/palettes/montreal.json | 55 +++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/public/resources/palettes/montreal.json b/public/resources/palettes/montreal.json index b99e9118..ee88d463 100644 --- a/public/resources/palettes/montreal.json +++ b/public/resources/palettes/montreal.json @@ -52,5 +52,60 @@ "zh-Hans": "大都会快速网络", "zh-Hant": "大都會快速網絡" } + }, + { + "id": "e11", + "colour": "#f26178", + "fg": "#000", + "name": { + "en": "Line 11- Vaudreuil/Hudson", + "zh-Hans": "11-沃德勒伊-哈德孙线", + "zh-Hant": "11-沃德勒伊-哈德孫綫", + "fr": "Ligne 11- Vaudreuil/Hudson" + } + }, + { + "id": "e12", + "colour": "#ffdf7e", + "fg": "#000", + "name": { + "en": "Line 12- Saint-Jérôme", + "zh-Hans": "12-圣热罗姆线", + "zh-Hant": "12-聖熱羅姆綫", + "fr": "Ligne 12- Saint-Jérôme" + } + }, + { + "id": "e13", + "colour": "#9a98c8", + "fg": "#000", + "name": { + "en": "Line 13- Mont-Saint-Hilaire", + "zh-Hans": "13-圣希莱尔山线", + "zh-Hant": "13-聖希萊爾山綫", + "fr": "Ligne 13- Mont-Saint-Hilaire" + } + }, + { + "id": "e14", + "colour": "#57b6b2", + "fg": "#000", + "name": { + "en": "Line 14- Candiac", + "zh-Hans": "14-坎迪亚克线", + "zh-Hant": "14-坎迪亞尅綫", + "fr": "Ligne 14- Candiac" + } + }, + { + "id": "e15", + "colour": "#cc5599", + "fg": "#000", + "name": { + "en": "Line 15- Mascouche", + "zh-Hans": "15-马斯库什线", + "zh-Hant": "15-馬斯庫什綫", + "fr": "Ligne 15- Mascouche" + } } ] From 2d943f939d039feec8eda6d393b6545771671d2f Mon Sep 17 00:00:00 2001 From: axl099 <138973971+axl099@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:23:19 +0000 Subject: [PATCH 17/45] #1348 Resources: New palettes of Las Vegas --- public/resources/city-config.json | 9 +++++++++ public/resources/palettes/lv.json | 12 ++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 public/resources/palettes/lv.json diff --git a/public/resources/city-config.json b/public/resources/city-config.json index 2c2f910d..bef4ed7c 100644 --- a/public/resources/city-config.json +++ b/public/resources/city-config.json @@ -929,6 +929,15 @@ "zh-Hant": "洛陽" } }, + { + "id": "lv", + "country": "US", + "name": { + "en": "Las Vegas", + "zh-Hans": "拉斯维加斯", + "zh-Hant": "拉斯維加斯" + } + }, { "id": "lyon", "country": "FR", diff --git a/public/resources/palettes/lv.json b/public/resources/palettes/lv.json new file mode 100644 index 00000000..f8086090 --- /dev/null +++ b/public/resources/palettes/lv.json @@ -0,0 +1,12 @@ +[ + { + "id": "monorail", + "colour": "#061a6c", + "fg": "#fff", + "name": { + "en": "Las Vegas Monorail", + "zh-Hans": "拉斯维加斯单轨", + "zh-Hant": "拉斯維加斯單軌" + } + } +] From 00f5f84e2465a143dff9dcd133fbd4cf48a4b65a Mon Sep 17 00:00:00 2001 From: yam9093 <176502704+yam9093@users.noreply.github.com> Date: Wed, 21 Aug 2024 05:43:36 +0000 Subject: [PATCH 18/45] #1334 Resources: New palettes of Singapore --- public/resources/palettes/singapore.json | 70 ++++++++++++++++-------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/public/resources/palettes/singapore.json b/public/resources/palettes/singapore.json index 01785488..65d78fe3 100644 --- a/public/resources/palettes/singapore.json +++ b/public/resources/palettes/singapore.json @@ -1,73 +1,99 @@ [ { "id": "ewl", + "colour": "#009739", + "fg": "#fff", + "pantone": "355-C", "name": { "en": "East-West Line", "zh-Hans": "东西线", "zh-Hant": "東西線" - }, - "colour": "#009739", - "pantone": "355-C" + } }, { "id": "nsl", + "colour": "#DA291C", + "fg": "#fff", + "pantone": "485-C", "name": { "en": "North-South Line", "zh-Hans": "南北线", "zh-Hant": "南北線" - }, - "colour": "#DA291C", - "pantone": "485-C" + } }, { "id": "nel", + "colour": "#9B26B6", + "fg": "#fff", + "pantone": "2592-C", "name": { "en": "North-East Line", "zh-Hans": "东北线", "zh-Hant": "東北線" - }, - "colour": "#9B26B6", - "pantone": "2592-C" + } }, { "id": "ccl", + "colour": "#FF9E1B", + "fg": "#000", + "pantone": "1375-C", "name": { "en": "Circle Line", "zh-Hans": "环线", "zh-Hant": "環線" - }, - "colour": "#FF9E1B", - "fg": "#000", - "pantone": "1375-C" + } }, { "id": "dtl", + "colour": "#0057B7", + "fg": "#fff", + "pantone": "2935-C", "name": { "en": "Downtown Line", "zh-Hans": "滨海市区线", "zh-Hant": "濱海市區線" - }, - "colour": "#0057B7", - "pantone": "2935-C" + } }, { "id": "tel", + "colour": "#9B5A1A", + "fg": "#fff", + "pantone": "154-C", "name": { "en": "Thomson-East Coast Line", "zh-Hans": "汤申-东海岸线", "zh-Hant": "湯申-東海岸線" - }, - "colour": "#9B5A1A", - "pantone": "154-C" + } }, { "id": "lrt", + "colour": "#708573", + "fg": "#fff", + "pantone": "5625-C", "name": { "en": "Light Rapid Transit (LRT)", "zh-Hans": "轻轨", "zh-Hant": "輕軌" - }, - "colour": "#708573", - "pantone": "5625-C" + } + }, + { + "id": "JRL", + "colour": "#089cac", + "fg": "#fff", + "name": { + "en": "Jurong Region Line", + "zh-Hans": "裕廊区域线", + "zh-Hant": "裕廊區域線" + } + }, + { + "id": "CRL", + "colour": "#a0c40c", + "fg": "#000", + "name": { + "en": "Cross Island Line", + "zh-Hans": "跨岛线", + "zh-Hant": "跨島線" + } } ] From b2c466633529a211f51586aaf784f5fe3fba6e13 Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Sat, 17 Aug 2024 10:12:14 +0000 Subject: [PATCH 19/45] #1332 Resources: New palettes of Nottingham --- public/resources/city-config.json | 9 +++++++++ public/resources/palettes/nottingham.json | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 public/resources/palettes/nottingham.json diff --git a/public/resources/city-config.json b/public/resources/city-config.json index bef4ed7c..137f1333 100644 --- a/public/resources/city-config.json +++ b/public/resources/city-config.json @@ -1217,6 +1217,15 @@ "zh-Hant": "寧波" } }, + { + "id": "nottingham", + "country": "GBENG", + "name": { + "en": "Nottingham", + "zh-Hans": "诺丁汉", + "zh-Hant": "諾丁漢" + } + }, { "id": "novosibirsk", "country": "RU", diff --git a/public/resources/palettes/nottingham.json b/public/resources/palettes/nottingham.json new file mode 100644 index 00000000..bda1e8ca --- /dev/null +++ b/public/resources/palettes/nottingham.json @@ -0,0 +1,22 @@ +[ + { + "id": "n1", + "colour": "#43a757", + "fg": "#fff", + "name": { + "en": "Line 1", + "zh-Hans": "1号线", + "zh-Hant": "1號缐" + } + }, + { + "id": "n2", + "colour": "#543c92", + "fg": "#fff", + "name": { + "en": "Line 2", + "zh-Hans": "2号线", + "zh-Hant": "2號缐" + } + } +] From 9558c4bf56eeb95d03d39d8fbe1fcc4ba5771e74 Mon Sep 17 00:00:00 2001 From: metromaker53 <172249939+metromaker53@users.noreply.github.com> Date: Thu, 15 Aug 2024 13:01:34 +0000 Subject: [PATCH 20/45] #1330 Resources: New palettes of Helsinki --- public/resources/city-config.json | 7 +++++++ public/resources/country-config.json | 7 +++++++ public/resources/palettes/helsinki.json | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 public/resources/palettes/helsinki.json diff --git a/public/resources/city-config.json b/public/resources/city-config.json index 137f1333..f6a9e857 100644 --- a/public/resources/city-config.json +++ b/public/resources/city-config.json @@ -628,6 +628,13 @@ "en": "Hefei" } }, + { + "id": "helsinki", + "country": "FI", + "name": { + "en": "Helsinki" + } + }, { "id": "hiroshima", "country": "JP", diff --git a/public/resources/country-config.json b/public/resources/country-config.json index 1bd60c80..3eb243a3 100644 --- a/public/resources/country-config.json +++ b/public/resources/country-config.json @@ -158,6 +158,13 @@ }, "language": "es" }, + { + "id": "FI", + "name": { + "en": "Finland" + }, + "language": "sv" + }, { "id": "FR", "name": { diff --git a/public/resources/palettes/helsinki.json b/public/resources/palettes/helsinki.json new file mode 100644 index 00000000..ee51d71a --- /dev/null +++ b/public/resources/palettes/helsinki.json @@ -0,0 +1,18 @@ +[ + { + "id": "m1", + "colour": "#ff6319", + "fg": "#fff", + "name": { + "en": "M1" + } + }, + { + "id": "m2", + "colour": "#ff6319", + "fg": "#fff", + "name": { + "en": "M2" + } + } +] From e80be566a61ca88a69a289f6328fe8f3041f3d98 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 6 Sep 2024 11:07:56 +0000 Subject: [PATCH 21/45] rmg-palette-0.16.19 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c758b6df..4a291dec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.18", + "version": "0.16.19", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.18", + "version": "0.16.19", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 519da3f9..36b04620 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.18" + "version": "0.16.19" } From 70fdabc0039dacfb6817c8579ddb4ebec42ac3b5 Mon Sep 17 00:00:00 2001 From: larrychan4022 <182455654+larrychan4022@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:36:21 +0000 Subject: [PATCH 22/45] #1383 Resources: New palettes of Shenzhen --- public/resources/palettes/shenzhen.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/resources/palettes/shenzhen.json b/public/resources/palettes/shenzhen.json index 49c19a82..76b7541b 100644 --- a/public/resources/palettes/shenzhen.json +++ b/public/resources/palettes/shenzhen.json @@ -204,7 +204,7 @@ "colour": "#1974d2", "fg": "#fff", "name": { - "en": "Pingshan sky shuttlo", + "en": "Pingshan SkyShuttle", "zh-Hans": "坪山云巴", "zh-Hant": "坪山雲巴" } From ab73cd8cad4faff5ee91de142bb005606514dc66 Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Thu, 19 Sep 2024 07:44:43 +0000 Subject: [PATCH 23/45] #1373 Resources: New palettes of Greater KL/Klang Valley --- public/resources/palettes/klangvalley.json | 39 ++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/public/resources/palettes/klangvalley.json b/public/resources/palettes/klangvalley.json index 76f72ec7..f041066d 100644 --- a/public/resources/palettes/klangvalley.json +++ b/public/resources/palettes/klangvalley.json @@ -1,8 +1,9 @@ [ { "id": "kl1", - "colour": "#0168b3", + "colour": "#0032A0", "fg": "#fff", + "pantone": "286 C", "name": { "en": "KTM Seremban Line", "ms": "KTM Laluan Seremban", @@ -12,8 +13,9 @@ }, { "id": "kl2", - "colour": "#ee2e22", + "colour": "#D22730", "fg": "#fff", + "pantone": "1795 C", "name": { "en": "KTM Port Klang Line", "ms": "KTM Laluan Port Klang", @@ -23,8 +25,9 @@ }, { "id": "kl3", - "colour": "#f4901d", + "colour": "#E57200", "fg": "#fff", + "pantone": "152 C", "name": { "en": "LRT Ampang Line", "ms": "LRT Laluan Ampang", @@ -34,8 +37,9 @@ }, { "id": "kl4", - "colour": "#8b0a02", + "colour": "#76232F", "fg": "#fff", + "pantone": "188 C", "name": { "en": "LRT Sri Petaling Line", "ms": "LRT Laluan Sri Petaling", @@ -45,8 +49,9 @@ }, { "id": "kl5", - "colour": "#ed154e", + "colour": "#D50032", "fg": "#fff", + "pantone": "199 C", "name": { "en": "LRT Kelana Jaya Line", "ms": "LRT Laluan Kelana Jaya", @@ -56,8 +61,9 @@ }, { "id": "kl6", - "colour": "#a0218c", + "colour": "#93328E", "fg": "#fff", + "pantone": "513 C", "name": { "en": "ERL KLIA Ekspres Line", "ms": "ERL Laluan KLIA Ekspres", @@ -67,8 +73,9 @@ }, { "id": "kl7", - "colour": "#00a0b0", + "colour": "#00A7B5", "fg": "#fff", + "pantone": "7710 C", "name": { "en": "ERL KLIA Transit Line", "ms": "ERL Laluan KLIA Transit", @@ -78,8 +85,9 @@ }, { "id": "kl8", - "colour": "#8bc63e", + "colour": "#84BD00", "fg": "#fff", + "pantone": "376 C", "name": { "en": "KL Monorail Line", "ms": "Laluan Monorel KL", @@ -89,8 +97,9 @@ }, { "id": "kl9", - "colour": "#00843d", + "colour": "#007A33", "fg": "#fff", + "pantone": "356 C", "name": { "en": "MRT Sungai Buloh-Kajang Line", "ms": "MRT Laluan Sungai Buloh-Kajang", @@ -100,8 +109,9 @@ }, { "id": "kl10", - "colour": "#827c00", + "colour": "#996017", "fg": "#fff", + "pantone": "1395 C", "name": { "en": "KTM Skypark Line", "ms": "KTM Laluan Skypark", @@ -111,8 +121,9 @@ }, { "id": "kl11", - "colour": "#00a5e3", + "colour": "#41B6E6", "fg": "#fff", + "pantone": "298 C", "name": { "en": "LRT Shah Alam Line", "ms": "LRT Laluan Shah Alam", @@ -122,8 +133,9 @@ }, { "id": "kl12", - "colour": "#fed105", + "colour": "#FFCD00", "fg": "#fff", + "pantone": "116 C", "name": { "en": "MRT Putrajaya Line", "ms": "MRT Laluan Putrajaya", @@ -145,8 +157,9 @@ }, { "id": "klb1", - "colour": "#00502e", + "colour": "#154734", "fg": "#fff", + "pantone": "3435 C", "name": { "en": "BRT Sunway Line", "ms": "BRT Laluan Sunway", From 6ad8b9cb4e90d939c1faacb2ec2babce287026e6 Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Tue, 17 Sep 2024 13:02:42 +0000 Subject: [PATCH 24/45] #1371 Resources: New palettes of Helsinki --- public/resources/palettes/helsinki.json | 138 +++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/public/resources/palettes/helsinki.json b/public/resources/palettes/helsinki.json index ee51d71a..8badaaf0 100644 --- a/public/resources/palettes/helsinki.json +++ b/public/resources/palettes/helsinki.json @@ -4,7 +4,9 @@ "colour": "#ff6319", "fg": "#fff", "name": { - "en": "M1" + "en": "M1", + "zh-Hans": "地铁1号线", + "zh-Hant": "地鐡1號缐" } }, { @@ -12,7 +14,139 @@ "colour": "#ff6319", "fg": "#fff", "name": { - "en": "M2" + "en": "M2", + "zh-Hans": "地铁2号线", + "zh-Hant": "地鐡2號缐" + } + }, + { + "id": "c", + "colour": "#963281", + "fg": "#fff", + "name": { + "en": "Commuter trains", + "zh-Hans": "赫尔辛基通勤铁路", + "zh-Hant": "赫爾辛基通勤鐵路" + } + }, + { + "id": "t1", + "colour": "#00b4e5", + "fg": "#fff", + "name": { + "en": "Tram Line 1", + "zh-Hans": "有轨电车1号线", + "zh-Hant": "有軌電車1號缐" + } + }, + { + "id": "t2", + "colour": "#65b32e", + "fg": "#fff", + "name": { + "en": "Tram Line 2", + "zh-Hans": "有轨电车2号线", + "zh-Hant": "有軌電車2號缐" + } + }, + { + "id": "t3", + "colour": "#007ec7", + "fg": "#fff", + "name": { + "en": "Tram Line 3", + "zh-Hans": "有轨电车3号线", + "zh-Hant": "有軌電車3號缐" + } + }, + { + "id": "t4", + "colour": "#e61657", + "fg": "#fff", + "name": { + "en": "Tram Line 4", + "zh-Hans": "有轨电车4号线", + "zh-Hant": "有軌電車4號缐" + } + }, + { + "id": "t5", + "colour": "#7a6f6f", + "fg": "#fff", + "name": { + "en": "Tram Line 5", + "zh-Hans": "有轨电车5号线", + "zh-Hant": "有軌電車5號缐" + } + }, + { + "id": "t6", + "colour": "#009757", + "fg": "#fff", + "name": { + "en": "Tram Line 6", + "zh-Hans": "有轨电车6号线", + "zh-Hant": "有軌電車6號缐" + } + }, + { + "id": "t7", + "colour": "#d5007f", + "fg": "#fff", + "name": { + "en": "Tram Line 7", + "zh-Hans": "有轨电车7号线", + "zh-Hant": "有軌電車7號缐" + } + }, + { + "id": "t8", + "colour": "#7f5ca3", + "fg": "#fff", + "name": { + "en": "Tram Line 8", + "zh-Hans": "有轨电车8号线", + "zh-Hant": "有軌電車8號缐" + } + }, + { + "id": "t9", + "colour": "#f19ec4", + "fg": "#fff", + "name": { + "en": "Tram Line 9", + "zh-Hans": "有轨电车9号线", + "zh-Hant": "有軌電車9號缐" + } + }, + { + "id": "t10", + "colour": "#fbb800", + "fg": "#fff", + "name": { + "en": "Tram Line 10", + "zh-Hans": "有轨电车10号线", + "zh-Hant": "有軌電車10號缐" + } + }, + { + "id": "t13", + "colour": "#ffdd00", + "fg": "#fff", + "name": { + "en": "Tram Line 13", + "zh-Hans": "有轨电车13号线", + "zh-Hant": "有軌電車13號缐" + } + }, + { + "id": "t15", + "colour": "#00a1a5", + "fg": "#fff", + "name": { + "en": "Light rail Line 15", + "zh-Hans": "轻铁15号线", + "zh-Hant": "輕鐡15號缐" } } ] From 0e2e99a0ff5d2512e29c9bf493cb33c4859f959b Mon Sep 17 00:00:00 2001 From: MajorDucks <121087569+MajorDucks@users.noreply.github.com> Date: Fri, 23 Aug 2024 07:37:21 +0000 Subject: [PATCH 25/45] #1346 Resources: New palettes of Wuxi --- public/resources/palettes/wuxi.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/resources/palettes/wuxi.json b/public/resources/palettes/wuxi.json index 0406a24f..953d7f44 100644 --- a/public/resources/palettes/wuxi.json +++ b/public/resources/palettes/wuxi.json @@ -4,9 +4,9 @@ "colour": "#EE2737", "fg": "#fff", "name": { - "en": "Line 1-Line S1", - "zh-Hans": "1号线-S1线/锡澄线", - "zh-Hant": "1號綫-S1綫/錫澄綫" + "en": "Line 1/Line S1", + "zh-Hans": "1号线/S1线（锡澄线）", + "zh-Hant": "1號綫/S1綫（錫澄綫）" } }, { From a2be1d6477d9c45eefb48c66cad7acf0e46aa2be Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Mon, 23 Sep 2024 04:10:31 +0000 Subject: [PATCH 26/45] #1385 Resources: New palettes of Brussels --- public/resources/palettes/brussels.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/resources/palettes/brussels.json b/public/resources/palettes/brussels.json index b7899adb..a4895f89 100644 --- a/public/resources/palettes/brussels.json +++ b/public/resources/palettes/brussels.json @@ -111,7 +111,7 @@ }, { "id": "br10", - "colour": "#9d8eb3", + "colour": "#7d489c", "fg": "#fff", "name": { "en": "Tram Line 10", From 61541a60679f9e2dfea307bb85679f02972d8716 Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Mon, 23 Sep 2024 04:12:26 +0000 Subject: [PATCH 27/45] #1385 Resources: New palettes of Brussels --- public/resources/palettes/brussels.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/resources/palettes/brussels.json b/public/resources/palettes/brussels.json index a4895f89..45889ab8 100644 --- a/public/resources/palettes/brussels.json +++ b/public/resources/palettes/brussels.json @@ -78,7 +78,7 @@ }, { "id": "br7", - "colour": "#fcf26f", + "colour": "#ece354", "fg": "#000", "name": { "en": "Tram Line 7", From 46a137e4078d9f7a03c59747d6a9d87146c8a38c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Sep 2024 04:41:10 +0000 Subject: [PATCH 28/45] rmg-palette-0.16.20 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a291dec..31e8c212 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.19", + "version": "0.16.20", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.19", + "version": "0.16.20", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 36b04620..285688e8 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.19" + "version": "0.16.20" } From eff968845d63394668c37c7107660fb73ea1e253 Mon Sep 17 00:00:00 2001 From: leowulinhui <124780705+leowulinhui@users.noreply.github.com> Date: Thu, 10 Oct 2024 03:25:38 +0000 Subject: [PATCH 29/45] #1413 Resources: New palettes of Okayama --- public/resources/city-config.json | 10 ++++++++++ public/resources/palettes/okayama.json | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 public/resources/palettes/okayama.json diff --git a/public/resources/city-config.json b/public/resources/city-config.json index f6a9e857..de7469cc 100644 --- a/public/resources/city-config.json +++ b/public/resources/city-config.json @@ -1253,6 +1253,16 @@ "de": "Nürnberg" } }, + { + "id": "okayama", + "country": "JP", + "name": { + "en": "Okayama", + "zh-Hans": "冈山", + "zh-Hant": "岡山", + "ja": "岡山" + } + }, { "id": "osaka", "country": "JP", diff --git a/public/resources/palettes/okayama.json b/public/resources/palettes/okayama.json new file mode 100644 index 00000000..c72e44bd --- /dev/null +++ b/public/resources/palettes/okayama.json @@ -0,0 +1,24 @@ +[ + { + "id": "oh1", + "colour": "#e5330d", + "fg": "#fff", + "name": { + "en": "Higashiyama Line", + "zh-Hans": "东山线", + "ja": "東山線", + "zh-Hant": "東山線" + } + }, + { + "id": "oh2", + "colour": "#3d7f44", + "fg": "#fff", + "name": { + "en": "Seikibashi Line", + "zh-Hans": "清辉桥线", + "ja": "清輝橋線", + "zh-Hant": "清會橋線" + } + } +] From 66cd226fb75eaa1a30bb142f8e2997a51384f219 Mon Sep 17 00:00:00 2001 From: linchen1965 <92020676+linchen1965@users.noreply.github.com> Date: Mon, 23 Sep 2024 04:52:34 +0000 Subject: [PATCH 30/45] #1387 Resources: New palettes of Brussels --- public/resources/palettes/brussels.json | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/public/resources/palettes/brussels.json b/public/resources/palettes/brussels.json index 45889ab8..b0d128b8 100644 --- a/public/resources/palettes/brussels.json +++ b/public/resources/palettes/brussels.json @@ -158,10 +158,10 @@ "colour": "#ec4838", "fg": "#fff", "name": { - "en": "Bus Line 17/28/46/54/57/64", - "fr": "Autobus Ligne 17/28/46/54/57/64", - "zh-Hans": "巴士线路17/28/46/54/57/64", - "zh-Hant": "巴士線路17/28/46/54/57/64" + "en": "Bus Line 17/28/46/47/54/57/64", + "fr": "Autobus Ligne 17/28/46/47/54/57/64", + "zh-Hans": "巴士线路17/28/46/47/54/57/64", + "zh-Hant": "巴士線路17/28/46/47/54/57/64" } }, { @@ -219,6 +219,17 @@ "zh-Hant": "巴士線路29/48/56/69" } }, + { + "id": "br35", + "colour": "#316797", + "fg": "#fff", + "name": { + "en": "Tram Line 35", + "fr": "Tramway Ligne 35", + "zh-Hans": "电车35号线", + "zh-Hant": "電車35號線" + } + }, { "id": "br37", "colour": "#316797", From 85a78b5fb643715406b26adae8c7e06815264a75 Mon Sep 17 00:00:00 2001 From: Todist2022 <111163606+Todist2022@users.noreply.github.com> Date: Wed, 28 Aug 2024 06:01:59 +0000 Subject: [PATCH 31/45] #1315 Resources: New palettes of Chongqing --- public/resources/palettes/chongqing.json | 131 ++--------------------- 1 file changed, 10 insertions(+), 121 deletions(-) diff --git a/public/resources/palettes/chongqing.json b/public/resources/palettes/chongqing.json index 04b392c0..e52ad2dd 100644 --- a/public/resources/palettes/chongqing.json +++ b/public/resources/palettes/chongqing.json @@ -1,9 +1,8 @@ [ { "id": "loop", - "colour": "#F2A900", + "colour": "#f2a900", "fg": "#fff", - "pantone": "130 C", "name": { "en": "Loop Line", "zh-Hans": "环线", @@ -14,7 +13,6 @@ "id": "cq1", "colour": "#E4002B", "fg": "#fff", - "pantone": "185 C", "name": { "en": "Line 1", "zh-Hans": "1号线", @@ -23,9 +21,8 @@ }, { "id": "cq2", - "colour": "#007A33", + "colour": "#007033", "fg": "#fff", - "pantone": "356 C", "name": { "en": "Line 2", "zh-Hans": "2号线", @@ -36,7 +33,6 @@ "id": "cq3", "colour": "#003DA5", "fg": "#fff", - "pantone": "293 C", "name": { "en": "Line 3", "zh-Hans": "3号线", @@ -47,7 +43,6 @@ "id": "cq4", "colour": "#DC8633", "fg": "#fff", - "pantone": "7413 C", "name": { "en": "Line 4", "zh-Hans": "4号线", @@ -58,7 +53,6 @@ "id": "cq5", "colour": "#00A3E0", "fg": "#fff", - "pantone": "299 C", "name": { "en": "Line 5", "zh-Hans": "5号线", @@ -69,7 +63,6 @@ "id": "cq6", "colour": "#F67599", "fg": "#fff", - "pantone": "190 C", "name": { "en": "Line 6", "zh-Hans": "6号线", @@ -80,7 +73,6 @@ "id": "cq7", "colour": "#008C95", "fg": "#fff", - "pantone": "321 C", "name": { "en": "Line 7", "zh-Hans": "7号线", @@ -91,7 +83,6 @@ "id": "cq8", "colour": "#7A9A01", "fg": "#fff", - "pantone": "377 C", "name": { "en": "Line 8", "zh-Hans": "8号线", @@ -100,9 +91,8 @@ }, { "id": "cq9", - "colour": "#862041", + "colour": "#861f41", "fg": "#fff", - "pantone": "208 C", "name": { "en": "Line 9", "zh-Hans": "9号线", @@ -111,9 +101,8 @@ }, { "id": "cq10", - "colour": "#5F249F", + "colour": "#5f259f", "fg": "#fff", - "pantone": "267 C", "name": { "en": "Line 10", "zh-Hans": "10号线", @@ -124,7 +113,6 @@ "id": "cq11", "colour": "#D986BA", "fg": "#fff", - "pantone": "673 C", "name": { "en": "Line 11", "zh-Hans": "11号线", @@ -135,7 +123,6 @@ "id": "cq12", "colour": "#D2D755", "fg": "#fff", - "pantone": "584 C", "name": { "en": "Line 12", "zh-Hans": "12号线", @@ -146,7 +133,6 @@ "id": "cq13", "colour": "#B89D18", "fg": "#fff", - "pantone": "457 C", "name": { "en": "Line 13", "zh-Hans": "13号线", @@ -157,7 +143,6 @@ "id": "cq14", "colour": "#B94700", "fg": "#fff", - "pantone": "1525 C", "name": { "en": "Line 14", "zh-Hans": "14号线", @@ -166,9 +151,8 @@ }, { "id": "cq15", - "colour": "#0057B7", + "colour": "#0057b8", "fg": "#fff", - "pantone": "2935 C", "name": { "en": "Line 15", "zh-Hans": "15号线", @@ -179,7 +163,6 @@ "id": "cq16", "colour": "#B04A5A", "fg": "#fff", - "pantone": "7419 C", "name": { "en": "Line 16", "zh-Hans": "16号线", @@ -190,7 +173,6 @@ "id": "cq17", "colour": "#9F5CC0", "fg": "#fff", - "pantone": "7441 C", "name": { "en": "Line 17", "zh-Hans": "17号线", @@ -199,130 +181,38 @@ }, { "id": "cq18", - "colour": "#2AD2C9", + "colour": "#2ad2c9", "fg": "#fff", - "pantone": "3252 C", "name": { "en": "Line 18", "zh-Hans": "18号线", "zh-Hant": "18號線" } }, - { - "id": "cq19", - "colour": "#BC204B", - "fg": "#fff", - "pantone": "7636 C", - "name": { - "en": "Line 19", - "zh-Hans": "19号线", - "zh-Hant": "19號線" - } - }, - { - "id": "cq20", - "colour": "#E31C79", - "fg": "#fff", - "pantone": "213 C", - "name": { - "en": "Line 20", - "zh-Hans": "20号线", - "zh-Hant": "20號線" - } - }, - { - "id": "cq21", - "colour": "#007FA3", - "fg": "#fff", - "pantone": "314 C", - "name": { - "en": "Line 21", - "zh-Hans": "21号线", - "zh-Hant": "21號線" - } - }, - { - "id": "cq22", - "colour": "#003D4C", - "fg": "#fff", - "pantone": "548 C", - "name": { - "en": "Line 22", - "zh-Hans": "22号线", - "zh-Hant": "22號線" - } - }, - { - "id": "cq23", - "colour": "#E35205", - "fg": "#fff", - "pantone": "166 C", - "name": { - "en": "Line 23", - "zh-Hans": "23号线", - "zh-Hant": "23號線" - } - }, { "id": "cq24", - "colour": "#D7A048", + "colour": "#00a3ad", "fg": "#fff", - "pantone": "4025 C", "name": { "en": "Line 24", "zh-Hans": "24号线", "zh-Hant": "24號線" } }, - { - "id": "cq25", - "colour": "#00685E", - "fg": "#fff", - "pantone": "329 C", - "name": { - "en": "Line 25", - "zh-Hans": "25号线", - "zh-Hant": "25號線" - } - }, - { - "id": "cq26", - "colour": "#00C389", - "fg": "#fff", - "pantone": "3395 C", - "name": { - "en": "Line 26", - "zh-Hans": "26号线", - "zh-Hant": "26號線" - } - }, { "id": "cq27", - "colour": "#685BC7", + "colour": "#685bc7", "fg": "#fff", - "pantone": "2725 C", "name": { "en": "Line 27", "zh-Hans": "27号线", "zh-Hant": "27號線" } }, - { - "id": "cq28", - "colour": "#007398", - "fg": "#fff", - "pantone": "7468 C", - "name": { - "en": "Line 28", - "zh-Hans": "28号线", - "zh-Hant": "28號線" - } - }, { "id": "jiangtiao", - "colour": "#0077C8", + "colour": "#0077c8", "fg": "#fff", - "pantone": "3005 C", "name": { "en": "Jiangtiao Line", "zh-Hans": "江跳线", @@ -331,9 +221,8 @@ }, { "id": "bitong", - "colour": "#685BC7", + "colour": "#0057b8", "fg": "#fff", - "pantone": "2725 C", "name": { "en": "Bitong Line", "zh-Hans": "璧铜线", From ce568539b3618c36eb39244ed67050eea743a944 Mon Sep 17 00:00:00 2001 From: TheDucHuy <177153091+TheDucHuy@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:56:19 +0000 Subject: [PATCH 32/45] #1297 Resources: New palettes of Ho Chi Minh City --- public/resources/palettes/hochiminh.json | 89 ++++++++++++++++-------- 1 file changed, 60 insertions(+), 29 deletions(-) diff --git a/public/resources/palettes/hochiminh.json b/public/resources/palettes/hochiminh.json index 0f39391d..914aa359 100644 --- a/public/resources/palettes/hochiminh.json +++ b/public/resources/palettes/hochiminh.json @@ -1,92 +1,123 @@ [ { "id": "hcm1", + "colour": "#0079b8", + "fg": "#fff", "name": { "en": "Line 1", "vi": "Tuyến số 1", "zh-Hans": "1号线", "zh-Hant": "1號線" - }, - "colour": "#117FC2" + } }, { "id": "hcm2", + "colour": "#cc205f", + "fg": "#fff", "name": { "en": "Line 2", "vi": "Tuyến số 2", "zh-Hans": "2号线", "zh-Hant": "2號線" - }, - "colour": "#E91D26" + } }, { - "id": "hcm3", + "id": "hcm3a", + "colour": "#fb7d37", + "fg": "#fff", "name": { - "en": "Line 3", - "vi": "Tuyến số 3", - "zh-Hans": "3号线", - "zh-Hant": "3號線" - }, - "colour": "#ED5D2D" + "en": "Line 3A", + "vi": "Tuyến số 3A", + "zh-Hans": "3A号线", + "zh-Hant": "3A號線" + } + }, + { + "id": "hcm3b", + "colour": "#fb7d37", + "fg": "#fff", + "name": { + "en": "Line 3B", + "vi": "Tuyến số 3B", + "zh-Hans": "3B号线", + "zh-Hant": "3B號線" + } }, { "id": "hcm4", + "colour": "#97cf6f", + "fg": "#fff", "name": { "en": "Line 4", "vi": "Tuyến số 4", "zh-Hans": "4号线", "zh-Hant": "4號線" - }, - "colour": "#3AB34B" + } + }, + { + "id": "hcm4b", + "colour": "#97cf6f", + "fg": "#fff", + "name": { + "en": "Line 4B", + "vi": "Tuyến số 4B", + "zh-Hans": "4B号线", + "zh-Hant": "4B號線" + } }, { "id": "hcm5", + "colour": "#e690bb", + "fg": "#fff", "name": { "en": "Line 5", "vi": "Tuyến số 5", "zh-Hans": "5号线", "zh-Hant": "5號線" - }, - "colour": "#BE1C7C" + } }, { "id": "hcm6", + "colour": "#ab7c65", + "fg": "#fff", "name": { "en": "Line 6", "vi": "Tuyến số 6", "zh-Hans": "6号线", "zh-Hant": "6號線" - }, - "colour": "#A67E5F" + } }, { "id": "hcmt1", + "colour": "#53c5e0", + "fg": "#fff", "name": { - "en": "Line T1", - "vi": "Tuyến số T1", + "en": "Tramway 1", + "vi": "Tuyến Tramway số 1", "zh-Hans": "T1号线", "zh-Hant": "T1號線" - }, - "colour": "#894798" + } }, { "id": "hcmm2", + "colour": "#894e9a", + "fg": "#fff", "name": { - "en": "Line M2", - "vi": "Tuyến số M2", + "en": "Monorail 2", + "vi": "Tuyến Monorail 2", "zh-Hans": "M2号线", "zh-Hant": "M2號線" - }, - "colour": "#949391" + } }, { "id": "hcmm3", + "colour": "#87898b", + "fg": "#fff", "name": { - "en": "Line M3", - "vi": "Tuyến số M3", + "en": "Monorail 3", + "vi": "Tuyến Monorail 3", "zh-Hans": "M3号线", "zh-Hant": "M3號線" - }, - "colour": "#79C6DB" + } } ] From bd9923a58bb32160465d3412e1b7659aca32392e Mon Sep 17 00:00:00 2001 From: Benson20110806 <122724777+Benson20110806@users.noreply.github.com> Date: Sun, 11 Aug 2024 13:11:51 +0000 Subject: [PATCH 33/45] #1324 Resources: New palettes of New Taipei --- public/resources/palettes/newtaipei.json | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/public/resources/palettes/newtaipei.json b/public/resources/palettes/newtaipei.json index 6cc68f63..630d5898 100644 --- a/public/resources/palettes/newtaipei.json +++ b/public/resources/palettes/newtaipei.json @@ -44,9 +44,9 @@ "colour": "#e5007f", "fg": "#fff", "name": { - "en": "Wugu-Taishan LRT", - "zh-Hans": "五股泰山轻轨", - "zh-Hant": "五股泰山輕軌" + "en": "Wugu-Taishan-Banqiao LRT", + "zh-Hans": "五股泰山板桥轻轨", + "zh-Hant": "五股泰山板橋輕軌" } }, { @@ -54,19 +54,29 @@ "colour": "#f6c2d8", "fg": "#fff", "name": { - "en": "Taishan-Banqiao LRT", - "zh-Hans": "泰山板桥轻轨", - "zh-Hant": "泰山板橋輕軌" + "en": "Linkou LRT/Zhonghe-Guangfu Line", + "zh-Hans": "林口轻轨/中和光复线", + "zh-Hant": "林口輕軌/中和光復線" } }, { "id": "y", "colour": "#ffd500", - "fg": "#fff", + "fg": "#000", "name": { "en": "Circular Line", "zh-Hans": "环状线", "zh-Hant": "環狀線" } + }, + { + "id": "sb", + "colour": "#25aae1", + "fg": "#fff", + "name": { + "en": "Xizhi-Donghu MRT/Keelung MRT", + "zh-Hans": "汐东捷运/基隆捷运", + "zh-Hant": "汐東捷運/基隆捷運" + } } ] From 1e5b01e6c7d0cd57d6a6895da83553182c9f19f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 12 Oct 2024 14:23:55 +0000 Subject: [PATCH 34/45] rmg-palette-0.16.21 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31e8c212..579a73c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.20", + "version": "0.16.21", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.20", + "version": "0.16.21", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 285688e8..46684ac9 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.20" + "version": "0.16.21" } From 498331cc762fbde56d826a67901d323c51fa9c53 Mon Sep 17 00:00:00 2001 From: 816R <140082406+816R@users.noreply.github.com> Date: Sun, 20 Oct 2024 22:01:50 +0000 Subject: [PATCH 35/45] #1418 Resources: New palettes of Shanghai --- public/resources/palettes/shanghai.json | 36 +++++++++++++++++++------ 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/public/resources/palettes/shanghai.json b/public/resources/palettes/shanghai.json index 8274aaa2..e00f3c0d 100644 --- a/public/resources/palettes/shanghai.json +++ b/public/resources/palettes/shanghai.json @@ -31,7 +31,7 @@ }, { "id": "sh4", - "colour": "#461D84", + "colour": "#461d84", "fg": "#fff", "name": { "en": "Line 4", @@ -181,7 +181,7 @@ }, { "id": "sh19", - "colour": "#F6AF74", + "colour": "#f5ab78", "fg": "#000", "name": { "en": "Line 19", @@ -191,7 +191,7 @@ }, { "id": "sh20", - "colour": "#009f5d", + "colour": "#009f65", "fg": "#fff", "name": { "en": "Line 20", @@ -201,7 +201,7 @@ }, { "id": "sh21", - "colour": "#eea900", + "colour": "#f7af00", "fg": "#000", "name": { "en": "Line 21", @@ -211,7 +211,7 @@ }, { "id": "sh22", - "colour": "#56426f", + "colour": "#5f376f", "fg": "#fff", "name": { "en": "Line 22", @@ -221,7 +221,7 @@ }, { "id": "sh23", - "colour": "#a8cc80", + "colour": "#b0d478", "fg": "#000", "name": { "en": "Line 23", @@ -229,6 +229,26 @@ "zh-Hant": "23號線" } }, + { + "id": "sh26", + "colour": "#5f67a9", + "fg": "#fff", + "name": { + "en": "Line 26", + "zh-Hans": "26号线", + "zh-Hant": "26號線" + } + }, + { + "id": "sh27", + "colour": "#43a5a0", + "fg": "#fff", + "name": { + "en": "Line 27", + "zh-Hans": "27号线", + "zh-Hant": "27號線" + } + }, { "id": "pjl", "colour": "#B5B5B6", @@ -251,7 +271,7 @@ }, { "id": "maglev", - "colour": "#009090", + "colour": "#008b9a", "fg": "#fff", "name": { "en": "Shanghai Maglev Train", @@ -321,7 +341,7 @@ }, { "id": "airport", - "colour": "#3D6B8A", + "colour": "#236890", "fg": "#fff", "name": { "en": "Airport Link Line", From dd88710c3d3595611589bf3ef8871b1ba2e27d5d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 22 Oct 2024 22:23:04 +0000 Subject: [PATCH 36/45] rmg-palette-0.16.22 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 579a73c3..dd9525a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.21", + "version": "0.16.22", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.21", + "version": "0.16.22", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 46684ac9..415969bb 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.21" + "version": "0.16.22" } From cd8fa61bd2a302cb6cca77cf58ce7670690dbe81 Mon Sep 17 00:00:00 2001 From: aaronyz2007 <120014893+aaronyz2007@users.noreply.github.com> Date: Thu, 24 Oct 2024 08:23:16 +0000 Subject: [PATCH 37/45] #1424 Resources: New palettes of Istanbul --- public/resources/palettes/istanbul.json | 150 ++++++++++++++++-------- 1 file changed, 102 insertions(+), 48 deletions(-) diff --git a/public/resources/palettes/istanbul.json b/public/resources/palettes/istanbul.json index 35540ef5..c4cc9dce 100644 --- a/public/resources/palettes/istanbul.json +++ b/public/resources/palettes/istanbul.json @@ -1,223 +1,277 @@ [ { "id": "istm1", + "colour": "#E02725", + "fg": "#fff", "name": { "en": "M1", "tr": "M1", "zh-Hans": "地铁1号线", "zh-Hant": "地鐵1號線" - }, - "colour": "#E02725" + } }, { "id": "istm2", + "colour": "#009A4C", + "fg": "#fff", "name": { "en": "M2", "tr": "M2", "zh-Hans": "地铁2号线", "zh-Hant": "地鐵2號線" - }, - "colour": "#009A4C" + } }, { "id": "istm3", + "colour": "#00A7E0", + "fg": "#fff", "name": { "en": "M3", "tr": "M3", "zh-Hans": "地铁3号线", "zh-Hant": "地鐵3號線" - }, - "colour": "#00A7E0" + } }, { "id": "istm4", + "colour": "#E62176", + "fg": "#fff", "name": { "en": "M4", "tr": "M4", "zh-Hans": "地铁4号线", "zh-Hant": "地鐵4號線" - }, - "colour": "#E62176" + } }, { "id": "istm5", + "colour": "#663064", + "fg": "#fff", "name": { "en": "M5", "tr": "M5", "zh-Hans": "地铁5号线", "zh-Hant": "地鐵5號線" - }, - "colour": "#663064" + } }, { "id": "istm6", + "colour": "#C7A978", + "fg": "#fff", "name": { "en": "M6", "tr": "M6", "zh-Hans": "地铁6号线", "zh-Hant": "地鐵6號線" - }, - "colour": "#C7A978" + } }, { "id": "istm7", + "colour": "#F396B7", + "fg": "#fff", "name": { "en": "M7", "tr": "M7", "zh-Hans": "地铁7号线", "zh-Hant": "地鐵7號線" - }, - "colour": "#F396B7" + } }, { "id": "istm8", + "colour": "#417CBE", + "fg": "#fff", "name": { "en": "M8", "tr": "M8", "zh-Hans": "地铁8号线", "zh-Hant": "地鐵8號線" - }, - "colour": "#417CBE" + } }, { "id": "istm9", + "colour": "#FBD411", + "fg": "#000", "name": { "en": "M9", "tr": "M9", "zh-Hans": "地铁9号线", "zh-Hant": "地鐵9號線" - }, - "colour": "#FBD411", - "fg": "#000" + } }, { "id": "istm10", + "colour": "#84D5E2", + "fg": "#fff", "name": { "en": "M10", "tr": "M10", "zh-Hans": "地铁10号线", "zh-Hant": "地鐵10號線" - }, - "colour": "#84D5E2" + } }, { "id": "istm11", + "colour": "#9A5A94", + "fg": "#fff", "name": { "en": "M11", "tr": "M11", "zh-Hans": "地铁11号线", "zh-Hant": "地鐵11號線" - }, - "colour": "#9A5A94" + } }, { "id": "istm12", + "colour": "#C6C924", + "fg": "#fff", "name": { "en": "M12", "tr": "M12", "zh-Hans": "地铁12号线", "zh-Hant": "地鐵12號線" - }, - "colour": "#C6C924" + } }, { "id": "istm13", + "colour": "#01A850", + "fg": "#fff", "name": { "en": "M13", "tr": "M13", "zh-Hans": "地铁13号线", "zh-Hant": "地鐵13號線" - }, - "colour": "#01A850" + } + }, + { + "id": "istm14", + "colour": "#ab6227", + "fg": "#fff", + "name": { + "en": "M14", + "tr": "M14", + "zh-Hans": "地铁14号线", + "zh-Hant": "地鐵14號線" + } }, { "id": "istt1", + "colour": "#024F7B", + "fg": "#fff", "name": { "en": "T1", "tr": "T1", "zh-Hans": "有轨电车1号线", "zh-Hant": "有軌電車1號線" - }, - "colour": "#024F7B" + } }, { "id": "istt2", + "colour": "#8EAA9E", + "fg": "#fff", "name": { "en": "T2", "tr": "T2", "zh-Hans": "有轨电车2号线", "zh-Hant": "有軌電車2號線" - }, - "colour": "#8EAA9E" + } }, { "id": "istt3", + "colour": "#9A552B", + "fg": "#fff", "name": { "en": "T3", "tr": "T3", "zh-Hans": "有轨电车3号线", "zh-Hant": "有軌電車3號線" - }, - "colour": "#9A552B" + } }, { "id": "istt4", + "colour": "#F37F46", + "fg": "#fff", "name": { "en": "T4", "tr": "T4", "zh-Hans": "有轨电车4号线", "zh-Hant": "有軌電車4號線" - }, - "colour": "#F37F46" + } }, { "id": "istt5", + "colour": "#7473b5", + "fg": "#fff", "name": { "en": "T5", "tr": "T5", "zh-Hans": "有轨电车5号线", "zh-Hant": "有軌電車5號線" - }, - "colour": "#C4D5A2" + } + }, + { + "id": "istt6", + "colour": "#e67d7c", + "fg": "#fff", + "name": { + "en": "T6", + "tr": "T6", + "zh-Hans": "有轨电车6号线", + "zh-Hant": "有軌電車6號線" + } }, { "id": "istbrt", + "colour": "#DAD498", + "fg": "#fff", "name": { "en": "BRT", "tr": "Metrobüs", "zh-Hans": "BRT", "zh-Hant": "BRT" - }, - "colour": "#DAD498" + } }, { "id": "istcc", + "colour": "#62BCB0", + "fg": "#fff", "name": { "en": "Cable Car", "tr": "Teleferik", "zh-Hans": "缆车", "zh-Hant": "纜車" - }, - "colour": "#62BCB0" + } }, { "id": "istf", + "colour": "#787256", + "fg": "#fff", "name": { "en": "Funicular", "tr": "Füniküler", "zh-Hans": "缆索铁道", "zh-Hant": "纜索鐵道" - }, - "colour": "#787256" + } }, { - "id": "istb", + "id": "istb1", + "colour": "#616368", + "fg": "#fff", "name": { - "en": "Suburban Line B", - "tr": "Marmaray", + "en": "Suburban Line B1", + "tr": " Halkalı-Gebze Banliyö Hattı", "zh-Hans": "市域铁路B线", "zh-Hant": "市域鐵路B線" - }, - "colour": "#595D60" + } + }, + { + "id": "istb2", + "colour": "#747579", + "fg": "#fff", + "name": { + "en": "Suburban Line B2", + "tr": "Halkalı-Bahçeşehir Banliyö Hattı", + "zh-Hans": "市域铁路B2线", + "zh-Hant": "市域鐵路B2線" + } } ] From c5cf8a4fc03ac5b170f94d446e1e168164cb72f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 24 Oct 2024 16:40:19 +0000 Subject: [PATCH 38/45] rmg-palette-0.16.23 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd9525a8..50219cc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.22", + "version": "0.16.23", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.22", + "version": "0.16.23", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 415969bb..c3b4c42b 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.22" + "version": "0.16.23" } From 35a2205337402a0abf4da1488fcb3c25a3eaeaf6 Mon Sep 17 00:00:00 2001 From: Minwtraft <137034903+Minwtraft@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:23:50 +0000 Subject: [PATCH 39/45] #1359 Resources: New palettes of Guangzhou --- public/resources/palettes/guangzhou.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/resources/palettes/guangzhou.json b/public/resources/palettes/guangzhou.json index d556fb10..ce07c661 100644 --- a/public/resources/palettes/guangzhou.json +++ b/public/resources/palettes/guangzhou.json @@ -188,7 +188,7 @@ }, { "id": "gz18", - "colour": "#0047BA", + "colour": "#3040b6", "fg": "#fff", "name": { "en": "Line 18", @@ -231,7 +231,7 @@ }, { "id": "gz22", - "colour": "#CD5228", + "colour": "#d24c1e", "fg": "#fff", "name": { "en": "Line 22", @@ -273,7 +273,7 @@ }, { "id": "thz1", - "colour": "#43B02A", + "colour": "#61c013", "fg": "#fff", "name": { "en": "THZ1 (Haizhu Tram Line 1)", @@ -283,7 +283,7 @@ }, { "id": "thp1", - "colour": "#D42D1B", + "colour": "#c11b20", "fg": "#fff", "name": { "en": "THP1 (Huangpu Tram Line 1)", @@ -293,7 +293,7 @@ }, { "id": "thp2", - "colour": "#e82583", + "colour": "#e50083", "fg": "#fff", "name": { "en": "THP2 (Huangpu Tram Line 2)", @@ -313,7 +313,7 @@ }, { "id": "gdcj", - "colour": "#2c569e", + "colour": "#255aa8", "fg": "#fff", "name": { "en": "Guangdong Intercity", From c2ff6035aceeea836d52baae3fbec3e458d2ee25 Mon Sep 17 00:00:00 2001 From: Chito Wong Date: Sat, 26 Oct 2024 17:18:31 +0800 Subject: [PATCH 40/45] #1359 Update Guangzhou palette --- src/components/picker-view/colour-picker.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/picker-view/colour-picker.test.tsx b/src/components/picker-view/colour-picker.test.tsx index d359a355..6ba497eb 100644 --- a/src/components/picker-view/colour-picker.test.tsx +++ b/src/components/picker-view/colour-picker.test.tsx @@ -53,7 +53,7 @@ describe('ColourPicker', () => { // select THZ1 await user.click(thz1Option); expect(mockCallbacks.onChange).toBeCalledTimes(1); - expect(mockCallbacks.onChange).toBeCalledWith('thz1', '#43B02A', '#fff', undefined); + expect(mockCallbacks.onChange).toBeCalledWith('thz1', '#61c013', '#fff', undefined); }); it('Can reload list of palette when city prop is changed', async () => { From 4a5c27bb838c6c2a4bf62e81fe0da2adf5c70458 Mon Sep 17 00:00:00 2001 From: CaiFengXiang0709 <85141332+CaiFengXiang0709@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:57:07 +0000 Subject: [PATCH 41/45] #1352 Resources: New palettes of Zhongshan --- public/resources/city-config.json | 9 +++++++++ public/resources/palettes/zhongshan.json | 12 ++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 public/resources/palettes/zhongshan.json diff --git a/public/resources/city-config.json b/public/resources/city-config.json index de7469cc..98bc6317 100644 --- a/public/resources/city-config.json +++ b/public/resources/city-config.json @@ -1912,5 +1912,14 @@ "zh-Hans": "镇江", "zh-Hant": "鎮江" } + }, + { + "id": "zhongshan", + "country": "CN", + "name": { + "en": "Zhongshan", + "zh-Hans": "中山", + "zh-Hant": "中山" + } } ] diff --git a/public/resources/palettes/zhongshan.json b/public/resources/palettes/zhongshan.json new file mode 100644 index 00000000..d5dbfafc --- /dev/null +++ b/public/resources/palettes/zhongshan.json @@ -0,0 +1,12 @@ +[ + { + "id": "gz18s", + "colour": "#0047ba", + "fg": "#fff", + "name": { + "en": "Guangzhou Metro Line 18 South Extension Section (Nanzhong Intercity)", + "zh-Hans": "广州地铁18号线南延段（南中城际）", + "zh-Hant": "廣州地鐵18號線南延段（南中城際）" + } + } +] From a10ba91c57e57291fb55a5455ec13984ab44755f Mon Sep 17 00:00:00 2001 From: Chito Wong Date: Sat, 26 Oct 2024 17:24:27 +0800 Subject: [PATCH 42/45] #1352 Update zhongshan.json --- public/resources/palettes/zhongshan.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/resources/palettes/zhongshan.json b/public/resources/palettes/zhongshan.json index d5dbfafc..af8a7a6e 100644 --- a/public/resources/palettes/zhongshan.json +++ b/public/resources/palettes/zhongshan.json @@ -1,12 +1,12 @@ [ { - "id": "gz18s", - "colour": "#0047ba", + "id": "gz18", + "colour": "#3040b6", "fg": "#fff", "name": { - "en": "Guangzhou Metro Line 18 South Extension Section (Nanzhong Intercity)", - "zh-Hans": "广州地铁18号线南延段（南中城际）", - "zh-Hant": "廣州地鐵18號線南延段（南中城際）" + "en": "Guangzhou Line 18", + "zh-Hans": "广州18号线", + "zh-Hant": "廣州18號線" } } ] From 76a13112954e999e15f25738c43555e4d53d8788 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 26 Oct 2024 09:26:41 +0000 Subject: [PATCH 43/45] rmg-palette-0.16.24 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50219cc0..2a46bf0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.23", + "version": "0.16.24", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.23", + "version": "0.16.24", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index c3b4c42b..22cfd0cb 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.23" + "version": "0.16.24" } From 1e2119a5fa3f2e44bb9dc271f196150a180bbaaf Mon Sep 17 00:00:00 2001 From: wongchito <9390786+wongchito@users.noreply.github.com> Date: Sat, 26 Oct 2024 10:11:33 +0000 Subject: [PATCH 44/45] #1426 Resources: New palettes of Guangzhou --- public/resources/palettes/guangzhou.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/resources/palettes/guangzhou.json b/public/resources/palettes/guangzhou.json index ce07c661..6af8233d 100644 --- a/public/resources/palettes/guangzhou.json +++ b/public/resources/palettes/guangzhou.json @@ -111,9 +111,8 @@ }, { "id": "gz11", - "colour": "#470A68", - "fg": "#fff", - "pantone": "2617 C", + "colour": "#ffb00a", + "fg": "#000", "name": { "en": "Line 11", "zh-Hans": "11号线", From 54b7c91800031df0fd75daaefa36e9aea7b02feb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 26 Oct 2024 10:13:55 +0000 Subject: [PATCH 45/45] rmg-palette-0.16.25 release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a46bf0e..843ea912 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rmg-palette", - "version": "0.16.24", + "version": "0.16.25", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rmg-palette", - "version": "0.16.24", + "version": "0.16.25", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 22cfd0cb..d733d7c6 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "postinstall": "cd ./package && npm i", "preview": "vite preview" }, - "version": "0.16.24" + "version": "0.16.25" }