Merge branch 'main' into bot-1263

railmapgen · Oct 26, 2024 · 78255a3 · 78255a3
2 parents 6518829 + 54b7c91
commit 78255a3
Show file tree

Hide file tree

Showing 26 changed files with 827 additions and 312 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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.25"
 }
diff --git 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",
@@ -619,6 +628,13 @@
             "en": "Hefei"
         }
     },
+    {
+        "id": "helsinki",
+        "country": "FI",
+        "name": {
+            "en": "Helsinki"
+        }
+    },
     {
         "id": "hiroshima",
         "country": "JP",
@@ -773,6 +789,17 @@
             "zh-Hant": "大吉隆坡/巴生谷"
         }
     },
+    {
+        "id": "kobe",
+        "country": "JP",
+        "name": {
+            "en": "Kobe",
+            "zh-Hans": "神户",
+            "zh-Hant": "神户",
+            "ja": "神户",
+            "ko": "고베"
+        }
+    },
     {
         "id": "kunming",
         "country": "CN",
@@ -909,6 +936,15 @@
             "zh-Hant": "洛陽"
         }
     },
+    {
+        "id": "lv",
+        "country": "US",
+        "name": {
+            "en": "Las Vegas",
+            "zh-Hans": "拉斯维加斯",
+            "zh-Hant": "拉斯維加斯"
+        }
+    },
     {
         "id": "lyon",
         "country": "FR",
@@ -1188,6 +1224,15 @@
             "zh-Hant": "寧波"
         }
     },
+    {
+        "id": "nottingham",
+        "country": "GBENG",
+        "name": {
+            "en": "Nottingham",
+            "zh-Hans": "诺丁汉",
+            "zh-Hant": "諾丁漢"
+        }
+    },
     {
         "id": "novosibirsk",
         "country": "RU",
@@ -1208,6 +1253,16 @@
             "de": "Nürnberg"
         }
     },
+    {
+        "id": "okayama",
+        "country": "JP",
+        "name": {
+            "en": "Okayama",
+            "zh-Hans": "冈山",
+            "zh-Hant": "岡山",
+            "ja": "岡山"
+        }
+    },
     {
         "id": "osaka",
         "country": "JP",
@@ -1857,5 +1912,14 @@
             "zh-Hans": "镇江",
             "zh-Hant": "鎮江"
         }
+    },
+    {
+        "id": "zhongshan",
+        "country": "CN",
+        "name": {
+            "en": "Zhongshan",
+            "zh-Hans": "中山",
+            "zh-Hant": "中山"
+        }
     }
 ]
diff --git 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": {
@@ -372,6 +379,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
@@ -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": "奧尼洪加綫"
+        }
+    }
+]
diff --git 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",
@@ -111,7 +111,7 @@
     },
     {
         "id": "br10",
-        "colour": "#9d8eb3",
+        "colour": "#7d489c",
         "fg": "#fff",
         "name": {
             "en": "Tram Line 10",
@@ -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",

diff --git 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": "芒果巴士"
+        }
     }
 ]