Skip to content

Commit

Permalink
Merge branch 'main' into bot-1357
Browse files Browse the repository at this point in the history
  • Loading branch information
linchen1965 authored Oct 12, 2024
2 parents 374bf87 + 66cd226 commit 80efe5e
Show file tree
Hide file tree
Showing 14 changed files with 405 additions and 48 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@
"postinstall": "cd ./package && npm i",
"preview": "vite preview"
},
"version": "0.16.18"
"version": "0.16.20"
}
35 changes: 35 additions & 0 deletions public/resources/city-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,13 @@
"en": "Hefei"
}
},
{
"id": "helsinki",
"country": "FI",
"name": {
"en": "Helsinki"
}
},
{
"id": "hiroshima",
"country": "JP",
Expand Down Expand Up @@ -929,6 +936,15 @@
"zh-Hant": "洛陽"
}
},
{
"id": "lv",
"country": "US",
"name": {
"en": "Las Vegas",
"zh-Hans": "拉斯维加斯",
"zh-Hant": "拉斯維加斯"
}
},
{
"id": "lyon",
"country": "FR",
Expand Down Expand Up @@ -1208,6 +1224,15 @@
"zh-Hant": "寧波"
}
},
{
"id": "nottingham",
"country": "GBENG",
"name": {
"en": "Nottingham",
"zh-Hans": "诺丁汉",
"zh-Hant": "諾丁漢"
}
},
{
"id": "novosibirsk",
"country": "RU",
Expand All @@ -1228,6 +1253,16 @@
"de": "Nürnberg"
}
},
{
"id": "okayama",
"country": "JP",
"name": {
"en": "Okayama",
"zh-Hans": "冈山",
"zh-Hant": "岡山",
"ja": "岡山"
}
},
{
"id": "osaka",
"country": "JP",
Expand Down
7 changes: 7 additions & 0 deletions public/resources/country-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,13 @@
},
"language": "es"
},
{
"id": "FI",
"name": {
"en": "Finland"
},
"language": "sv"
},
{
"id": "FR",
"name": {
Expand Down
23 changes: 17 additions & 6 deletions public/resources/palettes/brussels.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
},
{
"id": "br7",
"colour": "#fcf26f",
"colour": "#ece354",
"fg": "#000",
"name": {
"en": "Tram Line 7",
Expand Down Expand Up @@ -111,7 +111,7 @@
},
{
"id": "br10",
"colour": "#9d8eb3",
"colour": "#7d489c",
"fg": "#fff",
"name": {
"en": "Tram Line 10",
Expand Down Expand Up @@ -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"
}
},
{
Expand Down Expand Up @@ -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",
Expand Down
152 changes: 152 additions & 0 deletions public/resources/palettes/helsinki.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
[
{
"id": "m1",
"colour": "#ff6319",
"fg": "#fff",
"name": {
"en": "M1",
"zh-Hans": "地铁1号线",
"zh-Hant": "地鐡1號缐"
}
},
{
"id": "m2",
"colour": "#ff6319",
"fg": "#fff",
"name": {
"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號缐"
}
}
]
Loading

0 comments on commit 80efe5e

Please sign in to comment.